Merge pull request #15775 from AnturK/fix1

Bunch of fixes
This commit is contained in:
tkdrg
2016-02-27 21:27:08 -03:00
12 changed files with 37 additions and 24 deletions
+2 -2
View File
@@ -24,8 +24,8 @@
return
/obj/item/weapon/paper_bin/MouseDrop(atom/over_object)
var/mob/M = usr
if(M.incapacitated() || !Adjacent(M))
var/mob/living/M = usr
if(!istype(M) || M.incapacitated() || !Adjacent(M))
return
if(over_object == M)