From c3a4d0d06a94af63a279b8644b2e1b5dc174b85a Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Mon, 13 Nov 2017 17:40:10 -0500 Subject: [PATCH 1/2] Makes cryoxadone heal clone damage again --- .../reagents/chemistry/reagents/medicine_reagents.dm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index 095db17c7f..a6843d7848 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -164,6 +164,7 @@ metabolization_rate = 1.5 * REAGENTS_METABOLISM /datum/reagent/medicine/clonexadone/on_mob_life(mob/living/M) +<<<<<<< HEAD switch(M.bodytemperature) // Low temperatures are required to take effect. if(0 to 100) // At extreme temperatures (upgraded cryo) the effect is greatly increased. M.status_flags &= ~DISFIGURED @@ -177,6 +178,13 @@ M.status_flags &= ~DISFIGURED M.adjustCloneLoss(-2, 0) . = 1 +======= + if(M.bodytemperature < T0C) + M.adjustCloneLoss(0.00006 * (M.bodytemperature ** 2) - 6, 0) + M.status_flags &= ~DISFIGURED + . = 1 + metabolization_rate = REAGENTS_METABOLISM * (0.000015 * (M.bodytemperature ** 2) + 0.75) +>>>>>>> 5cf4809... Merge pull request #32723 from nicbn/ohnoohnoohno ..() /datum/reagent/medicine/rezadone From 2d137b2bf997b4b4c872deaacd0eb6476d2c13a5 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Tue, 14 Nov 2017 15:51:58 -0600 Subject: [PATCH 2/2] Update medicine_reagents.dm --- .../chemistry/reagents/medicine_reagents.dm | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index a6843d7848..7547a0834c 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -164,27 +164,11 @@ metabolization_rate = 1.5 * REAGENTS_METABOLISM /datum/reagent/medicine/clonexadone/on_mob_life(mob/living/M) -<<<<<<< HEAD - switch(M.bodytemperature) // Low temperatures are required to take effect. - if(0 to 100) // At extreme temperatures (upgraded cryo) the effect is greatly increased. - M.status_flags &= ~DISFIGURED - M.adjustCloneLoss(-7, 0) - . = 1 - if(100 to 225) // At lower temperatures (cryo) the full effect is boosted - M.status_flags &= ~DISFIGURED - M.adjustCloneLoss(-3, 0) - . = 1 - if(225 to T0C) - M.status_flags &= ~DISFIGURED - M.adjustCloneLoss(-2, 0) - . = 1 -======= if(M.bodytemperature < T0C) M.adjustCloneLoss(0.00006 * (M.bodytemperature ** 2) - 6, 0) M.status_flags &= ~DISFIGURED . = 1 metabolization_rate = REAGENTS_METABOLISM * (0.000015 * (M.bodytemperature ** 2) + 0.75) ->>>>>>> 5cf4809... Merge pull request #32723 from nicbn/ohnoohnoohno ..() /datum/reagent/medicine/rezadone