From 9f7605626be6e24fa2e4c0c62382cdd5173f7ff2 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Thu, 27 Jul 2023 22:25:21 +0200 Subject: [PATCH] [MIRROR] fixes a guillotine logging runtime [MDB IGNORE] (#22726) * fixes a guillotine logging runtime (#77130) ## About The Pull Request passes user ## Why It's Good For The Game fixes #77082 ## Changelog :cl: fix: guillotines no longer runtime when logging after decapping someone if they buckle AFTER the blade starts to drop /:cl: * fixes a guillotine logging runtime --------- Co-authored-by: jimmyl <70376633+mc-oofert@users.noreply.github.com> --- code/game/objects/structures/guillotine.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/guillotine.dm b/code/game/objects/structures/guillotine.dm index a9d0f6f9def..1c914734cbf 100644 --- a/code/game/objects/structures/guillotine.dm +++ b/code/game/objects/structures/guillotine.dm @@ -130,7 +130,7 @@ else blade_status = GUILLOTINE_BLADE_MOVING icon_state = "guillotine_drop" - addtimer(CALLBACK(src, PROC_REF(drop_blade)), GUILLOTINE_ANIMATION_LENGTH) + addtimer(CALLBACK(src, PROC_REF(drop_blade), user), GUILLOTINE_ANIMATION_LENGTH) /// Sets the guillotine blade in a raised position /obj/structure/guillotine/proc/raise_blade()