cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-19 20:15:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bug fixes

Browse Source
This commit is contained in:
Jack Edge
2016-06-25 11:39:18 +01:00
parent 87016bc6cd
commit 177dcbe16b
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/transformer.dm
+1 -2
View File
@@ -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()
code/modules/countdown/countdown.dm
+3 -2
View File
@@ -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)]"