Merge pull request #4555 from ComicIronic/SMESBatteries

SMES Cleanup + Portable Batteries
2025-12-10 02:16:05 +00:00 · 2015-05-22 12:10:54 -05:00
parent 3879aadbfc 2b01341979
commit 9376e300f2
21 changed files with 665 additions and 441 deletions
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -1361,6 +1361,9 @@
 #include "code\modules\paperwork\photography.dm"
 #include "code\modules\paperwork\stamps.dm"
 #include "code\modules\power\apc.dm"
+#include "code\modules\power\battery.dm"
+#include "code\modules\power\battery_ion.dm"
+#include "code\modules\power\battery_port.dm"
 #include "code\modules\power\cable.dm"
 #include "code\modules\power\cable_heavyduty.dm"
 #include "code\modules\power\cell.dm"
--- a/code/game/gamemodes/events/ninja_equipment.dm
+++ b/code/game/gamemodes/events/ninja_equipment.dm
@@ -991,7 +991,7 @@ ________________________________________________________________________________
 				U << "<span class='warning'>This APC has run dry of power. You must find another source.</span>"

 		if("SMES")
-			var/obj/machinery/power/smes/A = target
+			var/obj/machinery/power/battery/smes/A = target
 			if(A.charge)
 				var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()
 				spark_system.set_up(5, 0, A.loc)
--- a/code/game/gamemodes/events/power_failure.dm
+++ b/code/game/gamemodes/events/power_failure.dm
@@ -5,13 +5,13 @@
 		command_alert("Abnormal activity detected in [station_name()]'s powernet. As a precautionary measure, the station's power will be shut off for an indeterminate duration.", "Critical Power Failure")
 		for(var/mob/M in player_list)
 			if(M.client) M << sound('sound/AI/poweroff.ogg')
-	for(var/obj/machinery/power/smes/S in power_machines)
+	for(var/obj/machinery/power/battery/smes/S in power_machines)
 		if(istype(get_area(S), /area/turret_protected) || S.z != 1)
 			continue
 		S.charge = 0
 		S.output = 0
 		S.online = 0
-		S.updateicon()
+		S.update_icon()
 		S.power_change()

 	var/list/skipped_areas = list(/area/engineering/engine, /area/turret_protected/ai)
@@ -57,13 +57,13 @@
 		if(C.cell && C.z == 1)
 			C.cell.charge = C.cell.maxcharge
 			C.chargemode = 1
-	for(var/obj/machinery/power/smes/S in power_machines)
+	for(var/obj/machinery/power/battery/smes/S in power_machines)
 		if(S.z != 1)
 			continue
 		S.charge = S.capacity
 		S.output = 200000
 		S.online = 1
-		S.updateicon()
+		S.update_icon()
 		S.power_change()
 	for(var/area/A in areas)
 		if(A.name != "Space" && A.name != "Engine Walls" && A.name != "Chemical Lab Test Chamber" && A.name != "space" && A.name != "Escape Shuttle" && A.name != "Arrival Area" && A.name != "Arrival Shuttle" && A.name != "start area" && A.name != "Engine Combustion Chamber")
@@ -77,12 +77,12 @@
 		command_alert("All SMESs on [station_name()] have been recharged. We apologize for the inconvenience.", "Power Systems Nominal")
 		for(var/mob/M in player_list)
 			if(M.client) M << sound('sound/AI/poweron.ogg')
-	for(var/obj/machinery/power/smes/S in power_machines)
+	for(var/obj/machinery/power/battery/smes/S in power_machines)
 		if(S.z != 1)
 			continue
 		S.charge = S.capacity
 		S.output = 200000
 		S.online = 1
-		S.updateicon()
+		S.update_icon()
 		S.power_change()
 	suspend_alert = 0
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -1044,7 +1044,7 @@ Pressure: [env.return_pressure()]"}
 			if(!Rad.active)
 				Rad.toggle_power()

-	for(var/obj/machinery/power/smes/SMES in power_machines)
+	for(var/obj/machinery/power/battery/smes/SMES in power_machines)
 		if(SMES.anchored)
 			SMES.connect_to_network() // Just in case.
 			SMES.chargemode = 1
@@ -1062,10 +1062,10 @@ Pressure: [env.return_pressure()]"}
 	log_admin("[key_name(usr)] haxed the powergrid with magic SMES.")
 	message_admins("<span class='notice'>[key_name_admin(usr)] haxed the powergrid with magic SMES.</span>", 1)

-	for(var/obj/machinery/power/smes/SMES in power_machines)
+	for(var/obj/machinery/power/battery/smes/SMES in power_machines)
 		var/turf/T=SMES.loc
 		del(SMES)
-		var/obj/machinery/power/smes/magical/magic = new(T)
+		var/obj/machinery/power/battery/smes/infinite/magic = new(T)
 		// Manually set up our powernets since stupid seems to reign in the powernet code.
 		magic.connect_to_network()
 		magic.output=200000 // AKA rape
--- a/code/modules/maps/spawners/spawners.dm
+++ b/code/modules/maps/spawners/spawners.dm
@@ -185,7 +185,7 @@
 		/obj/machinery/power/rad_collector,
 		/obj/machinery/power/rust_core,
 		/obj/machinery/power/rust_fuel_injector,
-		/obj/machinery/power/smes,
+		/obj/machinery/power/battery/smes,
 		/obj/machinery/processor,
 		/obj/machinery/recharge_station,
 		/obj/machinery/rust/gyrotron,
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -66,7 +66,6 @@
 	var/coverlocked = 1
 	var/aidisabled = 0
 	var/tdir = null
-	var/obj/machinery/power/terminal/terminal = null
 	var/lastused_light = 0
 	var/lastused_equip = 0
 	var/lastused_environ = 0
@@ -136,9 +135,9 @@
 		cell.maxcharge = cell_type	// cell_type is maximum charge (old default was 1000 or 2500 (values one and two respectively)
 		cell.charge = start_charge * cell.maxcharge / 100.0 		// (convert percentage to actual value)

-	make_terminal()
+	finalise_terminal() //creates the terminal itself

-/obj/machinery/power/apc/proc/make_terminal()
+/obj/machinery/power/apc/finalise_terminal()
 	// create a terminal object at the same position as original turf loc
 	// wires will attach to this
 	terminal = new/obj/machinery/power/terminal(src.loc)
@@ -464,36 +463,15 @@
 				else
 					user << "You fail to [ locked ? "unlock" : "lock"] the APC interface."
 	else if (istype(W, /obj/item/stack/cable_coil) && !terminal && opened && has_electronics != 2)
-		var/turf/T = get_turf(src)
-
-		// APCs are actually on the same tile as their terminal
-		if (T != get_turf(user))
-			user << "<span class='warning'>You can't wire the APC from there!</span>"
-			return
-
-		if (T.intact)
-			user << "<span class='warning'>You must remove the floor plating in front of the APC first.</span>"
-			return
-
 		var/obj/item/stack/cable_coil/C = W
 		if(C.amount < 10)
 			user << "<span class='warning'>You need more wires.</span>"
 			return
-		user << "You start adding cables to the APC frame..."
-		playsound(get_turf(src), 'sound/items/Deconstruct.ogg', 50, 1)
-		if (do_after(user, 20) && !T.intact && opened && !terminal && has_electronics != 2 && C.amount >= 10)
-			var/obj/structure/cable/N = T.get_cable_node()
-			if (prob(50) && electrocute_mob(usr, N, N))
-				var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
-				s.set_up(5, 1, src)
-				s.start()
-				return
+
+		if(make_terminal(user))
 			C.use(10)
-			user.visible_message(\
-				"<span class='warning'>[user.name] has added cables to the APC frame!</span>",\
-				"You add cables to the APC frame.")
-			make_terminal()
 			terminal.connect_to_network()
+
 	else if (istype(W, /obj/item/weapon/wirecutters) && opened && terminal && has_electronics!=2)
 		var/turf/T = get_turf(src)
 		if (T.intact)
@@ -1002,6 +980,8 @@
 				for(var/mob/M in viewers(src))
 					M.show_message("<span class='warning'>The [src.name] suddenly lets out a blast of smoke and some sparks!</span>", 3, "<span class='warning'>You hear sizzling electronics.</span>", 2)

+/obj/machinery/power/apc/can_attach_terminal(mob/user)
+	return user.loc == src.loc && has_electronics != 2 && !terminal

 /obj/machinery/power/apc/surplus()
 	if(terminal)
