Merge pull request #175 from alex-gh/fixes_and_cherrypicks

Fixes, cherrypicks and improvements
This commit is contained in:
ZomgPonies
2014-03-24 08:31:51 -04:00
13 changed files with 117 additions and 29 deletions
@@ -274,6 +274,8 @@
for(var/atom/A in T)
if(!A.Adjacent(src))
continue
if(istype(A, /obj/structure/window) || istype(A, /obj/structure/closet) || istype(A, /obj/structure/table) || istype(A, /obj/structure/grille) || istype(A, /obj/structure/rack))
if(istype(A, /obj/structure/window) || istype(A, /obj/structure/closet) || \
istype(A, /obj/structure/table) || istype(A, /obj/structure/grille) || \
istype(A, /obj/structure/rack) || istype(A, /obj/machinery/door/window))
A.attack_animal(src)
return