From 367eb1f448ea5a43749bd68b622cee31ed87c6a5 Mon Sep 17 00:00:00 2001 From: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com> Date: Thu, 2 May 2019 22:14:51 -0400 Subject: [PATCH] Vehicle Buckling Fix Fixes bug with vehicle buckling. --- code/modules/mob/living/living.dm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index a7aeae21b9..8c6297357a 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -891,9 +891,14 @@ default behaviour is: to_chat(src, "You struggle free of \the [H.loc].") H.forceMove(get_turf(H)) +//TFF 2/5/19: Polaris fix for resisting out of vehicles /mob/living/proc/escape_buckle() if(buckled) - buckled.user_unbuckle_mob(src, src) + if(istype(buckled, /obj/vehicle)) + var/obj/vehicle/vehicle = buckled + vehicle.unload() + else + buckled.user_unbuckle_mob(src, src) /mob/living/proc/resist_grab() var/resisting = 0 @@ -1277,4 +1282,4 @@ default behaviour is: /mob/living/proc/has_vision() - return !(eye_blind || (disabilities & BLIND) || stat || blinded) \ No newline at end of file + return !(eye_blind || (disabilities & BLIND) || stat || blinded)