From 4ecbd1e407da1a1d4a4ab72168120840f2069fa1 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Tue, 4 Feb 2020 22:00:33 -0500 Subject: [PATCH] Update carp.dm --- code/modules/mob/living/simple_animal/hostile/carp.dm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm index d990362088..fbe46f9665 100644 --- a/code/modules/mob/living/simple_animal/hostile/carp.dm +++ b/code/modules/mob/living/simple_animal/hostile/carp.dm @@ -37,14 +37,12 @@ /mob/living/simple_animal/hostile/carp/adjustHealth(amount, updating_health = TRUE, forced = FALSE) . = ..() - if(regen != TRUE) - return - else + if(regen) regen_cooldown = world.time + REGENERATION_DELAY /mob/living/simple_animal/hostile/carp/Life() . = ..() - if(regen_cooldown < world.time) + if(regen && regen_cooldown < world.time) heal_overall_damage(heal_amout) //Space carp aren't affected by cold.