Merge pull request #10903 from Hatterhat/tg-47770

fuck organ decay - tgstation#47770
This commit is contained in:
Ghom
2020-02-05 19:26:40 +01:00
committed by GitHub
2 changed files with 7 additions and 5 deletions
+3 -1
View File
@@ -358,7 +358,7 @@
return
// No decay if formaldehyde in corpse or when the corpse is charred
if(reagents.has_reagent(/datum/reagent/toxin/formaldehyde, 15) || HAS_TRAIT(src, TRAIT_HUSK))
if(reagents.has_reagent(/datum/reagent/toxin/formaldehyde, 1) || HAS_TRAIT(src, TRAIT_HUSK))
return
// Also no decay if corpse chilled or not organic/undead
@@ -397,6 +397,8 @@
if(O)
O.on_life()
else
if(reagents.has_reagent(/datum/reagent/toxin/formaldehyde, 1)) // No organ decay if the body contains formaldehyde.
return
for(var/V in internal_organs)
var/obj/item/organ/O = V
if(O)