--- a/code/modules/power/battery.dm
+++ b/code/modules/power/battery.dm
@@ -0,0 +1,309 @@
+// Generic battery machine
+// stores power
+
+#define SMESLEVELCHARGE		1
+#define SMESLEVELCHARGING	2
+#define SMESLEVELONLINE		3
+
+var/global/list/battery_charge = 	list(
+										image('icons/obj/power.dmi', "smes-og1"),
+										image('icons/obj/power.dmi', "smes-og2"),
+										image('icons/obj/power.dmi', "smes-og3"),
+										image('icons/obj/power.dmi', "smes-og4"),
+										image('icons/obj/power.dmi', "smes-og5")
+										)
+
+var/global/list/battery_charging =	list(
+										image('icons/obj/power.dmi', "smes-oc0"),
+										image('icons/obj/power.dmi', "smes-oc1")
+										)
+var/global/list/battery_online =	list(
+										image('icons/obj/power.dmi', "smes-op0"),
+										image('icons/obj/power.dmi', "smes-op1")
+										)
+
+/obj/machinery/power/battery/update_icon()
+	overlays.len = 0
+	if(stat & BROKEN)	return
+
+	overlays += battery_online[online + 1]
+
+	if(charging)
+		overlays += battery_charging[2]
+	else if(chargemode)
+		overlays += battery_charging[1]
+
+	var/clevel = chargedisplay()
+	if(clevel>0)
+		overlays += battery_charge[clevel]
+	return
+
+#define SMESMAXCHARGELEVEL 200000
+#define SMESMAXOUTPUT 200000
+#define SMESRATE 0.05 				// rate of internal charge to external power
+
+/obj/machinery/power/battery
+	name = "power storage unit"
+	desc = "A placeholder power storage unit. If found, please return to CentCom."
+	icon_state = "smes"
+	density = 1
+	anchored = 1
+	use_power = 0
+
+	var/output = 50000
+	var/lastout = 0
+	var/loaddemand = 0
+	var/capacity = 5e6 //Max stored charge
+	var/charge = 1e6 //Stored charge
+	var/charging = 0 //Are we currently taking charge in?
+	var/chargemode = 0 //Are we set to charge or not? Not the same as charging
+	var/chargecount = 0 //How long we've spent since not charging
+	var/chargelevel = 50000
+	var/online = 1
+
+	var/name_tag = ""
+
+	var/infinite_power = 0 //makes the machine just generate power itself
+
+	//Holders for powerout event.
+	var/last_output = 0
+	var/last_charge = 0
+	var/last_online = 0
+
+	machine_flags = SCREWTOGGLE | CROWDESTROY
+
+/obj/machinery/power/battery/process()
+	if (stat & BROKEN)
+		return
+
+	if(infinite_power) //Only used for magical machines - BEWARE
+		capacity = INFINITY
+		charge = INFINITY
+
+	var/_charging = charging
+	var/_online = online
+
+	// Input
+	var/excess = surplus()
+
+	if (charging)
+		if (excess >= chargelevel) // If there's power available, try to charge
+			var/load = min((capacity - charge) / SMESRATE, chargelevel) // Charge at set rate, limited to spare capacity
+
+			charge += load * SMESRATE // Increase the charge
+
+			add_load(load) // Add the load to the terminal side network
+
+		else
+			charging = FALSE
+			chargecount = 0
+
+	else
+		if (chargemode)
+			if (chargecount > rand(3, 6))
+				charging = TRUE
+				chargecount = 0
+
+			if (excess > chargelevel)
+				chargecount++
+			else
+				chargecount = 0
+		else
+			chargecount = 0
+
+	// Output
+	if (online)
+		lastout = min(charge / SMESRATE, output) // Limit output to that stored
+
+		charge -= lastout * SMESRATE // Reduce the storage (may be recovered in /restore() if excessive)
+
+		add_avail(lastout) // Add output to powernet (smes side)
+
+		if (charge < 0.0001)
+			online = FALSE
+			lastout = 0
+
+	// Only update icon if state changed
+	if(_charging != charging || _online != online)
+		update_icon()
+
+/obj/machinery/power/battery/proc/chargedisplay()
+	return round(5.5*charge/(capacity ? capacity : 5e6))
+
+/*
+ * Called after all power processes are finished
+ * Restores charge level to smes if there was excess this ptick
+ */
+/obj/machinery/power/battery/proc/restore()
+	if (stat & BROKEN)
+		return
+
+	var/_chargedisplay = chargedisplay()
+
+	var/excess = powernet.netexcess // This was how much wasn't used on the network last ptick, minus any removed by other SMESes
+
+	excess = min(lastout, excess) // Clamp it to how much was actually output by this SMES last ptick
+
+	excess = min((capacity - charge) / SMESRATE, excess) // For safety, also limit recharge by space capacity of SMES (shouldn't happen)
+
+	// Now recharge this amount
+
+	charge += excess * SMESRATE // Restore unused power
+
+	powernet.netexcess -= excess // Remove the excess from the powernet, so later SMESes don't try to use it
+
+	loaddemand = lastout - excess
+
+	if(_chargedisplay != chargedisplay()) // If needed updates the icons overlay
+		update_icon()
+
+/obj/machinery/power/battery/attack_ai(mob/user)
+	src.add_hiddenprint(user)
+	add_fingerprint(user)
+	ui_interact(user)
+
+/obj/machinery/power/battery/attack_hand(mob/user)
+	add_fingerprint(user)
+	ui_interact(user)
+
+/obj/machinery/power/battery/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null)
+
+	if(stat & BROKEN)
+		return
+
+	// this is the data which will be sent to the ui
+	var/data[0]
+	data["nameTag"] = name_tag
+	data["storedCapacity"] = round(100.0*charge/capacity, 0.1)
+	data["charging"] = charging
+	data["chargeMode"] = chargemode
+	data["chargeLevel"] = chargelevel
+	data["chargeMax"] = SMESMAXCHARGELEVEL
+	data["outputOnline"] = online
+	data["outputLevel"] = output
+	data["outputMax"] = SMESMAXOUTPUT
+	data["outputLoad"] = round(loaddemand)
+
+	// update the ui if it exists, returns null if no ui is passed/found
+	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data)
+	if (!ui)
+		// the ui does not exist, so we'll create a new() one
+        // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm
+		ui = new(user, src, ui_key, "smes.tmpl", "SMES Power Storage Unit", 540, 380)
+		// when the ui is first opened this is the data it will use
+		ui.set_initial_data(data)
+		// open the new ui window
+		ui.open()
+		// auto update every Master Controller tick
+		ui.set_auto_update(1)
+
+/obj/machinery/power/battery/Topic(href, href_list)
+	if(..())
+		return 1
+	if(href_list["close"])
+		if(usr.machine == src) usr.unset_machine()
+		return 1
+	if (usr.stat || usr.restrained() )
+		return
+	if (!(istype(usr, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey")
+		if(!istype(usr, /mob/living/silicon/ai))
+			usr << "<span class='warning'>You don't have the dexterity to do this!</span>"
+			return
+
+//world << "[href] ; [href_list[href]]"
+
+	if (!isturf(src.loc) && !istype(usr, /mob/living/silicon/))
+		return 0 // Do not update ui
+
+	if( href_list["cmode"] )
+		chargemode = !chargemode
+		if(!chargemode)
+			charging = 0
+		update_icon()
+
+	else if( href_list["online"] )
+		online = !online
+		update_icon()
+	else if( href_list["input"] )
+		switch( href_list["input"] )
+			if("min")
+				chargelevel = 0
+			if("max")
+				chargelevel = SMESMAXCHARGELEVEL		//30000
+			if("set")
+				chargelevel = input(usr, "Enter new input level (0-[SMESMAXCHARGELEVEL])", "SMES Input Power Control", chargelevel) as num
+		chargelevel = max(0, min(SMESMAXCHARGELEVEL, chargelevel))	// clamp to range
+
+	else if( href_list["output"] )
+		switch( href_list["output"] )
+			if("min")
+				output = 0
+			if("max")
+				output = SMESMAXOUTPUT		//30000
+			if("set")
+				output = input(usr, "Enter new output level (0-[SMESMAXOUTPUT])", "SMES Output Power Control", output) as num
+		output = max(0, min(SMESMAXOUTPUT, output))	// clamp to range
+
+	investigation_log(I_SINGULO,"input/output; [chargelevel>output?"<font color='green'>":"<font color='red'>"][chargelevel]/[output]</font> | Output-mode: [online?"<font color='green'>on</font>":"<font color='red'>off</font>"] | Input-mode: [chargemode?"<font color='green'>auto</font>":"<font color='red'>off</font>"] by [usr.key]")
+
+	return 1
+
+/obj/machinery/power/battery/proc/ion_act()
+	if(src.z == 1)
+		if(prob(1)) //explosion
+			message_admins("<span class='warning'>SMES explosion in [get_area(src)]</span>")
+			src.visible_message("<span class='warning'>\The [src] is making strange noises!</span>",
+								"<span class='warning'>You hear sizzling electronics.</span>")
+
+			sleep(10*pick(4,5,6,7,10,14))
+
+			var/datum/effect/effect/system/smoke_spread/smoke = new()
+			smoke.set_up(3, 0, src.loc)
+			smoke.attach(src)
+			smoke.start()
+			explosion(src.loc, -1, 0, 1, 3, 0)
+			qdel(src)
+			return
+		else if(prob(15)) //Power drain
+			message_admins("<span class='warning'>SMES power drain in [get_area(src)]</span>")
+			var/datum/effect/effect/system/spark_spread/s = new
+			s.set_up(3, 1, src)
+			s.start()
+			if(prob(50))
+				emp_act(1)
+			else
+				emp_act(2)
+		else if(prob(5)) //smoke only
+			message_admins("<span class='warning'>SMES smoke in [get_area(src)]</span>")
+			var/datum/effect/effect/system/smoke_spread/smoke = new()
+			smoke.set_up(3, 0, src.loc)
+			smoke.attach(src)
+			smoke.start()
+
+
+/obj/machinery/power/battery/emp_act(severity)
+
+	var/old_online = online
+	var/old_charging = charging
+	var/old_output = output
+
+	online = 0
+	charging = 0
+	output = 0
+	charge = max(0, charge - 1e6/severity)
+
+	spawn(100)
+		if(output == 0)
+			output = old_output
+		if(online == 0)
+			online = old_online
+		if(charging == 0)
+			charging = old_charging
+	..()
+
+/proc/rate_control(var/S, var/V, var/C, var/Min=1, var/Max=5, var/Limit=null)
+	var/href = "<A href='?src=\ref[S];rate control=1;[V]"
+	var/rate = "[href]=-[Max]'>-</A>[href]=-[Min]'>-</A> [(C?C : 0)] [href]=[Min]'>+</A>[href]=[Max]'>+</A>"
+	if(Limit) return "[href]=-[Limit]'>-</A>"+rate+"[href]=[Limit]'>+</A>"
+	return rate
+
--- a/code/modules/power/battery_ion.dm
+++ b/code/modules/power/battery_ion.dm
@@ -0,0 +1,91 @@
+// Generic battery machine
+// stores power
+
+/obj/machinery/power/battery/portable
+	name = "portable power storage unit"
+	desc = "A IOn-model portable storage unit, used to transport charge around the station."
+	icon_state = "port_smes"
+	density = 1
+	anchored = 0
+	use_power = 0
+
+	machine_flags = SCREWTOGGLE | CROWDESTROY | WRENCHMOVE
+
+	var/obj/machinery/power/battery_port/connected_to
+
+/obj/machinery/power/battery/portable/Destroy()
+	if(connected_to)
+		connected_to.disconnect_battery()
+	..()
+
+/obj/machinery/power/battery/portable/initialize()
+	..()
+	if(anchored)
+		var/obj/machinery/power/battery_port/port = locate() in src.loc
+		if(port)
+			port.connect_battery(src)
+
+/obj/machinery/power/battery/portable/get_powernet()
+	if(connected_to)
+		return connected_to.get_powernet()
+
+/obj/machinery/power/battery/portable/add_avail(var/amount)
+	if(connected_to)
+		connected_to.add_avail(amount)
+
+/obj/machinery/power/battery/portable/add_load(var/amount)
+	if(connected_to)
+		connected_to.add_load(amount)
+
+/obj/machinery/power/battery/portable/surplus()
+	if(connected_to)
+		return connected_to.surplus()
+	return 0
+
+/obj/machinery/power/battery/portable/wrenchAnchor(mob/user)
+	if(..() == 1)
+		if(anchored)
+			var/obj/machinery/power/battery_port/port = locate() in src.loc
+			if(port)
+				port.connect_battery(src)
+		else
+			if(connected_to)
+				connected_to.disconnect_battery()
+		return 1
+	return -1
+
+/obj/machinery/power/battery/portable/update_icon()
+	if(stat & BROKEN)	return
+
+	..()
+
+	if(connected_to)
+		connected_to.update_icon()
+	return
+
+/obj/machinery/power/battery/portable/restore()
+	if (stat & BROKEN)
+		return
+
+	if(!connected_to)
+		return
+
+	var/_chargedisplay = chargedisplay()
+
+	var/excess = connected_to.powernet.netexcess // This was how much wasn't used on the network last ptick, minus any removed by other SMESes
+
+	excess = min(lastout, excess) // Clamp it to how much was actually output by this SMES last ptick
+
+	excess = min((capacity - charge) / SMESRATE, excess) // For safety, also limit recharge by space capacity of SMES (shouldn't happen)
+
+	// Now recharge this amount
+
+	charge += excess * SMESRATE // Restore unused power
+
+	connected_to.powernet.netexcess -= excess // Remove the excess from the powernet, so later SMESes don't try to use it
+
+	loaddemand = lastout - excess
+
+	if(_chargedisplay != chargedisplay()) // If needed updates the icons overlay
+		update_icon()
+
--- a/code/modules/power/battery_port.dm
+++ b/code/modules/power/battery_port.dm
@@ -0,0 +1,92 @@
+/obj/machinery/power/battery_port
+	name = "power connector"
+	desc = "A user-safe high-current contact port, used for attaching compatible machinery."
+	icon_state = "battery_port"
+	density = 0
+	anchored = 1
+	use_power = 0
+
+	var/obj/machinery/power/battery/portable/connected = null
+
+	machine_flags = SCREWTOGGLE | CROWDESTROY
+
+
+/obj/machinery/power/battery_port/New()
+	. = ..()
+
+/*
+	component_parts = newlist(
+		/obj/item/weapon/circuitboard/battery_port
+	)
+
+	RefreshParts()
+*/
+	connect_to_network()
+
+
+/obj/machinery/power/battery_port/Destroy()
+	disconnect_battery()
+	..()
+
+/obj/machinery/power/battery_port/attackby(obj/item/W, mob/user)
+	if(istype(W, /obj/item/stack/cable_coil) && !terminal)
+		var/obj/item/stack/cable_coil/CC = W
+
+		if (CC.amount < 10)
+			user << "<span class=\"warning\">You need 10 length cable coil to make a terminal.</span>"
+			return
+
+		if(make_terminal(user))
+			CC.use(10)
+			terminal.connect_to_network()
+
+			user.visible_message(\
+				"<span class='warning'>[user.name] has added cables to the SMES!</span>",\
+				"You added cables the SMES.")
+			src.stat = 0
+			return 1
+	return ..()
+
+/obj/machinery/power/battery_port/update_icon()
+	overlays.len = 0
+	if(stat & BROKEN)	return
+
+	if(connected && connected.charging)
+		overlays += image('icons/obj/power.dmi', "bp-c")
+	else
+		if(connected)
+			if(connected.charge > 0)
+				overlays += image('icons/obj/power.dmi', "bp-o")
+			else
+				overlays += image('icons/obj/power.dmi', "bp-d")
+
+/obj/machinery/power/battery_port/add_load(var/amount)
+	if(terminal && terminal.get_powernet())
+		terminal.powernet.load += amount
+		return 1
+	return 0
+
+/obj/machinery/power/battery_port/surplus()
+	if(terminal)
+		return terminal.surplus()
+	return 0
+
+/obj/machinery/power/battery_port/crowbarDestroy(mob/user)
+	if(connected)
+		user << "You can't disconnect \the [src] while it has \the [connected] attached."
+		return -1
+	return ..()
+
+/obj/machinery/power/battery_port/proc/connect_battery(obj/machinery/power/battery/portable/portable)
+	if(portable)
+		connected = portable
+		portable.connected_to = src
+		connected.update_icon()
+
+/obj/machinery/power/battery_port/proc/disconnect_battery()
+	if(connected)
+		connected.connected_to = null
+		connected.update_icon()
+		connected = null
+		update_icon()
+
--- a/code/modules/power/power.dm
+++ b/code/modules/power/power.dm
@@ -18,6 +18,8 @@
 	//For powernet rebuilding
 	var/build_status = 0 //1 means it needs rebuilding during the next tick or on usage

+	var/obj/machinery/power/terminal/terminal = null //not strictly used on all machines - a placeholder
+
 /obj/machinery/power/New()
 	. = ..()
 	machines -= src
@@ -27,6 +29,11 @@
 /obj/machinery/power/Destroy()
 	disconnect_from_network()
 	power_machines -= src
+
+	if (terminal)
+		terminal.master = null
+		terminal = null
+
 	..()

 ///////////////////////////////
--- a/code/modules/power/powernet.dm
+++ b/code/modules/power/powernet.dm
@@ -99,8 +99,11 @@ Powernet procs :
 	netexcess = avail - load

 	if(netexcess > 100 && nodes && nodes.len) // if there was excess power last cycle
-		for(var/obj/machinery/power/smes/S in nodes) // find the SMESes in the network
-			S.restore() // and restore some of the power that was used
+		for(var/obj/machinery/power/battery/B in nodes) // find the SMESes in the network
+			B.restore() // and restore some of the power that was used
+		for(var/obj/machinery/power/battery_port/BP in nodes) //Since portable batteries aren't in our nodes, we pass ourselves to restore them via their connectors
+			if(BP.connected)
+				BP.connected.restore()

 	// updates the viewed load (as seen on power computers)
 	viewload = 0.8 * viewload + 0.2 * load
--- a/code/modules/power/smes.dm
+++ b/code/modules/power/smes.dm
@@ -1,37 +1,17 @@
 // the SMES
 // stores power

-#define SMESMAXCHARGELEVEL 200000
-#define SMESMAXOUTPUT 200000
-#define SMESRATE 0.05 				// rate of internal charge to external power
-
-/obj/machinery/power/smes
+/obj/machinery/power/battery/smes
 	name = "power storage unit"
 	desc = "A high-capacity superconducting magnetic energy storage (SMES) unit."
 	icon_state = "smes"
 	density = 1
 	anchored = 1
 	use_power = 0
-	var/output = 50000
-	var/lastout = 0
-	var/loaddemand = 0
-	var/capacity = 5e6
-	var/charge = 1e6
-	var/charging = 0
-	var/chargemode = 0
-	var/chargecount = 0
-	var/chargelevel = 50000
-	var/online = 1
-	var/name_tag = null
-	var/obj/machinery/power/terminal/terminal = null
-	//Holders for powerout event.
-	var/last_output = 0
-	var/last_charge = 0
-	var/last_online = 0

 	machine_flags = SCREWTOGGLE | CROWDESTROY

-/obj/machinery/power/smes/New()
+/obj/machinery/power/battery/smes/New()
 	. = ..()
 	spawn(5)
 		dir_loop:
@@ -45,7 +25,7 @@
 			stat |= BROKEN
 			return
 		terminal.master = src
-		updateicon()
+		update_icon()

 	component_parts = newlist(
 		/obj/item/weapon/circuitboard/smes,
@@ -65,34 +45,7 @@

 	RefreshParts()

-/obj/machinery/power/smes/proc/make_terminal(const/mob/user)
-	if (user.loc == loc)
-		user << "<span class='warning'>You must not be on the same tile with SMES.</span>"
-		return 1
-
-	var/userdir = get_dir(user, src)
-
-	for(var/dirs in cardinal)	//there shouldn't be any diagonal terminals
-		if(userdir == dirs)
-			var/turf/T = get_turf(user)
-			if(T.intact)
-				user << "<span class='warning'>The floor plating must be removed first.</span>"
-				return 1
-
-			user << "<span class='notice'>You start adding cable to the SMES.</span>"
-			playsound(get_turf(src), 'sound/items/zip.ogg', 100, 1)
-			if (do_after(user, 100) && panel_open && !terminal && !T.intact)
-				terminal = new /obj/machinery/power/terminal(get_turf(user))
-				terminal.dir = dirs
-				terminal.master = src
-				return 0
-			else
-				return 1
-
-	user << "<span class='warning'>You can't wire the SMES like that!</span>"
-	return 1
-
-/obj/machinery/power/smes/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) //these can only be moved by being reconstructed, solves having to remake the powernet.
+/obj/machinery/power/battery/smes/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) //these can only be moved by being reconstructed, solves having to remake the powernet.
 	if(iscrowbar(W) && panel_open && terminal)
 		user << "<span class='warning'>You must first cut the terminal from the SMES!</span>"
 		return 1
@@ -106,15 +59,15 @@
 				user << "<span class=\"warning\">You need 10 length cable coil to make a terminal.</span>"
 				return

-			if (make_terminal(user))
-				return
+			if(make_terminal(user))
+				CC.use(10)
+				terminal.connect_to_network()

-			CC.use(10)
-			user.visible_message(\
-				"<span class='warning'>[user.name] has added cables to the SMES!</span>",\
-				"You added cables the SMES.")
-			terminal.connect_to_network()
-			src.stat = 0
+				user.visible_message(\
+					"<span class='warning'>[user.name] has added cables to the SMES!</span>",\
+					"You added cables the SMES.")
+				src.stat = 0
+				return 1
 		else if(istype(W, /obj/item/weapon/wirecutters) && terminal)
 			var/turf/T = get_turf(terminal)
 			if(T.intact)
@@ -139,271 +92,23 @@
 			return 1
 	return

-/obj/machinery/power/smes/proc/updateicon()
-	overlays.len = 0
-	if(stat & BROKEN)	return
+/obj/machinery/power/battery/smes/can_attach_terminal(mob/user)
+	return ..(user) && panel_open

-	overlays += image('icons/obj/power.dmi', "smes-op[online]")
+/obj/machinery/power/battery/smes/surplus()
+	if(terminal)
+		return terminal.surplus()
+	return 0

-	if(charging)
-		overlays += image('icons/obj/power.dmi', "smes-oc1")
-	else
-		if(chargemode)
-			overlays += image('icons/obj/power.dmi', "smes-oc0")
+/obj/machinery/power/battery/smes/add_load(var/amount)
+	if(terminal)
+		terminal.add_load(amount)

-	var/clevel = chargedisplay()
-	if(clevel>0)
-		overlays += image('icons/obj/power.dmi', "smes-og[clevel]")
-	return
-
-
-/obj/machinery/power/smes/proc/chargedisplay()
-	return round(5.5*charge/(capacity ? capacity : 5e6))
-
-/obj/machinery/power/smes/process()
-	if (stat & BROKEN)
-		return
-
-	var/_charging = charging
-	var/_online = online
-
-	// Input
-	if (terminal)
-		var/excess = terminal.surplus()
-
-		if (charging)
-			if (excess >= chargelevel) // If there's power available, try to charge
-				var/load = min((capacity - charge) / SMESRATE, chargelevel) // Charge at set rate, limited to spare capacity
-
-				charge += load * SMESRATE // Increase the charge
-
-				add_load(load) // Add the load to the terminal side network
-			else
-				charging = FALSE
-				chargecount = 0
-		else
-			if (chargemode)
-				if (chargecount > rand(3, 6))
-					charging = TRUE
-					chargecount = 0
-
-				if (excess > chargelevel)
-					chargecount++
-				else
-					chargecount = 0
-			else
-				chargecount = 0
-	else
-		charging = FALSE
-		chargecount = 0
-
-	// Output
-	if (online)
-		lastout = min(charge / SMESRATE, output) // Limit output to that stored
-
-		charge -= lastout * SMESRATE // Reduce the storage (may be recovered in /restore() if excessive)
-
-		add_avail(lastout) // Add output to powernet (smes side)
-
-		if (charge < 0.0001)
-			online = FALSE
-			lastout = 0
-
-	// Only update icon if state changed
-	if(_charging != charging || _online != online)
-		updateicon()
-
-/*
- * Called after all power processes are finished
- * Restores charge level to smes if there was excess this ptick
- */
-/obj/machinery/power/smes/proc/restore()
-	if (stat & BROKEN)
-		return
-
-	var/excess = powernet.netexcess // This was how much wasn't used on the network last ptick, minus any removed by other SMESes
-
-	excess = min(lastout, excess) // Clamp it to how much was actually output by this SMES last ptick
-
-	excess = min((capacity - charge) / SMESRATE, excess) // For safety, also limit recharge by space capacity of SMES (shouldn't happen)
-
-	// Now recharge this amount
-
-	var/_chargedisplay = chargedisplay()
-
-	charge += excess * SMESRATE // Restore unused power
-
-	powernet.netexcess -= excess // Remove the excess from the powernet, so later SMESes don't try to use it
-
-	loaddemand = lastout - excess
-
-	if(_chargedisplay != chargedisplay()) // If needed updates the icons overlay
-		updateicon()
-
-/obj/machinery/power/smes/add_load(var/amount)
-	if(terminal && terminal.get_powernet())
-		terminal.powernet.load += amount
-
-/obj/machinery/power/smes/attack_ai(mob/user)
-	src.add_hiddenprint(user)
-	add_fingerprint(user)
-	ui_interact(user)
-
-/obj/machinery/power/smes/attack_hand(mob/user)
-	add_fingerprint(user)
-	ui_interact(user)
-
-/obj/machinery/power/smes/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null)
-
-	if(stat & BROKEN)
-		return
-
-	// this is the data which will be sent to the ui
-	var/data[0]
-	data["nameTag"] = name_tag
-	data["storedCapacity"] = round(100.0*charge/capacity, 0.1)
-	data["charging"] = charging
-	data["chargeMode"] = chargemode
-	data["chargeLevel"] = chargelevel
-	data["chargeMax"] = SMESMAXCHARGELEVEL
-	data["outputOnline"] = online
-	data["outputLevel"] = output
-	data["outputMax"] = SMESMAXOUTPUT
-	data["outputLoad"] = round(loaddemand)
-
-	// update the ui if it exists, returns null if no ui is passed/found
-	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data)
-	if (!ui)
-		// the ui does not exist, so we'll create a new() one
-        // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm
-		ui = new(user, src, ui_key, "smes.tmpl", "SMES Power Storage Unit", 540, 380)
-		// when the ui is first opened this is the data it will use
-		ui.set_initial_data(data)
-		// open the new ui window
-		ui.open()
-		// auto update every Master Controller tick
-		ui.set_auto_update(1)
-
-/obj/machinery/power/smes/Topic(href, href_list)
-	if(!isAI(usr) && usr.z != z) return 1
-	..()
-	if(href_list["close"])
-		if(usr.machine == src) usr.unset_machine()
-		return 1
-	if (usr.stat || usr.restrained() )
-		return
-	if (!(istype(usr, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey")
-		if(!istype(usr, /mob/living/silicon/ai))
-			usr << "<span class='warning'>You don't have the dexterity to do this!</span>"
-			return
-
-//world << "[href] ; [href_list[href]]"
-
-	if (!isturf(src.loc) && !istype(usr, /mob/living/silicon/))
-		return 0 // Do not update ui
-
-	if( href_list["cmode"] )
-		chargemode = !chargemode
-		if(!chargemode)
-			charging = 0
-		updateicon()
-
-	else if( href_list["online"] )
-		online = !online
-		updateicon()
-	else if( href_list["input"] )
-		switch( href_list["input"] )
-			if("min")
-				chargelevel = 0
-			if("max")
-				chargelevel = SMESMAXCHARGELEVEL		//30000
-			if("set")
-				chargelevel = input(usr, "Enter new input level (0-[SMESMAXCHARGELEVEL])", "SMES Input Power Control", chargelevel) as num
-		chargelevel = max(0, min(SMESMAXCHARGELEVEL, chargelevel))	// clamp to range
-
-	else if( href_list["output"] )
-		switch( href_list["output"] )
-			if("min")
-				output = 0
-			if("max")
-				output = SMESMAXOUTPUT		//30000
-			if("set")
-				output = input(usr, "Enter new output level (0-[SMESMAXOUTPUT])", "SMES Output Power Control", output) as num
-		output = max(0, min(SMESMAXOUTPUT, output))	// clamp to range
-
-	investigation_log(I_SINGULO,"input/output; [chargelevel>output?"<font color='green'>":"<font color='red'>"][chargelevel]/[output]</font> | Output-mode: [online?"<font color='green'>on</font>":"<font color='red'>off</font>"] | Input-mode: [chargemode?"<font color='green'>auto</font>":"<font color='red'>off</font>"] by [usr.key]")
-
-	return 1
-
-/obj/machinery/power/smes/proc/ion_act()
-	if(src.z == 1)
-		if(prob(1)) //explosion
-			world << "<span class='warning'>SMES explosion in [src.loc.loc]</span>"
-			for(var/mob/M in viewers(src))
-				M.show_message("<span class='warning'>The [src.name] is making strange noises!</span>", 3, "<span class='warning'>You hear sizzling electronics.</span>", 2)
-			sleep(10*pick(4,5,6,7,10,14))
-			var/datum/effect/effect/system/smoke_spread/smoke = new /datum/effect/effect/system/smoke_spread()
-			smoke.set_up(3, 0, src.loc)
-			smoke.attach(src)
-			smoke.start()
-			explosion(src.loc, -1, 0, 1, 3, 0)
-			del(src)
-			return
-		if(prob(15)) //Power drain
-			world << "<span class='warning'>SMES power drain in [src.loc.loc]</span>"
-			var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
-			s.set_up(3, 1, src)
-			s.start()
-			if(prob(50))
-				emp_act(1)
-			else
-				emp_act(2)
-		if(prob(5)) //smoke only
-			world << "<span class='warning'>SMES smoke in [src.loc.loc]</span>"
-			var/datum/effect/effect/system/smoke_spread/smoke = new /datum/effect/effect/system/smoke_spread()
-			smoke.set_up(3, 0, src.loc)
-			smoke.attach(src)
-			smoke.start()
-
-
-/obj/machinery/power/smes/emp_act(severity)
-	online = 0
-	charging = 0
-	output = 0
-	charge -= 1e6/severity
-	if (charge < 0)
-		charge = 0
-	spawn(100)
-		output = initial(output)
-		charging = initial(charging)
-		online = initial(online)
-	..()
-
-
-
-/obj/machinery/power/smes/magical
+/obj/machinery/power/battery/smes/infinite
 	name = "magical power storage unit"
 	desc = "A high-capacity superconducting magnetic energy storage (SMES) unit. Magically produces power."

+	infinite_power = 1
+
 	mech_flags = MECH_SCAN_FAIL

-/obj/machinery/power/smes/magical/process()
-	// Is this really needed?
-	capacity = INFINITY
-	charge = INFINITY
-	..()
-
-/proc/rate_control(var/S, var/V, var/C, var/Min=1, var/Max=5, var/Limit=null)
-	var/href = "<A href='?src=\ref[S];rate control=1;[V]"
-	var/rate = "[href]=-[Max]'>-</A>[href]=-[Min]'>-</A> [(C?C : 0)] [href]=[Min]'>+</A>[href]=[Max]'>+</A>"
-	if(Limit) return "[href]=-[Limit]'>-</A>"+rate+"[href]=[Limit]'>+</A>"
-	return rate
-
-/obj/machinery/power/smes/Destroy()
-	if (terminal)
-		terminal.master = null
-		terminal = null
-
-	..()
-
-#undef SMESRATE
--- a/code/modules/power/terminal.dm
+++ b/code/modules/power/terminal.dm
@@ -42,3 +42,37 @@
 		qdel(src)
 		return
 	..()
+
+/obj/machinery/power/proc/make_terminal(mob/user)
+	if(!can_attach_terminal(user))
+		user << "<span class='warning'>You can't wire \the [src] like that!</span>"
+		return 0
+
+	var/turf/T = get_turf(user)
+	if(T.intact)
+		user << "<span class='warning'>The floor plating must be removed first.</span>"
+		return 0
+
+	user << "<span class='notice'>You start adding cable to \the [src].</span>"
+	playsound(get_turf(src), 'sound/items/zip.ogg', 100, 1)
+	if (do_after(user, 100) && !T.intact && can_attach_terminal(user))
+
+		//Shock chance
+		var/obj/structure/cable/N = T.get_cable_node()
+		if (prob(50) && electrocute_mob(user, N, N))
+			var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
+			s.set_up(5, 1, src)
+			s.start()
+			return 0
+
+		finalise_terminal(get_turf(user))
+		return 1
+	return 0
+
+/obj/machinery/power/proc/finalise_terminal(newloc)
+	terminal = new /obj/machinery/power/terminal(newloc)
+	terminal.dir = get_dir(newloc, src)
+	terminal.master = src
+
+/obj/machinery/power/proc/can_attach_terminal(mob/user)
+	return user.loc != src.loc && (get_dir(user, src) in cardinal) && !terminal
--- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_cellcharge.dm
+++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_cellcharge.dm
@@ -19,7 +19,7 @@
 		for (var/obj/machinery/power/apc/C in range(200, holder))
 			for (var/obj/item/weapon/cell/B in C.contents)
 				B.charge += 25
-		for (var/obj/machinery/power/smes/S in range (src.effectrange,src))
+		for (var/obj/machinery/power/battery/S in range (src.effectrange,src))
 			S.charge += 25
 		for (var/mob/living/silicon/robot/M in mob_list)
 			for (var/obj/item/weapon/cell/D in M.contents)
@@ -35,7 +35,7 @@
 		for (var/obj/machinery/power/apc/C in range(200, holder))
 			for (var/obj/item/weapon/cell/B in C.contents)
 				B.charge += rand() * 100
-		for (var/obj/machinery/power/smes/S in range (src.effectrange,src))
+		for (var/obj/machinery/power/battery/S in range (src.effectrange,src))
 			S.charge += 250
 		for (var/mob/living/silicon/robot/M in mob_list)
 			for (var/obj/item/weapon/cell/D in M.contents)
--- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_celldrain.dm
+++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_celldrain.dm
@@ -20,7 +20,7 @@
 		for (var/obj/machinery/power/apc/C in range(200, holder))
 			for (var/obj/item/weapon/cell/B in C.contents)
 				B.charge = max(B.charge - 50,0)
-		for (var/obj/machinery/power/smes/S in range (src.effectrange,src))
+		for (var/obj/machinery/power/battery/S in range (src.effectrange,src))
 			S.charge = max(S.charge - 100,0)
 		for (var/mob/living/silicon/robot/M in mob_list)
 			for (var/obj/item/weapon/cell/D in M.contents)
@@ -33,7 +33,7 @@
 		for (var/obj/machinery/power/apc/C in range(200, holder))
 			for (var/obj/item/weapon/cell/B in C.contents)
 				B.charge = max(B.charge - rand() * 150,0)
-		for (var/obj/machinery/power/smes/S in range (src.effectrange,src))
+		for (var/obj/machinery/power/battery/S in range (src.effectrange,src))
 			S.charge = max(S.charge - 250,0)
 		for (var/mob/living/silicon/robot/M in mob_list)
 			for (var/obj/item/weapon/cell/D in M.contents)
--- a/icons/obj/power.dmi
+++ b/icons/obj/power.dmi
--- a/maps/defficiency.dmm
+++ b/maps/defficiency.dmm
@@ -611,7 +611,7 @@
 "alM" = (/obj/machinery/telecomms/server/presets/supply,/turf/simulated/floor{icon_state = "dark"},/area/tcomms/chamber)
 "alN" = (/obj/machinery/message_server,/turf/simulated/floor{icon_state = "dark"},/area/tcomms/chamber)
 "alO" = (/turf/simulated/floor{icon_state = "dark"},/area/tcomms/chamber)
-"alP" = (/obj/machinery/power/smes{charge = 5e+006},/obj/structure/cable,/turf/simulated/floor/bluegrid,/area/tcomms/chamber)
+"alP" = (/obj/machinery/power/battery/smes{charge = 5e+006},/obj/structure/cable,/turf/simulated/floor/bluegrid,/area/tcomms/chamber)
 "alQ" = (/obj/machinery/blackbox_recorder,/turf/simulated/floor{icon_state = "dark"},/area/tcomms/chamber)
 "alR" = (/obj/machinery/telecomms/server/presets/common,/turf/simulated/floor{icon_state = "dark"},/area/tcomms/chamber)
 "alS" = (/obj/machinery/telecomms/server/presets/engineering,/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction/hidden{dir = 1},/turf/simulated/floor{icon_state = "dark"},/area/tcomms/chamber)
@@ -1459,7 +1459,7 @@
 "aCc" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/solar/fport)
 "aCd" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_y = 32},/turf/simulated/floor/plating,/area/solar/fport)
 "aCe" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/power/terminal{dir = 4},/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plating,/area/solar/fport)
