From d07e315ddfc218d6c116bf94760da3edd9db6d29 Mon Sep 17 00:00:00 2001
From: Ikarrus <ericgfwong@hotmail.com>
Date: Sat, 27 Jun 2015 14:22:38 -0600
Subject: [PATCH] Squashed

---
 .../objects/structures/crates_lockers/closets/gimmick.dm   | 2 ++
 .../structures/crates_lockers/closets/job_closets.dm       | 4 +++-
 .../structures/crates_lockers/closets/secure/bar.dm        | 2 ++
 .../structures/crates_lockers/closets/secure/personal.dm   | 1 +
 .../structures/crates_lockers/closets/secure/security.dm   | 1 +
 code/modules/clothing/suits/toggles.dm                     | 7 +++++++
 code/modules/mob/living/carbon/human/human_damage.dm       | 2 +-
 code/modules/mob/living/carbon/human/inventory.dm          | 2 +-
 8 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/code/game/objects/structures/crates_lockers/closets/gimmick.dm b/code/game/objects/structures/crates_lockers/closets/gimmick.dm
index 1cabfc03243..a0d01834972 100644
--- a/code/game/objects/structures/crates_lockers/closets/gimmick.dm
+++ b/code/game/objects/structures/crates_lockers/closets/gimmick.dm
@@ -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"
diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm
index 9ac55af828a..302b49a66f4 100644
--- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm
@@ -108,4 +108,6 @@
 /obj/structure/closet/coffin
 	name = "coffin"
 	desc = "It's a burial receptacle for the dearly departed."
-	icon_state = "coffin"
\ No newline at end of file
+	icon_state = "coffin"
+	burn_state = 0 //Burnable
+	burntime = 20
\ No newline at end of file
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/bar.dm b/code/game/objects/structures/crates_lockers/closets/secure/bar.dm
index e5d818ca19f..e7c46ced1ce 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/bar.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/bar.dm
@@ -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()
 	..()
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm
index 32e4e24b632..908c05c33d8 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm
@@ -26,6 +26,7 @@
 /obj/structure/closet/secure_closet/personal/cabinet
 	icon_state = "cabinet"
 	burn_state = 0 //Burnable
+	burntime = 20
 
 /obj/structure/closet/secure_closet/personal/cabinet/New()
 	..()
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
index 46adf4137d6..ebf2237ca3a 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -156,6 +156,7 @@
 	req_access = list(access_forensics_lockers)
 	icon_state = "cabinet"
 	burn_state = 0 //Burnable
+	burntime = 20
 
 /obj/structure/closet/secure_closet/detective/New()
 	..()
diff --git a/code/modules/clothing/suits/toggles.dm b/code/modules/clothing/suits/toggles.dm
index 44e2d98abf6..24989946279 100644
--- a/code/modules/clothing/suits/toggles.dm
+++ b/code/modules/clothing/suits/toggles.dm
@@ -8,6 +8,10 @@
 	MakeHood()
 	..()
 
+/obj/item/clothing/suit/hooded/Destroy()
+	qdel(hood)
+	..()
+
 /obj/item/clothing/suit/hooded/proc/MakeHood()
 	if(!hood)
 		var/obj/item/clothing/head/winterhood/W = new hoodtype(src)
@@ -93,6 +97,9 @@
 		verbs -= /obj/item/clothing/suit/space/hardsuit/verb/Jetpack
 		verbs -= /obj/item/clothing/suit/space/hardsuit/verb/Jetpack_Rockets
 	..()
+/obj/item/clothing/suit/space/hardsuit/Destroy()
+	qdel(helmet)
+	..()
 
 /obj/item/clothing/suit/space/hardsuit/proc/MakeHelmet()
 	if(!helmettype)
diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm
index df2c627615c..48250417654 100644
--- a/code/modules/mob/living/carbon/human/human_damage.dm
+++ b/code/modules/mob/living/carbon/human/human_damage.dm
@@ -12,7 +12,7 @@
 	health = maxHealth - getOxyLoss() - getToxLoss() - getCloneLoss() - total_burn - total_brute
 	if( ((maxHealth - total_burn) < config.health_threshold_dead) && stat == DEAD )
 		ChangeToHusk()
-		if(bodytemperature > FIRE_MINIMUM_TEMPERATURE_TO_EXIST)
+		if(on_fire)
 			shred_clothing()
 	med_hud_set_health()
 	med_hud_set_status()
diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm
index df383f3e0e5..297938a075c 100644
--- a/code/modules/mob/living/carbon/human/inventory.dm
+++ b/code/modules/mob/living/carbon/human/inventory.dm
@@ -463,7 +463,7 @@
 				Item.loc = src.loc
 			spawn(1) //so the shreds aren't instantly deleted by the explosion
 				var/obj/effect/decal/cleanable/shreds/Shreds = new(loc)
-				Shreds.desc = "The sad remains of what used to be a glorious [src.name]."
+				Shreds.desc = "The sad remains of what used to be [src.name]."
 				qdel(src)
 		else
 			burn()