From 1a1e03490a1a80f9369de39f544c15dedafd309b Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Wed, 13 Dec 2017 12:02:50 -0500
Subject: [PATCH] Update gygax.dm

---
 code/game/mecha/combat/gygax.dm | 92 +++++++++------------------------
 1 file changed, 23 insertions(+), 69 deletions(-)

diff --git a/code/game/mecha/combat/gygax.dm b/code/game/mecha/combat/gygax.dm
index 3e29f20f53..d5228b9130 100644
--- a/code/game/mecha/combat/gygax.dm
+++ b/code/game/mecha/combat/gygax.dm
@@ -1,73 +1,29 @@
-/obj/mecha/combat/gygax
-	desc = "A lightweight, security exosuit. Popular among private and corporate security."
-	name = "\improper Gygax"
-	icon_state = "gygax"
-	step_in = 3
-	dir_in = 1 //Facing North.
+/obj/mecha/combat/gygax
+	desc = "A lightweight, security exosuit. Popular among private and corporate security."
+	name = "\improper Gygax"
+	icon_state = "gygax"
+	step_in = 3
+	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)
-	max_temperature = 25000
-	infra_luminosity = 6
-	wreckage = /obj/structure/mecha_wreckage/gygax
-	internal_damage_threshold = 35
-	max_equip = 3
-	step_energy_drain = 3
-
-/obj/mecha/combat/gygax/dark
-	desc = "A lightweight exosuit, painted in a dark scheme. This model appears to have some modifications."
-	name = "\improper Dark Gygax"
-	icon_state = "darkgygax"
+	deflect_chance = 5
+	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
+	internal_damage_threshold = 35
+	max_equip = 3
+	step_energy_drain = 3
+
+/obj/mecha/combat/gygax/dark
+	desc = "A lightweight exosuit, painted in a dark scheme. This model appears to have some modifications."
+	name = "\improper Dark Gygax"
+	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)
-	max_temperature = 35000
-	leg_overload_coeff = 100
+	deflect_chance = 15
+	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)
-<<<<<<< HEAD
-	wreckage = /obj/structure/mecha_wreckage/gygax/dark
-	max_equip = 4
-
-/obj/mecha/combat/gygax/dark/loaded/New()
-	..()
-	var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/carbine
-	ME.attach(src)
-	ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/flashbang
-	ME.attach(src)
-	ME = new /obj/item/mecha_parts/mecha_equipment/teleporter
-	ME.attach(src)
-	ME = new /obj/item/mecha_parts/mecha_equipment/tesla_energy_relay
-	ME.attach(src)
-	return
-
-/obj/mecha/combat/gygax/dark/add_cell(obj/item/stock_parts/cell/C=null)
-	if(C)
-		C.forceMove(src)
-		cell = C
-		return
-	cell = new(src)
-	cell.charge = 30000
-	cell.maxcharge = 30000
-
-
-/obj/mecha/combat/gygax/GrantActions(mob/living/user, human_occupant = 0)
-	..()
-	overload_action.Grant(user, src)
-
-/obj/mecha/combat/gygax/dark/GrantActions(mob/living/user, human_occupant = 0)
-	..()
-	thrusters_action.Grant(user, src)
-
-
-/obj/mecha/combat/gygax/RemoveActions(mob/living/user, human_occupant = 0)
-	..()
-	overload_action.Remove(user)
-
-/obj/mecha/combat/gygax/dark/RemoveActions(mob/living/user, human_occupant = 0)
-	..()
-	thrusters_action.Remove(user)
-
-=======
 	wreckage = /obj/structure/mecha_wreckage/gygax/dark
 	max_equip = 4
 
@@ -107,5 +63,3 @@
 /obj/mecha/combat/gygax/dark/RemoveActions(mob/living/user, human_occupant = 0)
 	..()
 	thrusters_action.Remove(user)
-
->>>>>>> ccfe2d4... Merge pull request #33481 from AutomaticFrenzy/patch/celldesc