From 14d0c0da7a2ca60778318db2e9db3fe1fa59df94 Mon Sep 17 00:00:00 2001
From: Kyep <github-aweb@sneakemail.com>
Date: Sat, 11 Mar 2017 04:42:31 -0800
Subject: [PATCH] Fixes #5694 - Phazons not phasing, toxic injector being
 broken
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

🆑 Kyep
fix: Phazons' phase ability now works again.
fix: Phazons' toxin injector melee damage type (a weak melee attack) now
works again.
/🆑
---
 code/game/mecha/combat/phazon.dm | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/code/game/mecha/combat/phazon.dm b/code/game/mecha/combat/phazon.dm
index 205fb4497cd..5f66ad3a85c 100644
--- a/code/game/mecha/combat/phazon.dm
+++ b/code/game/mecha/combat/phazon.dm
@@ -28,18 +28,18 @@
 	ME = new /obj/item/mecha_parts/mecha_equipment/gravcatapult
 	ME.attach(src)
 
-/obj/mecha/combat/phazon/Bump(var/atom/obstacle)
-	if(phasing && get_charge() >= phasing_energy_drain)
-		spawn()
-			if(can_move)
-				can_move = 0
-				flick("phazon-phase", src)
-				forceMove(get_step(src, dir))
-				use_power(phasing_energy_drain)
-				sleep(step_in * 3)
-				can_move = 1
-	else
-		. = ..()
+/obj/mecha/combat/phazon/mechstep(direction)
+	. = ..()
+	if(!. && phasing && get_charge() >= phasing_energy_drain)
+		if(can_move)
+			can_move = 0
+			flick("phazon-phase", src)
+			forceMove(get_step(src, direction))
+			use_power(phasing_energy_drain)
+			playsound(src,stepsound,40,1)
+			sleep(step_in * 3)
+			can_move = 1
+			return 1
 
 /obj/mecha/combat/phazon/click_action(atom/target,mob/user)
 	if(phasing)
@@ -62,7 +62,7 @@
 		if("Torch")
 			damtype = "fire"
 			occupant_message("A torch tip extends from your exosuit's hand, glowing red.")
-		if("Toxic injector")
+		if("Toxic Injector")
 			damtype = "tox"
 			occupant_message("A bone-chillingly thick plasteel needle protracts from the exosuit's palm.")
 	playsound(src, 'sound/mecha/mechmove01.ogg', 50, 1)