From 617dbc50e70c382bd6cb47e6b05a0872423b3e77 Mon Sep 17 00:00:00 2001 From: Bizzonium Date: Tue, 4 Aug 2020 15:41:16 +0300 Subject: [PATCH] Remove unnecessary checks --- code/game/machinery/computer/pod.dm | 1 - code/game/mecha/mecha.dm | 7 +------ code/game/objects/effects/portals.dm | 4 ---- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm index 463e46a51f1..bafcd2d8ca2 100644 --- a/code/game/machinery/computer/pod.dm +++ b/code/game/machinery/computer/pod.dm @@ -313,7 +313,6 @@ 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/mecha/mecha.dm b/code/game/mecha/mecha.dm index 52973c9e285..1d53e34927d 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -421,12 +421,7 @@ return if(isobj(obstacle)) var/obj/O = obstacle - if(istype(O, /obj/effect/portal)) //derpfix - anchored = 0 - O.Bumped(src) - spawn(0) //countering portal teleport spawn(0), hurr - anchored = 1 - else if(!O.anchored) + if(!O.anchored) step(obstacle, dir) else if(ismob(obstacle)) step(obstacle, dir) diff --git a/code/game/objects/effects/portals.dm b/code/game/objects/effects/portals.dm index 82de542078c..a2b084463a4 100644 --- a/code/game/objects/effects/portals.dm +++ b/code/game/objects/effects/portals.dm @@ -14,7 +14,6 @@ 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) ..() @@ -89,9 +88,6 @@ if(!M.simulated || iseffect(M)) . = FALSE - if(!can_mecha_pass && M.anchored && ismecha(M)) - . = FALSE - /obj/effect/portal/proc/teleport(atom/movable/M) if(!can_teleport(M)) return FALSE