From bf3eb118d9493acf5c7828ccb75c923ff52fa6d7 Mon Sep 17 00:00:00 2001 From: Jack Edge Date: Thu, 2 Jun 2016 18:28:46 +0100 Subject: [PATCH] Push --- code/modules/countdown/countdown.dm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/code/modules/countdown/countdown.dm b/code/modules/countdown/countdown.dm index 886e8874403..cc28e5b6fef 100644 --- a/code/modules/countdown/countdown.dm +++ b/code/modules/countdown/countdown.dm @@ -84,24 +84,25 @@ /obj/effect/countdown/clonepod name = "cloning pod countdown" text_color = "#0C479D" - text_size = 2 + text_size = 1 /obj/effect/countdown/clonepod/get_value() var/obj/machinery/clonepod/C = attached_to if(!istype(C)) return - if(C.occupant) + else if(C.occupant) var/completion = round(C.get_completion()) return completion /obj/effect/countdown/dominator name = "dominator countdown" - text_size = 2 + text_size = 1 text_color = "#ff00ff" // Overwritten when the dominator starts -/obj/effect/countdown/clonepod/get_value() +/obj/effect/countdown/dominator/get_value() var/obj/machinery/dominator/D = attached_to if(!istype(D)) return - if(D.gang && D.gang.dom_timer) - return D.gang.dom_timer + else if(D.gang && D.gang.dom_timer) + var/timer = D.gang.dom_timer + return timer