From 0727c307683aaed3dfd452f8080d7895e179544a Mon Sep 17 00:00:00 2001 From: Casey Date: Thu, 22 Sep 2022 20:57:09 -0400 Subject: [PATCH] Merge pull request #13777 from Heroman3003/teleport-runtime Fixes teleport artifact not unbuckling mobs properly --- code/modules/power/port_gen_vr.dm | 2 +- code/modules/xenoarcheaology/effects/teleport.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/power/port_gen_vr.dm b/code/modules/power/port_gen_vr.dm index 0744a9143d..2b891643a6 100644 --- a/code/modules/power/port_gen_vr.dm +++ b/code/modules/power/port_gen_vr.dm @@ -316,7 +316,7 @@ /obj/machinery/power/rtg/reg/unbuckle_mob(mob/living/buckled_mob, force = FALSE) . = ..() - buckled_mob.pixel_y = initial(buckled_mob.pixel_y) + buckled_mob.pixel_y = buckled_mob.default_pixel_y /obj/machinery/power/rtg/reg/RefreshParts() var/n = 0 diff --git a/code/modules/xenoarcheaology/effects/teleport.dm b/code/modules/xenoarcheaology/effects/teleport.dm index 2c766323db..de71e76768 100644 --- a/code/modules/xenoarcheaology/effects/teleport.dm +++ b/code/modules/xenoarcheaology/effects/teleport.dm @@ -31,7 +31,7 @@ if(prob(100 * weakness)) to_chat(M, "You are displaced by a strange force!") if(M.buckled) - M.buckled.unbuckle_mob() + M.buckled.unbuckle_mob(M) var/datum/effect/effect/system/spark_spread/sparks = new /datum/effect/effect/system/spark_spread() sparks.set_up(3, 0, get_turf(M))