Merge pull request #4349 from Citadel-Station-13/upstream-merge-33481

[MIRROR] Correctly set description of nonstandard cells
2017-12-13 21:47:57 +00:00
parent a87262f867 e46811d210
commit dbd08a18a4
7 changed files with 71 additions and 84 deletions
@@ -98,9 +98,7 @@

 	use_power(5000) // Use a lot of power.
 	var/mob/living/silicon/robot/R = H.Robotize()
-
-	R.cell.maxcharge = robot_cell_charge
-	R.cell.charge = robot_cell_charge
+	R.cell = new /obj/item/stock_parts/cell/upgraded/plus(R, robot_cell_charge)

 	// So he can't jump out the gate right away.
 	R.SetLockdown()
@@ -1,68 +1,65 @@
-/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)
-	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
+
+/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 /obj/item/stock_parts/cell/hyper(src)
+
+
+/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)
@@ -231,9 +231,7 @@
 		C.forceMove(src)
 		cell = C
 		return
-	cell = new(src)
-	cell.charge = 15000
-	cell.maxcharge = 15000
+	cell = new /obj/item/stock_parts/cell/high/plus(src)

 /obj/mecha/proc/add_cabin()
 	cabin_air = new