From 447008e625649f4e2ef249f45bb71435f2d6392a Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Fri, 30 Mar 2018 12:11:37 -0400 Subject: [PATCH] Merge pull request #36795 from robbym/master Fixes custom ticker logic (#36792) --- code/modules/integrated_electronics/subtypes/time.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/integrated_electronics/subtypes/time.dm b/code/modules/integrated_electronics/subtypes/time.dm index 86e5e99059..26bd1fc1d6 100644 --- 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