From 177dcbe16be0b03364bde5e3f87f67567984e4e0 Mon Sep 17 00:00:00 2001 From: Jack Edge Date: Sat, 25 Jun 2016 11:39:18 +0100 Subject: [PATCH] Bug fixes --- code/game/machinery/transformer.dm | 3 +-- code/modules/countdown/countdown.dm | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/machinery/transformer.dm b/code/game/machinery/transformer.dm index f627feb6afc..f7ca0ccd18f 100644 --- a/code/game/machinery/transformer.dm +++ b/code/game/machinery/transformer.dm @@ -69,8 +69,7 @@ return 0 /obj/machinery/transformer/process() - . = ..() - if(cooldown && cooldown_timer <= world.time) + if(cooldown && (cooldown_timer <= world.time)) cooldown = FALSE update_icon() diff --git a/code/modules/countdown/countdown.dm b/code/modules/countdown/countdown.dm index c53bcfea8be..c7ad91b2b0f 100644 --- a/code/modules/countdown/countdown.dm +++ b/code/modules/countdown/countdown.dm @@ -124,11 +124,12 @@ /obj/effect/countdown/transformer name = "transformer countdown" + text_color = "#4C5866" /obj/effect/countdown/transformer/get_value() var/obj/machinery/transformer/T = attached_to if(!istype(T)) return else if(T.cooldown) - var/seconds_left = (T.cooldown_timer - world.time) / 10 - return "[max(seconds_left, 0)]" + var/seconds_left = max(0, (T.cooldown_timer - world.time) / 10) + return "[round(seconds_left)]"