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

[MIRROR] Fixes some edge cases with chameleon projectors and sleepers
This commit is contained in:
LetterJay
2018-04-01 01:03:10 -05:00
committed by GitHub
2 changed files with 10 additions and 2 deletions
+6 -1
View File
@@ -58,8 +58,13 @@
"<span class='notice'>You climb out of [src]!</span>")
open_machine()
/obj/machinery/sleeper/Exited(atom/movable/user)
if (!state_open && user == occupant)
container_resist(user)
/obj/machinery/sleeper/relaymove(mob/user)
container_resist(user)
if (!state_open)
container_resist(user)
/obj/machinery/sleeper/open_machine()
if(!state_open && !panel_open)
@@ -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)