From 5d80c210b66be44f17f1f5ae808a8fb0e33ecd48 Mon Sep 17 00:00:00 2001 From: Archie Date: Sun, 27 Jun 2021 16:13:34 -0300 Subject: [PATCH 1/3] Copium --- .../code/datums/mood_events/events.dm | 5 ++++ .../chemistry/reagents/food_reagents.dm | 3 -- .../chemistry/reagents/medicine_reagents.dm | 29 +++++++++++++++++++ .../reagents/chemistry/recipes/medicine.dm | 6 ++++ tgstation.dme | 2 ++ 5 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 hyperstation/code/modules/reagents/chemistry/reagents/medicine_reagents.dm create mode 100644 hyperstation/code/modules/reagents/chemistry/recipes/medicine.dm diff --git a/hyperstation/code/datums/mood_events/events.dm b/hyperstation/code/datums/mood_events/events.dm index 5c58d9ab..933c6548 100644 --- a/hyperstation/code/datums/mood_events/events.dm +++ b/hyperstation/code/datums/mood_events/events.dm @@ -22,3 +22,8 @@ description = "I feel like I'm held together by flimsy string, and could fall apart at any moment!\n" mood_change = -4 timeout = 2 MINUTES + +/datum/mood_event/copium + description = "Things are going to be okay, right?\n" + mood_change = 2 + timeout = 3 MINUTES diff --git a/hyperstation/code/modules/reagents/chemistry/reagents/food_reagents.dm b/hyperstation/code/modules/reagents/chemistry/reagents/food_reagents.dm index e5a052d1..d8cda7c0 100644 --- a/hyperstation/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/hyperstation/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -6,6 +6,3 @@ nutriment_factor = 5 * REAGENTS_METABOLISM metabolization_rate = 1 * REAGENTS_METABOLISM taste_description = "sweetness" - -/datum/reagent/consumable/alienhoney/on_mob_life(mob/living/carbon/M) - ..() \ No newline at end of file diff --git a/hyperstation/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/hyperstation/code/modules/reagents/chemistry/reagents/medicine_reagents.dm new file mode 100644 index 00000000..59eda37c --- /dev/null +++ b/hyperstation/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -0,0 +1,29 @@ +/datum/reagent/medicine/copium + name = "copium" + description = "A heavy scented substance meant to help one deal with loss." + reagent_state = LIQUID + color = "#a8707e" + overdose_threshold = 25 + metabolization_rate = 0.75 * REAGENTS_METABOLISM + pH = 4 + +/datum/reagent/medicine/copium/on_mob_life(mob/living/carbon/M) + var/datum/component/mood/mood = M.GetComponent(/datum/component/mood) + if(mood.sanity <= SANITY_NEUTRAL && current_cycle >= 5) + mood.setSanity(min(mood.sanity+5, SANITY_NEUTRAL)) + SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "copium", /datum/mood_event/copium) + ..() + +/datum/reagent/medicine/copium/overdose_process(mob/living/carbon/M) //copious amounts of copium + M.blur_eyes(10) + if(prob(50)) + M.adjustToxLoss(1, 0) + if(prob(5)) + M.say(pick("That's okay. Things are going to be okay.", "This is fine.", "I'm okay with the events that are unfolding currently.", "World of Spacecraft is still a good game...", "I'm winning.", "Diesels are far more powerful.")) + if(prob(5)) + M.emote("me", 1, "seems to be crying.") + if(prob(4)) + M.emote("me", 1, "falls over, crying.") + M.Knockdown(40) + +//To-do: /datum/reagent/medicine/seethium diff --git a/hyperstation/code/modules/reagents/chemistry/recipes/medicine.dm b/hyperstation/code/modules/reagents/chemistry/recipes/medicine.dm new file mode 100644 index 00000000..7a542dc5 --- /dev/null +++ b/hyperstation/code/modules/reagents/chemistry/recipes/medicine.dm @@ -0,0 +1,6 @@ +/datum/chemical_reaction/copium + name = "copium" + id = /datum/reagent/medicine/copium + results = list(/datum/reagent/medicine/copium = 5) + required_reagents = list(/datum/reagent/medicine/mannitol = 2, /datum/reagent/water = 1, /datum/reagent/medicine/epinephrine = 1, /datum/reagent/consumable/sugar = 1) + required_temp = 266 diff --git a/tgstation.dme b/tgstation.dme index 5dba6967..28a0f282 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3121,7 +3121,9 @@ #include "hyperstation\code\modules\power\reactor\rbmk.dm" #include "hyperstation\code\modules\power\reactor\reactor_cargo.dm" #include "hyperstation\code\modules\reagents\chemistry\reagents\food_reagents.dm" +#include "hyperstation\code\modules\reagents\chemistry\reagents\medicine_reagents.dm" #include "hyperstation\code\modules\reagents\chemistry\reagents\hydroponics_reactions.dm" +#include "hyperstation\code\modules\reagents\chemistry\recipes\medicine.dm" #include "hyperstation\code\modules\resize\resize_action.dm" #include "hyperstation\code\modules\resize\resizing.dm" #include "hyperstation\code\modules\resize\sizechems.dm" From 68431eb05abadf2e319e2159b2b619e4b94d12d8 Mon Sep 17 00:00:00 2001 From: Archie Date: Sun, 27 Jun 2021 16:23:03 -0300 Subject: [PATCH 2/3] Vent clog list too. --- code/modules/events/vent_clog.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/events/vent_clog.dm b/code/modules/events/vent_clog.dm index 6ec2865f..91c7204c 100644 --- a/code/modules/events/vent_clog.dm +++ b/code/modules/events/vent_clog.dm @@ -53,8 +53,8 @@ /datum/reagent/carpet, /datum/reagent/firefighting_foam, /datum/reagent/consumable/tearjuice, - /datum/reagent/medicine/strange_reagent - + /datum/reagent/medicine/strange_reagent, + /datum/reagent/medicine/copium ) //needs to be chemid unit checked at some point From d59e840b764248fb9a358b6276adfdb26845592a Mon Sep 17 00:00:00 2001 From: Archie Date: Sun, 27 Jun 2021 16:24:45 -0300 Subject: [PATCH 3/3] Little lower and a little higher. --- hyperstation/code/datums/mood_events/events.dm | 2 +- .../modules/reagents/chemistry/reagents/medicine_reagents.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hyperstation/code/datums/mood_events/events.dm b/hyperstation/code/datums/mood_events/events.dm index 933c6548..b61bff1c 100644 --- a/hyperstation/code/datums/mood_events/events.dm +++ b/hyperstation/code/datums/mood_events/events.dm @@ -25,5 +25,5 @@ /datum/mood_event/copium description = "Things are going to be okay, right?\n" - mood_change = 2 + mood_change = 3 timeout = 3 MINUTES diff --git a/hyperstation/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/hyperstation/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index 59eda37c..3db0e93f 100644 --- a/hyperstation/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/hyperstation/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -3,7 +3,7 @@ description = "A heavy scented substance meant to help one deal with loss." reagent_state = LIQUID color = "#a8707e" - overdose_threshold = 25 + overdose_threshold = 21 metabolization_rate = 0.75 * REAGENTS_METABOLISM pH = 4