mirror of
https://github.com/PolarisSS13/Polaris.git
synced 2025-12-15 04:32:14 +00:00
My god I'm an idiot. Does the thing but intelligently.
This commit is contained in:
@@ -924,24 +924,22 @@
|
||||
if(istype(obstacle, /mob))//First we check if it is a mob. Mechs mostly shouln't go through them, even while phasing.
|
||||
var/mob/M = obstacle
|
||||
M.Move(get_step(obstacle,src.dir))
|
||||
else if(istype(obstacle, /turf) && phasing && get_charge()>=phasing_energy_drain)//Phazon check. This could use an improvement elsewhere.
|
||||
src.use_power(phasing_energy_drain)
|
||||
phase()
|
||||
. = ..(obstacle)
|
||||
return
|
||||
else if(istype(obstacle, /obj) || istype(obstacle, /turf))//Then we check for regular obstacles.
|
||||
var/obj/O = obstacle
|
||||
|
||||
if(phasing && get_charge()>=phasing_energy_drain)//Phazon check. This could use an improvement elsewhere.
|
||||
src.use_power(phasing_energy_drain)
|
||||
phase()
|
||||
. = ..(obstacle)
|
||||
return
|
||||
if(istype(O, /obj/effect/portal)) //derpfix
|
||||
src.anchored = 0 // Portals can only move unanchored objects.
|
||||
O.Crossed(src)
|
||||
spawn(0)//countering portal teleport spawn(0), hurr
|
||||
src.anchored = 1
|
||||
else if(istype(O))
|
||||
if(O.anchored)
|
||||
obstacle.Bumped(src)
|
||||
else
|
||||
step(obstacle,src.dir)
|
||||
if(O.anchored)
|
||||
obstacle.Bumped(src)
|
||||
else
|
||||
step(obstacle,src.dir)
|
||||
|
||||
else//No idea when this triggers, so i won't touch it.
|
||||
. = ..(obstacle)
|
||||
|
||||
Reference in New Issue
Block a user