-"aCf" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/power/smes{charge = 0},/turf/simulated/floor/plating,/area/solar/fport)
+"aCf" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/power/battery/smes{charge = 0},/turf/simulated/floor/plating,/area/solar/fport)
 "aCg" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; name = "HIGH VOLTAGE"},/turf/simulated/wall/r_wall,/area/solar/fport)
 "aCh" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plating,/area/derelictparts/fore)
 "aCi" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/nmpi{tag = "icon-maintguide (NORTH)"; icon_state = "maintguide"; dir = 1},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plating,/area/maintenance/fore)
@@ -3302,14 +3302,14 @@
 "blz" = (/obj/machinery/door/poddoor{density = 0; dir = 4; icon_state = "pdoor0"; id_tag = "SM_Rad2"; name = "radiation shutters"; opacity = 0},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plating,/area/engineering/supermatter_room)
 "blA" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/nmpi{tag = "icon-maintguide (EAST)"; icon_state = "maintguide"; dir = 4},/obj/machinery/power/apc{dir = 1; pixel_y = 24; pixel_x = 0},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/maintenance/fsmaint)
 "blB" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor,/area/engineering/engine)
-"blC" = (/obj/machinery/power/smes,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTH)"; icon_state = "warning"; dir = 1},/turf/simulated/floor,/area/engineering/engine)
+"blC" = (/obj/machinery/power/battery/smes,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTH)"; icon_state = "warning"; dir = 1},/turf/simulated/floor,/area/engineering/engine)
 "blD" = (/obj/structure/table/reinforced,/obj/machinery/door_control{id_tag = "xenobio3"; name = "Containment Blast Doors"; pixel_y = 4; req_access_txt = "55"},/obj/structure/window/reinforced{dir = 1},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/decal/warning_stripes{tag = "icon-warning (EAST)"; icon_state = "warning"; dir = 4},/turf/simulated/floor{icon_state = "white"},/area/science/xenobiology)
 "blE" = (/obj/structure/table,/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = -7},/obj/item/stack/cable_coil,/obj/item/weapon/circuitboard/airlock,/obj/item/weapon/circuitboard/airlock,/turf/simulated/floor,/area/engineering/engine)
 "blF" = (/obj/machinery/light/small,/turf/simulated/floor/plating,/area/engineering/engine)
 "blG" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_y = 32},/turf/simulated/floor/plating,/area/engineering/engine)
 "blH" = (/obj/structure/grille/broken,/obj/item/stack/rods,/turf/simulated/floor/plating,/area/derelictparts/fore)
 "blI" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/atmospherics/binary/valve{dir = 1},/obj/effect/decal/warning_stripes{tag = "icon-warning_corner"; icon_state = "warning_corner"; dir = 2},/turf/simulated/floor/plating,/area/maintenance/fsmaint)
-"blJ" = (/obj/machinery/power/smes,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTHWEST)"; icon_state = "warning"; dir = 9},/turf/simulated/floor,/area/engineering/engine)
+"blJ" = (/obj/machinery/power/battery/smes,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTHWEST)"; icon_state = "warning"; dir = 9},/turf/simulated/floor,/area/engineering/engine)
 "blK" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/wall,/area/maintenance/asmaint2)
 "blL" = (/obj/structure/disposalpipe/segment,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/door/airlock/maintenance{name = "Derelict Parts Access"; req_access_txt = "12"},/turf/simulated/floor/plating,/area/maintenance/asmaint2)
 "blM" = (/obj/effect/decal/cleanable/dirt,/obj/structure/closet/crate,/obj/map/spawner/maint,/turf/simulated/floor/plating,/area/maintenance/asmaint2)
@@ -3367,7 +3367,7 @@
 "bmM" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/effect/nmpi{tag = "icon-maintguide (EAST)"; icon_state = "maintguide"; dir = 4},/turf/simulated/floor/plating,/area/maintenance/asmaint2)
 "bmN" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall,/area/derelictparts/fsderelict)
 "bmO" = (/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor,/area/engineering/engine)
-"bmP" = (/obj/machinery/power/smes,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTHEAST)"; icon_state = "warning"; dir = 5},/turf/simulated/floor,/area/engineering/engine)
+"bmP" = (/obj/machinery/power/battery/smes,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTHEAST)"; icon_state = "warning"; dir = 5},/turf/simulated/floor,/area/engineering/engine)
 "bmQ" = (/obj/machinery/camera{c_tag = "Supermatter S-O"; dir = 4},/turf/simulated/floor/plating,/area/engineering/supermatter_room)
 "bmR" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/decal/warning_stripes{tag = "icon-loading_area (NORTH)"; icon_state = "loading_area"; dir = 1},/turf/simulated/floor,/area/hallway/secondary/entry)
 "bmS" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plating,/area/maintenance/asmaint2)
@@ -4053,7 +4053,7 @@
 "bzW" = (/obj/machinery/atmospherics/binary/valve{dir = 4},/turf/simulated/floor/plating,/area/maintenance/apmaint)
 "bzX" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/remains/robot,/obj/item/weapon/stock_parts/capacitor{pixel_x = 8; pixel_y = -8},/obj/structure/sink{dir = 4; pixel_x = 11},/turf/simulated/floor/plating,/area/derelictparts/asderelict)
 "bzY" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/obj/effect/decal/warning_stripes{tag = "icon-warning_corner (NORTH)"; icon_state = "warning_corner"; dir = 1},/turf/simulated/floor,/area/hallway/primary/central)
-"bzZ" = (/obj/machinery/power/smes{capacity = 5e+008; charge = 5e+008; name = "experimental power storage unit"},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/bluegrid,/area/turret_protected/ai)
+"bzZ" = (/obj/machinery/power/battery/smes{capacity = 5e+008; charge = 5e+008; name = "experimental power storage unit"},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/bluegrid,/area/turret_protected/ai)
 "bAa" = (/obj/machinery/conveyor_switch/oneway{convdir = -1; id_tag = "QMLoad2"},/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTHEAST)"; icon_state = "warning"; dir = 5},/turf/simulated/floor,/area/supply/storage)
 "bAb" = (/obj/machinery/power/terminal{dir = 8},/obj/structure/cable,/turf/simulated/floor/bluegrid,/area/turret_protected/ai)
 "bAc" = (/obj/effect/decal/cleanable/generic,/obj/item/weapon/reagent_containers/spray,/turf/simulated/floor/plating{icon_state = "panelscorched"},/area/derelictparts/asderelict)
