Merge pull request #6179 from Citadel-Station-13/upstream-merge-36807

[MIRROR] Fixes some edge cases with chameleon projectors and sleepers
2018-04-01 01:03:10 -05:00
parent 24d4b310cd fe59feedfd
commit c19f285322
2 changed files with 10 additions and 2 deletions
@@ -28,7 +28,10 @@
 	disrupt()

 /obj/item/device/chameleon/attack_self(mob/user)
-	toggle(user)
+	if (isturf(user.loc) || istype(user.loc, /obj/structure) || active_dummy)
+		toggle(user)
+	else
+		to_chat(user, "<span class='userwarning'>You can't use [src] while inside something.</span>")

 /obj/item/device/chameleon/afterattack(atom/target, mob/user , proximity)
 	if(!proximity)