From ce9ec8af683f2cf9c2e870e83c3ee97f02bda17f Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Wed, 23 Sep 2015 20:13:41 -0500 Subject: [PATCH 1/3] Fixes mobs flipping updside down forever on spikes --- code/game/objects/structures/kitchen_spike.dm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/game/objects/structures/kitchen_spike.dm b/code/game/objects/structures/kitchen_spike.dm index 46979a3b380..2519ddd3255 100644 --- a/code/game/objects/structures/kitchen_spike.dm +++ b/code/game/objects/structures/kitchen_spike.dm @@ -88,19 +88,19 @@ if(M != user) M.visible_message(\ "[user.name] tries to pull [M.name] free of the [src]!",\ - "[user.name] is trying to pull you off the [src], opening up fresh wounds!",\ + "[user.name] is trying to pull you off of [src], opening up fresh wounds!",\ "You hear a squishy wet noise.") if(!do_after(user, 300, target = src)) if(M && M.buckled) M.visible_message(\ "[user.name] fails to free [M.name]!",\ - "[user.name] fails to pull you off of the [src].") + "[user.name] fails to pull you off of [src].") return else M.visible_message(\ - "[M.name] struggles to break free from the [src]!",\ - "You struggle to break free from the [src], exacerbating your wounds! (Stay still for two minutes.)",\ + "[M.name] struggles to break free from [src]!",\ + "You struggle to break free from [src], exacerbating your wounds! (Stay still for two minutes.)",\ "You hear a wet squishing noise..") M.adjustBruteLoss(30) if(!do_after(M, 1200, target = src)) @@ -110,12 +110,12 @@ if(!M.buckled) return var/mob/living/L = buckled_mob - var/matrix/m120 = matrix(L.transform) + var/matrix/m120 = matrix() m120.Turn(360) animate(L, transform = m120, time = 3) L.pixel_y = L.get_standard_pixel_y_offset(360) M.adjustBruteLoss(30) - src.visible_message(text("[M] falls free of the [src]!")) + src.visible_message(text("[M] falls free of [src]!")) unbuckle_mob() L.emote("scream") L.AdjustWeakened(10) From 58c540494790e7941d561e660f16dc9c0c51f55a Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Fri, 25 Sep 2015 12:22:29 -0500 Subject: [PATCH 2/3] Fix --- code/game/objects/structures/kitchen_spike.dm | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/code/game/objects/structures/kitchen_spike.dm b/code/game/objects/structures/kitchen_spike.dm index 2519ddd3255..cd9335ff85e 100644 --- a/code/game/objects/structures/kitchen_spike.dm +++ b/code/game/objects/structures/kitchen_spike.dm @@ -109,13 +109,12 @@ return if(!M.buckled) return - var/mob/living/L = buckled_mob - var/matrix/m120 = matrix() - m120.Turn(360) - animate(L, transform = m120, time = 3) - L.pixel_y = L.get_standard_pixel_y_offset(360) + var/matrix/m120 = matrix(M.transform) + m120.Turn(180) + animate(M, transform = m120, time = 3) + M.pixel_y = M.get_standard_pixel_y_offset(180) M.adjustBruteLoss(30) - src.visible_message(text("[M] falls free of [src]!")) + src.visible_message(text("[M] falls free of the [src]!")) unbuckle_mob() - L.emote("scream") - L.AdjustWeakened(10) + M.emote("scream") + M.AdjustWeakened(10) From 76928b467b0b0402d73fbf0be73a4ffb5af6137a Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Fri, 25 Sep 2015 12:25:51 -0500 Subject: [PATCH 3/3] Fixes var names --- code/game/objects/structures/kitchen_spike.dm | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/code/game/objects/structures/kitchen_spike.dm b/code/game/objects/structures/kitchen_spike.dm index cd9335ff85e..4bc45ba6bcf 100644 --- a/code/game/objects/structures/kitchen_spike.dm +++ b/code/game/objects/structures/kitchen_spike.dm @@ -70,9 +70,9 @@ H.buckled = src H.dir = 2 buckled_mob = H - var/matrix/m120 = matrix(H.transform) - m120.Turn(180) - animate(H, transform = m120, time = 3) + var/matrix/m180 = matrix(H.transform) + m180.Turn(180) + animate(H, transform = m180, time = 3) H.pixel_y = H.get_standard_pixel_y_offset(180) return user << "You can't use that on the spike!" @@ -88,19 +88,19 @@ if(M != user) M.visible_message(\ "[user.name] tries to pull [M.name] free of the [src]!",\ - "[user.name] is trying to pull you off of [src], opening up fresh wounds!",\ + "[user.name] is trying to pull you off the [src], opening up fresh wounds!",\ "You hear a squishy wet noise.") if(!do_after(user, 300, target = src)) if(M && M.buckled) M.visible_message(\ "[user.name] fails to free [M.name]!",\ - "[user.name] fails to pull you off of [src].") + "[user.name] fails to pull you off of the [src].") return else M.visible_message(\ - "[M.name] struggles to break free from [src]!",\ - "You struggle to break free from [src], exacerbating your wounds! (Stay still for two minutes.)",\ + "[M.name] struggles to break free from the [src]!",\ + "You struggle to break free from the [src], exacerbating your wounds! (Stay still for two minutes.)",\ "You hear a wet squishing noise..") M.adjustBruteLoss(30) if(!do_after(M, 1200, target = src)) @@ -109,9 +109,9 @@ return if(!M.buckled) return - var/matrix/m120 = matrix(M.transform) - m120.Turn(180) - animate(M, transform = m120, time = 3) + 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 the [src]!"))