Skip to content

Commit

Permalink
Integrated headwear (from hooded and hard suits) are now Fireproofed …
Browse files Browse the repository at this point in the history
…by the Fireproof chaplain spell (#10089)

* Hoods now correctly get fireproofed

* minor whoopsie

* hardsuits now as well
  • Loading branch information
HowToLoLu authored Oct 27, 2023
1 parent 855126f commit a997ab6
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions code/modules/religion/rites.dm
Original file line number Diff line number Diff line change
Expand Up @@ -238,8 +238,13 @@
..()
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)
var/obj/item/clothing/suit/hooded/as_hooded = chosen_clothing
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
Expand Down

0 comments on commit a997ab6

Please sign in to comment.