Merge pull request #36795 from robbym/master

Fixes custom ticker logic (#36792)
2018-03-30 12:11:37 -04:00
parent f61c73d486
commit 447008e625
1 changed files with 1 additions and 1 deletions
--- a/code/modules/integrated_electronics/subtypes/time.dm
+++ b/code/modules/integrated_electronics/subtypes/time.dm
@@ -90,7 +90,7 @@
 	if(do_tick && !is_running)
 		is_running = TRUE
 		tick()
-	else if(is_running)
+	else if(!do_tick && is_running)
 		is_running = FALSE