From ba72e3d8f08a7cb0c4ae4ff039dc725869d5e73d Mon Sep 17 00:00:00 2001 From: zerothebigboy Date: Sat, 11 Sep 2021 23:04:21 -0400 Subject: [PATCH 1/3] why --- .../reagents/chemistry/reagents/medicine_reagents.dm | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index a07c5f7a2a..72a9779726 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -1451,7 +1451,7 @@ /datum/reagent/medicine/changelingadrenaline/on_mob_life(mob/living/carbon/metabolizer, delta_time, times_fired) ..() metabolizer.AdjustAllImmobility(-20 * REM * delta_time) - metabolizer.adjustStaminaLoss(-10 * REM * delta_time, 0) + metabolizer.adjustStaminaLoss(-30 * REM * delta_time, 0) metabolizer.Jitter(10 * REM * delta_time) metabolizer.Dizzy(10 * REM * delta_time) return TRUE @@ -1477,7 +1477,7 @@ /datum/reagent/medicine/changelinghaste name = "Changeling Haste" - description = "Drastically increases movement speed, but deals toxin damage." + description = "Drastically increases movement speed." color = "#AE151D" metabolization_rate = 2.5 * REAGENTS_METABOLISM @@ -1489,12 +1489,6 @@ L.remove_movespeed_modifier(/datum/movespeed_modifier/reagent/changelinghaste) ..() -/datum/reagent/medicine/changelinghaste/on_mob_life(mob/living/carbon/metabolizer, delta_time, times_fired) - metabolizer.adjustToxLoss(2 * REM * delta_time, 0) - ..() - return TRUE - - /datum/reagent/medicine/corazone // Heart attack code will not do damage if corazone is present // because it's SPACE MAGIC ASPIRIN From 223ba8d6c1005085bc19f8b456d38c0db89a7efb Mon Sep 17 00:00:00 2001 From: zerothebigboy Date: Sat, 11 Sep 2021 23:20:01 -0400 Subject: [PATCH 2/3] why --- code/modules/movespeed/modifiers/reagents.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/movespeed/modifiers/reagents.dm b/code/modules/movespeed/modifiers/reagents.dm index 96b7be3a69..a6c3133c8b 100644 --- a/code/modules/movespeed/modifiers/reagents.dm +++ b/code/modules/movespeed/modifiers/reagents.dm @@ -23,7 +23,7 @@ multiplicative_slowdown = -4 priority = 500 complex_calculation = TRUE - absolute_max_tiles_per_second = 8 + absolute_max_tiles_per_second = 10 /datum/movespeed_modifier/reagent/methamphetamine // very strong painkiller effect that caps out at slightly above runspeed From d41648b3651d868204177594b037ad6fa3642fc9 Mon Sep 17 00:00:00 2001 From: zerothebigboy Date: Sat, 11 Sep 2021 23:34:02 -0400 Subject: [PATCH 3/3] dumbasskevinz --- code/modules/movespeed/_movespeed_modifier.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/modules/movespeed/_movespeed_modifier.dm b/code/modules/movespeed/_movespeed_modifier.dm index 74eedc16c9..5fc415b2b6 100644 --- a/code/modules/movespeed/_movespeed_modifier.dm +++ b/code/modules/movespeed/_movespeed_modifier.dm @@ -41,9 +41,9 @@ Key procs /// Next two variables depend on this: Should we do advanced calculations? var/complex_calculation = FALSE /// Absolute max tiles we can boost to - var/absolute_max_tiles_per_second + var/absolute_max_tiles_per_second = INFINITY /// Max tiles per second we can boost - var/max_tiles_per_second_boost + var/max_tiles_per_second_boost = INFINITY /// Movetypes this applies to var/movetypes = ALL @@ -54,6 +54,8 @@ Key procs /// Other modification datums this conflicts with. var/conflicts_with + + /datum/movespeed_modifier/New() . = ..() if(!id)