From 69855383ac3b93e454c963de33becce5eed15cf7 Mon Sep 17 00:00:00 2001 From: Neerti Date: Sun, 14 Apr 2019 02:30:15 -0400 Subject: [PATCH 1/2] Merge pull request #6078 from Heroman3003/unbluespacing-vehicles 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 83438240c15..4020f13d140 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -950,7 +950,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