@@ -4558,7 +4558,7 @@
 "bJH" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/effect/nmpi{tag = "icon-maintguide (EAST)"; icon_state = "maintguide"; dir = 4},/turf/simulated/floor/plating,/area/maintenance/apmaint)
 "bJI" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/effect/nmpi{tag = "icon-maintguide (EAST)"; icon_state = "maintguide"; dir = 4},/turf/simulated/floor/plating,/area/maintenance/apmaint)
 "bJJ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/obj/effect/nmpi{tag = "icon-maintguide (EAST)"; icon_state = "maintguide"; dir = 4},/obj/effect/nmpi{tag = "icon-maintguide (NORTHEAST)"; icon_state = "maintguide"; dir = 5},/turf/simulated/floor/plating,/area/maintenance/apmaint)
-"bJK" = (/obj/machinery/power/smes{charge = 0},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/turf/simulated/floor/plating,/area/solar/fstarboard)
+"bJK" = (/obj/machinery/power/battery/smes{charge = 0},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/turf/simulated/floor/plating,/area/solar/fstarboard)
 "bJL" = (/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/machinery/power/terminal{dir = 8},/turf/simulated/floor/plating,/area/solar/fstarboard)
 "bJM" = (/turf/simulated/floor/plating{icon_state = "platingdmg3"},/area/solar/fstarboard)
 "bJN" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/solar/fstarboard)
@@ -6433,7 +6433,7 @@
 "ctK" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/solar/aport)
 "ctL" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_y = 32},/turf/simulated/floor/plating,/area/solar/aport)
 "ctM" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/power/terminal{dir = 4},/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plating,/area/solar/aport)
-"ctN" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/power/smes{charge = 0},/turf/simulated/floor/plating,/area/solar/aport)
+"ctN" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/power/battery/smes{charge = 0},/turf/simulated/floor/plating,/area/solar/aport)
 "ctO" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; name = "HIGH VOLTAGE"},/turf/simulated/wall/r_wall,/area/solar/aport)
 "ctP" = (/obj/machinery/door/airlock/hatch{req_access_txt = "16"},/turf/simulated/floor/engine,/area/construction/mommi_nest)
 "ctQ" = (/obj/effect/decal/cleanable/dirt,/obj/effect/nmpi,/obj/machinery/alarm{dir = 8; pixel_x = 22},/turf/simulated/floor/plating,/area/maintenance/aft)
@@ -6787,7 +6787,7 @@
 "cAA" = (/obj/machinery/light_switch{pixel_x = -4; pixel_y = 28},/turf/simulated/floor{icon_state = "bluecorner"; dir = 1},/area/bridge)
 "cAB" = (/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor{icon_state = "blue"; dir = 4},/area/bridge)
 "cAC" = (/obj/structure/table/woodentable,/obj/structure/window/reinforced{dir = 8},/obj/item/weapon/storage/secure/briefcase,/turf/simulated/floor/carpet,/area/bridge)
-"cAD" = (/obj/machinery/power/smes/magical{output = 200000},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/turf/simulated/floor/airless{icon_state = "dark"},/area/turret_protected/goonroom)
+"cAD" = (/obj/machinery/power/battery/smes/infinite{output = 200000},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/turf/simulated/floor/airless{icon_state = "dark"},/area/turret_protected/goonroom)
 "cAE" = (/obj/machinery/computer/communications,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/simulated/floor/carpet,/area/bridge)
 "cAF" = (/obj/structure/table/woodentable,/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/obj/machinery/door/window{base_state = "right"; dir = 2; icon_state = "right"; name = "Captain's Desk"; pixel_y = -7; req_access_txt = "20"},/obj/item/weapon/folder/blue,/turf/simulated/floor/carpet,/area/bridge)
 "cAG" = (/obj/structure/table/woodentable,/obj/structure/window/reinforced{dir = 4},/obj/item/device/aicard,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/carpet,/area/bridge)
@@ -7174,7 +7174,7 @@
 "cHX" = (/obj/item/weapon/soap/nanotrasen{desc = "Don't drop it."},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1},/turf/simulated/floor{icon_state = "freezerfloor"},/area/security/prison)
 "cHY" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/simulated/floor{icon_state = "freezerfloor"},/area/security/prison)
 "cHZ" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor{icon_state = "freezerfloor"},/area/security/prison)
-"cIa" = (/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/power/smes{charge = 0},/turf/simulated/floor/plating,/area/solar/astarboard)
+"cIa" = (/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/power/battery/smes{charge = 0},/turf/simulated/floor/plating,/area/solar/astarboard)
 "cIb" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/solar/astarboard)
 "cIc" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plating,/area/solar/astarboard)
 "cId" = (/obj/machinery/door/airlock/engineering{name = "Aft Port Solar Access"; req_access_txt = "10"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/solar/astarboard)
@@ -8077,7 +8077,7 @@
 "cZq" = (/obj/item/weapon/cigbutt,/turf/simulated/floor/airless,/area/no_ethereal)
 "cZr" = (/obj/machinery/prism{anchored = 1; dir = 4},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/goonroom)
 "cZs" = (/obj/structure/sign/securearea{pixel_y = 32},/obj/machinery/light/small{dir = 1},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/goonroom)
-"cZt" = (/obj/machinery/power/smes/magical,/obj/structure/cable,/turf/simulated/floor/airless{icon_state = "dark"},/area/turret_protected/goonroom)
+"cZt" = (/obj/machinery/power/battery/smes/infinite,/obj/structure/cable,/turf/simulated/floor/airless{icon_state = "dark"},/area/turret_protected/goonroom)
 "cZu" = (/obj/machinery/light/small{dir = 1},/obj/structure/sign/securearea{pixel_y = 32},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/goonroom)
 "cZv" = (/obj/structure/lattice,/obj/structure/grille/broken,/turf/space,/area/no_ethereal)
 "cZw" = (/turf/simulated/floor{icon_state = "solarpanel"},/area)
@@ -8141,7 +8141,7 @@
 "daC" = (/obj/structure/table,/obj/item/weapon/folder,/obj/item/weapon/stock_parts/micro_laser{pixel_x = -5; pixel_y = 5},/obj/item/weapon/stock_parts/micro_laser,/obj/item/weapon/circuitboard/seed_extractor,/turf/simulated/floor/plating,/area/maintenance/aft)
 "daD" = (/obj/machinery/flasher{id_tag = "Cell 1"; pixel_y = -28},/turf/simulated/floor{icon_state = "floorgrime"},/area/security/prison)
 "daE" = (/obj/machinery/vending,/turf/simulated/floor/plating,/area/maintenance/aft)
-"daF" = (/obj/machinery/power/smes/magical,/obj/structure/cable,/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/goonroom)
+"daF" = (/obj/machinery/power/battery/smes/infinite,/obj/structure/cable,/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/goonroom)
 "daG" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/machinery/door/window{dir = 1; name = "Execution Room"; req_access_txt = "63"},/turf/simulated/floor{icon_state = "dark"},/area/security/gas_chamber)
 "daH" = (/obj/machinery/flasher{id_tag = "Cell 4"; pixel_y = -28},/turf/simulated/floor{icon_state = "floorgrime"},/area/security/prison)
 "daI" = (/obj/machinery/atmospherics/miner/toxins,/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/goonroom)
@@ -8262,7 +8262,7 @@
 "dcT" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor/plating/airless,/area/solar/derelict_starboard)
 "dcU" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/obj/structure/disposalpipe/segment{dir = 4},/obj/effect/nmpi{tag = "icon-maintguide (EAST)"; icon_state = "maintguide"; dir = 4},/turf/simulated/floor/plating,/area/maintenance/aft)
 "dcV" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1},/obj/machinery/camera{c_tag = "Prison Southwest"; dir = 4; network = list("SS13","Prison")},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door_timer/cell_2{dir = 8; pixel_x = -32; pixel_y = 0},/turf/simulated/floor{icon_state = "red"; dir = 8},/area/security/prison)
-"dcW" = (/obj/machinery/power/smes,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor,/area/derelict/solar_control)
+"dcW" = (/obj/machinery/power/battery/smes,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor,/area/derelict/solar_control)
 "dcX" = (/obj/machinery/power/solar/panel{id_tag = "djstationsolar"; name = "DJ Station Solar Array"},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor{icon_state = "solarpanel"},/area/djstation/solars)
 "dcY" = (/obj/machinery/light/small{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor,/area/derelict/solar_control)
 "dcZ" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/derelict/solar_control)
@@ -8452,7 +8452,7 @@
 "dgB" = (/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine)
 "dgC" = (/turf/simulated/wall/r_wall,/area/derelict/hallway/primary)
 "dgD" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary)
-"dgE" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/power/smes{charge = 5e+006},/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTH)"; icon_state = "warning"; dir = 1},/turf/simulated/floor/plating,/area/djstation)
+"dgE" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/power/battery/smes{charge = 5e+006},/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTH)"; icon_state = "warning"; dir = 1},/turf/simulated/floor/plating,/area/djstation)
 "dgF" = (/obj/structure/window{dir = 4},/turf/simulated/floor/airless,/area/derelict/hallway/primary)
 "dgG" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTH)"; icon_state = "warning"; dir = 1},/turf/simulated/floor/plating,/area/djstation)
 "dgH" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/item/weapon/shard{icon_state = "medium"},/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine)
@@ -8737,7 +8737,7 @@
 "dma" = (/obj/machinery/door/airlock/command{name = "AI Upload"; req_access_txt = "16"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/airless,/area/derelict/bridge/ai_upload)
 "dmb" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating/airless,/area/derelict/bridge/ai_upload)
 "dmc" = (/obj/structure/grille,/turf/simulated/floor/plating/airless,/area/derelict/hallway/secondary)
-"dmd" = (/obj/machinery/power/smes,/obj/structure/cable,/turf/simulated/floor/airless,/area/derelict/bridge/ai_upload)
+"dmd" = (/obj/machinery/power/battery/smes,/obj/structure/cable,/turf/simulated/floor/airless,/area/derelict/bridge/ai_upload)
 "dme" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/airless,/area/derelict/bridge/ai_upload)
 "dmf" = (/obj/machinery/atmospherics/unary/vent_pump{canSpawnMice = 0; dir = 4; external_pressure_bound = 140; on = 1; pressure_checks = 0},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/derelict/research)
 "dmg" = (/turf/simulated/floor/airless,/area/derelict/bridge/ai_upload)
@@ -8843,7 +8843,7 @@
 "doc" = (/mob/living/carbon/monkey,/turf/simulated/floor{icon_state = "dark"},/area/research_outpost/longtermstorage)
 "dod" = (/obj/machinery/light/small{dir = 1},/mob/living/carbon/monkey,/turf/simulated/floor{icon_state = "dark"},/area/research_outpost/longtermstorage)
 "doe" = (/turf/simulated/floor{icon_state = "dark"},/area/research_outpost/longtermstorage)
-"dof" = (/obj/machinery/power/smes,/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/turf/simulated/floor/plating,/area/research_outpost/power)
+"dof" = (/obj/machinery/power/battery/smes,/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/turf/simulated/floor/plating,/area/research_outpost/power)
 "dog" = (/obj/machinery/atmospherics/unary/outlet_injector{frequency = 1438; icon_state = "on"; id_tag = "tox_in"; on = 1},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine/vacuum,/area/derelict/atmos)
 "doh" = (/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor/airless{icon_state = "white"},/area/derelict/research)
 "doi" = (/obj/machinery/atmospherics/pipe/manifold/insulated/hidden/blue{dir = 4},/obj/item/weapon/paper/derelict_invoice,/obj/machinery/meter,/obj/effect/decal/warning_stripes{tag = "icon-warning (WEST)"; icon_state = "warning"; dir = 8},/turf/simulated/floor/airless{icon_state = "white"},/area/derelict/research)
@@ -9412,7 +9412,7 @@
 "dyZ" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor,/area/mine/production)
 "dza" = (/obj/machinery/light/small{dir = 8},/obj/machinery/camera{c_tag = "Mining External"; dir = 4; network = list("MINE")},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/ore_box,/turf/unsimulated/floor/asteroid,/area/mine/explored)
 "dzb" = (/obj/structure/sink{dir = 4; pixel_x = 11},/obj/machinery/light/small{dir = 8},/obj/structure/mirror{pixel_x = 28},/turf/simulated/floor{icon_state = "showroomfloor"},/area/mine/living_quarters)
-"dzc" = (/obj/machinery/power/smes{charge = 5e+006},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/plating,/area/mine/maintenance)
+"dzc" = (/obj/machinery/power/battery/smes{charge = 5e+006},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/plating,/area/mine/maintenance)
 "dzd" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/light/small{dir = 1},/obj/item/weapon/storage/box/lights/mixed,/turf/simulated/floor/plating,/area/mine/maintenance)
 "dze" = (/obj/machinery/door/airlock/glass_mining{name = "Mining Station Production"; req_access_txt = "48"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor,/area/mine/production)
 "dzf" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/turf/simulated/floor,/area/mine/living_quarters)
@@ -9598,7 +9598,7 @@
 "dCD" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/turf/simulated/floor/plating/airless{icon_state = "asteroidplating"},/area/derelict/secret)
 "dCE" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating/airless,/area/derelict/secret)
 "dCF" = (/obj/machinery/light/small{dir = 8},/turf/simulated/floor/airless{icon_state = "asteroidfloor"},/area/derelict/secret)
-"dCG" = (/obj/machinery/power/smes{charge = 5e+006},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/plating{icon_state = "panelscorched"},/area/derelict/secret)
+"dCG" = (/obj/machinery/power/battery/smes{charge = 5e+006},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/plating{icon_state = "panelscorched"},/area/derelict/secret)
 "dCH" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/weapon/storage/box/lights/mixed,/turf/simulated/floor/plating{icon_state = "platingdmg3"},/area/derelict/secret)
 "dCI" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/derelict/secret)
 "dCJ" = (/turf/simulated/floor/plating{icon_state = "panelscorched"},/area/derelict/secret)
@@ -9768,7 +9768,7 @@
 "dFR" = (/obj/machinery/sleeper,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station/start)
 "dFS" = (/obj/structure/sign/vacuum,/turf/simulated/wall/r_wall,/area/turret_protected/goonroom)
 "dFT" = (/obj/machinery/sleep_console,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station/start)
-"dFU" = (/obj/machinery/power/smes,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/engineering/antimatter_room)
+"dFU" = (/obj/machinery/power/battery/smes,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/engineering/antimatter_room)
 "dFV" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plating,/area/engineering/supermatter_room)
 "dFW" = (/obj/machinery/door_control{id_tag = "SM_Rad1"; name = "Radiation Collectors Shutters Control"; pixel_y = -25; req_access_txt = "11"},/turf/simulated/floor/plating,/area/engineering/supermatter_room)
 "dFX" = (/obj/machinery/light,/turf/simulated/floor/plating,/area/engineering/supermatter_room)
--- a/maps/metaclub.dmm
+++ b/maps/metaclub.dmm
@@ -218,7 +218,7 @@
 "aej" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/obj/structure/cable/yellow{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/plating,/area/security/hos)
 "aek" = (/obj/machinery/power/apc{dir = 8; name = "Fore Starboard Solar APC"; pixel_x = -25; pixel_y = 3},/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/plating,/area/maintenance/auxsolarstarboard)
 "ael" = (/obj/structure/closet,/obj/item/mounted/poster,/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor/plating,/area/maintenance/fore)
-"aem" = (/obj/machinery/power/smes{charge = 0},/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/maintenance/auxsolarstarboard)
+"aem" = (/obj/machinery/power/battery/smes{charge = 0},/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/maintenance/auxsolarstarboard)
 "aen" = (/turf/simulated/floor/plating,/area/crew_quarters/fitness{name = "\improper Recreation Area"})
 "aeo" = (/obj/machinery/door/window{base_state = "right"; dir = 4; icon_state = "right"; name = "Infirmary"; req_access_txt = "0"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden,/turf/simulated/floor{dir = 4; icon_state = "whitered"; tag = "icon-whitehall (WEST)"},/area/security/medical)
 "aep" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/simulated/floor{icon_state = "redcorner"; dir = 4},/area/security/brig)
@@ -490,7 +490,7 @@
 "ajv" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"})
 "ajw" = (/obj/machinery/power/apc{dir = 8; name = "Fore Port Solar APC"; pixel_x = -25; pixel_y = 3},/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/plating,/area/maintenance/auxsolarport)
 "ajx" = (/obj/machinery/door/airlock/engineering{icon_state = "door_closed"; locked = 0; name = "Fore Port (NW) Solar Access"; req_access_txt = "10"},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/maintenance/auxsolarport)
-"ajy" = (/obj/machinery/power/smes{charge = 0},/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/maintenance/auxsolarport)
+"ajy" = (/obj/machinery/power/battery/smes{charge = 0},/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/maintenance/auxsolarport)
 "ajz" = (/obj/structure/table,/obj/item/stack/medical/ointment{pixel_x = 3; pixel_y = -2},/obj/item/stack/medical/bruise_pack{pixel_x = -3; pixel_y = 2},/obj/item/weapon/reagent_containers/syringe/inaprovaline,/obj/item/weapon/storage/secure/safe{pixel_x = 6; pixel_y = 28},/obj/item/weapon/handcuffs/cable/pink,/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"})
 "ajA" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/maintenance/fore)
 "ajB" = (/obj/machinery/space_heater,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating{tag = "icon-platingdmg2"; icon_state = "platingdmg2"},/area/maintenance/fpmaint2{name = "Port Maintenance"})
@@ -1498,7 +1498,7 @@
 "aCP" = (/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{dir = 2; icon_state = "neutralcorner"},/area/crew_quarters/sleep)
 "aCQ" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{dir = 2; icon_state = "neutralcorner"},/area/crew_quarters/sleep)
 "aCR" = (/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/fore)
