From 356d551aced46e5c1bd3e38ecb519c12457e28f3 Mon Sep 17 00:00:00 2001
From: Belsima <31827220+Belsima@users.noreply.github.com>
Date: Sun, 17 Sep 2017 20:09:20 -0400
Subject: [PATCH] Adds a pair of Skrellian drugs. (#3849)
* Adds a pair of Skrellian drugs.
* Fixes talum_quem damage.
* i copypastad wrong and now it wont compile
* Adds nicotine to cigarettes.
* Revert "Adds nicotine to cigarettes."
This reverts commit f7640f1142ff2f3c68caf90f6352a509915040c8.
---
.../Chemistry-Reagents-Medicine.dm | 22 ++++++++++++
.../Chemistry-Reagents-Toxins.dm | 27 ++++++++++++++
code/modules/reagents/Chemistry-Recipes.dm | 17 ++++++++-
html/changelogs/Belsima-Skrellchems.yml | 36 +++++++++++++++++++
4 files changed, 101 insertions(+), 1 deletion(-)
create mode 100644 html/changelogs/Belsima-Skrellchems.yml
diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
index ebc3650ee54..a5fcab44308 100644
--- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
@@ -672,3 +672,25 @@
if(dose > 10)
M.make_dizzy(5)
M.make_jittery(5)
+
+/datum/reagent/qerr_quem
+ name = "Qerr-quem"
+ id = "querr_quem"
+ description = "A potent stimulant and anti-anxiety medication, made for the Qerr-Katish."
+ taste_description = "mint"
+ reagent_state = LIQUID
+ color = "#e6efe3"
+ metabolism = 0.01
+ mrate_static = TRUE
+ data = 0
+
+/datum/reagent/qerr_quem/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+ if(alien == IS_DIONA)
+ return
+ if(volume <= 0.1 && data != -1)
+ data = -1
+ to_chat(M, "You feel antsy, your concentration wavers...")
+ else
+ if(world.time > data + ANTIDEPRESSANT_MESSAGE_DELAY)
+ data = world.time
+ to_chat(M, "You feel invigorated and calm.")
\ No newline at end of file
diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
index aa4d62fc07c..300bdc07fde 100644
--- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
@@ -648,6 +648,33 @@
reagent_state = LIQUID
color = "#181818"
+/datum/reagent/talum_quem
+ name = "Talum-quem"
+ id = "talum_quem"
+ description = " A very carefully tailored hallucinogen, for use of the Talum-Katish."
+ taste_description = "bubblegum"
+ taste_mult = 1.6
+ reagent_state = LIQUID
+ color = "#db2ed8"
+ metabolism = REM * 0.5
+ overdose = REAGENTS_OVERDOSE
+
+datum/reagent/talum_quem/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+ if(alien == IS_DIONA)
+ return
+
+ var/drug_strength = 29
+ if(alien == IS_SKRELL)
+ drug_strength = drug_strength * 0.8
+ else
+ M.adjustToxLoss(10 * removed) //Given incorporations of other toxins with similiar damage, this seems right.
+
+ M.druggy = max(M.druggy, drug_strength)
+ if(prob(10) && isturf(M.loc) && !istype(M.loc, /turf/space) && M.canmove && !M.restrained())
+ step(M, pick(cardinal))
+ if(prob(7))
+ M.emote(pick("twitch", "drool", "moan", "giggle"))
+
/* Transformations */
/datum/reagent/slimetoxin
diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm
index 5e38218ac08..1e4ae3710d3 100644
--- a/code/modules/reagents/Chemistry-Recipes.dm
+++ b/code/modules/reagents/Chemistry-Recipes.dm
@@ -2002,4 +2002,19 @@
/datum/chemical_reaction/deuterium/on_reaction(var/datum/reagents/holder, var/created_volume)
var/turf/T = get_turf(holder.my_atom)
if(istype(T)) new /obj/item/stack/material/deuterium(T, created_volume)
- return
\ No newline at end of file
+ return
+
+//Skrellian crap.
+/datum/chemical_reaction/talum_quem
+ name = "Talum-quem"
+ id = "talum_quem"
+ result = "talum_quem"
+ required_reagents = list("space_drugs" = 2, "sugar" = 1, "amatoxin" = 1)
+ result_amount = 4
+
+/datum/chemical_reaction/qerr_quem
+ name = "Qerr-quem"
+ id = "qerr_quem"
+ result = "qerr_quem"
+ required_reagents = list("nicotine" = 1, "carbon" = 1, "sugar" = 2)
+ result_amount = 4
\ No newline at end of file
diff --git a/html/changelogs/Belsima-Skrellchems.yml b/html/changelogs/Belsima-Skrellchems.yml
new file mode 100644
index 00000000000..ec0a58cfc43
--- /dev/null
+++ b/html/changelogs/Belsima-Skrellchems.yml
@@ -0,0 +1,36 @@
+################################
+# 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: Belsima
+
+# 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: "Added Qerr-quem and Talum-quem, a pair of Skrellian drugs."