cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-17 05:31:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes Phazon and Janus being unable to phase

Browse Source 
- Fixes #6302
This commit is contained in:
Atlantiscze
2020-04-22 15:52:00 +02:00
parent 5a92fc4ec9
commit a9af839845
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/game/mecha/combat/phazon.dm
View File

@@ -18,6 +18,7 @@
internal_damage_threshold = 25 internal_damage_threshold = 25
force = 15 force = 15
var/phasing = 0 var/phasing = 0
var/can_phase = TRUE
var/phasing_energy_drain = 200 var/phasing_energy_drain = 200
max_equip = 4 max_equip = 4
@@ -38,13 +39,13 @@
/obj/mecha/combat/phazon/Bump(var/atom/obstacle) /obj/mecha/combat/phazon/Bump(var/atom/obstacle)
if(phasing && get_charge()>=phasing_energy_drain) if(phasing && get_charge()>=phasing_energy_drain)
spawn() spawn()
if(can_move) if(can_phase)
can_move = 0 can_phase = FALSE
flick("[initial_icon]-phase", src) flick("[initial_icon]-phase", src)
src.loc = get_step(src,src.dir) src.loc = get_step(src,src.dir)
src.use_power(phasing_energy_drain) src.use_power(phasing_energy_drain)
sleep(step_in*3) sleep(step_in*3)
can_move = 1 can_phase = TRUE
else else
. = ..() . = ..()
return return