diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index ce69693fd20..0ab8c87aa5f 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -279,6 +279,8 @@ /obj/machinery/door/firedoor/border_only/proc/on_exit(datum/source, atom/movable/leaving, direction) SIGNAL_HANDLER + if(leaving.movement_type & PHASING) + return if(leaving == src) return // Let's not block ourselves. diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 7e224978e08..b9b0bedc9da 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -140,6 +140,8 @@ /obj/machinery/door/window/proc/on_exit(datum/source, atom/movable/leaving, direction) SIGNAL_HANDLER + if(leaving.movement_type & PHASING) + return if(leaving == src) return // Let's not block ourselves. diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm index bc3c1b24193..aca98f7ae8f 100644 --- a/code/game/objects/structures/windoor_assembly.dm +++ b/code/game/objects/structures/windoor_assembly.dm @@ -77,6 +77,9 @@ /obj/structure/windoor_assembly/proc/on_exit(datum/source, atom/movable/leaving, direction) SIGNAL_HANDLER + if(leaving.movement_type & PHASING) + return + if(leaving == src) return // Let's not block ourselves. diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index c51fa0ff821..b1aea45fc9d 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -127,6 +127,9 @@ /obj/structure/window/proc/on_exit(datum/source, atom/movable/leaving, direction) SIGNAL_HANDLER + if(leaving.movement_type & PHASING) + return + if(leaving == src) return // Let's not block ourselves. diff --git a/code/modules/ruins/objects_and_mobs/necropolis_gate.dm b/code/modules/ruins/objects_and_mobs/necropolis_gate.dm index 18297126af7..49a1fefa40c 100644 --- a/code/modules/ruins/objects_and_mobs/necropolis_gate.dm +++ b/code/modules/ruins/objects_and_mobs/necropolis_gate.dm @@ -70,6 +70,9 @@ /obj/structure/necropolis_gate/proc/on_exit(datum/source, atom/movable/leaving, direction) SIGNAL_HANDLER + if(leaving.movement_type & PHASING) + return + if(leaving == src) return // Let's not block ourselves.