Quote the armor lists

code/game/mecha/combat/combat.dm

@@ -1,7 +1,7 @@
 /obj/mecha/combat
 	force = 30
 	internal_damage_threshold = 50
-	armor = list(melee = 30, bullet = 30, laser = 15, energy = 20, bomb = 20, bio = 0, rad = 0, fire = 100, acid = 100)
+	armor = list("melee" = 30, "bullet" = 30, "laser" = 15, "energy" = 20, "bomb" = 20, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
 
 /obj/mecha/combat/moved_inside(mob/living/carbon/human/H)
 	if(..())

code/game/mecha/combat/durand.dm

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 /obj/mecha/combat/durand
 	desc = "An aging combat exosuit utilized by the Nanotrasen corporation. Originally developed to combat hostile alien lifeforms."
 	name = "\improper Durand"
@@ -20,3 +21,27 @@
 	..()
 	defense_action.Remove(user)
 
+=======
+/obj/mecha/combat/durand
+	desc = "An aging combat exosuit utilized by the Nanotrasen corporation. Originally developed to combat hostile alien lifeforms."
+	name = "\improper Durand"
+	icon_state = "durand"
+	step_in = 4
+	dir_in = 1 //Facing North.
+	max_integrity = 400
+	deflect_chance = 20
+	armor = list("melee" = 40, "bullet" = 35, "laser" = 15, "energy" = 10, "bomb" = 20, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
+	max_temperature = 30000
+	infra_luminosity = 8
+	force = 40
+	wreckage = /obj/structure/mecha_wreckage/durand
+
+/obj/mecha/combat/durand/GrantActions(mob/living/user, human_occupant = 0)
+	..()
+	defense_action.Grant(user, src)
+
+/obj/mecha/combat/durand/RemoveActions(mob/living/user, human_occupant = 0)
+	..()
+	defense_action.Remove(user)
+
+>>>>>>> d282c60... Quote the armor lists (#35668)

code/game/mecha/combat/gygax.dm

@@ -6,7 +6,7 @@
 	dir_in = 1 //Facing North.
 	max_integrity = 250
 	deflect_chance = 5
-	armor = list(melee = 25, bullet = 20, laser = 30, energy = 15, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 100)
+	armor = list("melee" = 25, "bullet" = 20, "laser" = 30, "energy" = 15, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
 	max_temperature = 25000
 	infra_luminosity = 6
 	wreckage = /obj/structure/mecha_wreckage/gygax
@@ -20,7 +20,7 @@
 	icon_state = "darkgygax"
 	max_integrity = 300
 	deflect_chance = 15
-	armor = list(melee = 40, bullet = 40, laser = 50, energy = 35, bomb = 20, bio = 0, rad = 0, fire = 100, acid = 100)
+	armor = list("melee" = 40, "bullet" = 40, "laser" = 50, "energy" = 35, "bomb" = 20, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
 	max_temperature = 35000
 	leg_overload_coeff = 100
 	operation_req_access = list(ACCESS_SYNDICATE)

code/game/mecha/combat/honker.dm

@@ -6,7 +6,7 @@
 	max_integrity = 140
 	deflect_chance = 60
 	internal_damage_threshold = 60
-	armor = list(melee = -20, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 100)
+	armor = list("melee" = -20, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
 	max_temperature = 25000
 	infra_luminosity = 5
 	operation_req_access = list(ACCESS_THEATRE)

code/game/mecha/combat/marauder.dm

@@ -5,7 +5,7 @@
 	step_in = 5
 	max_integrity = 500
 	deflect_chance = 25
-	armor = list(melee = 50, bullet = 55, laser = 40, energy = 30, bomb = 30, bio = 0, rad = 0, fire = 100, acid = 100)
+	armor = list("melee" = 50, "bullet" = 55, "laser" = 40, "energy" = 30, "bomb" = 30, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
 	max_temperature = 60000
 	resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
 	infra_luminosity = 3

code/game/mecha/combat/phazon.dm

@@ -1,3 +1,4 @@
+<<<<<<< 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"
@@ -28,3 +29,35 @@
 	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"
+	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)
+
+>>>>>>> d282c60... Quote the armor lists (#35668)

code/game/mecha/combat/reticence.dm

@@ -6,7 +6,7 @@
 	dir_in = 1 //Facing North.
 	max_integrity = 100
 	deflect_chance = 3
-	armor = list(melee = 25, bullet = 20, laser = 30, energy = 15, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 100)
+	armor = list("melee" = 25, "bullet" = 20, "laser" = 30, "energy" = 15, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
 	max_temperature = 15000
 	wreckage = /obj/structure/mecha_wreckage/reticence
 	operation_req_access = list(ACCESS_THEATRE)