From 38cf36bc3613ab5884f1fe841ab9df45923a76dc Mon Sep 17 00:00:00 2001 From: "kortgstation@gmail.com" Date: Sun, 4 Mar 2012 01:49:55 +0000 Subject: [PATCH] You can no longer buckle people to roller beds from an infinite distance or as a ghost. You no longer see hand labels applied while unconscious. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3246 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/objects/items/weapons/hand_lablers.dm | 3 ++- code/game/objects/stool.dm | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/hand_lablers.dm b/code/game/objects/items/weapons/hand_lablers.dm index bde3a17c834..ea560cb43ce 100644 --- a/code/game/objects/items/weapons/hand_lablers.dm +++ b/code/game/objects/items/weapons/hand_lablers.dm @@ -24,7 +24,8 @@ return for(var/mob/M in viewers()) - M << "\blue [user] labels [A] as [label]." + if ((M.client && !( M.blinded ))) + M << "\blue [user] labels [A] as [label]." A.name = "[A.name] ([label])" /obj/item/weapon/hand_labeler/attack_self() diff --git a/code/game/objects/stool.dm b/code/game/objects/stool.dm index 9b2a1e91496..d8fb054ef7e 100644 --- a/code/game/objects/stool.dm +++ b/code/game/objects/stool.dm @@ -152,6 +152,8 @@ 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)) + return M.pixel_y = 6 M.update_clothing() density = 1