diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm index 3f6a499ee0..8bbb4ac950 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm @@ -311,23 +311,6 @@ var/mob/living/carbon/human/H = M H.update_mutations() -/datum/reagent/hyperzine - name = "Hyperzine" - id = "hyperzine" - description = "Hyperzine is a highly effective, long lasting, muscle stimulant." - reagent_state = LIQUID - color = "#FF3300" - metabolism = REM * 0.3 - mrate_static = TRUE - overdose = REAGENTS_OVERDOSE * 0.5 - -/datum/reagent/hyperzine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) - if(alien == IS_DIONA) - return - if(prob(5)) - M.emote(pick("twitch", "blink_r", "shiver")) - M.add_chemical_effect(CE_SPEEDBOOST, 1) - /datum/reagent/ethylredoxrazine name = "Ethylredoxrazine" id = "ethylredoxrazine" diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm index dd31ac05e4..3c01978d26 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm @@ -79,6 +79,39 @@ 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." + 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(prob(5)) + M.emote(pick("twitch", "blink_r", "shiver")) + M.take_organ_damage(3 * removed, 0) + M.add_chemical_effect(CE_SPEEDBOOST, 1) + +/datum/reagent/toxin/stimm //Homemade Hyperzine + name = "Stimm" + id = "stimm" + description = "A homemade stimulant with some serious side-effects." + color = "#d0583a" + metabolism = REM * 3 + overdose = 10 + strength = 3 + +/datum/reagent/toxin/stimm/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) + ..() + if(prob(20)) + M.emote(pick("twitch", "blink_r", "shiver")) + if(prob(5)) + M.take_organ_damage(6 * removed, 0) + M.add_chemical_effect(CE_SPEEDBOOST, 1) + /datum/reagent/toxin/potassium_chloride name = "Potassium Chloride" id = "potassium_chloride" diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 081be5d54a..4d7d13e5b3 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -356,6 +356,14 @@ required_reagents = list("sugar" = 1, "phosphorus" = 1, "sulfur" = 1) result_amount = 3 +/datum/chemical_reaction/stimm + name = "Stimm" + id = "stimm" + result = "stimm" + required_reagents = list("sugar" = 1, "fuel" = 1) + catalysts = list("fuel" = 5) + result_amount = 2 + /datum/chemical_reaction/ryetalyn name = "Ryetalyn" id = "ryetalyn" diff --git a/html/changelogs/Anewbe - Stimm.yml b/html/changelogs/Anewbe - Stimm.yml new file mode 100644 index 0000000000..fc89ba44b8 --- /dev/null +++ b/html/changelogs/Anewbe - Stimm.yml @@ -0,0 +1,37 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +################################# + +# Your name. +author: Anewbe + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Adds Stimm, a homemade hyperzine made of sugar and welding fuel." + - rscdel: "Hyperzine is now toxic."