-"aCS" = (/obj/machinery/power/smes,/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/structure/sign/securearea{desc = "A warning sign which reads 'RADIOACTIVE AREA'"; dir = 1; icon_state = "radiation"; name = "RADIOACTIVE AREA"; pixel_x = 0; pixel_y = 32},/turf/simulated/floor,/area/engineering/engine)
+"aCS" = (/obj/machinery/power/battery/smes,/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/structure/sign/securearea{desc = "A warning sign which reads 'RADIOACTIVE AREA'"; dir = 1; icon_state = "radiation"; name = "RADIOACTIVE AREA"; pixel_x = 0; pixel_y = 32},/turf/simulated/floor,/area/engineering/engine)
 "aCT" = (/turf/simulated/floor{dir = 4; icon_state = "brown"},/area/supply/miningdock{name = "\improper Mining Office"})
 "aCU" = (/obj/effect/decal/warning_stripes{icon_state = "unloading"},/obj/structure/closet/secure_closet/engineering_welding,/turf/simulated/floor,/area/engineering/supermatter_room)
 "aCV" = (/obj/structure/sign/securearea,/turf/simulated/wall/r_wall,/area/engineering/engine)
@@ -2352,7 +2352,7 @@
 "aTl" = (/obj/structure/table,/obj/item/clothing/head/soft/grey{pixel_x = -2; pixel_y = 3},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor,/area/crew_quarters/locker)
 "aTm" = (/obj/structure/table,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/item/toy/cards,/turf/simulated/floor,/area/crew_quarters/locker)
 "aTn" = (/obj/structure/table,/obj/item/device/paicard,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor,/area/crew_quarters/locker)
-"aTo" = (/obj/machinery/power/smes{capacity = 5e+006; charge = 5e+006; chargemode = 1; charging = 1; output = 100000},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai)
+"aTo" = (/obj/machinery/power/battery/smes{capacity = 5e+006; charge = 5e+006; chargemode = 1; charging = 1; output = 100000},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai)
 "aTp" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor,/area/crew_quarters/locker)
 "aTq" = (/obj/machinery/status_display{density = 0; pixel_x = -32; pixel_y = 0; supply_display = 1},/obj/effect/decal/warning_stripes{tag = "icon-loading_area (NORTH)"; icon_state = "loading_area"; dir = 1},/obj/machinery/camera{c_tag = "Cargo Bay - SW"; dir = 4; network = list("SS13")},/turf/simulated/floor/plating{dir = 2; icon_state = "floor"},/area/supply/storage)
 "aTr" = (/obj/machinery/atmospherics/pipe/simple/insulated/visible/blue{dir = 10},/obj/machinery/ai_status_display{pixel_x = 0; pixel_y = 32},/turf/simulated/floor{icon_state = "dark"},/area/tcommsat/computer{name = "\improper Telecoms Control Room"})
@@ -3700,7 +3700,7 @@
 "bth" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor{dir = 8; icon_state = "neutralcorner"},/area/hallway/primary/port)
 "bti" = (/obj/machinery/power/apc{cell_type = 30000; dir = 8; equipment = 2; name = "MiniSat Solar APC"; pixel_x = -26; pixel_y = 3},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/effect/decal/warning_stripes{tag = "icon-warning_corner"; icon_state = "warning_corner"; dir = 2},/obj/machinery/light/small,/obj/structure/sign/securearea{pixel_y = -32},/turf/simulated/floor/plating,/area/prison/solar_control{name = "\improper MiniSat Solar Array Control"})
 "btj" = (/obj/structure/lattice,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/space,/area)
-"btk" = (/obj/machinery/power/smes{charge = 1e+006; chargemode = 1; charging = 1; output = 80000},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/effect/decal/warning_stripes{tag = "icon-warning_corner (WEST)"; icon_state = "warning_corner"; dir = 8},/obj/machinery/light/small,/obj/machinery/camera{c_tag = "MiniSat - Exterior - W"; dir = 8; network = list("MiniSat")},/obj/structure/sign/securearea{pixel_y = -32},/turf/simulated/floor/plating,/area/prison/solar_control{name = "\improper MiniSat Solar Array Control"})
+"btk" = (/obj/machinery/power/battery/smes{charge = 1e+006; chargemode = 1; charging = 1; output = 80000},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/effect/decal/warning_stripes{tag = "icon-warning_corner (WEST)"; icon_state = "warning_corner"; dir = 8},/obj/machinery/light/small,/obj/machinery/camera{c_tag = "MiniSat - Exterior - W"; dir = 8; network = list("MiniSat")},/obj/structure/sign/securearea{pixel_y = -32},/turf/simulated/floor/plating,/area/prison/solar_control{name = "\improper MiniSat Solar Array Control"})
 "btl" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor{dir = 4; icon_state = "brown"},/area/supply/miningdock{name = "\improper Mining Office"})
 "btm" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = ""},/turf/simulated/floor/plating,/area/prison/solar_control{name = "\improper MiniSat Solar Array Control"})
 "btn" = (/obj/machinery/power/solar/control{id_tag = "minisatsolar"; name = "MiniSat Solar Control"; track = 2},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/plating,/area/prison/solar_control{name = "\improper MiniSat Solar Array Control"})
@@ -4109,7 +4109,7 @@
 "bBa" = (/obj/machinery/door/firedoor/border_only,/turf/simulated/floor,/area/hallway/secondary/entry)
 "bBb" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/full/reinforced,/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id_tag = "courtroompriv"; name = "Privacy Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/crew_quarters/courtroom)
 "bBc" = (/obj/effect/decal/warning_stripes{icon_state = "unloading"},/obj/structure/closet/secure_closet/engineering_personal,/obj/item/clothing/gloves/yellow,/turf/simulated/floor{dir = 1; icon_state = "floor"},/area/engineering/engine)
-"bBd" = (/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/obj/machinery/camera{c_tag = "Engineering - Power Monitoring"; dir = 2; network = list("SS13")},/obj/machinery/power/smes,/turf/simulated/floor{dir = 1; icon_state = "floor"},/area/engineering/engine)
+"bBd" = (/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/obj/machinery/camera{c_tag = "Engineering - Power Monitoring"; dir = 2; network = list("SS13")},/obj/machinery/power/battery/smes,/turf/simulated/floor{dir = 1; icon_state = "floor"},/area/engineering/engine)
 "bBe" = (/turf/simulated/wall/r_wall,/area/engineering/atmos_control)
 "bBf" = (/obj/machinery/alarm{pixel_y = 23},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = -30},/obj/structure/table,/obj/item/weapon/wrench,/obj/item/weapon/crowbar/red,/obj/item/clothing/mask/gas,/turf/simulated/floor{dir = 9; icon_state = "caution"},/area/engineering/atmos_control)
 "bBg" = (/obj/machinery/computer/atmoscontrol,/obj/structure/sign/atmosplaque{pixel_x = 0; pixel_y = 32},/turf/simulated/floor{dir = 1; icon_state = "caution"},/area/engineering/atmos_control)
@@ -4210,7 +4210,7 @@
 "bCX" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = ""},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/obj/effect/decal/warning_stripes{icon_state = "unloading"},/obj/machinery/door/window{dir = 4; name = "Power Monitoring"; req_access_txt = "10"},/turf/simulated/floor{dir = 1; icon_state = "floor"},/area/engineering/engine)
 "bCY" = (/obj/structure/device/piano{pixel_x = 6},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor{tag = "icon-cult"; icon_state = "cult"; dir = 2},/area/crew_quarters/bar)
 "bCZ" = (/obj/machinery/power/terminal{dir = 8},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/effect/decal/warning_stripes{tag = "icon-warning (WEST)"; icon_state = "warning"; dir = 8},/turf/simulated/floor{dir = 1; icon_state = "floor"},/area/engineering/engine)
-"bDa" = (/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/obj/machinery/power/smes,/turf/simulated/floor{dir = 1; icon_state = "floor"},/area/engineering/engine)
+"bDa" = (/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/obj/machinery/power/battery/smes,/turf/simulated/floor{dir = 1; icon_state = "floor"},/area/engineering/engine)
 "bDb" = (/obj/structure/stool/bed/chair{name = "Judge"},/obj/machinery/light{dir = 1},/turf/simulated/floor{dir = 1; icon_state = "blue"},/area/crew_quarters/courtroom)
 "bDc" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; name = "HIGH VOLTAGE"; pixel_x = -31},/obj/effect/decal/warning_stripes{tag = "icon-warning (EAST)"; icon_state = "warning"; dir = 4},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor{dir = 1; icon_state = "floor"},/area/engineering/engine)
 "bDd" = (/turf/simulated/floor{icon_state = "caution"; dir = 4},/area/hallway/primary/starboard)
@@ -5183,7 +5183,7 @@
 "bVI" = (/obj/machinery/portable_atmospherics/pump,/turf/simulated/floor,/area/engineering/atmos)
 "bVJ" = (/obj/machinery/computer/general_air_control/large_tank_control{frequency = 1441; input_tag = "tox_in"; name = "Toxin Supply Control"; output_tag = "tox_out"; sensors = list("tox_sensor" = "Tank")},/obj/machinery/atmospherics/pipe/simple/filtering/visible,/obj/machinery/light{dir = 4},/obj/effect/decal/warning_stripes{tag = "icon-warning (EAST)"; icon_state = "warning"; dir = 4},/turf/simulated/floor,/area/engineering/atmos)
 "bVK" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 8; frequency = 1441; icon_state = "on"; id_tag = "tox_in"; on = 1; pixel_y = 1},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine{name = "plasma floor"; toxins = 70000},/area/engineering/atmos)
-"bVL" = (/obj/machinery/power/smes{capacity = 6e+006; charge = 2e+006; chargemode = 1; charging = 1; output = 1500},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/light/small,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; temperature = 80},/area/tcomms/chamber)
+"bVL" = (/obj/machinery/power/battery/smes{capacity = 6e+006; charge = 2e+006; chargemode = 1; charging = 1; output = 1500},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/light/small,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; temperature = 80},/area/tcomms/chamber)
 "bVM" = (/obj/machinery/camera{c_tag = "MiniSat - Telecoms - Server Room - Power"; dir = 1; network = list("SS13","tcomm")},/obj/machinery/power/terminal{dir = 4},/obj/structure/cable,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; temperature = 80},/area/tcomms/chamber)
 "bVN" = (/obj/machinery/power/apc{cell_type = 5000; dir = 2; name = "Telecoms Server Room APC"; pixel_x = 1; pixel_y = -24},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; temperature = 80},/area/tcomms/chamber)
 "bVO" = (/obj/machinery/atmospherics/miner/toxins,/obj/effect/decal/warning_stripes{icon_state = "unloading"},/obj/machinery/light/small{dir = 4},/turf/simulated/floor/engine{name = "plasma floor"; toxins = 70000},/area/engineering/atmos)
@@ -5325,7 +5325,7 @@
 "bYu" = (/obj/machinery/floodlight,/turf/simulated/floor,/area/engineering/atmos)
 "bYv" = (/obj/machinery/power/apc{dir = 8; name = "Aft Port Solar APC"; pixel_x = -26; pixel_y = 3},/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/plating,/area/maintenance/aportsolar)
 "bYw" = (/obj/machinery/power/apc{cell_type = 10000; dir = 1; name = "Research Division APC"; pixel_x = 0; pixel_y = 25},/obj/structure/cable/yellow{d2 = 2; icon_state = "0-2"},/turf/simulated/floor{dir = 4; icon_state = "whitepurplecorner"},/area/science/hallway{name = "Research Division"})
-"bYx" = (/obj/machinery/power/smes{charge = 0},/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/maintenance/aportsolar)
+"bYx" = (/obj/machinery/power/battery/smes{charge = 0},/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/maintenance/aportsolar)
 "bYy" = (/obj/structure/closet/crate,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"})
 "bYz" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/grille,/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"})
 "bYA" = (/obj/structure/rack,/obj/item/weapon/weldingtool,/obj/item/weapon/screwdriver{pixel_y = 16},/turf/simulated/floor/plating,/area/maintenance/aft{name = "Aft Maintenance"})
@@ -7438,7 +7438,7 @@
 "cNb" = (/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 2},/obj/structure/cable/yellow{icon_state = "4-8"},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor{dir = 1; icon_state = "whitepurple"},/area/science/xenobiology)
 "cNc" = (/obj/machinery/power/apc{dir = 8; name = "Aft Starboard Solar APC"; pixel_x = -26; pixel_y = 3},/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/plating,/area/maintenance/fstarboardsolar)
 "cNd" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4; initialize_directions = 11},/obj/structure/disposalpipe/junction{tag = "icon-pipe-j2"; icon_state = "pipe-j2"; dir = 2},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay3{name = "Medbay Aft"})
-"cNe" = (/obj/machinery/power/smes{charge = 0},/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/maintenance/fstarboardsolar)
+"cNe" = (/obj/machinery/power/battery/smes{charge = 0},/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/maintenance/fstarboardsolar)
 "cNf" = (/obj/structure/closet/emcloset,/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor/plating,/area/maintenance/virology_maint)
 "cNg" = (/obj/machinery/alarm{dir = 4; pixel_x = -23; pixel_y = 0},/turf/simulated/floor{dir = 10; icon_state = "whitegreen"},/area/medical/virology)
 "cNh" = (/turf/simulated/floor{icon_state = "whitegreen"},/area/medical/virology)
@@ -9645,7 +9645,7 @@
 "dDy" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/djstation)
 "dDz" = (/obj/item/weapon/extinguisher,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTH)"; icon_state = "warning"; dir = 1},/turf/simulated/floor/plating,/area/djstation)
 "dDA" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTH)"; icon_state = "warning"; dir = 1},/turf/simulated/floor/plating,/area/djstation)
-"dDB" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/power/smes{charge = 5e+006},/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTH)"; icon_state = "warning"; dir = 1},/turf/simulated/floor/plating,/area/djstation)
+"dDB" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/power/battery/smes{charge = 5e+006},/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTH)"; icon_state = "warning"; dir = 1},/turf/simulated/floor/plating,/area/djstation)
 "dDC" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTH)"; icon_state = "warning"; dir = 1},/turf/simulated/floor/plating,/area/djstation)
 "dDD" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTH)"; icon_state = "warning"; dir = 1},/turf/simulated/floor/plating,/area/djstation)
 "dDE" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/power/solar/panel{id_tag = "derelictsolar"; name = "Derelict Solar Array"},/turf/simulated/floor/plating/airless,/area/solar/derelict_aft)
@@ -9806,7 +9806,7 @@
 "dGD" = (/obj/machinery/atmospherics/unary/vent_pump{canSpawnMice = 0; dir = 4; external_pressure_bound = 120; frequency = 1438; icon_state = "in"; id_tag = "n2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine/vacuum,/area/derelict/atmos)
 "dGE" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/window/full/reinforced,/obj/machinery/atmospherics/pipe/simple/general/hidden{dir = 4},/obj/structure/grille,/turf/simulated/floor/plating,/area/derelict/atmos)
 "dGF" = (/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/power/apc{dir = 1; environ = 0; equipment = 1; lighting = 0; locked = 0; name = "apc"; pixel_y = 24},/turf/simulated/floor,/area/derelict/solar_control)
-"dGG" = (/obj/machinery/power/smes,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor,/area/derelict/solar_control)
+"dGG" = (/obj/machinery/power/battery/smes,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor,/area/derelict/solar_control)
 "dGH" = (/obj/machinery/light/small{dir = 4},/turf/unsimulated/floor/asteroid,/area/mine/explored)
 "dGI" = (/obj/machinery/light/small{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor,/area/derelict/solar_control)
 "dGJ" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/derelict/solar_control)
@@ -10305,7 +10305,7 @@
 "dQi" = (/obj/machinery/door/airlock/command{name = "AI Upload"; req_access_txt = "16"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/airless,/area/derelict/bridge/ai_upload)
 "dQj" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating/airless,/area/derelict/bridge/ai_upload)
 "dQk" = (/obj/structure/grille,/turf/simulated/floor/plating/airless,/area/derelict/hallway/secondary)
-"dQl" = (/obj/machinery/power/smes,/obj/structure/cable,/turf/simulated/floor/airless,/area/derelict/bridge/ai_upload)
+"dQl" = (/obj/machinery/power/battery/smes,/obj/structure/cable,/turf/simulated/floor/airless,/area/derelict/bridge/ai_upload)
 "dQm" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/airless,/area/derelict/bridge/ai_upload)
 "dQn" = (/turf/simulated/floor/airless{broken = 1; icon_state = "damaged4"},/area/derelict/bridge/ai_upload)
 "dQo" = (/turf/simulated/floor/airless,/area/derelict/bridge/ai_upload)
@@ -10473,7 +10473,7 @@
 "dTu" = (/obj/structure/rack,/turf/simulated/floor/airless,/area/mine/abandoned)
 "dTv" = (/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/power/port_gen/pacman{anchored = 1},/turf/simulated/floor/plating,/area/mine/north_outpost)
 "dTw" = (/obj/machinery/power/terminal{dir = 4},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plating,/area/mine/north_outpost)
-"dTx" = (/obj/machinery/power/smes,/obj/structure/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor/plating,/area/mine/north_outpost)
+"dTx" = (/obj/machinery/power/battery/smes,/obj/structure/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor/plating,/area/mine/north_outpost)
 "dTy" = (/obj/machinery/atmospherics/unary/tank/air,/turf/simulated/floor/plating,/area/mine/north_outpost)
 "dTz" = (/turf/simulated/wall/r_wall,/area/research_outpost/spectro)
 "dTA" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9; pixel_y = 0},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay3{name = "Medbay Aft"})
