Merge pull request #6436 from Citadel-Station-13/upstream-merge-37141

[MIRROR] Repeat of "I don't recall an arcade machine being th... GLORF (Chameleon Projector Change)"
This commit is contained in:
LetterJay
2018-04-22 02:41:57 -05:00
committed by GitHub
@@ -39,7 +39,7 @@
if(!check_sprite(target))
return
if(!active_dummy)
if(isitem(target) && !istype(target, /obj/item/disk/nuclear))
if(!(isturf(target) || istype(target, /obj/structure/falsewall) || ismob(target))) //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()