From 94242ce235c7506edfa65ab637f8f0665e6bb207 Mon Sep 17 00:00:00 2001 From: Bizzonium Date: Tue, 28 Jul 2020 03:04:41 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=D0=BE=20=D0=BF=D0=BE=D0=B2=D0=B5=D0=B4=D0=B5=D0=BD=D0=B8=D0=B5?= =?UTF-8?q?=20=D1=84=D1=83=D0=BD=D0=BA=D1=86=D0=B8=D0=B8=20=D0=BF=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D0=B8=20=D0=B2=D0=BE=D0=B7=D0=BC?= =?UTF-8?q?=D0=BE=D0=B6=D0=BD=D0=BE=D1=81=D1=82=D0=B8=20=D1=82=D0=B5=D0=BB?= =?UTF-8?q?=D0=B5=D0=BF=D0=BE=D1=80=D1=82=D0=B0=20=D0=B4=D0=BB=D1=8F=20?= =?UTF-8?q?=D0=BC=D0=B5=D1=85=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/game/machinery/computer/pod.dm | 1 + code/game/objects/effects/portals.dm | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm index bafcd2d8ca2..463e46a51f1 100644 --- a/code/game/machinery/computer/pod.dm +++ b/code/game/machinery/computer/pod.dm @@ -313,6 +313,7 @@ var/obj/effect/portal/P = new(L.loc, pick(spawn_marauder)) P.invisibility = 101//So it is not seen by anyone. P.failchance = 0//So it has no fail chance when teleporting. + P.can_mecha_pass = TRUE spawn_marauder.Remove(P.target) for(var/obj/machinery/door/poddoor/M in GLOB.airlocks) diff --git a/code/game/objects/effects/portals.dm b/code/game/objects/effects/portals.dm index aa756631768..82de542078c 100644 --- a/code/game/objects/effects/portals.dm +++ b/code/game/objects/effects/portals.dm @@ -14,6 +14,7 @@ var/precision = TRUE // how close to the portal you will teleport. FALSE = on the portal, TRUE = adjacent var/can_multitool_to_remove = FALSE var/ignore_tele_proof_area_setting = FALSE + var/can_mecha_pass = FALSE /obj/effect/portal/New(loc, turf/target, creator = null, lifespan = 300) ..() @@ -88,7 +89,7 @@ if(!M.simulated || iseffect(M)) . = FALSE - if(M.anchored && ismecha(M)) + if(!can_mecha_pass && M.anchored && ismecha(M)) . = FALSE /obj/effect/portal/proc/teleport(atom/movable/M)