@@ -10796,7 +10796,7 @@
 "dZF" = (/obj/machinery/power/port_gen/pacman{anchored = 1},/turf/simulated/floor/plating,/area/research_outpost/power)
 "dZG" = (/obj/machinery/power/port_gen/pacman{anchored = 1},/obj/structure/sign/nosmoking_1{pixel_y = 32},/turf/simulated/floor/plating,/area/research_outpost/power)
 "dZH" = (/obj/machinery/power/terminal{dir = 4},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/turf/simulated/floor/plating,/area/research_outpost/power)
-"dZI" = (/obj/machinery/power/smes{charge = 5e+006},/obj/structure/sign/electricshock{pixel_x = 32},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/turf/simulated/floor/plating,/area/research_outpost/power)
+"dZI" = (/obj/machinery/power/battery/smes{charge = 5e+006},/obj/structure/sign/electricshock{pixel_x = 32},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/turf/simulated/floor/plating,/area/research_outpost/power)
 "dZJ" = (/obj/effect/alien/resin/wall,/turf/simulated/floor/airless{icon_state = "floorgrime"},/area/mine/abandoned)
 "dZK" = (/obj/structure/girder,/turf/simulated/floor/plating/airless{icon_state = "asteroidplating"},/area/mine/abandoned)
 "dZL" = (/obj/machinery/door/airlock/external{name = "Mining Bridge"; req_access_txt = "54"},/turf/simulated/floor/airless{icon_state = "asteroidfloor"},/area/mine/north_outpost)
@@ -10828,7 +10828,7 @@
 "eal" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/engineering{name = "Outpost Power Substation"; req_access_txt = "0"; req_one_access_txt = "47;10;24"},/turf/simulated/floor/plating,/area/research_outpost/power)
 "eam" = (/turf/simulated/floor/plating,/area/research_outpost/power)
 "ean" = (/obj/machinery/power/terminal{dir = 4},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/research_outpost/power)
-"eao" = (/obj/machinery/power/smes{charge = 5e+006},/obj/machinery/light{dir = 4},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/research_outpost/power)
+"eao" = (/obj/machinery/power/battery/smes{charge = 5e+006},/obj/machinery/light{dir = 4},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/research_outpost/power)
 "eap" = (/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/wall/r_wall,/area/research_outpost/power)
 "eaq" = (/obj/effect/decal/warning_stripes{icon_state = "oxygen"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/research_outpost/atmos)
 "ear" = (/obj/effect/decal/warning_stripes{icon_state = "nitrogen"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/research_outpost/atmos)
@@ -11497,7 +11497,7 @@
 "enk" = (/obj/machinery/atmospherics/unary/tank/air{dir = 1; initialize_directions = 0; level = 1},/turf/simulated/floor/plating,/area/mine/west_outpost)
 "enl" = (/obj/machinery/power/port_gen/pacman{anchored = 1},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/plating,/area/mine/west_outpost)
 "enm" = (/obj/machinery/power/terminal{dir = 4},/obj/machinery/light/small,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/mine/west_outpost)
-"enn" = (/obj/machinery/power/smes,/obj/structure/cable,/turf/simulated/floor/plating,/area/mine/west_outpost)
+"enn" = (/obj/machinery/power/battery/smes,/obj/structure/cable,/turf/simulated/floor/plating,/area/mine/west_outpost)
 "eno" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/mine/living_quarters)
 "enp" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass_medical{id_tag = null; name = "Infirmary"; req_access_txt = "0"},/turf/simulated/floor{icon_state = "white"},/area/mine/living_quarters)
 "enq" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; name = "HIGH VOLTAGE"},/turf/simulated/wall,/area/mine/living_quarters)
@@ -11521,7 +11521,7 @@
 "enI" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "white"},/area/mine/living_quarters)
 "enJ" = (/turf/simulated/floor{icon_state = "white"},/area/mine/living_quarters)
 "enK" = (/obj/machinery/alarm{pixel_y = 23},/turf/simulated/floor{icon_state = "white"},/area/mine/living_quarters)
-"enL" = (/obj/machinery/power/smes{charge = 5e+006},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/plating,/area/mine/living_quarters)
+"enL" = (/obj/machinery/power/battery/smes{charge = 5e+006},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/plating,/area/mine/living_quarters)
 "enM" = (/obj/machinery/light/small{dir = 4},/obj/structure/closet/emcloset,/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1},/turf/simulated/floor,/area/mine/living_quarters)
 "enN" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/recharger{pixel_x = -29},/turf/simulated/floor{icon_state = "floorgrime"},/area/mine/living_quarters)
 "enO" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/full/reinforced,/turf/simulated/floor/plating,/area/mine/living_quarters)
--- a/maps/ministation.dmm
+++ b/maps/ministation.dmm
@@ -1285,9 +1285,9 @@
 "ayK" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/door/firedoor/border_only{dir = 1; name = "hazard door north"},/turf/simulated/floor{icon_state = "yellow"; dir = 1},/area/engineering/engine)
 "ayL" = (/obj/structure/table,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/light{dir = 1},/obj/machinery/cell_charger,/turf/simulated/floor,/area/engineering/engine)
 "ayM" = (/obj/structure/table,/obj/machinery/alarm{pixel_y = 23},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/clothing/gloves/yellow,/obj/item/weapon/storage/toolbox/mechanical{pixel_y = 5},/turf/simulated/floor,/area/engineering/engine)
-"ayN" = (/obj/machinery/power/smes,/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor{dir = 10; icon_state = "warning"},/area/engineering/engine)
-"ayO" = (/obj/machinery/power/smes,/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/camera/autoname,/turf/simulated/floor{dir = 2; icon_state = "warning"},/area/engineering/engine)
-"ayP" = (/obj/machinery/power/smes,/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor{dir = 6; icon_state = "warning"},/area/engineering/engine)
+"ayN" = (/obj/machinery/power/battery/smes,/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor{dir = 10; icon_state = "warning"},/area/engineering/engine)
+"ayO" = (/obj/machinery/power/battery/smes,/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/camera/autoname,/turf/simulated/floor{dir = 2; icon_state = "warning"},/area/engineering/engine)
+"ayP" = (/obj/machinery/power/battery/smes,/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor{dir = 6; icon_state = "warning"},/area/engineering/engine)
 "ayQ" = (/obj/structure/table,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/clothing/gloves/yellow,/obj/item/weapon/storage/toolbox/electrical{pixel_y = 5},/obj/item/device/radio/intercom{broadcasting = 0; freerange = 0; listening = 1; name = "Common Channel"; pixel_y = 25},/turf/simulated/floor,/area/engineering/engine)
 "ayR" = (/obj/structure/closet/crate,/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/rods{amount = 50},/obj/item/stack/sheet/glass/glass{amount = 50},/obj/item/weapon/circuitboard/airlock,/obj/item/weapon/circuitboard/airlock,/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/obj/item/stack/sheet/mineral/plasma{amount = 30},/obj/structure/extinguisher_cabinet{pixel_x = -5; pixel_y = 30},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/turf/simulated/floor{icon_state = "warningcorner"; dir = 8},/area/engineering/engine)
 "ayS" = (/obj/machinery/power/apc{dir = 1; name = "_North APC"; pixel_y = 24},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/engineering/engine)
@@ -1633,7 +1633,7 @@
 "aFu" = (/obj/structure/transit_tube/station{tag = "icon-closed (EAST)"; icon_state = "closed"; dir = 4},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 4},/area/tcommsat/computer)
 "aFv" = (/turf/simulated/wall/r_wall,/area/tcommsat/computer)
 "aFw" = (/obj/machinery/power/apc{cell_type = 5000; dir = 8; name = "Telecoms Server APC"; pixel_x = -25; pixel_y = 1},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/computer)
-"aFx" = (/obj/machinery/power/smes{charge = 5e+006},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/computer)
+"aFx" = (/obj/machinery/power/battery/smes{charge = 5e+006},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/computer)
 "aFy" = (/obj/machinery/power/terminal{dir = 8},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/computer)
 "aFz" = (/obj/machinery/door/airlock/glass_engineering{name = "Server Room"; req_access_txt = "61"},/turf/simulated/floor{icon_state = "vault"; dir = 5},/area/tcommsat/computer)
 "aFA" = (/turf/simulated/floor{dir = 8; icon_state = "yellow"},/area/tcommsat/computer)
@@ -1692,7 +1692,7 @@
 "aGB" = (/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -35},/obj/effect/landmark/start{name = "AI"},/turf/simulated/floor,/area/tcommsat/computer)
 "aGC" = (/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/structure/filingcabinet/chestdrawer,/turf/simulated/floor,/area/tcommsat/computer)
 "aGD" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/weapon/storage/toolbox/mechanical{pixel_x = -2; pixel_y = -1},/obj/machinery/newscaster{pixel_x = 32; pixel_y = 0},/turf/simulated/floor,/area/tcommsat/computer)
-"aGE" = (/obj/machinery/power/smes{charge = 5e+006},/obj/structure/cable,/turf/simulated/floor,/area/engineering/engine)
+"aGE" = (/obj/machinery/power/battery/smes{charge = 5e+006},/obj/structure/cable,/turf/simulated/floor,/area/engineering/engine)
 "aGF" = (/obj/machinery/light,/obj/structure/stool/bed/chair/office/light{dir = 4},/obj/machinery/power/terminal{dir = 8},/turf/simulated/floor,/area/engineering/engine)
 "aGG" = (/obj/structure/table,/obj/item/weapon/pen/blue,/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/turf/simulated/floor,/area/engineering/engine)
 "aGH" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'RADIOACTIVE AREA'"; icon_state = "radiation"; name = "RADIOACTIVE AREA"; pixel_x = 0; pixel_y = 0},/turf/simulated/wall/r_wall,/area/engineering/engine)
@@ -2407,7 +2407,7 @@
 "caC" = (/obj/item/device/multitool,/turf/simulated/floor/plating,/area/djstation)
 "caD" = (/obj/item/weapon/storage/toolbox/mechanical{pixel_x = -2; pixel_y = -1},/turf/simulated/floor/plating,/area/djstation)
 "caE" = (/obj/item/weapon/extinguisher,/turf/simulated/floor/plating,/area/djstation)
-"caF" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/power/smes/magical{desc = "A high-capacity superconducting magnetic energy storage (SMES) unit."; name = "power storage unit"},/turf/simulated/floor/plating,/area/djstation)
+"caF" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/power/battery/smes/infinite{desc = "A high-capacity superconducting magnetic energy storage (SMES) unit."; name = "power storage unit"},/turf/simulated/floor/plating,/area/djstation)
 "caG" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/djstation)
 "caH" = (/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/power/apc{dir = 0; name = "Worn-out APC"; pixel_y = -24},/turf/simulated/floor/plating,/area/djstation)
 "caI" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/weapon/storage/box/lights/mixed,/obj/structure/sign/securearea{desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; name = "HIGH VOLTAGE"; pixel_x = 0; pixel_y = -32},/turf/simulated/floor/plating,/area/djstation)
--- a/maps/taxistation.dmm
+++ b/maps/taxistation.dmm
@@ -456,7 +456,7 @@
 "aiN" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plating,/area/engine/aux_control{name = "Engineering Medical"})
 "aiO" = (/obj/machinery/power/terminal,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/engine/aux_control{name = "Engineering Medical"})
 "aiP" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/catwalk{icon_state = "catwalk3"},/turf/space,/area/solar/fstarboard{name = "\improper Medbay Solar Array"})
-"aiQ" = (/obj/machinery/power/smes{charge = 5e+006},/obj/machinery/atmospherics/pipe/simple/heat_exchanging,/turf/simulated/floor/bluegrid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/tcomms/chamber)
+"aiQ" = (/obj/machinery/power/battery/smes{charge = 5e+006},/obj/machinery/atmospherics/pipe/simple/heat_exchanging,/turf/simulated/floor/bluegrid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/tcomms/chamber)
 "aiR" = (/obj/machinery/telecomms/broadcaster/preset_left,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; nitrogen = 500; oxygen = 0; temperature = 80},/area/tcomms/chamber)
 "aiS" = (/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; nitrogen = 500; oxygen = 0; temperature = 80},/area/tcomms/chamber)
 "aiT" = (/obj/machinery/telecomms/broadcaster/preset_right,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; nitrogen = 500; oxygen = 0; temperature = 80},/area/tcomms/chamber)
@@ -489,7 +489,7 @@
 "aju" = (/obj/structure/stool{pixel_y = 8},/obj/effect/landmark{name = "blobstart"},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plating,/area/engine/aux_control{name = "Engineering Medical"})
 "ajv" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plating,/area/engine/aux_control{name = "Engineering Medical"})
 "ajw" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/engine/aux_control{name = "Engineering Medical"})
-"ajx" = (/obj/machinery/power/smes{charge = 1e+006},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/engine/aux_control{name = "Engineering Medical"})
+"ajx" = (/obj/machinery/power/battery/smes{charge = 1e+006},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/engine/aux_control{name = "Engineering Medical"})
 "ajy" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/turf/simulated/floor/plating,/area/engine/aux_control{name = "Engineering Medical"})
 "ajz" = (/obj/machinery/telecomms/bus/preset_two,/obj/machinery/atmospherics/pipe/simple/heat_exchanging,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; nitrogen = 500; oxygen = 0; temperature = 80},/area/tcomms/chamber)
 "ajA" = (/obj/machinery/telecomms/bus/preset_four,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; nitrogen = 500; oxygen = 0; temperature = 80},/area/tcomms/chamber)
@@ -812,7 +812,7 @@
 "apF" = (/obj/machinery/door/airlock/external{req_access_txt = "13"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/solar/fore{name = "\improper Engineering Solar Array"})
 "apG" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/ai_slipper,/obj/machinery/camera{c_tag = "AI Core West"; dir = 8},/turf/simulated/floor/bluegrid,/area/turret_protected/ai)
 "apH" = (/obj/machinery/status_display,/turf/simulated/wall/r_wall,/area/turret_protected/ai)
-"apI" = (/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/machinery/power/smes{charge = 1e+006},/turf/simulated/floor/bluegrid,/area/turret_protected/ai)
+"apI" = (/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/machinery/power/battery/smes{charge = 1e+006},/turf/simulated/floor/bluegrid,/area/turret_protected/ai)
 "apJ" = (/obj/effect/landmark/start{name = "AI"},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/turf/simulated/floor/bluegrid,/area/turret_protected/ai)
 "apK" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/ai_slipper,/turf/simulated/floor/bluegrid,/area/turret_protected/ai)
 "apL" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/window{base_state = "left"; dir = 8; icon_state = "left"; name = "AI Core"; req_access_txt = "16"},/obj/machinery/door/window{base_state = "left"; dir = 2; icon_state = "left"; name = "AI Core"; req_access_txt = "16"},/obj/machinery/door/window{base_state = "left"; dir = 1; icon_state = "left"; name = "AI Core"; req_access_txt = "16"},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai)
@@ -969,7 +969,7 @@
 "asG" = (/obj/machinery/conveyor{dir = 4; id_tag = "engigarbage"},/turf/simulated/floor/plating,/area/maintenance/disposal{name = "Disposals Engineering"})
 "asH" = (/obj/machinery/conveyor{dir = 4; id_tag = "engigarbage"},/obj/item/trash/chips,/turf/simulated/floor/plating,/area/maintenance/disposal{name = "Disposals Engineering"})
 "asI" = (/obj/structure/disposaloutlet{dir = 8},/obj/structure/disposalpipe/trunk,/turf/simulated/floor/plating,/area/maintenance/disposal{name = "Disposals Engineering"})
-"asJ" = (/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/power/smes{charge = 1e+006},/turf/simulated/floor/plating,/area/solar/fore{name = "\improper Engineering Solar Array"})
+"asJ" = (/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/power/battery/smes{charge = 1e+006},/turf/simulated/floor/plating,/area/solar/fore{name = "\improper Engineering Solar Array"})
 "asK" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plating,/area/solar/fore{name = "\improper Engineering Solar Array"})
 "asL" = (/obj/structure/stool{pixel_y = 8},/obj/machinery/power/apc{dir = 4; pixel_x = 24; pixel_y = 0},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/solar/fore{name = "\improper Engineering Solar Array"})
 "asM" = (/turf/simulated/floor/engine/n20,/area/engineering/atmos)
@@ -1433,7 +1433,7 @@
 "aBC" = (/obj/structure/table,/obj/item/weapon/book/manual/barman_recipes,/obj/item/weapon/reagent_containers/food/snacks/pie,/obj/item/weapon/reagent_containers/food/drinks/shaker,/obj/structure/sign/securearea{desc = "Under the painting a plaque reads: 'While the meat grinder may not have spared you, fear not. Not one part of you has gone to waste... You were delicious. Strange that this picture doesn't even look like Mr. Deempisi.'"; icon_state = "monkey_painting"; name = "Mr. Deempisi portrait"; pixel_x = 28; pixel_y = 0},/turf/simulated/floor{icon_state = "grimy"},/area/crew_quarters/bar)
 "aBD" = (/obj/machinery/power/terminal{dir = 4},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor{icon_state = "dark"},/area/engineering/engineering_auxiliary)
 "aBE" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/grille,/turf/simulated/floor/plating,/area/engineering/engine)
