From c0fd7290c784865769d47ae13226d3d0c2f7e097 Mon Sep 17 00:00:00 2001 From: Erik Darkpaws Date: Fri, 13 Sep 2019 22:38:44 -0700 Subject: [PATCH 1/3] Realistic Salt --- .../Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm index 4d4de7b0ab..d06d06580b 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -257,7 +257,7 @@ taste_description = "salt" reagent_state = SOLID color = "#FFFFFF" - overdose = REAGENTS_OVERDOSE + overdose = REAGENTS_OVERDOSE * 0.5 ingest_met = REM /datum/reagent/sodiumchloride/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) @@ -270,6 +270,13 @@ var/passthrough = (removed - (removed/pass_mod)) //Some may be nullified during consumption, between one third and one fifth. affect_blood(M, alien, passthrough) +/datum/reagent/sodiumchloride/overdose(var/mob/living/carbon/M, var/alien, var/removed) // This is for you, Solus. -Erik + if(alien == IS_DIONA) + return + + M/human.losebreath = 10 + M.adjustOxyLoss(removed * 5) + /datum/reagent/blackpepper name = "Black Pepper" id = "blackpepper" From c0e15a3f44f3ab555abd945155db09c57bff2e07 Mon Sep 17 00:00:00 2001 From: Erik Darkpaws Date: Fri, 13 Sep 2019 23:10:56 -0700 Subject: [PATCH 2/3] Normal OD But Oxy --- .../Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm index d06d06580b..141c5ffdc8 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -257,7 +257,7 @@ taste_description = "salt" reagent_state = SOLID color = "#FFFFFF" - overdose = REAGENTS_OVERDOSE * 0.5 + overdose = REAGENTS_OVERDOSE ingest_met = REM /datum/reagent/sodiumchloride/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) @@ -275,7 +275,7 @@ return M/human.losebreath = 10 - M.adjustOxyLoss(removed * 5) + M.adjustOxyLoss(removed) /datum/reagent/blackpepper name = "Black Pepper" From b0283e8440a183d124270b7764623e9b5d324400 Mon Sep 17 00:00:00 2001 From: Erik Darkpaws Date: Fri, 13 Sep 2019 23:21:06 -0700 Subject: [PATCH 3/3] damage fix --- .../Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm index 141c5ffdc8..fc292a9e6e 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -275,7 +275,6 @@ return M/human.losebreath = 10 - M.adjustOxyLoss(removed) /datum/reagent/blackpepper name = "Black Pepper"