From 5a9f4c1b156b53a225fc8b99e8a99b1e37f7d3bd Mon Sep 17 00:00:00 2001 From: ShizCalev Date: Wed, 17 Oct 2018 14:18:01 -0400 Subject: [PATCH 1/2] Monkeys no longer move at lightspeed (#40968) --- code/modules/mob/living/carbon/monkey/monkey.dm | 4 ++-- code/modules/mob/living/simple_animal/slime/slime.dm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm index 55ecebda8cc2..d481dc07f31d 100644 --- a/code/modules/mob/living/carbon/monkey/monkey.dm +++ b/code/modules/mob/living/carbon/monkey/monkey.dm @@ -80,8 +80,8 @@ . = ..() var/slow = 0 if (bodytemperature < 283.222) - slow += (283.222 - bodytemperature) / 10 * 1.75 - add_movespeed_modifier(MOVESPEED_ID_MONKEY_TEMPERATURE_SPEEDMOD, TRUE, 100, override = TRUE, multiplicative_slowdown = amount) + slow += ((283.222 - bodytemperature) / 10) * 1.75 + add_movespeed_modifier(MOVESPEED_ID_MONKEY_TEMPERATURE_SPEEDMOD, TRUE, 100, override = TRUE, multiplicative_slowdown = slow) /mob/living/carbon/monkey/Stat() ..() diff --git a/code/modules/mob/living/simple_animal/slime/slime.dm b/code/modules/mob/living/simple_animal/slime/slime.dm index bba5e1aad2b3..634ebd1b355d 100644 --- a/code/modules/mob/living/simple_animal/slime/slime.dm +++ b/code/modules/mob/living/simple_animal/slime/slime.dm @@ -161,8 +161,8 @@ var/mod = 0 if(bodytemperature >= 330.23) // 135 F or 57.08 C mod = -1 // slimes become supercharged at high temperatures - else if(bodytemperature < 183.222) - mod = (283.222 - bodytemperature) / 10 * 1.75 + else if(bodytemperature < 283.222) + mod = ((283.222 - bodytemperature) / 10) * 1.75 if(mod) add_movespeed_modifier(MOVESPEED_ID_SLIME_TEMPMOD, TRUE, 100, override = TRUE, multiplicative_slowdown = mod) From e4b5a0dbf6c18571f8dd1b4580dbbf087b41ef4b Mon Sep 17 00:00:00 2001 From: yogstation13-bot Date: Wed, 17 Oct 2018 19:17:24 +0100 Subject: [PATCH 2/2] Mokeys no longer move at lightspeed