From cb5880068378a7af982de7cc5868e1922d742150 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Tue, 30 Jan 2018 07:32:34 -0600 Subject: [PATCH] [MIRROR] The punisher no longer punishes ticker subsystems with delayed fires (#5174) * Merge pull request #34964 from MrStonedOne/patch-463 The punisher no longer punishes ticker subsystems with delayed fires * The punisher no longer punishes ticker subsystems with delayed fires --- 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 57c2323c42..6363cc435d 100644 --- a/code/controllers/master.dm +++ b/code/controllers/master.dm @@ -515,7 +515,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)