From 44b53851eff92c4aa94e6fbc3e5c5f8a8bbcae9b Mon Sep 17 00:00:00 2001 From: jack-fractal Date: Sat, 15 Aug 2015 16:17:42 -0400 Subject: [PATCH] Dones don't get to put people in or on things Poor drones. --- code/__HELPERS/mobs.dm | 2 ++ code/game/objects/structures/tables_racks.dm | 2 ++ 2 files changed, 4 insertions(+) diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm index ced0307d..09aec188 100644 --- a/code/__HELPERS/mobs.dm +++ b/code/__HELPERS/mobs.dm @@ -112,6 +112,8 @@ proc/RoundHealth(health) return if(!ishuman(user) && !isrobot(user)) //No ghosts or mice putting people into the sleeper return + if(istype(user, /mob/living/silicon/robot/drone)) // drones don't get to use medical machinery + return if(user.loc==null) // just in case someone manages to get a closet into the blue light dimension, as unlikely as that seems return if(!istype(user.loc, /turf) || !istype(target.loc, /turf)) // are you in a container/closet/pod/etc? diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 0ab09618..ba841e52 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -349,6 +349,8 @@ if ((!( istype(O, /obj/item/weapon) ) || user.get_active_hand() != O)) return ..() + if(istype(user, /mob/living/silicon/robot/drone)) // drones don't get to table people + return ..() user.drop_item() if (O.loc != src.loc) step(O, get_dir(O, src))