From eb39d0202c7e564894b0f67168d7c132f373c0f9 Mon Sep 17 00:00:00 2001 From: Heroman Date: Sat, 13 Apr 2019 19:21:33 +1000 Subject: [PATCH] Fixes resisting out of vehicles causing problems --- code/modules/mob/living/living.dm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index fae3542f18..fe06438c69 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -904,7 +904,11 @@ default behaviour is: /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