From 129cd705d1a4326e760c79ad73b786fa3c1642a5 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Wed, 13 Dec 2017 10:12:35 -0500 Subject: [PATCH] Correctly set description of nonstandard cells --- code/game/machinery/transformer.dm | 4 +- code/game/mecha/combat/gygax.dm | 43 +++++++++++++++++++ code/game/mecha/mecha.dm | 4 +- .../modules/mob/living/silicon/robot/robot.dm | 7 +-- .../mob/living/simple_animal/bot/mulebot.dm | 4 +- code/modules/mob/transform_procs.dm | 5 +-- code/modules/power/cell.dm | 6 +++ 7 files changed, 55 insertions(+), 18 deletions(-) diff --git a/code/game/machinery/transformer.dm b/code/game/machinery/transformer.dm index 79428fce6f..fe18365a9c 100644 --- a/code/game/machinery/transformer.dm +++ b/code/game/machinery/transformer.dm @@ -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() diff --git a/code/game/mecha/combat/gygax.dm b/code/game/mecha/combat/gygax.dm index df66127cc7..3e29f20f53 100644 --- a/code/game/mecha/combat/gygax.dm +++ b/code/game/mecha/combat/gygax.dm @@ -24,6 +24,7 @@ max_temperature = 35000 leg_overload_coeff = 100 operation_req_access = list(ACCESS_SYNDICATE) +<<<<<<< HEAD wreckage = /obj/structure/mecha_wreckage/gygax/dark max_equip = 4 @@ -66,3 +67,45 @@ ..() 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) + +>>>>>>> ccfe2d4... Merge pull request #33481 from AutomaticFrenzy/patch/celldesc diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index ba41609fca..d5ad847afd 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -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 diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index e8b05bac9e..db10f4a81c 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -115,9 +115,7 @@ ident = rand(1, 999) if(!cell) - cell = new /obj/item/stock_parts/cell(src) - cell.maxcharge = 7500 - cell.charge = 7500 + cell = new /obj/item/stock_parts/cell/high(src, 7500) if(lawupdate) make_laws() @@ -854,8 +852,7 @@ /mob/living/silicon/robot/modules/syndicate/Initialize() . = ..() - cell.maxcharge = 25000 - cell.charge = 25000 + cell = new /obj/item/stock_parts/cell/hyper(src, 25000) radio = new /obj/item/device/radio/borg/syndicate(src) laws = new /datum/ai_laws/syndicate_override() addtimer(CALLBACK(src, .proc/show_playstyle), 5) diff --git a/code/modules/mob/living/simple_animal/bot/mulebot.dm b/code/modules/mob/living/simple_animal/bot/mulebot.dm index e7116db53e..570481933b 100644 --- a/code/modules/mob/living/simple_animal/bot/mulebot.dm +++ b/code/modules/mob/living/simple_animal/bot/mulebot.dm @@ -54,9 +54,7 @@ var/datum/job/cargo_tech/J = new/datum/job/cargo_tech access_card.access = J.get_access() prev_access = access_card.access - cell = new(src) - cell.charge = 2000 - cell.maxcharge = 2000 + cell = new /obj/item/stock_parts/cell/upgraded(src, 2000) var/static/mulebot_count = 0 mulebot_count += 1 diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm index f763c3ea86..534307f727 100644 --- a/code/modules/mob/transform_procs.dm +++ b/code/modules/mob/transform_procs.dm @@ -378,10 +378,7 @@ var/mob/living/silicon/robot/R = new /mob/living/silicon/robot(loc) // cyborgs produced by Robotize get an automatic power cell - R.cell = new(R) - R.cell.maxcharge = 7500 - R.cell.charge = 7500 - + R.cell = new /obj/item/stock_parts/cell/high(R, 7500) R.gender = gender R.invisibility = 0 diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index 36d99c2f65..1755084549 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -23,9 +23,15 @@ /obj/item/stock_parts/cell/get_cell() return src +<<<<<<< HEAD /obj/item/stock_parts/cell/New() +======= +/obj/item/stock_parts/cell/Initialize(mapload, override_maxcharge) +>>>>>>> ccfe2d4... Merge pull request #33481 from AutomaticFrenzy/patch/celldesc . = ..() START_PROCESSING(SSobj, src) + if (override_maxcharge) + maxcharge = override_maxcharge charge = maxcharge if(ratingdesc) desc += " This one has a rating of [DisplayEnergy(maxcharge)], and you should not swallow it."