From 874e5444e1d43a1670d1c66b2cd64050a18fed5a Mon Sep 17 00:00:00 2001 From: "quartz235@gmail.com" Date: Mon, 19 Mar 2012 23:56:27 +0000 Subject: [PATCH] Fixes issue 426 - pAIs can no longer buckle people with their invisible robo arms - Sadly, this brings forth the unintended side effect of pAIs no longer being able to give you a big hug when you're feeling down git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3325 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/objects/stool.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/stool.dm b/code/game/objects/stool.dm index d8fb054ef7e..7e628afa744 100644 --- a/code/game/objects/stool.dm +++ b/code/game/objects/stool.dm @@ -74,7 +74,7 @@ /obj/structure/stool/bed/proc/buckle_mob(mob/M as mob, mob/user as mob) if (!ticker) user << "You can't buckle anyone in before the game starts." - if ((!( istype(M, /mob) ) || get_dist(src, user) > 1 || M.loc != src.loc || user.restrained() || usr.stat || M.buckled)) + if ((!( istype(M, /mob) ) || get_dist(src, user) > 1 || M.loc != src.loc || user.restrained() || usr.stat || M.buckled || istype(user, /mob/living/silicon/pai))) return unbuckle() @@ -152,7 +152,7 @@ buckled_mob.loc = src.loc /obj/structure/stool/bed/roller/buckle_mob(mob/M as mob, mob/user as mob) - if ((!( istype(M, /mob) ) || get_dist(src, user) > 1 || M.loc != src.loc || user.restrained() || usr.stat || M.buckled)) + if ((!( istype(M, /mob) ) || get_dist(src, user) > 1 || M.loc != src.loc || user.restrained() || usr.stat || M.buckled || istype(usr, /mob/living/silicon/pai))) return M.pixel_y = 6 M.update_clothing()