From a2bea11d1455e71ca01f97e9140a79c80c42ed5d Mon Sep 17 00:00:00 2001 From: Anewbe Date: Wed, 26 Jul 2017 13:45:13 -0500 Subject: [PATCH] Hyperzine is no longer toxic --- .../Chemistry-Reagents-Medicine.dm | 17 +++++++++++++++++ .../Chemistry-Reagents-Toxins.dm | 18 ------------------ 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm index eb56b0904a..de6b474db7 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm @@ -291,6 +291,23 @@ M.adjustToxLoss(5 * removed) // It used to be incredibly deadly due to an oversight. Not anymore! M.add_chemical_effect(CE_PAINKILLER, 20) +/datum/reagent/hyperzine + name = "Hyperzine" + id = "hyperzine" + description = "Hyperzine is a highly effective, long lasting, muscle stimulant." + taste_description = "bitterness" + reagent_state = LIQUID + color = "#FF3300" + overdose = REAGENTS_OVERDOSE * 0.5 + +/datum/reagent/hyperzine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) + if(alien == IS_TAJARA) + removed *= 1.25 + ..() + if(prob(5)) + M.emote(pick("twitch", "blink_r", "shiver")) + M.add_chemical_effect(CE_SPEEDBOOST, 1) + /datum/reagent/alkysine name = "Alkysine" id = "alkysine" diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm index 1120192c6b..25f6025b98 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm @@ -128,24 +128,6 @@ M.adjustOxyLoss(20 * removed) M.sleeping += 1 -/datum/reagent/toxin/hyperzine - name = "Hyperzine" - id = "hyperzine" - description = "Hyperzine is a highly effective, long lasting, muscle stimulant." - taste_description = "bitterness" - reagent_state = LIQUID - color = "#FF3300" - overdose = REAGENTS_OVERDOSE * 0.5 - strength = 2 - -/datum/reagent/toxin/hyperzine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) - if(alien == IS_TAJARA) - removed *= 1.25 - ..() - if(prob(5)) - M.emote(pick("twitch", "blink_r", "shiver")) - M.add_chemical_effect(CE_SPEEDBOOST, 1) - /datum/reagent/toxin/stimm //Homemade Hyperzine name = "Stimm" id = "stimm"