Merge pull request #10211 from Ikarrus/burntweaks

Destructible Clothing Tweaks and Fixes
2026-08-30 08:37:43 +01:00 · 2015-06-29 21:38:20 -05:00
parent cb278febf6 4dbb5feb2d
commit 87cd31c11f
12 changed files with 34 additions and 10 deletions
@@ -74,9 +74,11 @@
 	layer = 3
 	icon = 'icons/effects/effects.dmi'
 	icon_state = "cobweb1"
-	burn_state = 0 //Burnable
 	burntime = 1

+/obj/effect/decal/cleanable/cobweb/fire_act()
+	qdel(src)
+
 /obj/effect/decal/cleanable/molten_item
 	name = "gooey grey mass"
 	desc = "It looks like a melted... something."
@@ -37,6 +37,7 @@
 	..()

 /obj/effect/decal/cleanable/fire_act()
-	reagents.chem_temp += 30
-	reagents.handle_reactions()
+	if(reagents)
+		reagents.chem_temp += 30
+		reagents.handle_reactions()
 	..()
@@ -2,6 +2,8 @@
 	name = "cabinet"
 	desc = "Old will forever be in fashion."
 	icon_state = "cabinet"
+	burn_state = 0 //Burnable
+	burntime = 20

 /obj/structure/closet/acloset
 	name = "strange closet"
@@ -111,6 +111,8 @@
 	name = "coffin"
 	desc = "It's a burial receptacle for the dearly departed."
 	icon_state = "coffin"
+	burn_state = 0 //Burnable
+	burntime = 20

 /obj/structure/closet/wardrobe/red
 	name = "security wardrobe"
@@ -2,6 +2,8 @@
 	name = "booze storage"
 	req_access = list(access_bar)
 	icon_state = "cabinet"
+	burn_state = 0 //Burnable
+	burntime = 20

 /obj/structure/closet/secure_closet/bar/New()
 	..()
@@ -25,6 +25,8 @@

 /obj/structure/closet/secure_closet/personal/cabinet
 	icon_state = "cabinet"
+	burn_state = 0 //Burnable
+	burntime = 20

 /obj/structure/closet/secure_closet/personal/cabinet/New()
 	..()
@@ -151,6 +151,8 @@
 	name = "\proper detective's cabinet"
 	req_access = list(access_forensics_lockers)
 	icon_state = "cabinet"
+	burn_state = 0 //Burnable
+	burntime = 20

 /obj/structure/closet/secure_closet/detective/New()
 	..()