Remove unnecessary checks

This commit is contained in:
Bizzonium
2020-08-04 15:41:16 +03:00
parent 94242ce235
commit 617dbc50e7
3 changed files with 1 additions and 11 deletions
-1
View File
@@ -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)
+1 -6
View File
@@ -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)
-4
View File
@@ -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