Merge pull request #7391 from Crazylemon64/tigercat_move_patch

Adds a patch to movement delay

code/modules/mob/living/carbon/slime/slime.dm

@@ -83,25 +83,25 @@
 	if(bodytemperature >= 330.23) // 135 F
 		return -1	// slimes become supercharged at high temperatures
 
-	var/tally = 0
+	. = ..(1)
 
 	var/health_deficiency = (100 - health)
-	if(health_deficiency >= 45) tally += (health_deficiency / 25)
+	if(health_deficiency >= 45) . += (health_deficiency / 25)
 
 	if(bodytemperature < 183.222)
-		tally += (283.222 - bodytemperature) / 10 * 1.75
+		. += (283.222 - bodytemperature) / 10 * 1.75
 
 	if(reagents)
 		if(reagents.has_reagent("methamphetamine")) // Meth slows slimes down
-			tally *= 2
+			. *= 2
 
 		if(reagents.has_reagent("frostoil")) // Frostoil also makes them move VEEERRYYYYY slow
-			tally *= 5
+			. *= 5
 
 	if(health <= 0) // if damaged, the slime moves twice as slow
-		tally *= 2
+		. *= 2
 
-	return tally + config.slime_delay
+	return . + config.slime_delay
 
 /mob/living/carbon/slime/ObjBump(obj/O)
 	if(!client && powerlevel > 0)

code/modules/mob/living/silicon/robot/robot_movement.dm

@@ -1,30 +1,27 @@
-/mob/living/silicon/robot/Process_Spacemove(var/movement_dir = 0)
-	if(ionpulse())
-		return 1
-	if(..())
-		return 1
-	return 0
-
- //No longer needed, but I'll leave it here incase we plan to re-use it.
-/mob/living/silicon/robot/movement_delay()
-	var/tally = 0 //Incase I need to add stuff other than "speed" later
-
-	tally = speed
-
-	if(module_active && istype(module_active,/obj/item/borg/combat/mobility))
-		tally-=3
-
-	return tally+config.robot_delay
-
-/mob/living/silicon/robot/Move()
-	..()
-
-/mob/living/silicon/robot/mob_negates_gravity()
-	return magpulse
-
-/mob/living/silicon/robot/mob_has_gravity()
-	return ..() || mob_negates_gravity()
-
-/mob/living/silicon/robot/experience_pressure_difference(pressure_difference, direction)
-	if(!magpulse)
+/mob/living/silicon/robot/Process_Spacemove(var/movement_dir = 0)
+	if(ionpulse())
+		return 1
+	if(..())
+		return 1
+	return 0
+
+ //No longer needed, but I'll leave it here incase we plan to re-use it.
+/mob/living/silicon/robot/movement_delay()
+	. = ..(1) //Incase I need to add stuff other than "speed" later
+
+	. += speed
+
+	if(module_active && istype(module_active,/obj/item/borg/combat/mobility))
+		. -= 3
+
+	return . + config.robot_delay
+
+/mob/living/silicon/robot/mob_negates_gravity()
+	return magpulse
+
+/mob/living/silicon/robot/mob_has_gravity()
+	return ..() || mob_negates_gravity()
+
+/mob/living/silicon/robot/experience_pressure_difference(pressure_difference, direction)
+	if(!magpulse)
 		return ..()

config/example/game_options.txt

@@ -47,7 +47,7 @@ HUMAN_DELAY 1.5
 ROBOT_DELAY 1.5
 MONKEY_DELAY 1.5
 ALIEN_DELAY 1.5
-METROID_DELAY 1.5
+SLIME_DELAY 1.5
 ANIMAL_DELAY 1.5
 
 ## Comment for "normal" explosions, which ignore obstacles