Merge pull request #19218 from coiax/syndicate-bomb-in-the-bar

Syndicate bombs use world.time; explode faster
This commit is contained in:
Cheridan
2016-07-10 09:59:19 -05:00
committed by GitHub
3 changed files with 87 additions and 40 deletions
+1 -1
View File
@@ -70,7 +70,7 @@
if(!istype(S))
return
else if(S.active)
return S.timer
return S.seconds_remaining()
/obj/effect/countdown/nuclearbomb
name = "nuclear bomb countdown"