Merge pull request #4694 from mwerezak/master

Fixes #4689, #4680
This commit is contained in:
Chinsky
2014-04-06 22:12:08 +04:00
2 changed files with 4 additions and 1 deletions
+1 -1
View File
@@ -154,7 +154,7 @@
attack_generic(user, rand(10, 15))
/obj/structure/window/attackby(obj/item/weapon/W as obj, mob/user as mob)
/obj/structure/window/attackby(obj/item/W as obj, mob/user as mob)
if(!istype(W)) return//I really wish I did not need this
if (istype(W, /obj/item/weapon/grab) && get_dist(src,user)<2)