From 322c6a31474c033d769384a90a3b090d8d7eda95 Mon Sep 17 00:00:00 2001 From: JaySparrow Date: Sat, 12 Sep 2020 04:13:50 -0500 Subject: [PATCH] Formaldehyde works now One unit of formaldehyde stops organ decay. Like how everyone thought it worked but didn't. --- code/modules/mob/living/carbon/life.dm | 2 ++ code/modules/reagents/reagent_containers/hypospray.dm | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm index 87f4c208..91b7dbaf 100644 --- a/code/modules/mob/living/carbon/life.dm +++ b/code/modules/mob/living/carbon/life.dm @@ -401,6 +401,8 @@ if(O) O.on_life() else + if(reagents.has_reagent("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) diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 662e6e86..ef1e7c06 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -80,17 +80,17 @@ /obj/item/reagent_containers/hypospray/medipen name = "epinephrine medipen" - desc = "A rapid and safe way to stabilize patients in critical condition for personnel without advanced medical knowledge." + desc = "A rapid and safe way to stabilize patients in critical condition for personnel without advanced medical knowledge. Also useful for preventing organ decay in the deceased." icon_state = "medipen" item_state = "medipen" lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' - amount_per_transfer_from_this = 10 - volume = 10 + amount_per_transfer_from_this = 11 + volume = 11 ignore_flags = 1 //so you can medipen through hardsuits reagent_flags = DRAWABLE flags_1 = null - list_reagents = list("epinephrine" = 10) + list_reagents = list("epinephrine" = 10, "formaldehyde" = 1) /obj/item/reagent_containers/hypospray/medipen/suicide_act(mob/living/carbon/user) user.visible_message("[user] begins to choke on \the [src]! It looks like [user.p_theyre()] trying to commit suicide!")