From b3b6ff2edddaa512c3a6440efe470b8ef4f27044 Mon Sep 17 00:00:00 2001 From: Kyle Spier-Swenson Date: Thu, 25 Jan 2018 18:55:52 -0800 Subject: [PATCH] The punisher no longer punishes ticker subsystems --- code/controllers/master.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/controllers/master.dm b/code/controllers/master.dm index 7d61ae2a924..68f75491f33 100644 --- a/code/controllers/master.dm +++ b/code/controllers/master.dm @@ -517,7 +517,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new queue_node.times_fired++ if (queue_node_flags & SS_TICKER) - queue_node.next_fire = world.time + (world.tick_lag * (queue_node.wait + (queue_node.tick_overrun/100))) + queue_node.next_fire = world.time + (world.tick_lag * queue_node.wait) else if (queue_node_flags & SS_POST_FIRE_TIMING) queue_node.next_fire = world.time + queue_node.wait + (world.tick_lag * (queue_node.tick_overrun/100)) else if (queue_node_flags & SS_KEEP_TIMING)