-"aBF" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/power/smes{charge = 0},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/turf/simulated/floor{icon_state = "dark vault stripe"; dir = 4},/area/engineering/engineering_auxiliary)
+"aBF" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/power/battery/smes{charge = 0},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/turf/simulated/floor{icon_state = "dark vault stripe"; dir = 4},/area/engineering/engineering_auxiliary)
 "aBG" = (/obj/machinery/pipedispenser/disposal,/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 5},/turf/simulated/floor,/area/engineering/atmos)
 "aBH" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 4},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor,/area/engineering/atmos)
 "aBI" = (/turf/simulated/floor,/area/engineering/engine)
@@ -1535,10 +1535,10 @@
 "aDA" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/turf/simulated/floor/plating,/area/crew_quarters/bar)
 "aDB" = (/obj/structure/table,/obj/machinery/reagentgrinder,/obj/machinery/firealarm{dir = 4; pixel_x = 24},/turf/simulated/floor{icon_state = "grimy"},/area/crew_quarters/bar)
 "aDC" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating,/area/maintenance/starboard)
-"aDD" = (/obj/machinery/power/smes,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor,/area/engine/locker{name = "\improper Engineering Foyer"})
+"aDD" = (/obj/machinery/power/battery/smes,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor,/area/engine/locker{name = "\improper Engineering Foyer"})
 "aDE" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden,/turf/simulated/floor{dir = 8; icon_state = "yellow"},/area/engineering/engine)
-"aDF" = (/obj/machinery/alarm{pixel_y = 23},/obj/machinery/power/smes{charge = 1e+006},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor,/area/engine/locker{name = "\improper Engineering Foyer"})
-"aDG" = (/obj/machinery/power/smes{charge = 1e+006},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor,/area/engine/locker{name = "\improper Engineering Foyer"})
+"aDF" = (/obj/machinery/alarm{pixel_y = 23},/obj/machinery/power/battery/smes{charge = 1e+006},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor,/area/engine/locker{name = "\improper Engineering Foyer"})
+"aDG" = (/obj/machinery/power/battery/smes{charge = 1e+006},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor,/area/engine/locker{name = "\improper Engineering Foyer"})
 "aDH" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/closet/firecloset,/turf/simulated/floor,/area/engine/locker{name = "\improper Engineering Foyer"})
 "aDI" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/clothing/gloves/black,/obj/item/weapon/extinguisher{pixel_x = 8},/obj/structure/disposalpipe/segment,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor,/area/engine/locker{name = "\improper Engineering Foyer"})
 "aDJ" = (/obj/effect/landmark/start{name = "Station Engineer"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor,/area/engineering/engine)
@@ -1808,7 +1808,7 @@
 "aIN" = (/obj/structure/mopbucket,/obj/item/weapon/mop,/turf/simulated/floor{icon_state = "floorgrime"},/area/janitor)
 "aIO" = (/obj/item/weapon/storage/box/lights/mixed,/obj/item/weapon/storage/box/lights/mixed,/obj/item/weapon/reagent_containers/glass/bucket,/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 101; on = 1},/obj/structure/table,/obj/item/weapon/storage/bag/trash,/turf/simulated/floor{icon_state = "floorgrime"},/area/janitor)
 "aIP" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/solar/aport{name = "\improper Cargo Solar Array"})
-"aIQ" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/power/smes{charge = 1e+006},/turf/simulated/floor/plating,/area/solar/aport{name = "\improper Cargo Solar Array"})
+"aIQ" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/power/battery/smes{charge = 1e+006},/turf/simulated/floor/plating,/area/solar/aport{name = "\improper Cargo Solar Array"})
 "aIR" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/light/small{dir = 8},/turf/simulated/floor,/area/supply/storage)
 "aIS" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor,/area/supply/storage)
 "aIT" = (/obj/structure/closet/crate/internals,/turf/simulated/floor,/area/supply/storage)
@@ -2392,7 +2392,7 @@
 "aTZ" = (/obj/structure/sign/vacuum,/turf/simulated/wall,/area/solar/fport{name = "\improper Security Solar Array"})
 "aUa" = (/obj/machinery/power/solar/control{id_tag = "secsolar"; name = "Security Solar Control"},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plating,/area/solar/fport{name = "\improper Security Solar Array"})
 "aUb" = (/obj/structure/stool,/obj/item/clothing/gloves/yellow,/obj/item/weapon/storage/toolbox/electrical{pixel_x = 1; pixel_y = -1},/obj/machinery/power/terminal{dir = 4},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/item/device/multitool{pixel_x = 4},/turf/simulated/floor/plating,/area/solar/fport{name = "\improper Security Solar Array"})
-"aUc" = (/obj/machinery/power/smes{charge = 1e+006},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/turf/simulated/floor/plating,/area/solar/fport{name = "\improper Security Solar Array"})
+"aUc" = (/obj/machinery/power/battery/smes{charge = 1e+006},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/turf/simulated/floor/plating,/area/solar/fport{name = "\improper Security Solar Array"})
 "aUd" = (/obj/machinery/power/port_gen/pacman{anchored = 1},/turf/simulated/floor/plating,/area/maintenance/fpmaint2)
 "aUe" = (/obj/machinery/space_heater,/turf/simulated/floor/plating,/area/maintenance/fpmaint2)
 "aUf" = (/obj/structure/closet/firecloset,/turf/simulated/floor/plating,/area/maintenance/fpmaint2)
@@ -4623,7 +4623,7 @@
 "bKU" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/djstation)
 "bKV" = (/obj/item/weapon/extinguisher,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/djstation)
 "bKW" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/plating,/area/djstation)
-"bKX" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/power/smes/magical{desc = "A high-capacity superconducting magnetic energy storage (SMES) unit."; name = "power storage unit"},/turf/simulated/floor/plating,/area/djstation)
+"bKX" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/power/battery/smes/infinite{desc = "A high-capacity superconducting magnetic energy storage (SMES) unit."; name = "power storage unit"},/turf/simulated/floor/plating,/area/djstation)
 "bKY" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plating,/area/djstation)
 "bKZ" = (/obj/machinery/telecomms/relay/preset/ruskie,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/djstation)
 "bLa" = (/obj/structure/cable,/obj/machinery/power/solar/panel{id_tag = "djsolar"; name = "DJ Solar Array"},/turf/simulated/floor{icon_state = "solarpanel"},/area/djstation/solars)
@@ -5424,7 +5424,7 @@
 "cap" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/derelict/storage/engine_storage{icon_state = "smaint"; name = "Derelict Starboard Maintenance"})
 "caq" = (/obj/structure/lattice,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/space,/area)
 "car" = (/obj/machinery/atmospherics/unary/tank/air{dir = 4},/turf/simulated/floor/plating,/area/derelict/storage/storage_access{icon_state = "pmaint"; name = "Derelict Port Maintenance"})
-"cas" = (/obj/machinery/power/smes,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/derelict/storage/storage_access{icon_state = "pmaint"; name = "Derelict Port Maintenance"})
+"cas" = (/obj/machinery/power/battery/smes,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/derelict/storage/storage_access{icon_state = "pmaint"; name = "Derelict Port Maintenance"})
 "cat" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/derelict/storage/storage_access{icon_state = "pmaint"; name = "Derelict Port Maintenance"})
 "cau" = (/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/turf/simulated/floor/plating,/area/derelict/storage/storage_access{icon_state = "pmaint"; name = "Derelict Port Maintenance"})
 "cav" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/simulated/floor/plating,/area/derelict/storage/storage_access{icon_state = "pmaint"; name = "Derelict Port Maintenance"})
@@ -5746,7 +5746,7 @@
 "cgz" = (/obj/machinery/atmospherics/unary/vent_pump{canSpawnMice = 0; dir = 4; external_pressure_bound = 120; frequency = 1438; icon_state = "in"; id_tag = "n2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine/vacuum{icon_state = "enginebot"},/area/derelict/atmos)
 "cgA" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/window/full/reinforced,/obj/machinery/atmospherics/pipe/simple/general/hidden{dir = 4},/obj/structure/grille,/turf/simulated/floor/plating,/area/derelict/atmos)
 "cgB" = (/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/power/apc{dir = 1; environ = 0; equipment = 1; lighting = 0; locked = 0; name = "apc"; pixel_y = 24},/turf/simulated/floor,/area/derelict/solar_control)
-"cgC" = (/obj/machinery/power/smes,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor,/area/derelict/solar_control)
+"cgC" = (/obj/machinery/power/battery/smes,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor,/area/derelict/solar_control)
 "cgD" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/power/solar/control{id_tag = "derelictsolar"; name = "Primary Solar Control"},/turf/simulated/floor,/area/derelict/solar_control)
 "cgE" = (/obj/machinery/light/small{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor,/area/derelict/solar_control)
 "cgF" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/derelict/solar_control)
@@ -6148,7 +6148,7 @@
 "col" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/turf/simulated/floor/plating/airless{icon_state = "asteroidplating"},/area/derelict/secret)
 "com" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating/airless,/area/derelict/secret)
 "con" = (/obj/machinery/light/small{dir = 8},/turf/simulated/floor/airless{icon_state = "asteroidfloor"},/area/derelict/secret)
-"coo" = (/obj/machinery/power/smes{charge = 5e+006},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/plating{icon_state = "panelscorched"},/area/derelict/secret)
+"coo" = (/obj/machinery/power/battery/smes{charge = 5e+006},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/plating{icon_state = "panelscorched"},/area/derelict/secret)
 "cop" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/weapon/storage/box/lights/mixed,/turf/simulated/floor/plating{icon_state = "platingdmg3"},/area/derelict/secret)
 "coq" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/derelict/secret)
 "cor" = (/turf/simulated/floor/plating{icon_state = "panelscorched"},/area/derelict/secret)
@@ -6430,7 +6430,7 @@
 "ctH" = (/obj/machinery/computer/general_air_control/large_tank_control{frequency = 1441; input_tag = "vox_in"; name = "Nitrogen Supply Control"; output_tag = "vox_out"; sensors = list("vox_sensor" = "Tank")},/turf/simulated/floor/vox,/area/vox_trading_post/atmos)
 "ctI" = (/obj/structure/stool/bed/roller,/turf/simulated/floor/plating/vox,/area/vox_trading_post/storage_1)
 "ctJ" = (/turf/simulated/floor/plating/vox,/area/vox_trading_post/storage_1)
-"ctK" = (/obj/machinery/power/smes/magical,/obj/structure/cable,/turf/simulated/floor/plating/vox,/area/vox_trading_post/storage_1)
+"ctK" = (/obj/machinery/power/battery/smes/infinite,/obj/structure/cable,/turf/simulated/floor/plating/vox,/area/vox_trading_post/storage_1)
 "ctL" = (/obj/machinery/atmospherics/pipe/simple/yellow/visible,/obj/machinery/power/apc{dir = 8; pixel_x = -24},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/vox,/area/vox_trading_post/atmos)
 "ctM" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 5},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/vox,/area/vox_trading_post/atmos)
 "ctN" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 4},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/vox,/area/vox_trading_post/atmos)
@@ -6704,7 +6704,7 @@
 "cyV" = (/obj/structure/table,/obj/item/weapon/wrench,/turf/simulated/floor{icon_state = "white"},/area/research_outpost/hallway{icon_state = "hallA"; name = "Xenoarchaeology Hallway"})
 "cyW" = (/obj/machinery/vending/coffee,/turf/simulated/floor{icon_state = "white"},/area/research_outpost/hallway{icon_state = "hallA"; name = "Xenoarchaeology Hallway"})
 "cyX" = (/obj/machinery/portable_atmospherics/canister/oxygen,/obj/machinery/alarm{pixel_y = 24},/turf/simulated/floor/plating,/area/research_outpost/atmos{name = "Outpost Atmospherics and Power"})
-"cyY" = (/obj/machinery/power/smes{charge = 5e+006},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/turf/simulated/floor/plating,/area/research_outpost/atmos{name = "Outpost Atmospherics and Power"})
+"cyY" = (/obj/machinery/power/battery/smes{charge = 5e+006},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/turf/simulated/floor/plating,/area/research_outpost/atmos{name = "Outpost Atmospherics and Power"})
 "cyZ" = (/obj/machinery/power/terminal{dir = 8},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/reagent_dispensers/fueltank,/turf/simulated/floor/plating,/area/research_outpost/atmos{name = "Outpost Atmospherics and Power"})
 "cza" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/power/port_gen/pacman{anchored = 1},/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plating,/area/research_outpost/atmos{name = "Outpost Atmospherics and Power"})
 "czb" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/full/reinforced,/turf/simulated/floor/plating,/area/research_outpost/atmos{name = "Outpost Atmospherics and Power"})
--- a/maps/tgstation.dmm
+++ b/maps/tgstation.dmm
@@ -1245,7 +1245,7 @@
 "axW" = (/obj/structure/stool/bed/chair{dir = 1},/obj/machinery/status_display{pixel_x = 32},/obj/machinery/media/receiver/boombox/wallmount/shuttle{pixel_x = -32},/turf/simulated/shuttle/floor,/area/shuttle/escape_pod2/station)
 "axX" = (/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/power/apc{dir = 8; pixel_x = -24},/obj/machinery/camera{c_tag = "Fore Port Solar Control"; dir = 1},/turf/simulated/floor/plating,/area/maintenance/fportsolar)
 "axY" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plating,/area/maintenance/fportsolar)
-"axZ" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/power/smes{charge = 0},/turf/simulated/floor/plating,/area/maintenance/fportsolar)
+"axZ" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/power/battery/smes{charge = 0},/turf/simulated/floor/plating,/area/maintenance/fportsolar)
 "aya" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/turf/simulated/floor/plating,/area/security/detectives_office)
 "ayb" = (/obj/machinery/hologram/holopad,/turf/simulated/floor{icon_state = "grimy"},/area/security/detectives_office)
 "ayc" = (/obj/structure/table/woodentable,/obj/machinery/computer/security/wooden_tv{pixel_x = 1; pixel_y = 3},/turf/simulated/floor/carpet,/area/security/detectives_office)
@@ -1335,7 +1335,7 @@
 "azI" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = "0"},/turf/simulated/floor/plating,/area/crew_quarters/fitness)
 "azJ" = (/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/power/apc{dir = 8; pixel_x = -24},/turf/simulated/floor/plating,/area/maintenance/fstarboardsolar)
 "azK" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plating,/area/maintenance/fstarboardsolar)
-"azL" = (/obj/machinery/camera{c_tag = "Fore Starboard Solars"; dir = 1},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/power/smes{charge = 0},/turf/simulated/floor/plating,/area/maintenance/fstarboardsolar)
+"azL" = (/obj/machinery/camera{c_tag = "Fore Starboard Solars"; dir = 1},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/power/battery/smes{charge = 0},/turf/simulated/floor/plating,/area/maintenance/fstarboardsolar)
 "azM" = (/turf/simulated/floor/plating,/obj/structure/shuttle/engine/propulsion/burst,/turf/simulated/shuttle/wall{icon_state = "swall_f5"},/area/shuttle/escape_pod1/station)
 "azN" = (/obj/machinery/door/unpowered/shuttle,/turf/simulated/shuttle/floor,/area/shuttle/escape_pod1/station)
 "azO" = (/turf/simulated/floor/plating,/obj/structure/shuttle/engine/propulsion/burst,/turf/simulated/shuttle/wall{icon_state = "swall_f9"},/area/shuttle/escape_pod1/station)
@@ -3275,7 +3275,7 @@
 "bkY" = (/turf/simulated/floor/bluegrid,/area/turret_protected/ai)
 "bkZ" = (/obj/machinery/alarm{pixel_y = 23},/obj/machinery/turret,/turf/simulated/floor/bluegrid,/area/turret_protected/ai)
 "bla" = (/obj/machinery/flasher{pixel_y = 24; id_tag = "AI"},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/bluegrid,/area/turret_protected/ai)
-"blb" = (/obj/machinery/power/smes{charge = 5e+006},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/bluegrid,/area/turret_protected/ai)
+"blb" = (/obj/machinery/power/battery/smes{charge = 5e+006},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/bluegrid,/area/turret_protected/ai)
 "blc" = (/obj/machinery/power/terminal{dir = 8},/obj/machinery/requests_console{department = "AI"; departmentType = 5; pixel_y = 29},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/turf/simulated/floor/bluegrid,/area/turret_protected/ai)
 "bld" = (/obj/machinery/turret,/turf/simulated/floor/bluegrid,/area/turret_protected/ai)
 "ble" = (/obj/effect/decal/cleanable/cobweb2,/turf/simulated/floor/bluegrid,/area/turret_protected/ai)
@@ -5845,7 +5845,7 @@
 "ciu" = (/obj/structure/table,/turf/simulated/floor,/area/tcomms/storage)
 "civ" = (/obj/structure/table,/obj/item/weapon/stock_parts/micro_laser/high,/obj/item/weapon/stock_parts/micro_laser/high,/obj/item/weapon/stock_parts/micro_laser/high,/obj/item/weapon/stock_parts/capacitor,/obj/item/weapon/stock_parts/manipulator,/obj/item/weapon/stock_parts/manipulator,/obj/machinery/light_switch{pixel_y = 27},/turf/simulated/floor,/area/tcomms/storage)
 "ciw" = (/obj/structure/table,/obj/item/weapon/stock_parts/subspace/treatment,/obj/item/weapon/stock_parts/subspace/treatment,/obj/item/weapon/stock_parts/subspace/treatment,/turf/simulated/floor,/area/tcomms/storage)
