ss220club · larentoun · Nov 8, 2024 · Nov 8, 2024
diff --git a/code/modules/movespeed/_movespeed_modifier.dm b/code/modules/movespeed/_movespeed_modifier.dm
@@ -176,7 +176,7 @@ GLOBAL_LIST_EMPTY(movespeed_modification_cache)
 		if(M.blacklisted_movetypes & movement_type) // There's a movetype here that disables this modifier, skip
 			continue
 		var/conflict = M.conflicts_with
-		var/amt = M.multiplicative_slowdown
+		var/amt = M.get_rp_speed() // BANDASTATION EDIT - Speed
 		if(conflict)
 			// Conflicting modifiers prioritize the larger slowdown or the larger speedup
 			// We purposefuly don't handle mixing speedups and slowdowns on the same id

diff --git a/modular_bandastation/balance/_balance.dme b/modular_bandastation/balance/_balance.dme
@@ -1,8 +1,12 @@
 #include "_balance.dm"
 
-#include "code/balance_riding.dm"
+#include "code/~defines.dm"
+
+#include "code/speed/movespeed_modifier.dm"
 #include "code/dynamic.dm"
 #include "code/events.dm"
 #include "code/station_traits.dm"
 #include "code/supply_packs.dm"
 #include "code/crew_manifest.dm"
+
+#include "code/~undefs.dm"
diff --git a/modular_bandastation/balance/code/balance_riding.dm b/modular_bandastation/balance/code/balance_riding.dm
diff --git a/modular_bandastation/balance/code/speed/movespeed_modifier.dm b/modular_bandastation/balance/code/speed/movespeed_modifier.dm
@@ -0,0 +1,10 @@
+/proc/modified_move_delay(move_delay, ignore_zero = FALSE)
+	if(move_delay == 0 && !ignore_zero)
+		return round(max(RP_SPEED - TG_SPEED, 0) * TG_SPEED, 0.01)
+	return round(RP_SPEED / TG_SPEED * move_delay, 0.01)
+
+/datum/movespeed_modifier/proc/get_rp_speed()
+	return modified_move_delay(multiplicative_slowdown, ignore_zero = TRUE)
+
+/datum/movespeed_modifier/config_walk_run/get_rp_speed()
+	return multiplicative_slowdown
diff --git a/modular_bandastation/balance/code/~defines.dm b/modular_bandastation/balance/code/~defines.dm
@@ -0,0 +1,2 @@
+#define TG_SPEED 1.5
+#define RP_SPEED CONFIG_GET(number/movedelay/run_delay)
diff --git a/modular_bandastation/balance/code/~undefs.dm b/modular_bandastation/balance/code/~undefs.dm
@@ -0,0 +1,2 @@
+#undef TG_SPEED
+#undef RP_SPEED
diff --git a/modular_bandastation/crawl_speed/_crawl_speed.dm b/modular_bandastation/crawl_speed/_crawl_speed.dm
diff --git a/modular_bandastation/crawl_speed/_crawl_speed.dme b/modular_bandastation/crawl_speed/_crawl_speed.dme
diff --git a/modular_bandastation/crawl_speed/code/_crawl_speed_defines.dm b/modular_bandastation/crawl_speed/code/_crawl_speed_defines.dm
diff --git a/modular_bandastation/crawl_speed/code/crawl_speed_component.dm b/modular_bandastation/crawl_speed/code/crawl_speed_component.dm
diff --git a/modular_bandastation/crawl_speed/code/crawl_speed_mob.dm b/modular_bandastation/crawl_speed/code/crawl_speed_mob.dm
diff --git a/modular_bandastation/crawl_speed/code/~crawl_speed_defines.dm b/modular_bandastation/crawl_speed/code/~crawl_speed_defines.dm
diff --git a/modular_bandastation/modular_bandastation.dme b/modular_bandastation/modular_bandastation.dme
@@ -13,11 +13,10 @@
 #include "balance/_balance.dme"
 #include "barsigns/_barsigns.dme"
 #include "communication/_communication.dme"
-//#include "crawl_speed/_crawl_speed.dme" // Fixing floored melee brawl, or first steps to remove RP speed
 #include "cyrillic_fixes/_cyrillic_fixes.dme"
 #include "database220/_database220.dme"
 #include "discord/_discord.dme"
-#include "emote_panel/_emote_panel.dme" // Waiting for upstream merge
+#include "emote_panel/_emote_panel.dme"
 #include "examine_panel/_examine_panel.dme"
 #include "gunhud/_gunhud.dme"
 #include "hair/_hair.dme"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		#define TG_SPEED 1.5
		#define RP_SPEED CONFIG_GET(number/movedelay/run_delay)