From dfd18108e8bf5b4d6e3e3f3ba17ae2683fb1bf51 Mon Sep 17 00:00:00 2001 From: Spaghetti-bit Date: Tue, 30 Jul 2024 05:32:48 -0700 Subject: [PATCH] Guillotine no longer nullspaces people upon being destroyed. (#26337) * Nullspace fix * Update code/game/objects/structures/guillotine.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: Spaghetti-bit * Update code/game/objects/structures/guillotine.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: Spaghetti-bit --------- Signed-off-by: Spaghetti-bit Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> --- code/game/objects/structures/guillotine.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/game/objects/structures/guillotine.dm b/code/game/objects/structures/guillotine.dm index 676c3f7786f..3061e4dbbac 100644 --- a/code/game/objects/structures/guillotine.dm +++ b/code/game/objects/structures/guillotine.dm @@ -32,6 +32,11 @@ LAZYINITLIST(buckled_mobs) return ..() +/obj/structure/guillotine/Destroy() + if(has_buckled_mobs()) + unbuckle_all_mobs() + return ..() + /obj/structure/guillotine/examine(mob/user) . = ..()