From 2e6ce795ed95c68a9a207f9f6521a24cb2881864 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Wed, 24 Jan 2018 16:18:37 -0500 Subject: [PATCH 1/2] Fix old usages of trait introduced by the trait merge --- .../chemistry/reagents/medicine_reagents.dm | 145 ++++++++++++++++++ 1 file changed, 145 insertions(+) diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index d49ddd57a1..a7e3fa5e6f 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -152,7 +152,41 @@ /datum/reagent/medicine/clonexadone/on_mob_life(mob/living/M) if(M.bodytemperature < T0C) M.adjustCloneLoss(0.00006 * (M.bodytemperature ** 2) - 6, 0) +<<<<<<< HEAD M.status_flags &= ~DISFIGURED +======= + M.remove_trait(TRAIT_DISFIGURED, TRAIT_GENERIC) + . = 1 + metabolization_rate = REAGENTS_METABOLISM * (0.000015 * (M.bodytemperature ** 2) + 0.75) + ..() + +/datum/reagent/medicine/pyroxadone + name = "Pyroxadone" + id = "pyroxadone" + description = "A mixture of cryoxadone and slime jelly, that apparently inverses the requirement for its activation." + color = "#f7832a" + taste_description = "spicy jelly" + +/datum/reagent/medicine/pyroxadone/on_mob_life(mob/living/M) + if(M.bodytemperature > BODYTEMP_HEAT_DAMAGE_LIMIT) + var/power = 0 + switch(M.bodytemperature) + if(BODYTEMP_HEAT_DAMAGE_LIMIT to 400) + power = 2 + if(400 to 460) + power = 3 + else + power = 5 + if(M.on_fire) + power *= 2 + + M.adjustOxyLoss(-2 * power, 0) + M.adjustBruteLoss(-power, 0) + M.adjustFireLoss(-1.5 * power, 0) + M.adjustToxLoss(-power, 0, TRUE) + M.adjustCloneLoss(-power, 0) + M.remove_trait(TRAIT_DISFIGURED, TRAIT_GENERIC) +>>>>>>> 3b7230a... Merge pull request #34894 from optimumtact/fixmaster . = 1 metabolization_rate = REAGENTS_METABOLISM * (0.000015 * (M.bodytemperature ** 2) + 0.75) ..() @@ -1105,3 +1139,114 @@ id = "corazone" description = "A medication used to treat pain, fever, and inflammation, along with heart attacks." color = "#F5F5F5" +<<<<<<< HEAD +======= + +/datum/reagent/medicine/ketrazine + name = "Ketrazine" + id = "ketrazine" + description = "A powerful and addictive combat stimulant, capable of healing grievous wounds and enabling the user to shrug off stuns and heavy weights by stimulating tendons and muscle groups; however the strain on the body causes severe lasting damage. Use only in life-or-death situations. Overdose is almost invariably fatal." + reagent_state = LIQUID + color = "#5F42F4" + metabolization_rate = 0.5 * REAGENTS_METABOLISM + overdose_threshold = 20 + addiction_threshold = 5 + +/datum/reagent/medicine/ketrazine/on_mob_life(mob/living/M) + M.adjustToxLoss(-3*REM, 0) + M.adjustBruteLoss(-5*REM, 0) + M.adjustFireLoss(-5*REM, 0) + M.adjustOxyLoss(-5*REM, 0) + M.AdjustStun(-80*REM, 0) + M.AdjustKnockdown(-70*REM, 0) + M.adjustStaminaLoss(-80*REM, 0) + M.AdjustUnconscious(-50*REM, 0) + M.adjustBrainLoss(0.5*REM,0) + switch(current_cycle) + if(2 to 12) + if(prob(15)) + to_chat(M, "You feel incredibly powerful! Nothing can stop you! ") + if(12) + to_chat(M, "Your muscles begin to ache terribly... " ) + if(14) + to_chat(M, "You feel like your body is being ripped to shreds! ") + if(15 to 25) + M.drowsyness += 3 + M.adjustBruteLoss(10*REM, 0) + M.adjustToxLoss(7*REM, 0) + if(25 to 30) + if(prob(33)) + to_chat(M, "The pain is unbearable! You can barely stand! ") + M.Sleeping(40, 0) + M.AdjustKnockdown(40*REM,0) + M.drop_all_held_items() + M.Dizzy(3) + M.drowsyness +=4 + M.adjustBruteLoss(15*REM,0) + M.adjustToxLoss(10*REM,0) + M.adjustStaminaLoss(30*REM,0) + if(30 to INFINITY) + if(prob(20)) + to_chat(M, "Your body can't handle the stress! ") + M.Sleeping(60, 0) + M.AdjustKnockdown(80*REM,0) + M.drop_all_held_items() + M.Dizzy(5) + M.drowsyness +=6 + M.adjustBruteLoss(20*REM,0) + M.adjustToxLoss(15*REM,0) + M.adjustStaminaLoss(40*REM,0) + M.losebreath +=2 + + + ..() + +/datum/reagent/medicine/ketrazine/on_mob_add(mob/living/M) + M.add_trait(TRAIT_IGNORESLOWDOWN, id) + M.add_trait(TRAIT_GOTTAGOFAST, id) + +/datum/reagent/medicine/ketrazine/on_mob_delete(mob/living/M) + M.remove_trait(TRAIT_IGNORESLOWDOWN, id) + M.remove_trait(TRAIT_GOTTAGOFAST, id) + +/datum/reagent/medicine/ketrazine/overdose_process(mob/living/M) + if(prob(66)) + to_chat(M, " You feel a sense of impending doom. ") + M.drop_all_held_items() + M.Dizzy(6) + M.Jitter(7) + M.adjustOxyLoss(40*REM,0) + M.adjustBruteLoss(40*REM,0) + M.losebreath +=10 + ..() + +/datum/reagent/medicine/ketrazine/addiction_act_stage1(mob/living/M) + if(prob(33)) + to_chat(M, "You feel like you need more power... ") + M.drop_all_held_items() + M.Jitter(2) + M.Dizzy(2) + ..() + +/datum/reagent/medicine/ketrazine/addiction_act_stage2(mob/living/M) + if(prob(50)) + to_chat(M, "You feel weak and sore, you need something to amp you up! ") + M.drop_all_held_items() + M.adjustToxLoss(2*REM, 0) + M.adjustBruteLoss(4*REM,0) + M.adjustStaminaLoss(6*REM,0) + M.Dizzy(3) + M.Jitter(3) + ..() + +/datum/reagent/medicine/ketrazine/addiction_act_stage3(mob/living/M) + if(prob(66)) + to_chat(M, " You need ketrazine! You need it badly! You need it now! ") + M.drop_all_held_items() + M.adjustToxLoss(4*REM, 0) + M.adjustBruteLoss(5*REM,0) + M.adjustStaminaLoss(7*REM,0) + M.Dizzy(7) + M.Jitter(7) + ..() +>>>>>>> 3b7230a... Merge pull request #34894 from optimumtact/fixmaster From 8ea6f372ed9bcefd70922c9e00c7c6c4772848ed Mon Sep 17 00:00:00 2001 From: LetterJay Date: Wed, 24 Jan 2018 20:50:21 -0600 Subject: [PATCH 2/2] Update medicine_reagents.dm --- .../reagents/chemistry/reagents/medicine_reagents.dm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index a7e3fa5e6f..4a21f9910d 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -152,9 +152,6 @@ /datum/reagent/medicine/clonexadone/on_mob_life(mob/living/M) if(M.bodytemperature < T0C) M.adjustCloneLoss(0.00006 * (M.bodytemperature ** 2) - 6, 0) -<<<<<<< HEAD - M.status_flags &= ~DISFIGURED -======= M.remove_trait(TRAIT_DISFIGURED, TRAIT_GENERIC) . = 1 metabolization_rate = REAGENTS_METABOLISM * (0.000015 * (M.bodytemperature ** 2) + 0.75) @@ -186,7 +183,6 @@ M.adjustToxLoss(-power, 0, TRUE) M.adjustCloneLoss(-power, 0) M.remove_trait(TRAIT_DISFIGURED, TRAIT_GENERIC) ->>>>>>> 3b7230a... Merge pull request #34894 from optimumtact/fixmaster . = 1 metabolization_rate = REAGENTS_METABOLISM * (0.000015 * (M.bodytemperature ** 2) + 0.75) ..() @@ -1139,8 +1135,6 @@ id = "corazone" description = "A medication used to treat pain, fever, and inflammation, along with heart attacks." color = "#F5F5F5" -<<<<<<< HEAD -======= /datum/reagent/medicine/ketrazine name = "Ketrazine" @@ -1249,4 +1243,4 @@ M.Dizzy(7) M.Jitter(7) ..() ->>>>>>> 3b7230a... Merge pull request #34894 from optimumtact/fixmaster +