Merge pull request #51 from Aurorastation/development

Codecatch
This commit is contained in:
SoundScopes
2015-09-02 18:54:02 +01:00
33 changed files with 694 additions and 837 deletions
+2 -2
View File
@@ -349,8 +349,8 @@
if ((!( istype(O, /obj/item/weapon) ) || user.get_active_hand() != O))
return ..()
if(isrobot(user))
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))