From f005ea3408f9a88c2c4eb6ee43936aca85e11b85 Mon Sep 17 00:00:00 2001 From: MenacingManatee Date: Sat, 25 Apr 2020 23:07:20 -0500 Subject: [PATCH 1/6] Meth tweak --- code/modules/reagents/chemistry/reagents/drug_reagents.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/drug_reagents.dm b/code/modules/reagents/chemistry/reagents/drug_reagents.dm index aeb17ba063c4..c36266df6e72 100644 --- a/code/modules/reagents/chemistry/reagents/drug_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drug_reagents.dm @@ -196,7 +196,7 @@ /datum/reagent/drug/methamphetamine/on_mob_metabolize(mob/living/L) ..() - L.add_movespeed_modifier(type, update=TRUE, priority=100, multiplicative_slowdown=-2, blacklisted_movetypes=(FLYING|FLOATING)) + L.add_movespeed_modifier(type, update=TRUE, priority=100, multiplicative_slowdown=-1.3, blacklisted_movetypes=(FLYING|FLOATING)) /datum/reagent/drug/methamphetamine/on_mob_end_metabolize(mob/living/L) L.remove_movespeed_modifier(type) @@ -213,7 +213,7 @@ M.AdjustImmobilized(-40, FALSE) M.adjustStaminaLoss(-2, 0) M.Jitter(2) - M.adjustOrganLoss(ORGAN_SLOT_BRAIN, rand(1,4)) + M.adjustOrganLoss(ORGAN_SLOT_BRAIN, rand(1,6)) if(prob(5)) M.emote(pick("twitch", "shiver")) ..() From 12436a6ccf32174767066464dc00fbc993291356 Mon Sep 17 00:00:00 2001 From: MenacingManatee Date: Sat, 25 Apr 2020 23:58:45 -0500 Subject: [PATCH 2/6] Slightly less damage --- code/modules/reagents/chemistry/reagents/drug_reagents.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/chemistry/reagents/drug_reagents.dm b/code/modules/reagents/chemistry/reagents/drug_reagents.dm index c36266df6e72..2e3cc9ce2d99 100644 --- a/code/modules/reagents/chemistry/reagents/drug_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drug_reagents.dm @@ -213,7 +213,7 @@ M.AdjustImmobilized(-40, FALSE) M.adjustStaminaLoss(-2, 0) M.Jitter(2) - M.adjustOrganLoss(ORGAN_SLOT_BRAIN, rand(1,6)) + M.adjustOrganLoss(ORGAN_SLOT_BRAIN, rand(1,5)) if(prob(5)) M.emote(pick("twitch", "shiver")) ..() From 495e6c41c78de8d967bd3360095e71f27d884fdd Mon Sep 17 00:00:00 2001 From: MenacingManatee Date: Sun, 26 Apr 2020 05:08:56 -0500 Subject: [PATCH 3/6] Meth nerf 2: Electric boogaloo Meth brain damage set to original value Meth speed lowered from 2 to 1.6 (previously 1.3) Meth now creates a small caustic smoke cloud on reaction --- .../reagents/chemistry/reagents/drug_reagents.dm | 5 +++-- code/modules/reagents/chemistry/recipes/drugs.dm | 14 +++++++++++++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/drug_reagents.dm b/code/modules/reagents/chemistry/reagents/drug_reagents.dm index 2e3cc9ce2d99..7919f163a169 100644 --- a/code/modules/reagents/chemistry/reagents/drug_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drug_reagents.dm @@ -194,9 +194,10 @@ addiction_threshold = 10 metabolization_rate = 0.75 * REAGENTS_METABOLISM + /datum/reagent/drug/methamphetamine/on_mob_metabolize(mob/living/L) ..() - L.add_movespeed_modifier(type, update=TRUE, priority=100, multiplicative_slowdown=-1.3, blacklisted_movetypes=(FLYING|FLOATING)) + L.add_movespeed_modifier(type, update=TRUE, priority=100, multiplicative_slowdown=-1.6, blacklisted_movetypes=(FLYING|FLOATING)) /datum/reagent/drug/methamphetamine/on_mob_end_metabolize(mob/living/L) L.remove_movespeed_modifier(type) @@ -213,7 +214,7 @@ M.AdjustImmobilized(-40, FALSE) M.adjustStaminaLoss(-2, 0) M.Jitter(2) - M.adjustOrganLoss(ORGAN_SLOT_BRAIN, rand(1,5)) + M.adjustOrganLoss(ORGAN_SLOT_BRAIN, rand(1,4)) if(prob(5)) M.emote(pick("twitch", "shiver")) ..() diff --git a/code/modules/reagents/chemistry/recipes/drugs.dm b/code/modules/reagents/chemistry/recipes/drugs.dm index 7049c3da0eac..0a5828935bff 100644 --- a/code/modules/reagents/chemistry/recipes/drugs.dm +++ b/code/modules/reagents/chemistry/recipes/drugs.dm @@ -25,9 +25,21 @@ name = /datum/reagent/drug/methamphetamine id = /datum/reagent/drug/methamphetamine results = list(/datum/reagent/drug/methamphetamine = 4) - required_reagents = list(/datum/reagent/medicine/ephedrine = 1, /datum/reagent/iodine = 1, /datum/reagent/phosphorus = 1, /datum/reagent/hydrogen = 1) + required_reagents = list(/datum/reagent/medicine/ephedrine = 1, /datum/reagent/iodine = 1, /datum/reagent/phosphorus = 1, /datum/reagent/hydrogen = 1, /datum/reagent/toxin/acid/fluacid = 1) required_temp = 374 +/datum/chemical_reaction/methamphetamine/on_reaction(datum/reagents/holder) + var/datum/reagents/R = new/datum/reagents(5) + R.my_atom = src + R.add_reagent(/datum/reagent/toxin/acid, 5) + var/smoke_radius = round(0.5, 0.5) + var/location = get_turf(holder.my_atom) + var/datum/effect_system/smoke_spread/chem/S = new + playsound(location, 'sound/effects/smoke.ogg', 50, 1, -3) + if(S) + S.set_up(R, smoke_radius, location, 0) + S.start() + /datum/chemical_reaction/bath_salts name = /datum/reagent/drug/bath_salts id = /datum/reagent/drug/bath_salts From 059f63b059b6dfaf2b967b95862420d6cf930cfc Mon Sep 17 00:00:00 2001 From: MenacingManatee Date: Mon, 27 Apr 2020 14:47:11 -0500 Subject: [PATCH 4/6] Meth now properly results in 5 parts instead of 4 --- code/modules/reagents/chemistry/recipes/drugs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/chemistry/recipes/drugs.dm b/code/modules/reagents/chemistry/recipes/drugs.dm index 0a5828935bff..d8476722f50f 100644 --- a/code/modules/reagents/chemistry/recipes/drugs.dm +++ b/code/modules/reagents/chemistry/recipes/drugs.dm @@ -24,7 +24,7 @@ /datum/chemical_reaction/methamphetamine name = /datum/reagent/drug/methamphetamine id = /datum/reagent/drug/methamphetamine - results = list(/datum/reagent/drug/methamphetamine = 4) + results = list(/datum/reagent/drug/methamphetamine = 5) required_reagents = list(/datum/reagent/medicine/ephedrine = 1, /datum/reagent/iodine = 1, /datum/reagent/phosphorus = 1, /datum/reagent/hydrogen = 1, /datum/reagent/toxin/acid/fluacid = 1) required_temp = 374 From 70c241e5acf50888cd39769eea7bc1a9b51d06e7 Mon Sep 17 00:00:00 2001 From: MenacingManatee Date: Wed, 6 May 2020 16:37:25 -0500 Subject: [PATCH 5/6] Adds suggested changes Minor edit to suggested change to handle removed var --- code/modules/reagents/chemistry/recipes/drugs.dm | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/code/modules/reagents/chemistry/recipes/drugs.dm b/code/modules/reagents/chemistry/recipes/drugs.dm index 0a5828935bff..e64e4b064631 100644 --- a/code/modules/reagents/chemistry/recipes/drugs.dm +++ b/code/modules/reagents/chemistry/recipes/drugs.dm @@ -30,15 +30,12 @@ /datum/chemical_reaction/methamphetamine/on_reaction(datum/reagents/holder) var/datum/reagents/R = new/datum/reagents(5) - R.my_atom = src - R.add_reagent(/datum/reagent/toxin/acid, 5) - var/smoke_radius = round(0.5, 0.5) - var/location = get_turf(holder.my_atom) + R.my_atom = holder.my_atom + R.add_reagent(/datum/reagent/toxin/acid/fluacid, 5) var/datum/effect_system/smoke_spread/chem/S = new - playsound(location, 'sound/effects/smoke.ogg', 50, 1, -3) - if(S) - S.set_up(R, smoke_radius, location, 0) - S.start() + S.set_up(R, 0.5, holder.my_atom, 0) + S.start() + playsound(get_turf(holder.my_atom), 'sound/effects/smoke.ogg', 50, 1, -3) /datum/chemical_reaction/bath_salts name = /datum/reagent/drug/bath_salts From 04578565279ec6ac57985e91744fd6723be1cdc9 Mon Sep 17 00:00:00 2001 From: MenacingManatee Date: Sun, 17 May 2020 19:28:10 -0500 Subject: [PATCH 6/6] Removed random extra newline --- code/modules/reagents/chemistry/reagents/drug_reagents.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/reagents/chemistry/reagents/drug_reagents.dm b/code/modules/reagents/chemistry/reagents/drug_reagents.dm index 383fc1423220..42a61ab5ce4e 100644 --- a/code/modules/reagents/chemistry/reagents/drug_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drug_reagents.dm @@ -194,7 +194,6 @@ addiction_threshold = 10 metabolization_rate = 0.75 * REAGENTS_METABOLISM - /datum/reagent/drug/methamphetamine/on_mob_metabolize(mob/living/L) ..() L.add_movespeed_modifier(type, update=TRUE, priority=100, multiplicative_slowdown=-1.6, blacklisted_movetypes=(FLYING|FLOATING))