diff --git a/code/__defines/machinery.dm b/code/__defines/machinery.dm
index 865a44ccbed..57afc7a6328 100644
--- a/code/__defines/machinery.dm
+++ b/code/__defines/machinery.dm
@@ -27,6 +27,9 @@
#define MAINT 0x8 // Under maintenance.
#define EMPED 0x10 // Temporary broken by EMP pulse.
+#define INOPERABLE(machine) (machine.stat & (BROKEN|NOPOWER|MAINT|EMPED))
+#define OPERABLE(machine) !INOPERABLE(machine)
+
// Used by firelocks
#define FIREDOOR_OPEN 1
#define FIREDOOR_CLOSED 2
@@ -144,4 +147,4 @@ var/list/restricted_camera_networks = list(NETWORK_ERT,NETWORK_MERCENARY,"Secret
// Machinery init flag masks
#define INIT_MACHINERY_PROCESS_SELF 0x1
#define INIT_MACHINERY_PROCESS_COMPONENTS 0x2
-#define INIT_MACHINERY_PROCESS_ALL 0x3
\ No newline at end of file
+#define INIT_MACHINERY_PROCESS_ALL 0x3
diff --git a/code/game/machinery/cell_charger.dm b/code/game/machinery/cell_charger.dm
index 646570b75c0..b9e77ebc8a1 100644
--- a/code/game/machinery/cell_charger.dm
+++ b/code/game/machinery/cell_charger.dm
@@ -1,119 +1,134 @@
/obj/machinery/cell_charger
name = "heavy-duty cell charger"
- desc = "A much more powerful version of the standard recharger that is specially designed for charging power cells."
+ desc = "A much more powerful version of the standard recharger that is specifically designed to charge power cells."
+ desc_info = "This can be moved by using a wrench. You will need to wrench it again when and where you want to use it. Requires electricity to function."
icon = 'icons/obj/power.dmi'
icon_state = "ccharger"
- anchored = 1
+ anchored = TRUE
idle_power_usage = 5
- active_power_usage = 90000 //90 kW. (this the power drawn when charging)
+ active_power_usage = 90 KILOWATTS
power_channel = EQUIP
- var/charging_efficiency = 1.38
- var/obj/item/cell/charging = null
- var/chargelevel = -1
+ update_icon_on_init = TRUE
-/obj/machinery/cell_charger/Initialize(mapload)
- . = ..()
- update_icon()
+ var/obj/item/cell/charging = null
+ var/charge_level = -1
+ var/const/CHARGE_EFFICIENCY = 1.38
+
+/obj/machinery/cell_charger/proc/update_charge_level()
+ if(!charging)
+ charge_level = -1
+ return
+
+ var/new_level = round(charging.percent() / 25)
+ if(new_level != charge_level)
+ charge_level = new_level
/obj/machinery/cell_charger/update_icon()
- if(charging && !(stat & (BROKEN|NOPOWER)) )
-
- var/newlevel = round(charging.percent() * 4.0 / 99)
-
- if(chargelevel != newlevel)
- cut_overlays()
- add_overlay("ccharger-o[newlevel]")
- chargelevel = newlevel
+ cut_overlays()
+ if(charging)
+ charging.update_icon()
add_overlay(charging.icon_state)
- add_overlay("cell-o2")
add_overlay("ccharger-on")
- else
- cut_overlays()
+ if(stat & (NOPOWER|BROKEN))
+ add_overlay(charging.overlays)
- if(!charging)
+ if(INOPERABLE(src) || !charging)
return
+ update_charge_level()
+ add_overlay("cell-o2")
+ add_overlay("[icon_state]-o[charge_level]")
+
/obj/machinery/cell_charger/examine(mob/user)
if(!..(user, 5))
return
- to_chat(user, "There's [charging ? "a" : "no"] cell in the charger.")
if(charging)
- to_chat(user, "Current charge: [charging.charge]")
+ to_chat(user, "There's \a [charging.name] in the charger. Current charge: [charging.percent()]%.")
+ else
+ to_chat(user, SPAN_WARNING("The charger is empty."))
/obj/machinery/cell_charger/attackby(obj/item/W, mob/user)
if(stat & BROKEN)
return TRUE
- if(istype(W, /obj/item/cell) && anchored)
+ if(W.iswrench())
if(charging)
- to_chat(user, "There is already a cell in the charger.")
- return TRUE
- else
- var/area/a = loc.loc // Gets our locations location, like a dream within a dream
- if(!isarea(a))
- return TRUE
- if(a.power_equip == 0) // There's no APC in this area, don't try to cheat power!
- to_chat(user, "The [name] blinks red as you try to insert the cell!")
- return TRUE
-
- user.drop_from_inventory(W,src)
- charging = W
- user.visible_message("[user] inserts a cell into the charger.", "You insert a cell into the charger.")
- chargelevel = -1
- START_PROCESSING_MACHINE(src, MACHINERY_PROCESS_SELF)
- update_icon()
- return TRUE
- else if(W.iswrench())
- if(charging)
- to_chat(user, "Remove the cell first!")
+ to_chat(user, SPAN_WARNING("Remove the cell first!"))
return TRUE
anchored = !anchored
- to_chat(user, "You [anchored ? "attach" : "detach"] the cell charger [anchored ? "to" : "from"] the ground")
- playsound(src.loc, W.usesound, 50, 1)
+ to_chat(user, "You [anchored ? "" : "un"]secure \the [src].")
+ playsound(src, W.usesound, 50, 1)
+ return TRUE
+
+ if(istype(W, /obj/item/cell))
+ if(!anchored)
+ to_chat(user, SPAN_WARNING("You need to secure \the [src] first."))
+ return TRUE
+
+ if(charging)
+ to_chat(user, SPAN_WARNING("There is already a cell in \the [src]."))
+ return TRUE
+
+ user.drop_from_inventory(W, src)
+ charging = W
+ user.visible_message("[user] inserts \the [charging.name] into \the [src].", "You insert \the [charging.name] into \the [src].")
+
+ update_icon()
+ START_PROCESSING_MACHINE(src, MACHINERY_PROCESS_SELF)
+ return TRUE
/obj/machinery/cell_charger/attack_hand(mob/user)
if(charging)
- usr.put_in_hands(charging)
+ user.put_in_hands(charging, TRUE)
charging.add_fingerprint(user)
charging.update_icon()
+ user.visible_message("[user] removes \the [charging.name] from \the [src].", "You remove \the [charging.name] from \the [src].")
- src.charging = null
- user.visible_message("[user] removes the cell from the charger.", "You remove the cell from the charger.")
- chargelevel = -1
+ charging = null
update_icon()
- STOP_PROCESSING_MACHINE(src, MACHINERY_PROCESS_SELF)
+
return TRUE
/obj/machinery/cell_charger/attack_ai(mob/user)
- if(istype(user, /mob/living/silicon/robot) && Adjacent(user)) // Borgs can remove the cell if they are near enough
- if(!src.charging)
- return
- user.put_in_hands(charging)
+ if(isrobot(user) && charging) // Borgs can remove the cell if they are near enough
+ user.put_in_hands(charging, TRUE)
charging.update_icon()
- charging = null
- update_icon()
- user.visible_message("[user] removes the cell from the charger.", "You remove the cell from the charger.")
+ user.visible_message("[user] removes \the [charging.name] from \the [src].", "You remove \the [charging.name] from \the [src].")
+ charging = null
+ charge_level = -1
+ update_icon()
/obj/machinery/cell_charger/emp_act(severity)
- if(stat & (BROKEN|NOPOWER))
+ if(INOPERABLE(src))
return
if(charging)
charging.emp_act(severity)
..(severity)
+/obj/machinery/cell_charger/power_change()
+ if(..() && charging && anchored)
+ if(INOPERABLE(src))
+ STOP_PROCESSING_MACHINE(src, MACHINERY_PROCESS_SELF)
+ else
+ START_PROCESSING_MACHINE(src, MACHINERY_PROCESS_SELF)
/obj/machinery/cell_charger/process()
- if((stat & (BROKEN|NOPOWER)) || !anchored)
+ if(INOPERABLE(src) || !anchored)
update_use_power(POWER_USE_OFF)
- return
+ update_icon()
+ return PROCESS_KILL
if (charging && !charging.fully_charged())
- charging.give(active_power_usage*CELLRATE*charging_efficiency)
- update_use_power(POWER_USE_ACTIVE)
-
+ if(use_power < POWER_USE_ACTIVE)
+ update_use_power(POWER_USE_ACTIVE)
+ charging.give(active_power_usage * CELLRATE * CHARGE_EFFICIENCY)
update_icon()
else
update_use_power(POWER_USE_IDLE)
+ update_icon()
+ if(charging)
+ ping()
+ return PROCESS_KILL
diff --git a/code/game/objects/items/weapons/power_cells.dm b/code/game/objects/items/weapons/power_cells.dm
index 7fa9c127fb5..f66a3f4a000 100644
--- a/code/game/objects/items/weapons/power_cells.dm
+++ b/code/game/objects/items/weapons/power_cells.dm
@@ -44,6 +44,7 @@
/obj/item/cell/crap/empty/Initialize()
. = ..()
charge = 0
+ update_icon()
/obj/item/cell/crap/cig
name = "\improper rechargable mini-battery"
@@ -59,6 +60,7 @@
/obj/item/cell/secborg/empty/Initialize()
. = ..()
charge = 0
+ update_icon()
/obj/item/cell/apc
name = "heavy-duty power cell"
@@ -83,6 +85,7 @@
/obj/item/cell/high/empty/Initialize()
. = ..()
charge = 0
+ update_icon()
/obj/item/cell/super
name = "super-capacity power cell"
@@ -94,6 +97,7 @@
/obj/item/cell/super/empty/Initialize()
. = ..()
charge = 0
+ update_icon()
/obj/item/cell/hyper
name = "hyper-capacity power cell"
@@ -105,6 +109,7 @@
/obj/item/cell/hyper/empty/Initialize()
. = ..()
charge = 0
+ update_icon()
/obj/item/cell/infinite
name = "infinite-capacity power cell!"
@@ -163,6 +168,7 @@
/obj/item/cell/device/emergency_light/empty/Initialize()
. = ..()
charge = 0
+ update_icon()
/obj/item/cell/proto
name = "proto power cell"
@@ -174,3 +180,4 @@
/obj/item/cell/proto/empty/Initialize()
. = ..()
charge = 0
+ update_icon()
diff --git a/html/changelogs/johnwildkins-chargers.yml b/html/changelogs/johnwildkins-chargers.yml
new file mode 100644
index 00000000000..47114320078
--- /dev/null
+++ b/html/changelogs/johnwildkins-chargers.yml
@@ -0,0 +1,9 @@
+author: JohnWildkins
+
+delete-after: True
+
+changes:
+ - refactor: "Cleaned up cell charger interaction and processing code."
+ - bugfix: "Cell chargers no longer send 90 kW into the void every time they're unwrenched and moved."
+ - bugfix: "Fixed empty cells not initializing with the proper icon state."
+ - tweak: "Cell chargers now audibly ping when their attached cell has finished charging."