From 0af8cf032907e603ebf6eb25dcf8861b351cc5af Mon Sep 17 00:00:00 2001 From: Leo Date: Sat, 4 Nov 2017 16:07:28 -0200 Subject: [PATCH] Merge pull request #32381 from AnturK/ridingdatumsneveragain Restores buckling sanity. --- code/game/objects/buckling.dm | 2 +- code/modules/vehicles/vehicle.dm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/objects/buckling.dm b/code/game/objects/buckling.dm index 8352a12e5e..2cf463e46c 100644 --- a/code/game/objects/buckling.dm +++ b/code/game/objects/buckling.dm @@ -22,7 +22,7 @@ /atom/movable/MouseDrop_T(mob/living/M, mob/living/user) . = ..() - if(can_buckle && istype(M)) + if(can_buckle && istype(M) && istype(user)) if(user_buckle_mob(M, user)) return 1 diff --git a/code/modules/vehicles/vehicle.dm b/code/modules/vehicles/vehicle.dm index 02d896613b..0debce8a5d 100644 --- a/code/modules/vehicles/vehicle.dm +++ b/code/modules/vehicles/vehicle.dm @@ -35,8 +35,8 @@ . = ..() -/obj/vehicle/user_buckle_mob(mob/living/M, mob/user) - if(user.incapacitated()) +/obj/vehicle/user_buckle_mob(mob/living/M, mob/living/user) + if(!istype(user) || user.incapacitated()) return for(var/atom/movable/A in get_turf(src)) if(A.density)