From d39d9909367e470336b87583ccd2a2ed517d187c Mon Sep 17 00:00:00 2001 From: mochi Date: Tue, 9 Jun 2020 14:06:24 +0200 Subject: [PATCH] Fix upside down glitch with meat spike This commit fixes a glitch where leaving a meatspike unexpectedly can leave the mob upside down until hooked again --- code/game/objects/structures/kitchen_spike.dm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/code/game/objects/structures/kitchen_spike.dm b/code/game/objects/structures/kitchen_spike.dm index 21af7f6e615..1f0d4b8b473 100644 --- a/code/game/objects/structures/kitchen_spike.dm +++ b/code/game/objects/structures/kitchen_spike.dm @@ -130,16 +130,18 @@ release_mob(M) /obj/structure/kitchenspike/proc/release_mob(mob/living/M) - var/matrix/m180 = matrix(M.transform) - m180.Turn(180) - animate(M, transform = m180, time = 3) - M.pixel_y = M.get_standard_pixel_y_offset(180) M.adjustBruteLoss(30) src.visible_message(text("[M] falls free of [src]!")) unbuckle_mob(M, force = TRUE) M.emote("scream") M.AdjustWeakened(10) +/obj/structure/kitchenspike/post_unbuckle_mob(mob/living/M) + M.pixel_y = M.get_standard_pixel_y_offset(0) + var/matrix/m180 = matrix(M.transform) + m180.Turn(180) + animate(M, transform = m180, time = 3) + /obj/structure/kitchenspike/Destroy() if(has_buckled_mobs()) for(var/mob/living/L in buckled_mobs)