Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Integrated headwear (from hooded and hard suits) are now Fireproofed by the Fireproof chaplain spell #10089

Merged
merged 3 commits into from
Oct 27, 2023
Merged

Integrated headwear (from hooded and hard suits) are now Fireproofed by the Fireproof chaplain spell #10089

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3aeb701
Hoods now correctly get fireproofed
HowToLoLu Oct 24, 2023
768dc21
minor whoopsie
HowToLoLu Oct 24, 2023
7a2b786
hardsuits now as well
HowToLoLu Oct 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions code/modules/religion/rites.dm
View file
Open in desktop
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
Loading