-"cix" = (/obj/machinery/power/smes{charge = 5e+006},/obj/structure/cable/yellow{icon_state = "0-2"},/obj/machinery/light{dir = 1},/turf/simulated/floor,/area/tcomms/storage)
+"cix" = (/obj/machinery/power/battery/smes{charge = 5e+006},/obj/structure/cable/yellow{icon_state = "0-2"},/obj/machinery/light{dir = 1},/turf/simulated/floor,/area/tcomms/storage)
 "ciy" = (/obj/machinery/power/terminal{dir = 8},/obj/structure/cable,/obj/structure/closet/malf/suits,/turf/simulated/floor,/area/tcomms/storage)
 "ciz" = (/obj/structure/table,/obj/machinery/atmospherics/pipe/simple/insulated/visible{dir = 5},/turf/simulated/floor,/area/tcomms/storage)
 "ciA" = (/obj/machinery/atmospherics/unary/tank/carbon_dioxide{dir = 8},/turf/simulated/floor,/area/tcomms/storage)
@@ -6132,7 +6132,7 @@
 "cnV" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/science/hallway)
 "cnW" = (/obj/machinery/power/apc{dir = 8; pixel_x = -24},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/plating,/area/maintenance/astarboardsolar)
 "cnX" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/plating,/area/maintenance/astarboardsolar)
-"cnY" = (/obj/machinery/power/smes{charge = 0},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/maintenance/astarboardsolar)
+"cnY" = (/obj/machinery/power/battery/smes{charge = 0},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/maintenance/astarboardsolar)
 "cnZ" = (/obj/machinery/door/airlock/external{req_access_txt = "13"; req_one_access_txt = "13"},/turf/simulated/floor/plating,/area/maintenance/aft)
 "coa" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/mob/living/simple_animal/mouse,/turf/simulated/floor/plating,/area/maintenance/aft)
 "cob" = (/obj/structure/cable/yellow{icon_state = "2-4"},/obj/machinery/atmospherics/pipe/simple/yellow/visible{dir = 9},/obj/structure/table,/obj/item/weapon/stock_parts/subspace/transmitter,/obj/item/weapon/stock_parts/subspace/transmitter,/turf/simulated/floor,/area/tcomms/storage)
@@ -6684,7 +6684,7 @@
 "cyB" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating/airless,/area/maintenance/aportsolar)
 "cyC" = (/turf/simulated/floor/plating,/area/maintenance/aportsolar)
 "cyD" = (/obj/machinery/power/terminal{dir = 4},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plating,/area/maintenance/aportsolar)
-"cyE" = (/obj/machinery/power/smes{charge = 0},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/turf/simulated/floor/plating,/area/maintenance/aportsolar)
+"cyE" = (/obj/machinery/power/battery/smes{charge = 0},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/turf/simulated/floor/plating,/area/maintenance/aportsolar)
 "cyF" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; name = "HIGH VOLTAGE"},/turf/simulated/wall/r_wall,/area/maintenance/aportsolar)
 "cyG" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/maintenance/aft)
 "cyH" = (/turf/simulated/wall/r_wall,/area/engineering/engine)
@@ -7042,9 +7042,9 @@
 "cFv" = (/obj/structure/sign/nosmoking_2{pixel_y = 32},/obj/machinery/light{dir = 1},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor,/area/engineering/engine)
 "cFw" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor{dir = 1; icon_state = "yellow"},/area/engineering/engine)
 "cFx" = (/turf/simulated/wall,/area/engineering/engine)
-"cFy" = (/obj/structure/cable,/obj/machinery/power/smes,/obj/effect/decal/warning_stripes{tag = "icon-warning (SOUTHWEST)"; icon_state = "warning"; dir = 10},/turf/simulated/floor,/area/engineering/engine)
-"cFz" = (/obj/structure/cable,/obj/machinery/power/smes,/obj/effect/decal/warning_stripes{tag = "icon-warning"; icon_state = "warning"; dir = 2},/turf/simulated/floor,/area/engineering/engine)
-"cFA" = (/obj/structure/cable,/obj/machinery/power/smes,/obj/effect/decal/warning_stripes{tag = "icon-warning (SOUTHEAST)"; icon_state = "warning"; dir = 6},/turf/simulated/floor,/area/engineering/engine)
+"cFy" = (/obj/structure/cable,/obj/machinery/power/battery/smes,/obj/effect/decal/warning_stripes{tag = "icon-warning (SOUTHWEST)"; icon_state = "warning"; dir = 10},/turf/simulated/floor,/area/engineering/engine)
+"cFz" = (/obj/structure/cable,/obj/machinery/power/battery/smes,/obj/effect/decal/warning_stripes{tag = "icon-warning"; icon_state = "warning"; dir = 2},/turf/simulated/floor,/area/engineering/engine)
+"cFA" = (/obj/structure/cable,/obj/machinery/power/battery/smes,/obj/effect/decal/warning_stripes{tag = "icon-warning (SOUTHEAST)"; icon_state = "warning"; dir = 6},/turf/simulated/floor,/area/engineering/engine)
 "cFB" = (/obj/machinery/light{dir = 1},/obj/structure/closet/wardrobe/engineering_yellow,/turf/simulated/floor,/area/engineering/engine)
 "cFC" = (/obj/machinery/atmospherics/pipe/simple/general/visible,/obj/structure/grille,/obj/machinery/meter,/turf/simulated/wall/r_wall,/area/engineering/atmos)
 "cFD" = (/obj/machinery/atmospherics/pipe/simple/general/visible,/obj/structure/grille,/obj/machinery/meter{frequency = 1443; id_tag = "mair_in_meter"; name = "Mixed Air Tank In"},/turf/simulated/wall/r_wall,/area/engineering/atmos)
@@ -7176,7 +7176,7 @@
 "cHZ" = (/obj/machinery/door_control{desc = "Lets all the hot gas out very quickly."; id_tag = "Burn Chamber Vent"; name = "Burn Chamber Vent"; pixel_x = -7; pixel_y = 32; req_access_txt = "0"},/obj/machinery/ignition_switch{id_tag = "Burn Chamber Igniter"; pixel_x = 6; pixel_y = 32},/turf/simulated/floor,/area/engineering/burn_chamber)
 "cIa" = (/obj/machinery/atmospherics/binary/pump{name = "Hot Fill Pump"},/turf/simulated/floor/plating,/area/engineering/burn_chamber)
 "cIb" = (/obj/machinery/atmospherics/binary/pump{name = "Cold Fill Pump"},/turf/simulated/floor/plating,/area/engineering/burn_chamber)
-"cIc" = (/obj/machinery/power/smes,/obj/machinery/light{dir = 8},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor,/area/engineering/engine)
+"cIc" = (/obj/machinery/power/battery/smes,/obj/machinery/light{dir = 8},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor,/area/engineering/engine)
 "cId" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/turf/simulated/floor,/area/engineering/engine)
 "cIe" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden{dir = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/effect/decal/warning_stripes/pathmarkers/red,/obj/effect/decal/warning_stripes/pathmarkers/red{tag = "icon-pathmarker (NORTH)"; icon_state = "pathmarker"; dir = 1},/turf/simulated/floor,/area/engineering/engine)
 "cIf" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor,/area/engineering/engine)
@@ -9326,7 +9326,7 @@
 "dxr" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = "0"},/turf/simulated/wall/r_wall,/area/turret_protected/tcomfoyer)
 "dxs" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/airlock/hatch{name = "Telecoms Satellite"; req_access_txt = "61"},/turf/simulated/floor,/area/turret_protected/tcomfoyer)
 "dxt" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/plating,/area/tcommsat/entrance)
-"dxu" = (/obj/machinery/power/smes/magical,/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor,/area/tcommsat/entrance)
+"dxu" = (/obj/machinery/power/battery/smes/infinite,/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor,/area/tcommsat/entrance)
 "dxv" = (/obj/machinery/power/terminal{dir = 8},/obj/effect/decal/warning_stripes{tag = "icon-warning (WEST)"; icon_state = "warning"; dir = 8},/turf/simulated/floor,/area/tcommsat/entrance)
 "dxw" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/sign/electricshock,/turf/simulated/wall/r_wall,/area/tcommsat/entrance)
 "dxx" = (/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = 20},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/turf/simulated/floor,/area/tcommsat/entrance)
@@ -9433,7 +9433,7 @@
 "dzu" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/djstation)
 "dzv" = (/obj/item/weapon/extinguisher,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTH)"; icon_state = "warning"; dir = 1},/turf/simulated/floor/plating,/area/djstation)
 "dzw" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTH)"; icon_state = "warning"; dir = 1},/turf/simulated/floor/plating,/area/djstation)
-"dzx" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/power/smes{charge = 5e+006},/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTH)"; icon_state = "warning"; dir = 1},/turf/simulated/floor/plating,/area/djstation)
+"dzx" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/power/battery/smes{charge = 5e+006},/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTH)"; icon_state = "warning"; dir = 1},/turf/simulated/floor/plating,/area/djstation)
 "dzy" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTH)"; icon_state = "warning"; dir = 1},/turf/simulated/floor/plating,/area/djstation)
 "dzz" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTH)"; icon_state = "warning"; dir = 1},/turf/simulated/floor/plating,/area/djstation)
 "dzA" = (/obj/machinery/power/solar/panel{id_tag = "djstationsolar"; name = "DJ Station Solar Array"},/obj/structure/cable,/turf/simulated/floor{icon_state = "solarpanel"},/area/djstation/solars)
@@ -9592,7 +9592,7 @@
 "dCx" = (/obj/machinery/atmospherics/unary/vent_pump{canSpawnMice = 0; dir = 4; external_pressure_bound = 120; frequency = 1438; icon_state = "in"; id_tag = "n2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/engine/vacuum,/area/derelict/atmos)
 "dCy" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/window/full/reinforced,/obj/machinery/atmospherics/pipe/simple/general/hidden{dir = 4},/obj/structure/grille,/turf/simulated/floor/plating,/area/derelict/atmos)
 "dCz" = (/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/power/apc{dir = 1; environ = 0; equipment = 1; lighting = 0; locked = 0; name = "apc"; pixel_y = 24},/turf/simulated/floor,/area/derelict/solar_control)
-"dCA" = (/obj/machinery/power/smes,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor,/area/derelict/solar_control)
+"dCA" = (/obj/machinery/power/battery/smes,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor,/area/derelict/solar_control)
 "dCB" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/power/solar/control{id_tag = "derelictsolar"; name = "Primary Solar Control"},/turf/simulated/floor,/area/derelict/solar_control)
 "dCC" = (/obj/machinery/light/small{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor,/area/derelict/solar_control)
 "dCD" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/derelict/solar_control)
@@ -10096,7 +10096,7 @@
 "dMh" = (/obj/machinery/door/airlock/command{name = "AI Upload"; req_access_txt = "16"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/airless,/area/derelict/bridge/ai_upload)
 "dMi" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating/airless,/area/derelict/bridge/ai_upload)
 "dMj" = (/obj/structure/grille,/turf/simulated/floor/plating/airless,/area/derelict/hallway/secondary)
-"dMk" = (/obj/machinery/power/smes,/obj/structure/cable,/turf/simulated/floor/airless,/area/derelict/bridge/ai_upload)
+"dMk" = (/obj/machinery/power/battery/smes,/obj/structure/cable,/turf/simulated/floor/airless,/area/derelict/bridge/ai_upload)
 "dMl" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/airless,/area/derelict/bridge/ai_upload)
 "dMm" = (/turf/simulated/floor/airless{broken = 1; icon_state = "damaged4"},/area/derelict/bridge/ai_upload)
 "dMn" = (/turf/simulated/floor/airless,/area/derelict/bridge/ai_upload)
@@ -10479,7 +10479,7 @@
 "dTA" = (/obj/machinery/power/port_gen/pacman{anchored = 1},/turf/simulated/floor/plating,/area/research_outpost/power)
 "dTB" = (/obj/machinery/power/port_gen/pacman{anchored = 1},/obj/structure/sign/nosmoking_1{pixel_y = 32},/turf/simulated/floor/plating,/area/research_outpost/power)
 "dTC" = (/obj/machinery/power/terminal{dir = 4},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/turf/simulated/floor/plating,/area/research_outpost/power)
-"dTD" = (/obj/machinery/power/smes{charge = 5e+006},/obj/structure/sign/electricshock{pixel_x = 32},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/turf/simulated/floor/plating,/area/research_outpost/power)
+"dTD" = (/obj/machinery/power/battery/smes{charge = 5e+006},/obj/structure/sign/electricshock{pixel_x = 32},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/turf/simulated/floor/plating,/area/research_outpost/power)
 "dTE" = (/obj/structure/transit_tube{icon_state = "N-S"},/turf/unsimulated/floor/airless{icon_state = "asteroidplating"},/area/mine/explored)
 "dTF" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/turf/simulated/floor/vox,/area/vox_trading_post/hallway)
 "dTG" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor/vox,/area/vox_trading_post/hallway)
@@ -10506,7 +10506,7 @@
 "dUb" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/engineering{name = "Outpost Power Substation"; req_access_txt = "0"; req_one_access_txt = "47;10;24"},/turf/simulated/floor/plating,/area/research_outpost/power)
 "dUc" = (/turf/simulated/floor/plating,/area/research_outpost/power)
 "dUd" = (/obj/machinery/power/terminal{dir = 4},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/research_outpost/power)
-"dUe" = (/obj/machinery/power/smes{charge = 5e+006},/obj/machinery/light{dir = 4},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/research_outpost/power)
+"dUe" = (/obj/machinery/power/battery/smes{charge = 5e+006},/obj/machinery/light{dir = 4},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/research_outpost/power)
 "dUf" = (/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/wall/r_wall,/area/research_outpost/power)
 "dUg" = (/obj/structure/transit_tube{icon_state = "N-S"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/light/small{dir = 8},/turf/unsimulated/floor/airless{icon_state = "asteroidplating"},/area/mine/explored)
 "dUh" = (/obj/structure/disposaloutlet,/obj/structure/disposalpipe/trunk{dir = 8},/turf/unsimulated/floor/airless{icon_state = "asteroidplating"},/area/mine/explored)
@@ -10982,7 +10982,7 @@
 "edj" = (/obj/structure/dispenser,/obj/machinery/light_switch{pixel_x = 27; pixel_y = 0},/turf/simulated/floor/plating,/area/research_outpost/maintstore2)
 "edk" = (/obj/machinery/light,/turf/simulated/floor{icon_state = "dark-markings"; dir = 8},/area/research_outpost/longtermstorage)
 "edl" = (/turf/simulated/floor/vox/wood,/area/vox_trading_post/storage_1)
-"edm" = (/obj/structure/cable,/obj/machinery/power/smes/magical{desc = "A high-capacity superconducting magnetic energy storage (SMES) unit."; name = "power storage unit"},/turf/simulated/floor/vox/wood,/area/vox_trading_post/storage_1)
+"edm" = (/obj/structure/cable,/obj/machinery/power/battery/smes/infinite{desc = "A high-capacity superconducting magnetic energy storage (SMES) unit."; name = "power storage unit"},/turf/simulated/floor/vox/wood,/area/vox_trading_post/storage_1)
 "edn" = (/turf/simulated/wall,/area/vox_trading_post/atmos)
 "edo" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass_atmos{name = "Trade Outpost Atmospherics"},/turf/simulated/floor/airless{icon_state = "floorgrime"},/area/vox_trading_post/atmos)
 "edp" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/vox_trading_post/atmos)
@@ -11508,7 +11508,7 @@
 "enq" = (/obj/machinery/conveyor_switch{id_tag = "mining_external"},/turf/unsimulated/floor/airless{icon_state = "asteroidwarning"},/area/mine/explored)
 "ens" = (/obj/machinery/power/port_gen/pacman{anchored = 1},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/plating,/area/mine/west_outpost)
 "ent" = (/obj/machinery/power/terminal{dir = 4},/obj/machinery/light/small,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/mine/west_outpost)
-"enu" = (/obj/machinery/power/smes,/obj/structure/cable,/turf/simulated/floor/plating,/area/mine/west_outpost)
+"enu" = (/obj/machinery/power/battery/smes,/obj/structure/cable,/turf/simulated/floor/plating,/area/mine/west_outpost)
 "env" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/mine/living_quarters)
 "enw" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass_medical{id_tag = null; name = "Infirmary"; req_access_txt = "0"},/turf/simulated/floor{icon_state = "white"},/area/mine/living_quarters)
 "enx" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; name = "HIGH VOLTAGE"},/turf/simulated/wall,/area/mine/living_quarters)
@@ -11533,7 +11533,7 @@
 "enQ" = (/turf/simulated/floor{icon_state = "white"},/area/mine/living_quarters)
 "enR" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "white"},/area/mine/living_quarters)
 "enS" = (/obj/structure/closet/walllocker/defiblocker{pixel_x = 30},/turf/simulated/floor{icon_state = "white"},/area/mine/living_quarters)
-"enT" = (/obj/machinery/power/smes{charge = 5e+006},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/plating,/area/mine/living_quarters)
+"enT" = (/obj/machinery/power/battery/smes{charge = 5e+006},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/plating,/area/mine/living_quarters)
 "enU" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/light/small{dir = 1},/obj/item/weapon/storage/box/lights/mixed,/turf/simulated/floor/plating,/area/mine/living_quarters)
 "enV" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/plating,/area/mine/living_quarters)
 "enW" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/mine/living_quarters)