From 0ed1c630664f6eabfbb4d7fac892b0d1d50c0697 Mon Sep 17 00:00:00 2001 From: Kyle Spier-Swenson Date: Wed, 30 Nov 2016 14:43:09 -0800 Subject: [PATCH] Fixes a small oversight in timer subsystem hashlist was designed to ensure that timers on different objects with the same name didn't get detected as the same timer, but when I added it, i forgot to make this line actually use the hashlist. --- code/controllers/subsystem/timer.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/controllers/subsystem/timer.dm b/code/controllers/subsystem/timer.dm index 5885fc6d5d8..9b1f698d3ba 100644 --- a/code/controllers/subsystem/timer.dm +++ b/code/controllers/subsystem/timer.dm @@ -75,7 +75,7 @@ var/datum/subsystem/timer/SStimer var/hashlist = args.Copy() hashlist[1] = "[thingToCall](\ref[thingToCall])" - event.hash = jointext(args, null) + event.hash = jointext(hashlist, null) var/bad_args = unique != TIMER_NORMAL && unique != TIMER_UNIQUE if(args.len > 4 || bad_args)