TGS Test Merge (#6073)

code/__DEFINES/inventory/carry_weight.dm

@@ -131,8 +131,8 @@
 #define ITEM_ENCUMBRANCE_VOIDSUIT_ANOMALY 30
 #define ITEM_ENCUMBRANCE_VOIDSUIT_ANOMALY_HELMET 2.5
 
-#define ITEM_ENCUMBRANCE_LEGACY_RIG_LIGHT 25
-#define ITEM_ENCUMBRANCE_LEGACY_RIG 30
+#define ITEM_ENCUMBRANCE_LEGACY_RIG_LIGHT 17.5
+#define ITEM_ENCUMBRANCE_LEGACY_RIG 25
 #define ITEM_ENCUMBRANCE_LEGACY_RIG_HEAVY 35
 
 #define ITEM_ENCUMBRANCE_EMERGENCY_SOFTSUIT 30

code/game/objects/items.dm

@@ -275,7 +275,8 @@
 			. += "It's so unwieldly that it's a surprise you can hold it at all. You really won't be doing much running with it."
 	switch(get_weight())
 		if(-INFINITY to 0.1)
-			. += "It looks like it weighs practically nothing."
+			// todo: put this in when we actually get weight
+			// . += "It looks like it weighs practically nothing."
 		if(0.1 to 0.75)
 			. += "It looks like it weighs very little."
 		if(0.75 to 2)

code/modules/movespeed/movespeed_modifier.dm

@@ -77,6 +77,7 @@ Key procs
   */
 /datum/movespeed_modifier/proc/apply_multiplicative(existing, mob/target)
 	// todo: we should max/min to ticklag rather than 0, but, we can't until everything is moved to modifiers.
+	// todo: this is all shitty god we need to get rid of movement_delay() proper aaaa
 	switch(calculation_type)
 	/*
 		if(MOVESPEED_CALCULATION_HYPERBOLIC)
@@ -91,7 +92,9 @@ Key procs
 	*/
 		if(MOVESPEED_CALCULATION_HYPERBOLIC)
 			// going below 0 would fuck multipliers up pretty badly
-			return max(0, existing + multiplicative_slowdown)
+			// return max(0, existing + multiplicative_slowdown)
+			//! WE DO IT ANYWAYS - LEGACY
+			return existing + multiplicative_slowdown
 		if(MOVESPEED_CALCULATION_HYPERBOLIC_BOOST)
 			var/current_tiles = 10 / max(existing, world.tick_lag)
 			var/max_buff_to = max(existing + multiplicative_slowdown, 10 / absolute_max_tiles_per_second, 10 / (current_tiles + max_tiles_per_second_boost))