Fixes Ghost Proximity Tripping

This commit is contained in:
TullyBurnalot
2016-08-13 21:09:04 +01:00
parent 9aafb49019
commit beed791211
2 changed files with 7 additions and 3 deletions
+5 -3
View File
@@ -174,7 +174,7 @@
return
dir = turn(dir, 90)
if(usr.machine == src)
interact(usr)
@@ -246,7 +246,9 @@
hit()
/obj/effect/beam/i_beam/Crossed(atom/movable/AM as mob|obj)
if(istype(AM, /obj/effect/beam) || !AM.density)
if(!isobj(AM) && !isliving(AM))
return
if(istype(AM, /obj/effect/beam))
return
hit()
@@ -259,4 +261,4 @@
if(previous)
previous.next = null
master.last = previous
return ..()
return ..()
+2
View File
@@ -42,6 +42,8 @@
HasProximity(atom/movable/AM as mob|obj)
if(!isobj(AM) && !isliving(AM))
return
if(istype(AM, /obj/effect/beam)) return
if(AM.move_speed < 12) sense()
return