From 420f889c9d22695738e9ef61df68f1348b8a41b0 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Fri, 16 Feb 2018 07:54:10 -0600
Subject: [PATCH] Update phazon.dm

---
 code/game/mecha/combat/phazon.dm | 34 --------------------------------
 1 file changed, 34 deletions(-)

diff --git a/code/game/mecha/combat/phazon.dm b/code/game/mecha/combat/phazon.dm
index 4a4c33704a..15b865c1e9 100644
--- a/code/game/mecha/combat/phazon.dm
+++ b/code/game/mecha/combat/phazon.dm
@@ -1,35 +1,3 @@
-<<<<<<< HEAD
-/obj/mecha/combat/phazon
-	desc = "This is a Phazon exosuit. The pinnacle of scientific research and pride of Nanotrasen, it uses cutting edge bluespace technology and expensive materials."
-	name = "\improper Phazon"
-	icon_state = "phazon"
-	step_in = 2
-	dir_in = 2 //Facing South.
-	step_energy_drain = 3
-	max_integrity = 200
-	deflect_chance = 30
-	armor = list(melee = 30, bullet = 30, laser = 30, energy = 30, bomb = 30, bio = 0, rad = 0, fire = 100, acid = 100)
-	max_temperature = 25000
-	infra_luminosity = 3
-	wreckage = /obj/structure/mecha_wreckage/phazon
-	add_req_access = 1
-	internal_damage_threshold = 25
-	force = 15
-	max_equip = 3
-	phase_state = "phazon-phase"
-
-/obj/mecha/combat/phazon/GrantActions(mob/living/user, human_occupant = 0)
-	..()
-	switch_damtype_action.Grant(user, src)
-	phasing_action.Grant(user, src)
-
-
-/obj/mecha/combat/phazon/RemoveActions(mob/living/user, human_occupant = 0)
-	..()
-	switch_damtype_action.Remove(user)
-	phasing_action.Remove(user)
-
-=======
 /obj/mecha/combat/phazon
 	desc = "This is a Phazon exosuit. The pinnacle of scientific research and pride of Nanotrasen, it uses cutting edge bluespace technology and expensive materials."
 	name = "\improper Phazon"
@@ -59,5 +27,3 @@
 	..()
 	switch_damtype_action.Remove(user)
 	phasing_action.Remove(user)
-
->>>>>>> d282c60... Quote the armor lists (#35668)