cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 06:29:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18883 from coiax/domination-time

Browse Source 
Gang domination now uses world.time
This commit is contained in:
Joan Lung
2016-06-25 14:43:40 -04:00
committed by GitHub
parent 4c2bb5b93a 2e093a54dd
commit df5afefc4d
8 changed files with 53 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/countdown/countdown.dm
+4 -2
View File
@@ -105,9 +105,11 @@
var/obj/machinery/dominator/D = attached_to
if(!istype(D))
return
else if(D.gang && D.gang.dom_timer)
var/timer = D.gang.dom_timer
else if(D.gang && D.gang.is_dominating)
var/timer = D.gang.domination_time_remaining()
return timer
else
return "OFFLINE"
/obj/effect/countdown/clockworkgate
name = "gateway countdown"