From 10926dfd3d8034890014946d5def282ff42cc0cb Mon Sep 17 00:00:00 2001 From: UEDCommander <52104104+UEDCommander@users.noreply.github.com> Date: Mon, 4 Mar 2024 14:17:06 +0300 Subject: [PATCH 1/6] Renaming Yeosa venom --- .../reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm index d93684cc59..2aee5f9f32 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm @@ -77,7 +77,7 @@ strength = 10 /datum/reagent/toxin/yeosvenom - name = "Yeosa'Unathi Venom" + name = "Esh Hashaar Haashane" description = "A non-lethal toxin produced by Yeosa'Unathi" taste_description = "absolutely vile" color = "#91d895" From c37de0758dbb7735720d5dea0b1bf82eda325ae1 Mon Sep 17 00:00:00 2001 From: UEDCommander <52104104+UEDCommander@users.noreply.github.com> Date: Mon, 4 Mar 2024 15:01:52 +0300 Subject: [PATCH 2/6] New reagents using Yeosa poison --- .../Chemistry-Reagents-Medicine.dm | 58 +++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm index 42a22a2cd1..c3d1282580 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm @@ -1056,3 +1056,61 @@ ..() M.add_chemical_effect(CE_TOXIN, 1) M.immunity -= 0.5 //inverse effects when abused + + // Unathi reagents +/datum/reagent/paashe + name = "Paashe Meish Sunn" + description = "An effective natural painkiller, produced from Yeosa'Unathi innate venom. Has similar effect to Tramadol, but features no side effects whatsoever." + taste_description = "way too much sweetness" + reagent_state = LIQUID + color = "#aea0c9" + scannable = 1 + metabolism = 0.05 + ingest_met = 0.02 + flags = IGNORE_MOB_SIZE + value = 3.1 + var/pain_power = 80 //magnitide of painkilling effect + var/effective_dose = 0.5 //how many units it need to process to reach max power + +/datum/reagent/paashe/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) + var/effectiveness = 1 + if(M.chem_doses[type] < effective_dose) //some ease-in ease-out for the effect + effectiveness = M.chem_doses[type]/effective_dose + else if(volume < effective_dose) + effectiveness = volume/effective_dose + M.add_chemical_effect(CE_PAINKILLER, pain_power * effectiveness) + +/datum/reagent/arhishaap + name = "Arhishaap" + description = "An advanced Yeosa'Unathi anti-toxin, significantly more effective than synthetic alternatives." + taste_description = "way too much sweetness" + reagent_state = LIQUID + color = "#49bc4b" + scannable = 1 + flags = IGNORE_MOB_SIZE + value = 2.1 + var/remove_generic = 1 + var/list/remove_toxins = list( + /datum/reagent/toxin/zombiepowder + ) + +/datum/reagent/arhishaap/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) + M.radiation = max(M.radiation - 30 * removed, 0) + if(alien == IS_DIONA) + return + + if(remove_generic) + M.drowsyness = max(0, M.drowsyness - 10 * removed) + M.adjust_hallucination(-14 * removed) + M.add_up_to_chemical_effect(CE_ANTITOX, 1) + + var/removing = (8 * removed) + var/datum/reagents/ingested = M.get_ingested_reagents() + for(var/datum/reagent/R in ingested.reagent_list) + if((remove_generic && istype(R, /datum/reagent/toxin)) || (R.type in remove_toxins)) + ingested.remove_reagent(R.type, removing) + return + for(var/datum/reagent/R in M.reagents.reagent_list) + if((remove_generic && istype(R, /datum/reagent/toxin)) || (R.type in remove_toxins)) + M.reagents.remove_reagent(R.type, removing) + return From d4ea928ca2a6c7f4d1aebd40c59e7447e008aa6c Mon Sep 17 00:00:00 2001 From: UEDCommander <52104104+UEDCommander@users.noreply.github.com> Date: Mon, 4 Mar 2024 15:05:26 +0300 Subject: [PATCH 3/6] New reagent reactions --- code/modules/reagents/Chemistry-Recipes.dm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index c3b2f1f304..4cf884d9ca 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -478,6 +478,26 @@ required_reagents = list(/datum/reagent/inaprovaline = 1, /datum/reagent/hyperzine = 1, /datum/reagent/dexalinp = 1) result_amount = 3 +/* Unathi reagents reactions */ +/datum/chemical_reaction/paashe + name = "Paashe Meish Sunn" + result = /datum/reagent/paashe + required_reagents = list(/datum/reagent/toxin/yeosvenom = 1, /datum/reagent/ethanol = 1, /datum/reagent/acetone = 1) + result_amount = 3 + +/datum/chemical_reaction/arhishaap + name = "Arhishaap" + result = /datum/reagent/arhishaap + required_reagents = list(/datum/reagent/toxin/yeosvenom = 1, /datum/reagent/ethanol = 1, /datum/reagent/ammonia = 1, /datum/reagent/radium = 1) + result_amount = 4 + +/datum/chemical_reaction/oxycodonealt + name = "Oxycodone Alt" + result = /datum/reagent/tramadol/oxycodone + required_reagents = list(/datum/reagent/ethanol = 1, /datum/reagent/paashe = 1) + catalysts = list(/datum/reagent/toxin/phoron = 5) + result_amount = 1 + /* Solidification */ /datum/chemical_reaction/phoronsolidification name = "Solid Phoron" From c2ca35e31db2552910095a15e3bfde1766d330e7 Mon Sep 17 00:00:00 2001 From: UEDCommander <52104104+UEDCommander@users.noreply.github.com> Date: Mon, 4 Mar 2024 15:29:54 +0300 Subject: [PATCH 4/6] Slight edit for the recepie --- code/modules/reagents/Chemistry-Recipes.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 4cf884d9ca..4dfb2bc5a4 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -488,7 +488,7 @@ /datum/chemical_reaction/arhishaap name = "Arhishaap" result = /datum/reagent/arhishaap - required_reagents = list(/datum/reagent/toxin/yeosvenom = 1, /datum/reagent/ethanol = 1, /datum/reagent/ammonia = 1, /datum/reagent/radium = 1) + required_reagents = list(/datum/reagent/toxin/yeosvenom = 1, /datum/reagent/diethylamine = 2, /datum/reagent/radium = 1) result_amount = 4 /datum/chemical_reaction/oxycodonealt From 7930098c3db093af60693a1d606c4386858a5e90 Mon Sep 17 00:00:00 2001 From: UEDCommander <52104104+UEDCommander@users.noreply.github.com> Date: Mon, 4 Mar 2024 15:31:23 +0300 Subject: [PATCH 5/6] Regular painkiller side effects --- .../Chemistry-Reagents-Medicine.dm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm index c3d1282580..aa2e8b2f00 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm @@ -1060,10 +1060,11 @@ // Unathi reagents /datum/reagent/paashe name = "Paashe Meish Sunn" - description = "An effective natural painkiller, produced from Yeosa'Unathi innate venom. Has similar effect to Tramadol, but features no side effects whatsoever." + description = "An effective natural painkiller, produced from Yeosa'Unathi innate venom. Has similar effect to Tramadol, but doesn't feature any significant side effects." taste_description = "way too much sweetness" reagent_state = LIQUID color = "#aea0c9" + overdose = 30 scannable = 1 metabolism = 0.05 ingest_met = 0.02 @@ -1079,6 +1080,20 @@ else if(volume < effective_dose) effectiveness = volume/effective_dose M.add_chemical_effect(CE_PAINKILLER, pain_power * effectiveness) + if(M.chem_doses[type] > 0.5 * overdose) + M.add_chemical_effect(CE_SLOWDOWN, 1) + if(prob(1)) + M.slurring = max(M.slurring, 10) + if(M.chem_doses[type] > 0.75 * overdose) + M.add_chemical_effect(CE_SLOWDOWN, 1) + if(prob(5)) + M.slurring = max(M.slurring, 20) + if(M.chem_doses[type] > overdose) + M.add_chemical_effect(CE_SLOWDOWN, 1) + M.slurring = max(M.slurring, 30) + if(prob(1)) + M.Weaken(2) + M.drowsyness = max(M.drowsyness, 5) /datum/reagent/arhishaap name = "Arhishaap" From b84b055761ff39104a5fe0da137c5f7beef3e702 Mon Sep 17 00:00:00 2001 From: UEDCommander <52104104+UEDCommander@users.noreply.github.com> Date: Mon, 4 Mar 2024 18:17:04 +0300 Subject: [PATCH 6/6] Update Chemistry-Reagents-Medicine.dm --- .../reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm index aa2e8b2f00..c8d9eada4f 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm @@ -1111,8 +1111,6 @@ /datum/reagent/arhishaap/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) M.radiation = max(M.radiation - 30 * removed, 0) - if(alien == IS_DIONA) - return if(remove_generic) M.drowsyness = max(0, M.drowsyness - 10 * removed)