Disallow effects from being scanned by the chameleon projector (#38017)

* henk

* iseffect
This commit is contained in:
vuonojenmustaturska
2018-05-25 15:36:56 +03:00
committed by letterjay
parent cc088d9113
commit 1d1dc1aca8
9 changed files with 19 additions and 16 deletions
+1 -2
View File
@@ -145,7 +145,7 @@
return ..()
/obj/effect/portal/proc/teleport(atom/movable/M, force = FALSE)
if(!force && (!istype(M) || istype(M, /obj/effect) || (ismecha(M) && !mech_sized) || (!isobj(M) && !ismob(M)))) //Things that shouldn't teleport.
if(!force && (!istype(M) || iseffect(M) || (ismecha(M) && !mech_sized) || (!isobj(M) && !ismob(M)))) //Things that shouldn't teleport.
return
var/turf/real_target = get_link_target_turf()
if(!istype(real_target))
@@ -175,4 +175,3 @@
else
real_target = get_turf(linked)
return real_target
@@ -40,7 +40,7 @@
if(!check_sprite(target))
return
if(!active_dummy)
if(!(isturf(target) || istype(target, /obj/structure/falsewall) || ismob(target))) //NOT any of these
if(!(isturf(target) || ismob(target) || istype(target, /obj/structure/falsewall) || istype(target, /obj/effect))) //NOT any of these
playsound(get_turf(src), 'sound/weapons/flash.ogg', 100, 1, -6)
to_chat(user, "<span class='notice'>Scanned [target].</span>")
var/obj/temp = new/obj()