Fire_fuel sanity & other various ignition fixes (vgstation-coders#35890)

* More fire updates * more * pie tin powercreep * committed * remove debug * empty
Kurfursten · Feb 7, 2024 · 09927af · 09927af
1 parent aaabf3c
commit 09927af
Show file tree

Hide file tree

Showing 40 changed files with 28 additions and 51 deletions.
diff --git a/code/controllers/subsystem/burnable.dm b/code/controllers/subsystem/burnable.dm
@@ -46,4 +46,4 @@ var/list/atom/burnableatoms = list()
 		var/datum/gas_mixture/G = return_air()
 		if(G && G.temperature >= autoignition_temperature && G.molar_density(GAS_OXYGEN) >= MINOXY2BURN)
 			ignite()
-#undef MINOXY2BURN
+#undef MINOXY2BURN
diff --git a/code/datums/gamemode/factions/bloodcult/bloodcult_items.dm b/code/datums/gamemode/factions/bloodcult/bloodcult_items.dm
@@ -19,7 +19,6 @@ var/list/arcane_tomes = list()
 	flags = FPRINT
 	slot_flags = SLOT_BELT
 	mech_flags = MECH_SCAN_FAIL
-	fire_fuel = 3
 	var/state = TOME_CLOSED
 	var/can_flick = 1
 	var/list/talismans = list()
@@ -356,7 +355,6 @@ var/list/arcane_tomes = list()
 	pressure_resistance = 1
 	attack_verb = list("slaps")
 	autoignition_temperature = AUTOIGNITION_PAPER
-	fire_fuel = 1
 	mech_flags = MECH_SCAN_FAIL
 	var/obj/abstract/mind_ui_element/hoverable/bloodcult_spell/talisman/linked_ui
 	var/blood_text = ""
@@ -1587,7 +1585,6 @@ var/list/arcane_tomes = list()
 	pressure_resistance = 1
 	attack_verb = list("slaps")
 	autoignition_temperature = AUTOIGNITION_PAPER
-	fire_fuel = 1
 	mech_flags = MECH_SCAN_FAIL
 
 /obj/item/weapon/bloodcult_pamphlet/attack_self(var/mob/user)

diff --git a/code/game/gamemodes/wizard/apprentice_contract.dm b/code/game/gamemodes/wizard/apprentice_contract.dm
@@ -56,7 +56,6 @@ var/list/wizard_apprentice_setups_by_name = list()
 	icon = 'icons/obj/wizard.dmi'
 	icon_state = "contract0"
 	autoignition_temperature = AUTOIGNITION_PAPER
-	fire_fuel = 1
 	throwforce = 0
 	w_class = W_CLASS_TINY
 	w_type = RECYK_WOOD

diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
@@ -279,9 +279,6 @@
 	icon = 'icons/obj/doors/Doorplasma.dmi'
 	mineral = "plasma"
 
-	autoignition_temperature = AUTOIGNITION_WELDERFUEL
-	fire_fuel = 10
-
 /obj/machinery/door/airlock/plasma/ignite(temperature)
 	PlasmaBurn(temperature)
 

diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm
@@ -161,6 +161,8 @@ Class Procs:
 	var/obj/item/weapon/card/id/scan = null	//ID inserted for identification, if applicable
 	var/id_tag = null // Identify the machine
 
+	autoignition_temperature = 0 //machinery shouldn't burn
+
 /obj/machinery/cultify()
 	var/list/random_structure = list(
 		/obj/structure/cult_legacy/talisman,

diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm
@@ -1163,7 +1163,6 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
 	pressure_resistance = 1
 	attack_verb = list("baps", "smacks", "whaps")
 	autoignition_temperature = AUTOIGNITION_PAPER
-	fire_fuel = TRUE
 
 	var/screen = 0
 	var/pages = 0

diff --git a/code/game/machinery/vending_packs.dm b/code/game/machinery/vending_packs.dm
@@ -234,7 +234,6 @@
 	var/foldable_amount = 4
 
 	autoignition_temperature = AUTOIGNITION_PAPER
-	fire_fuel = 2
 
 /obj/item/emptyvendomatpack/attack_self()
 	to_chat(usr, "<span class='notice'>You fold [src] flat.</span>")

diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
@@ -87,8 +87,10 @@
 
 	var/is_cookvessel //If true, the item is a cooking vessel.
 
+
 /obj/item/New()
 	..()
+	fire_fuel = autoignition_temperature ? w_class : 0 //If the item has an autoignition temperature, use the size as the fuel amount. If not, provide no fuel amount.
 	for(var/path in actions_types)
 		new path(src)
 

diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm
@@ -11,6 +11,7 @@
 	var/mob/living/silicon/ai/ai = list()
 	var/last_tick //used to delay the powercheck
 	var/buildstage = 0
+	autoignition_temperature = 0
 
 /obj/item/device/radio/intercom/supports_holomap()
 	return TRUE

diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm
@@ -9,7 +9,6 @@
 	desc = "This is rubbish."
 	w_type=NOT_RECYCLABLE
 	autoignition_temperature = AUTOIGNITION_PAPER
-	fire_fuel = 1
 	var/persistence_type = SS_TRASH
 	var/age = 1 //For map persistence. +1 per round that this item has survived. After a certain amount, it will not carry on to the next round anymore.
 	//var/global/list/trash_items = list()
@@ -145,7 +144,7 @@
 /obj/item/trash/pietin
 	name = "pie tin"
 	icon_state = "pietin"
-	autoignition_temperature = 0
+	autoignition_temperature = 450 //snowflaked value low enough to catch on fire from sparks
 	siemens_coefficient = 2 //Do not touch live wires
 	melt_temperature = MELTPOINT_SILICON //Not as high as steel
 

diff --git a/code/game/objects/items/weapons/boomerang.dm b/code/game/objects/items/weapons/boomerang.dm
@@ -12,7 +12,6 @@
 	force = 7
 
 	autoignition_temperature = AUTOIGNITION_WOOD
-	fire_fuel = 3
 	starting_materials = list(MAT_WOOD = CC_PER_SHEET_WOOD * 6)
 	w_type = RECYK_WOOD
 

diff --git a/code/game/objects/items/weapons/courtroom.dm b/code/game/objects/items/weapons/courtroom.dm
@@ -12,7 +12,6 @@
 	w_class = W_CLASS_MEDIUM
 	attack_verb = list("bashed", "battered", "judged", "whacked")
 	autoignition_temperature = AUTOIGNITION_WOOD
-	fire_fuel = 2
 
 /obj/item/weapon/gavelhammer/suicide_act(var/mob/living/user)
 	user.visible_message("<span class='danger'>[user] has sentenced \himself to death with \the [src]! It looks like \he's trying to commit suicide.</span>")
@@ -28,7 +27,6 @@
 	throwforce = 2
 	w_class = W_CLASS_MEDIUM
 	autoignition_temperature = AUTOIGNITION_WOOD
-	fire_fuel = 2
 	var/cooldown = 0
 
 /obj/item/weapon/gavelblock/attackby(obj/item/I, mob/user, params)

diff --git a/code/game/objects/items/weapons/storage/bible.dm b/code/game/objects/items/weapons/storage/bible.dm
@@ -18,7 +18,6 @@
 	rustle_sound = "pageturn"
 
 	autoignition_temperature = AUTOIGNITION_PAPER
-	fire_fuel = 2
 
 /obj/item/weapon/storage/bible/suicide_act(var/mob/living/user)
 	user.visible_message("<span class='danger'>[user] is farting on \the [src]! It looks like \he's trying to commit suicide!</span>")

diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm
@@ -31,7 +31,6 @@
 	starting_materials = list(MAT_CARDBOARD = 3750)
 	w_type=RECYK_MISC
 	autoignition_temperature = AUTOIGNITION_PAPER
-	fire_fuel = 2
 	autoignition_temperature = AUTOIGNITION_PAPER
 	on_armory_manifest = TRUE
 
@@ -48,7 +47,6 @@
 	max_combined_w_class = 42 // 21*2
 
 	autoignition_temperature = AUTOIGNITION_PAPER
-	fire_fuel = 3
 
 /obj/item/weapon/storage/box/surveillance
 	name = "\improper DromedaryCo packet"

diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm
@@ -771,6 +771,11 @@
 /obj/item/weapon/storage/proc/is_full()
 	return (storage_slots && (contents.len >= storage_slots)) || (get_sum_w_class() >= max_combined_w_class)
 
+/obj/item/weapon/storage/ignite(var/temperature)
+	var/turf/T = get_turf(src)
+	mass_remove(T) //dump contents if it's burning
+	..()
+
 /obj/item/weapon/storage_key
 	name = "storage key"
 	desc = "Might open what you want opened, or lock what you want locked."

diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm
@@ -286,7 +286,7 @@
 	starting_materials = list(MAT_IRON = 70, MAT_GLASS = 30)
 	w_type = RECYK_MISC
 	melt_temperature = MELTPOINT_PLASTIC
-	autoignition_temperature = AUTOIGNITION_PLASTIC
+	autoignition_temperature = 0
 
 	//R&D tech level
 	origin_tech = Tc_ENGINEERING + "=1"

diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm
@@ -2,6 +2,7 @@
 	icon = 'icons/obj/structures.dmi'
 	penetration_dampening = 5
 	var/hasbolts = FALSE
+	fire_fuel = 0 //exceptions defined as needed
 
 /obj/structure/examine(mob/user)
 	..()
@@ -64,4 +65,4 @@
 		H.Stun(10)
 
 /obj/structure/animationBolt(var/mob/firer)
-	new /mob/living/simple_animal/hostile/mimic/copy(loc, src, firer, duration=SPELL_ANIMATION_TTL)
+	new /mob/living/simple_animal/hostile/mimic/copy(loc, src, firer, duration=SPELL_ANIMATION_TTL)
diff --git a/code/game/objects/structures/stool_bed_chair_nest/stools.dm b/code/game/objects/structures/stool_bed_chair_nest/stools.dm
@@ -13,7 +13,7 @@
 	name = "bar stool"
 	desc = "Apply butt. Get drunk."
 	icon_state = "bar-stool"
-	
+
 /obj/item/weapon/stool/cushion
 	name = "cushion"
 	desc = "Apply butt. Get comfy."
@@ -27,7 +27,6 @@
 	desc = "Apply butt. Become Mozart."
 	icon_state = "stool_piano"
 	autoignition_temperature = AUTOIGNITION_WOOD
-	fire_fuel = 3
 	sheet_type = /obj/item/stack/sheet/wood
 
 /obj/item/weapon/stool/piano/initialize()

diff --git a/code/game/turfs/simulated/floor_types.dm b/code/game/turfs/simulated/floor_types.dm
@@ -35,7 +35,6 @@
 /turf/simulated/floor/vox/wood
 	icon_state = "wood"
 
-	fire_fuel = 10
 	soot_type = null
 	melt_temperature = 0 // Doesn't melt.
 
@@ -62,7 +61,6 @@
 	name = "floor"
 	icon_state = "wood"
 
-	fire_fuel = 10
 	soot_type = null
 	melt_temperature = 0 // Doesn't melt.
 

diff --git a/code/modules/clothing/accessories/accessory.dm b/code/modules/clothing/accessories/accessory.dm
@@ -476,7 +476,6 @@
 	var/triggered = FALSE
 	var/event_key
 	autoignition_temperature = AUTOIGNITION_PAPER
-	fire_fuel = 1
 	w_class = W_CLASS_TINY
 	w_type = RECYK_WOOD
 

diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
@@ -2,7 +2,6 @@
 	name = "clothing"
 	sterility = 5
 	autoignition_temperature = AUTOIGNITION_FABRIC
-	fire_fuel = 2
 	w_type = RECYK_FABRIC
 	starting_materials = list(MAT_FABRIC = CC_PER_SHEET_FABRIC)
 	var/list/species_restricted = null //Only these species can wear this kit.

diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm
@@ -7,7 +7,7 @@
 	w_class = W_CLASS_SMALL
 	body_parts_covered = EYES
 	slot_flags = SLOT_EYES
-	autoignition_temperature = null
+	autoignition_temperature = 0
 	var/vision_flags = 0
 	var/darkness_view = 0//Base human is 2
 	var/invisa_view = 0

diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm
@@ -272,7 +272,7 @@
 	icon_state = "goldenmask"
 	item_state = "goldenmask"
 	species_fit = list(INSECT_SHAPED)
-	autoignition_temperature = null
+	autoignition_temperature = 0
 
 /obj/item/clothing/mask/goldface/equipped()
 	..()

diff --git a/code/modules/clothing/masks/stone.dm b/code/modules/clothing/masks/stone.dm
@@ -8,7 +8,7 @@
 	w_class = 2
 	siemens_coefficient = 0 //it's made of stone, after all
 	mech_flags = MECH_SCAN_FAIL
-	autoignition_temperature = null
+	autoignition_temperature = 0
 	var/spikes_out = 0 //whether the spikes are extended
 	var/infinite = 0 //by default the mask is destroyed after one use
 	var/blood_to_give = 300 //seeing as the new vampire won't have had a whole round to prepare, they get some blood free

diff --git a/code/modules/clothing/spacesuits/rig.dm b/code/modules/clothing/spacesuits/rig.dm
@@ -26,7 +26,7 @@ var/list/all_hardsuit_pieces = list(HARDSUIT_HEADGEAR,HARDSUIT_GLOVES,HARDSUIT_B
 	eyeprot = 3
 	species_fit = list(GREY_SHAPED, TAJARAN_SHAPED, INSECT_SHAPED)
 	species_restricted = list("exclude",VOX_SHAPED)
-	autoignition_temperature = null //fireproofing is covered elsewhere
+	autoignition_temperature = 0 //fireproofing is covered elsewhere
 	var/obj/item/clothing/suit/space/rig/rig
 	body_parts_visible_override = 0
 
@@ -121,7 +121,7 @@ var/list/all_hardsuit_pieces = list(HARDSUIT_HEADGEAR,HARDSUIT_GLOVES,HARDSUIT_B
 	species_fit = list(GREY_SHAPED, TAJARAN_SHAPED, INSECT_SHAPED)
 	species_restricted = list("exclude",VOX_SHAPED)
 	armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 35, bio = 100, rad = 10)
-	autoignition_temperature = null //fireproofing is covered elsewhere
+	autoignition_temperature = 0 //fireproofing is covered elsewhere
 	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/weapon/storage/bag/ore,/obj/item/device/t_scanner,/obj/item/weapon/pickaxe, /obj/item/device/rcd, /obj/item/tool/wrench/socket)
 	max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE
 	pressure_resistance = 200 * ONE_ATMOSPHERE

diff --git a/code/modules/food/customizables.dm b/code/modules/food/customizables.dm
@@ -69,7 +69,7 @@
 	var/list/plates = list() // If the plates are stacked, they come here
 	var/new_stack = 0 // allows mappers to create plate stacks
 	var/trash_color = null
-	autoignition_temperature = null
+	autoignition_temperature = 0
 
 /obj/item/trash/plate/clean
 	icon_state = "cleanplate"

diff --git a/code/modules/games/cards/lotto.dm b/code/modules/games/cards/lotto.dm
@@ -156,7 +156,6 @@
 	desc = "A worthless, unprinted lotto ticket."
 	icon_state = "lotto_5"
 	autoignition_temperature = AUTOIGNITION_PAPER
-	fire_fuel = 1
 
 /obj/item/toy/lotto_ticket/unprinted/attackby(obj/item/weapon/S, mob/user)
 	return 0
diff --git a/code/modules/library/gamemaster_items.dm b/code/modules/library/gamemaster_items.dm
@@ -5,7 +5,6 @@
 	icon_state = "dicetower"
 	w_class = W_CLASS_MEDIUM
 	autoignition_temperature = AUTOIGNITION_WOOD
-	fire_fuel = 10
 	layer = MACHINERY_LAYER
 
 /obj/item/dicetower/attack_hand(mob/user)
@@ -162,4 +161,4 @@
 		pixel_x = 0
 		pixel_y = 0
 		return TRUE
-	return FALSE
+	return FALSE
diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm
@@ -200,7 +200,6 @@
 	attack_verb = list("bashes", "whacks", "educates")
 
 	autoignition_temperature = AUTOIGNITION_PAPER
-	fire_fuel = 3
 
 	var/dat			 // Actual page content
 	var/due_date = 0 // Game time in 1/10th seconds

diff --git a/code/modules/paperwork/clipboard.dm b/code/modules/paperwork/clipboard.dm
@@ -9,7 +9,6 @@
 	throw_speed = 3
 	throw_range = 10
 	autoignition_temperature = AUTOIGNITION_WOOD
-	fire_fuel = 3
 	storage_slots = 28
 	can_only_hold = list("/obj/item/weapon/photo", "/obj/item/weapon/paper", "/obj/item/weapon/pen")
 	var/obj/item/weapon/paper/toppaper = null
@@ -48,4 +47,4 @@
 	//If we looped through everything and there's still no paper
 	toppaper = null
 	update_icon()
-	return .
+	return .
diff --git a/code/modules/paperwork/folders.dm b/code/modules/paperwork/folders.dm
@@ -9,7 +9,6 @@
 	pressure_resistance = 2
 
 	autoignition_temperature = 522 // Kelvin
-	fire_fuel = 1
 	var/crayon = null
 
 /obj/item/weapon/folder/New()

diff --git a/code/modules/paperwork/nano_paper.dm b/code/modules/paperwork/nano_paper.dm
@@ -12,8 +12,6 @@
 
 	autoignition_temperature = AUTOIGNITION_PAPER
 
-	fire_fuel = 1
-
 /obj/item/weapon/paper/nano/New()
 	..()
 	pixel_y = rand(-8, 8) * PIXEL_MULTIPLIER
@@ -72,4 +70,4 @@
 		\[impact\] - \[/impact\] : <span style=\"font-family:Impact\">Impact</span><br>
 		\[palatino\] - \[/palatino\] : <span style=\"font-family:Palatino Linotype\">Palatino Linotype</span><br>
 		\[tnr\] - \[/tnr\] : <span style=\"font-family:Times New Roman\">Times New Roman</span><br>
-	</BODY></HTML>"}, "window=paper_help")
+	</BODY></HTML>"}, "window=paper_help")
diff --git a/code/modules/paperwork/nano_paper_bin.dm b/code/modules/paperwork/nano_paper_bin.dm
@@ -11,7 +11,6 @@
 	var/ressources = 30	// how much nano paper it contains
 	var/max_ressources = 30 // the maxium amount of paper it can contain, un-used for now
 	autoignition_temperature = 1000 // Kelvin
-	fire_fuel = 1
 
 
 /obj/item/weapon/paper_bin/nano/MouseDropFrom(atom/over_object)

diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
@@ -19,7 +19,6 @@
 	pressure_resistance = 1
 	attack_verb = list("slaps")
 	autoignition_temperature = AUTOIGNITION_PAPER
-	fire_fuel = 1
 
 	var/info		//What's actually written on the paper.
 	var/info_links	//A different version of the paper which includes html links at fields and EOF
@@ -537,4 +536,4 @@ var/global/list/paper_folding_results = list ( \
 	return
 
 /obj/item/weapon/paper/crumpled/bloody
-	icon_state = "scrap_bloodied"
+	icon_state = "scrap_bloodied"
diff --git a/code/modules/paperwork/paper_folded.dm b/code/modules/paperwork/paper_folded.dm
@@ -12,7 +12,6 @@
 	attack_verb = list("slaps")
 
 	autoignition_temperature = AUTOIGNITION_PAPER
-	fire_fuel = 1
 	var/obj/item/weapon/paper/unfolded
 	var/nano = 0