From 3aeb7014bf3cbd5e979057f0c3b4eda20fbc812b Mon Sep 17 00:00:00 2001 From: HowToLoLu Date: Tue, 24 Oct 2023 13:42:56 -0500 Subject: [PATCH 1/3] Hoods now correctly get fireproofed --- code/modules/religion/rites.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/religion/rites.dm b/code/modules/religion/rites.dm index 1b9b4bddd7aa2..d05cd3b375cf5 100644 --- a/code/modules/religion/rites.dm +++ b/code/modules/religion/rites.dm @@ -238,8 +238,8 @@ ..() if(!QDELETED(chosen_clothing) && get_turf(religious_tool) == chosen_clothing.loc) //check if the same clothing is still there if(istype(chosen_clothing,/obj/item/clothing/suit/hooded)) - for(var/obj/item/clothing/head/integrated_helmet in chosen_clothing.contents) //check if the clothing has a hood/helmet integrated and fireproof it if there is one. - apply_fireproof(integrated_helmet) + if(chosen_clothing.hood) //check if the clothing has a hood/helmet integrated and fireproof it if there is one. + apply_fireproof(chosen_clothing.hood) apply_fireproof(chosen_clothing) playsound(get_turf(religious_tool), 'sound/magic/fireball.ogg', 50, TRUE) chosen_clothing = null //our lord and savior no longer cares about this apparel From 768dc214db997d82c111069fa5312725dd96cde4 Mon Sep 17 00:00:00 2001 From: HowToLoLu Date: Tue, 24 Oct 2023 14:15:06 -0500 Subject: [PATCH 2/3] minor whoopsie --- code/modules/religion/rites.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/religion/rites.dm b/code/modules/religion/rites.dm index d05cd3b375cf5..c18337e35c36c 100644 --- a/code/modules/religion/rites.dm +++ b/code/modules/religion/rites.dm @@ -238,8 +238,9 @@ ..() if(!QDELETED(chosen_clothing) && get_turf(religious_tool) == chosen_clothing.loc) //check if the same clothing is still there if(istype(chosen_clothing,/obj/item/clothing/suit/hooded)) - if(chosen_clothing.hood) //check if the clothing has a hood/helmet integrated and fireproof it if there is one. - apply_fireproof(chosen_clothing.hood) + var/obj/item/clothing/suit/hooded/as_hooded = chosen_clothing + if(as_hooded.hood) //check if the clothing has a hood/helmet integrated and fireproof it if there is one. + apply_fireproof(as_hooded.hood) apply_fireproof(chosen_clothing) playsound(get_turf(religious_tool), 'sound/magic/fireball.ogg', 50, TRUE) chosen_clothing = null //our lord and savior no longer cares about this apparel From 7a2b78602b63ea9fb5d295635e3db31ba86e5003 Mon Sep 17 00:00:00 2001 From: HowToLoLu Date: Fri, 27 Oct 2023 00:38:43 -0500 Subject: [PATCH 3/3] hardsuits now as well --- code/modules/religion/rites.dm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/modules/religion/rites.dm b/code/modules/religion/rites.dm index c18337e35c36c..350abd66b43bf 100644 --- a/code/modules/religion/rites.dm +++ b/code/modules/religion/rites.dm @@ -239,8 +239,12 @@ if(!QDELETED(chosen_clothing) && get_turf(religious_tool) == chosen_clothing.loc) //check if the same clothing is still there if(istype(chosen_clothing,/obj/item/clothing/suit/hooded)) var/obj/item/clothing/suit/hooded/as_hooded = chosen_clothing - if(as_hooded.hood) //check if the clothing has a hood/helmet integrated and fireproof it if there is one. + if(as_hooded.hood) apply_fireproof(as_hooded.hood) + else if(istype(chosen_clothing,/obj/item/clothing/suit/space/hardsuit)) + var/obj/item/clothing/suit/space/hardsuit/suit = chosen_clothing + if(suit.helmet) + apply_fireproof(suit.helmet) apply_fireproof(chosen_clothing) playsound(get_turf(religious_tool), 'sound/magic/fireball.ogg', 50, TRUE) chosen_clothing = null //our lord and savior no longer cares about this apparel