From 0db2a23fafd5add58dcf65f534c16d33d234a086 Mon Sep 17 00:00:00 2001
From: Watermelon914 <37270891+Watermelon914@users.noreply.github.com>
Date: Tue, 25 Jun 2024 00:32:19 +0000
Subject: [PATCH] Adds a new power storage type: The Megacell. Drastically
reduces power cell consumption/storage. [MDB Ignore] (#84079)
## About The Pull Request
As the title says. A standard power cell now only stores 10 KJ and
drains power similar to how it did before the refactor to all power
appliances.
The new standard megacell stock part stores 1 MJ (what cells store right
now). APCs and SMESs have had their power cells replaced with these
megacell stock parts instead. Megacells can only be used in APCs and
SMESs. It shouldn't be possible to use megacells in any typical
appliance.
This shouldn't change anything about how much 'use' you can get out of a
power cell in regular practice. Most should operate the same and you
should still get the same amount of shots out of a laser gun, and we can
look at expanding what can be switched over to megacells, e.g. if we
want mechs to require significantly more power than a typical appliance.
Thanks to Meyhazah for the megacell icon sprites.
## Why It's Good For The Game
Power cell consumption is way too high ever since the power appliance
refactor that converted most things to be in joules. It's a bit
ridiculous for most of our machinery to drain the station's power supply
this early on.
The reason it's like this is because regular appliances (laser guns,
borgs, lights) all have a cell type that is identical to the APC/SMES
cell type. And it means that if we want to provide an easy way to charge
these appliances without making it easy to charge APCs/SMESs through a
power bug exploit, we need to introduce a new cell type to differentiate
between what supplies power and regular appliances that use power. This
is primarily what the megacell stock part does.
This moves us back to what it was originally like before the power
refactor, where recharging power cells wouldn't drain an exorbitant
amount of energy. However, it maintains the goal of the original
refactor which was to prevent people from cheesing power generation to
produce an infinite amount of power, as the power that APCs and SMESs
operate at is drastically different from the power that a regular
appliance uses.
## Changelog
:cl: Watermelon, Mayhazah
balance: Drastically reduces the power consumption and max charge of
power cells
balance: Added a new stock part called the battery, used primarily in
the construction of APCs and SMESs.
add: Suiciding with a cell/battery will shock you and potentially dust
you/shock the people around you if the charge is great enough.
/:cl:
---------
Co-authored-by: Watermelon914 <3052169-Watermelon914@users.noreply.gitlab.com>
Co-authored-by: Pickle-Coding <58013024+Pickle-Coding@users.noreply.github.com>
---
.../IceRuins/icemoon_surface_smoking_room.dmm | 2 +-
..._underground_abandoned_plasma_facility.dmm | 4 +-
.../lavaland_surface_syndicate_base1.dmm | 4 +-
.../SpaceRuins/abandonedteleporter.dmm | 2 +-
.../SpaceRuins/allamericandiner.dmm | 2 +-
_maps/RandomRuins/SpaceRuins/bigderelict1.dmm | 8 +-
_maps/RandomRuins/SpaceRuins/crashedship.dmm | 2 +-
.../SpaceRuins/cyborg_mothership.dmm | 2 +-
.../RandomRuins/SpaceRuins/garbagetruck1.dmm | 3 +-
.../RandomRuins/SpaceRuins/garbagetruck2.dmm | 3 +-
.../RandomRuins/SpaceRuins/garbagetruck3.dmm | 9 +-
.../RandomRuins/SpaceRuins/garbagetruck4.dmm | 5 +-
.../SpaceRuins/hilbertresearchfacility.dmm | 2 +-
.../SpaceRuins/listeningstation.dmm | 4 +-
_maps/RandomRuins/SpaceRuins/oldAIsat.dmm | 2 +-
.../SpaceRuins/old_infiltrator.dmm | 4 +-
_maps/RandomRuins/SpaceRuins/oldstation.dmm | 14 +-
.../RandomRuins/SpaceRuins/oldteleporter.dmm | 2 +-
.../SpaceRuins/russian_derelict.dmm | 24 +-
.../RandomRuins/SpaceRuins/travelers_rest.dmm | 2 +-
.../SpaceRuins/turretedoutpost.dmm | 2 +-
_maps/RandomRuins/SpaceRuins/waystation.dmm | 2 +-
_maps/RandomZLevels/TheBeach.dmm | 2 +-
_maps/RandomZLevels/caves.dmm | 2 +-
_maps/RandomZLevels/moonoutpost19.dmm | 14 +-
_maps/RandomZLevels/research.dmm | 14 +-
_maps/RandomZLevels/snowdin.dmm | 2 +-
_maps/RandomZLevels/undergroundoutpost45.dmm | 12 +-
_maps/map_files/Birdshot/birdshot.dmm | 664 ++++----
.../map_files/Deltastation/DeltaStation2.dmm | 660 ++++----
.../map_files/IceBoxStation/IceBoxStation.dmm | 1070 ++++++-------
_maps/map_files/MetaStation/MetaStation.dmm | 678 ++++----
_maps/map_files/Mining/Lavaland.dmm | 12 +-
_maps/map_files/NorthStar/north_star.dmm | 536 +++----
_maps/map_files/debug/runtimestation.dmm | 8 +-
.../atmoscilower_attachment_a_3.dmm | 2 +-
.../maintenance_modules/cargoscilower_3.dmm | 2 +-
.../cargoscilower_attachment_a_3.dmm | 8 +-
.../maintenance_modules/dormenginelower_2.dmm | 2 +-
.../dormenginelower_attachment_b_1.dmm | 2 +-
.../medsciupper_attachment_a_1.dmm | 2 +-
_maps/map_files/tramstation/tramstation.dmm | 552 +++----
_maps/map_files/wawastation/wawastation.dmm | 1376 ++++++++---------
_maps/shuttles/emergency_birdshot.dmm | 2 +-
_maps/shuttles/emergency_delta.dmm | 4 +-
_maps/shuttles/emergency_lance.dmm | 2 +-
_maps/shuttles/emergency_northstar.dmm | 2 +-
_maps/shuttles/emergency_omega.dmm | 2 +-
_maps/shuttles/emergency_raven.dmm | 2 +-
_maps/shuttles/emergency_shadow.dmm | 4 +-
_maps/shuttles/emergency_zeta.dmm | 2 +-
_maps/shuttles/infiltrator_advanced.dmm | 4 +-
_maps/shuttles/infiltrator_basic.dmm | 4 +-
_maps/shuttles/mining_kilo.dmm | 2 +-
_maps/shuttles/mining_large.dmm | 2 +-
_maps/shuttles/pirate_default.dmm | 2 +-
_maps/shuttles/pirate_ex_interdyne.dmm | 2 +-
_maps/shuttles/pirate_geode.dmm | 6 +-
_maps/shuttles/pirate_grey.dmm | 4 +-
_maps/shuttles/pirate_irs.dmm | 2 +-
_maps/shuttles/ruin_cyborg_mothership.dmm | 2 +-
_maps/shuttles/ruin_pirate_cutter.dmm | 2 +-
_maps/shuttles/whiteship_birdshot.dmm | 4 +-
_maps/shuttles/whiteship_cere.dmm | 2 +-
_maps/shuttles/whiteship_delta.dmm | 4 +-
_maps/shuttles/whiteship_donut.dmm | 4 +-
_maps/shuttles/whiteship_kilo.dmm | 2 +-
_maps/shuttles/whiteship_meta.dmm | 8 +-
_maps/shuttles/whiteship_pubby.dmm | 2 +-
_maps/shuttles/whiteship_tram.dmm | 2 +-
_maps/templates/battlecruiser_starfury.dmm | 10 +-
_maps/virtual_domains/abductor_ship.dmm | 2 +-
code/__DEFINES/modular_computer.dm | 2 +-
code/__DEFINES/power.dm | 13 +-
code/__DEFINES/robots.dm | 4 +-
code/_globalvars/lists/maintenance_loot.dm | 6 +-
code/datums/components/crafting/chemistry.dm | 2 +-
code/datums/components/crafting/equipment.dm | 4 +-
.../components/crafting/ranged_weapon.dm | 4 +-
code/datums/components/crank_recharge.dm | 4 +-
code/datums/components/shell.dm | 4 +-
.../quirks/neutral_quirks/transhumanist.dm | 2 +-
code/game/machinery/_machinery.dm | 4 +-
code/game/machinery/cell_charger.dm | 4 +-
code/game/machinery/defibrillator_mount.dm | 4 +-
code/game/machinery/recharger.dm | 4 +-
code/game/machinery/rechargestation.dm | 6 +-
code/game/machinery/spaceheater.dm | 6 +-
code/game/machinery/suit_storage_unit.dm | 4 +-
code/game/machinery/transformer.dm | 2 +-
.../machines/machine_circuitboards.dm | 26 +-
code/game/objects/items/defib.dm | 10 +-
code/game/objects/items/inducer.dm | 36 +-
code/game/objects/items/inspector.dm | 4 +-
code/game/objects/items/maintenance_loot.dm | 8 +-
code/game/objects/items/melee/baton.dm | 12 +-
code/game/objects/items/melee/energy.dm | 2 +-
.../game/objects/items/robot/items/generic.dm | 10 +-
code/game/objects/items/robot/robot_parts.dm | 4 +-
.../crates_lockers/closets/gimmick.dm | 2 +-
code/modules/admin/verbs/borgpanel.dm | 2 +-
.../antagonists/ninja/ninjaDrainAct.dm | 4 +-
.../components/electrolyzer/electrolyzer.dm | 4 +-
.../machinery/components/fusion/hfr_procs.dm | 2 +-
.../atmos_machines_recipes.dm | 2 +-
.../machinery/portable/canister.dm | 10 +-
code/modules/autowiki/pages/stockparts.dm | 17 +-
code/modules/cargo/exports/xenobio.dm | 4 +-
code/modules/cargo/packs/engineering.dm | 2 +-
.../clothing/spacesuits/_spacesuits.dm | 4 +-
.../clothing/spacesuits/bountyhunter.dm | 2 +-
code/modules/clothing/spacesuits/syndi.dm | 2 +-
.../modules/deathmatch/deathmatch_loadouts.dm | 2 +-
.../experisci/experiment/experiments.dm | 2 +-
.../exploration_events/trader.dm | 4 +-
code/modules/explorer_drone/loot.dm | 4 +-
code/modules/fishing/fish/fish_types.dm | 4 +-
code/modules/fishing/fishing_rod.dm | 2 +-
.../food_and_drinks/machinery/microwave.dm | 12 +-
.../recipes/tablecraft/recipes_misc.dm | 2 +-
.../recipes/tablecraft/recipes_pie.dm | 2 +-
.../recipes/tablecraft/recipes_pizza.dm | 2 +-
code/modules/hydroponics/plant_genes.dm | 4 +-
code/modules/mob/living/basic/bots/_bots.dm | 4 +-
.../modules/mob/living/basic/festivus_pole.dm | 6 +-
.../mob/living/silicon/robot/robot_defense.dm | 2 +-
.../mob/living/silicon/robot/robot_defines.dm | 4 +-
.../mob/living/simple_animal/bot/bot.dm | 4 +-
.../mob/living/simple_animal/bot/mulebot.dm | 6 +-
.../mob/living/simple_animal/bot/secbot.dm | 2 +-
code/modules/mod/mod_control.dm | 2 +-
code/modules/mod/mod_core.dm | 14 +-
code/modules/mod/mod_link.dm | 6 +-
code/modules/mod/mod_types.dm | 34 +-
.../computers/item/computer.dm | 10 +-
.../computers/item/processor.dm | 2 +-
.../computers/machinery/modular_computer.dm | 2 +-
code/modules/power/apc/apc_attack.dm | 2 +-
code/modules/power/apc/apc_contextual_tips.dm | 6 +-
code/modules/power/apc/apc_main.dm | 8 +-
code/modules/power/apc/apc_tool_act.dm | 8 +-
code/modules/power/battery.dm | 79 +
code/modules/power/cell.dm | 376 +----
code/modules/power/lighting/light.dm | 10 +-
.../modules/power/lighting/light_construct.dm | 6 +-
code/modules/power/power.dm | 10 +-
code/modules/power/power_store.dm | 326 ++++
code/modules/power/smes.dm | 18 +-
code/modules/projectiles/guns/energy.dm | 4 +-
.../projectiles/guns/energy/energy_gun.dm | 4 +-
.../projectiles/guns/energy/laser_gatling.dm | 6 +-
code/modules/projectiles/guns/energy/pulse.dm | 10 +-
.../projectiles/guns/energy/recharge.dm | 2 +-
.../projectiles/guns/energy/special.dm | 6 +-
.../chemistry/machinery/chem_dispenser.dm | 26 +-
.../chemistry/recipes/slime_extracts.dm | 2 +-
.../reagents/reagent_containers/misc.dm | 6 +-
code/modules/religion/religion_sects.dm | 4 +-
.../designs/autolathe/engineering_designs.dm | 2 +-
.../modules/research/designs/power_designs.dm | 86 +-
code/modules/research/experimentor.dm | 2 +-
code/modules/research/stock_parts.dm | 12 +-
.../research/techweb/nodes/engi_nodes.dm | 7 +-
.../xenobiology/crossbreeding/_misc.dm | 2 +-
.../crossbreeding/_status_effects.dm | 4 +-
.../xenobiology/crossbreeding/charged.dm | 2 +-
.../xenobiology/crossbreeding/industrial.dm | 4 +-
.../xenobiology/crossbreeding/regenerative.dm | 4 +-
.../surgery/bodyparts/robot_bodyparts.dm | 4 +-
.../internal/stomach/stomach_ethereal.dm | 4 +-
code/modules/vehicles/mecha/_mecha.dm | 6 +-
code/modules/vehicles/mecha/combat/gygax.dm | 2 +-
code/modules/vehicles/mecha/combat/honker.dm | 2 +-
.../modules/vehicles/mecha/combat/marauder.dm | 4 +-
.../vehicles/mecha/combat/reticence.dm | 2 +-
.../mecha/mecha_construction_paths.dm | 6 +-
code/modules/vehicles/mecha/mecha_defense.dm | 2 +-
code/modules/vehicles/mecha/working/ripley.dm | 2 +-
code/modules/vehicles/motorized_wheelchair.dm | 10 +-
code/modules/vending/assist.dm | 3 +-
code/modules/vending/engineering.dm | 3 +-
code/modules/vending/engivend.dm | 5 +-
code/modules/vending/robotics.dm | 2 +-
.../wiremod/components/abstract/module.dm | 2 +-
.../wiremod/components/atom/remotecam.dm | 6 +-
code/modules/wiremod/core/component.dm | 2 +-
.../wiremod/core/integrated_circuit.dm | 8 +-
.../wiremod/shell/brain_computer_interface.dm | 4 +-
code/modules/wiremod/shell/gun.dm | 4 +-
icons/obj/machines/cell_charger.dmi | Bin 3629 -> 4554 bytes
tgstation.dme | 2 +
.../Scripts/74651_apc_to_apc_helpers.txt | 2 +-
.../Scripts/84079_cell_updates.txt | 2 +
tools/ci/check_grep.sh | 2 +-
194 files changed, 3771 insertions(+), 3566 deletions(-)
create mode 100644 code/modules/power/battery.dm
create mode 100644 code/modules/power/power_store.dm
create mode 100644 tools/UpdatePaths/Scripts/84079_cell_updates.txt
diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_smoking_room.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_smoking_room.dmm
index faa5cf18ae9..fd292ec7685 100644
--- a/_maps/RandomRuins/IceRuins/icemoon_surface_smoking_room.dmm
+++ b/_maps/RandomRuins/IceRuins/icemoon_surface_smoking_room.dmm
@@ -6,7 +6,7 @@
/obj/item/circuitboard/machine/space_heater,
/obj/item/stack/cable_coil/five,
/obj/structure/frame/machine,
-/obj/item/stock_parts/cell/super,
+/obj/item/stock_parts/power_store/cell/super,
/turf/open/floor/wood,
/area/ruin/smoking_room/house)
"d" = (
diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm
index f344652d623..96dec4af720 100644
--- a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm
+++ b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm
@@ -89,7 +89,7 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell,
+/obj/item/stock_parts/power_store/cell,
/turf/open/floor/plating,
/area/ruin/plasma_facility/operations)
"bv" = (
@@ -166,7 +166,7 @@
pixel_x = -7;
pixel_y = 8
},
-/obj/item/stock_parts/cell/high{
+/obj/item/stock_parts/power_store/cell/high{
pixel_x = -18;
pixel_y = -3
},
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
index fb738781bc7..09405b24334 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
@@ -2006,7 +2006,7 @@
},
/obj/structure/table,
/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
/obj/structure/cable,
/turf/open/floor/mineral/plastitanium,
/area/ruin/syndicate_lava_base/cargo)
@@ -2081,7 +2081,7 @@
/obj/machinery/firealarm/directional/west,
/obj/structure/table,
/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
diff --git a/_maps/RandomRuins/SpaceRuins/abandonedteleporter.dmm b/_maps/RandomRuins/SpaceRuins/abandonedteleporter.dmm
index 0f5ffbcb72c..51fea0a9517 100644
--- a/_maps/RandomRuins/SpaceRuins/abandonedteleporter.dmm
+++ b/_maps/RandomRuins/SpaceRuins/abandonedteleporter.dmm
@@ -48,7 +48,7 @@
/turf/open/floor/plating/airless,
/area/ruin/space/abandoned_tele)
"l" = (
-/obj/item/stock_parts/cell,
+/obj/item/stock_parts/power_store/cell,
/turf/open/floor/plating/airless,
/area/ruin/space/abandoned_tele)
"m" = (
diff --git a/_maps/RandomRuins/SpaceRuins/allamericandiner.dmm b/_maps/RandomRuins/SpaceRuins/allamericandiner.dmm
index f7dc2f52fe3..32329cf4a5c 100644
--- a/_maps/RandomRuins/SpaceRuins/allamericandiner.dmm
+++ b/_maps/RandomRuins/SpaceRuins/allamericandiner.dmm
@@ -513,7 +513,7 @@
"yE" = (
/obj/structure/table,
/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
/obj/machinery/power/terminal{
dir = 4
},
diff --git a/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm b/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm
index 12c40f0b280..4bdf2af01f1 100644
--- a/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm
+++ b/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm
@@ -132,8 +132,8 @@
"aI" = (
/obj/structure/closet/crate/engineering/electrical,
/obj/item/storage/toolbox/electrical,
-/obj/item/stock_parts/cell/hyper,
-/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/power_store/cell/hyper,
+/obj/item/stock_parts/power_store/cell/high,
/turf/open/floor/mineral/titanium/yellow,
/area/ruin/space/has_grav/derelictoutpost/dockedship)
"aJ" = (
@@ -207,7 +207,7 @@
"aW" = (
/obj/structure/closet/crate/engineering/electrical,
/obj/item/storage/toolbox/electrical,
-/obj/item/stock_parts/cell/hyper,
+/obj/item/stock_parts/power_store/cell/hyper,
/turf/open/floor/mineral/titanium/yellow,
/area/ruin/space/has_grav/derelictoutpost/dockedship)
"aX" = (
@@ -233,7 +233,7 @@
/area/ruin/space/has_grav/derelictoutpost/powerstorage)
"bc" = (
/obj/structure/table,
-/obj/item/stock_parts/cell/hyper,
+/obj/item/stock_parts/power_store/cell/hyper,
/obj/structure/cable,
/turf/open/floor/iron,
/area/ruin/space/has_grav/derelictoutpost/powerstorage)
diff --git a/_maps/RandomRuins/SpaceRuins/crashedship.dmm b/_maps/RandomRuins/SpaceRuins/crashedship.dmm
index 803e0afa28c..60e8714e865 100644
--- a/_maps/RandomRuins/SpaceRuins/crashedship.dmm
+++ b/_maps/RandomRuins/SpaceRuins/crashedship.dmm
@@ -1316,7 +1316,7 @@
dir = 1
},
/obj/structure/table,
-/obj/item/stock_parts/cell/lead,
+/obj/item/stock_parts/power_store/cell/lead,
/turf/open/floor/iron/airless,
/area/ruin/space/has_grav/crashedship/aft)
"XW" = (
diff --git a/_maps/RandomRuins/SpaceRuins/cyborg_mothership.dmm b/_maps/RandomRuins/SpaceRuins/cyborg_mothership.dmm
index 7e6927290bc..f72cdd8ecad 100644
--- a/_maps/RandomRuins/SpaceRuins/cyborg_mothership.dmm
+++ b/_maps/RandomRuins/SpaceRuins/cyborg_mothership.dmm
@@ -62,7 +62,7 @@
/turf/template_noop,
/area/space)
"s" = (
-/obj/item/stock_parts/cell/high/empty,
+/obj/item/stock_parts/power_store/cell/high/empty,
/turf/open/misc/asteroid/airless,
/area/space)
"u" = (
diff --git a/_maps/RandomRuins/SpaceRuins/garbagetruck1.dmm b/_maps/RandomRuins/SpaceRuins/garbagetruck1.dmm
index 8aa85a7e153..65c448e94c4 100644
--- a/_maps/RandomRuins/SpaceRuins/garbagetruck1.dmm
+++ b/_maps/RandomRuins/SpaceRuins/garbagetruck1.dmm
@@ -754,7 +754,7 @@
"Fz" = (
/obj/structure/table/reinforced,
/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/lead,
+/obj/item/stock_parts/power_store/cell/lead,
/turf/open/floor/iron/smooth,
/area/ruin/space/has_grav/garbagetruck/foodwaste)
"FL" = (
@@ -1070,7 +1070,6 @@
},
/obj/machinery/light/warm,
/obj/machinery/power/apc{
- cell_type = /obj/item/stock_parts/cell/lead;
locked = 0;
pixel_y = -25;
start_charge = 0
diff --git a/_maps/RandomRuins/SpaceRuins/garbagetruck2.dmm b/_maps/RandomRuins/SpaceRuins/garbagetruck2.dmm
index 9813823daeb..c394d14f977 100644
--- a/_maps/RandomRuins/SpaceRuins/garbagetruck2.dmm
+++ b/_maps/RandomRuins/SpaceRuins/garbagetruck2.dmm
@@ -238,7 +238,7 @@
"vf" = (
/obj/structure/table/reinforced,
/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/lead,
+/obj/item/stock_parts/power_store/cell/lead,
/turf/open/floor/iron/smooth,
/area/ruin/space/has_grav/garbagetruck/medicalwaste)
"vM" = (
@@ -537,7 +537,6 @@
},
/obj/machinery/light/warm,
/obj/machinery/power/apc{
- cell_type = /obj/item/stock_parts/cell/lead;
locked = 0;
pixel_y = -25;
start_charge = 0
diff --git a/_maps/RandomRuins/SpaceRuins/garbagetruck3.dmm b/_maps/RandomRuins/SpaceRuins/garbagetruck3.dmm
index c2da1e7646c..0f2f425fe62 100644
--- a/_maps/RandomRuins/SpaceRuins/garbagetruck3.dmm
+++ b/_maps/RandomRuins/SpaceRuins/garbagetruck3.dmm
@@ -187,7 +187,7 @@
/area/ruin/space/has_grav/garbagetruck/squat)
"kb" = (
/obj/effect/decal/cleanable/fuel_pool,
-/obj/item/stock_parts/cell/crap/empty,
+/obj/item/stock_parts/power_store/cell/crap/empty,
/obj/effect/decal/cleanable/plastic,
/obj/effect/spawner/random/maintenance/two,
/turf/open/floor/plating/dumpsterair,
@@ -447,7 +447,7 @@
/obj/structure/broken_flooring/pile,
/obj/item/food/deadmouse/moldy,
/obj/item/stock_parts/water_recycler,
-/obj/item/stock_parts/cell/lead,
+/obj/item/stock_parts/power_store/cell/lead,
/turf/open/floor/plating/dumpsterair,
/area/ruin/space/has_grav/garbagetruck/squat)
"vW" = (
@@ -470,7 +470,6 @@
},
/obj/machinery/light/warm,
/obj/machinery/power/apc{
- cell_type = /obj/item/stock_parts/cell/lead;
locked = 0;
pixel_y = -25;
start_charge = 0
@@ -669,7 +668,7 @@
"HN" = (
/obj/structure/table/reinforced,
/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/lead,
+/obj/item/stock_parts/power_store/cell/lead,
/turf/open/floor/iron/smooth,
/area/ruin/space/has_grav/garbagetruck/squat)
"HZ" = (
@@ -755,7 +754,7 @@
/turf/open/space/basic,
/area/ruin/space/has_grav/garbagetruck/squat)
"MQ" = (
-/obj/item/stock_parts/cell/crap/empty{
+/obj/item/stock_parts/power_store/cell/crap/empty{
pixel_x = -4;
pixel_y = 10
},
diff --git a/_maps/RandomRuins/SpaceRuins/garbagetruck4.dmm b/_maps/RandomRuins/SpaceRuins/garbagetruck4.dmm
index 33c5893bcee..84ec36e943a 100644
--- a/_maps/RandomRuins/SpaceRuins/garbagetruck4.dmm
+++ b/_maps/RandomRuins/SpaceRuins/garbagetruck4.dmm
@@ -653,7 +653,6 @@
},
/obj/machinery/light/warm,
/obj/machinery/power/apc{
- cell_type = /obj/item/stock_parts/cell/lead;
locked = 0;
pixel_y = -25;
start_charge = 0
@@ -672,7 +671,7 @@
"Mp" = (
/obj/structure/table/reinforced,
/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/lead,
+/obj/item/stock_parts/power_store/cell/lead,
/turf/open/floor/iron/smooth,
/area/ruin/space/has_grav/garbagetruck/toystore)
"MK" = (
@@ -758,7 +757,7 @@
/area/ruin/space/has_grav/garbagetruck/toystore)
"Rl" = (
/obj/item/paper/crumpled,
-/obj/item/stock_parts/cell/hyper,
+/obj/item/stock_parts/power_store/cell/hyper,
/obj/item/hand_labeler,
/obj/item/hand_labeler_refill,
/obj/item/hand_labeler_refill,
diff --git a/_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm b/_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm
index bdd59fa786b..01ef1895a66 100644
--- a/_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm
+++ b/_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm
@@ -1953,7 +1953,7 @@
/area/ruin/space/has_grav/powered/hilbertresearchfacility)
"Sn" = (
/obj/structure/table/wood,
-/obj/item/stock_parts/cell/bluespace{
+/obj/item/stock_parts/power_store/cell/bluespace{
pixel_y = 4
},
/obj/machinery/cell_charger{
diff --git a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm
index ad27c03ab9a..c1188e98663 100644
--- a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm
+++ b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm
@@ -919,7 +919,7 @@
"WD" = (
/obj/structure/table,
/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
/obj/item/stack/cable_coil{
pixel_x = 3;
pixel_y = 10
@@ -969,7 +969,7 @@
/obj/item/stack/sheet/mineral/plasma{
amount = 30
},
-/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
/obj/machinery/light/small/directional/east,
/obj/structure/closet/crate,
/obj/effect/turf_decal/delivery,
diff --git a/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm b/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm
index 4cd81c550dd..fbdc62bae7a 100644
--- a/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm
+++ b/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm
@@ -49,7 +49,7 @@
/turf/open/floor/plating/airless,
/area/ruin/space/tcommsat_oldaisat)
"am" = (
-/obj/item/stock_parts/cell,
+/obj/item/stock_parts/power_store/cell,
/turf/open/floor/plating/airless,
/area/ruin/space/tcommsat_oldaisat)
"an" = (
diff --git a/_maps/RandomRuins/SpaceRuins/old_infiltrator.dmm b/_maps/RandomRuins/SpaceRuins/old_infiltrator.dmm
index afa11afbc9a..4b42f668c33 100644
--- a/_maps/RandomRuins/SpaceRuins/old_infiltrator.dmm
+++ b/_maps/RandomRuins/SpaceRuins/old_infiltrator.dmm
@@ -676,11 +676,11 @@
"Ux" = (
/obj/structure/extinguisher_cabinet/directional/west,
/obj/structure/table,
-/obj/item/stock_parts/cell/high/empty{
+/obj/item/stock_parts/power_store/cell/high/empty{
pixel_y = 4;
pixel_x = 5
},
-/obj/item/stock_parts/cell/emproof/empty,
+/obj/item/stock_parts/power_store/cell/emproof/empty,
/turf/open/floor/mineral/plastitanium/red/airless,
/area/ruin/space/unpowered)
"UN" = (
diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm
index 60088fb274d..6062a970205 100644
--- a/_maps/RandomRuins/SpaceRuins/oldstation.dmm
+++ b/_maps/RandomRuins/SpaceRuins/oldstation.dmm
@@ -1598,13 +1598,13 @@
/obj/structure/rack,
/obj/effect/decal/cleanable/dirt,
/obj/item/crowbar,
-/obj/item/stock_parts/cell/high,
/obj/machinery/door/window/right/directional/north{
req_access = list("away_general")
},
/obj/item/paper/fluff/ruins/oldstation/apc_note,
/obj/effect/turf_decal/tile/yellow/anticorner/contrasted,
/obj/item/card/id/away/old/equipment,
+/obj/item/stock_parts/power_store/battery/high,
/turf/open/floor/iron,
/area/ruin/space/ancientstation/charlie/engie)
"hh" = (
@@ -5061,7 +5061,7 @@
pixel_x = -3;
pixel_y = 5
},
-/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
/obj/effect/turf_decal/tile/yellow/half/contrasted{
dir = 1
},
@@ -6079,11 +6079,11 @@
"IU" = (
/obj/structure/closet/crate/engineering,
/obj/item/circuitboard/machine/smes,
-/obj/item/stock_parts/cell/high/empty,
-/obj/item/stock_parts/cell/high/empty,
-/obj/item/stock_parts/cell/high/empty,
-/obj/item/stock_parts/cell/high/empty,
-/obj/item/stock_parts/cell/high/empty,
+/obj/item/stock_parts/power_store/cell/high/empty,
+/obj/item/stock_parts/power_store/cell/high/empty,
+/obj/item/stock_parts/power_store/cell/high/empty,
+/obj/item/stock_parts/power_store/cell/high/empty,
+/obj/item/stock_parts/power_store/cell/high/empty,
/obj/item/stock_parts/capacitor,
/obj/effect/decal/cleanable/dirt,
/obj/item/circuitboard/machine/thermomachine,
diff --git a/_maps/RandomRuins/SpaceRuins/oldteleporter.dmm b/_maps/RandomRuins/SpaceRuins/oldteleporter.dmm
index fc856f6858d..f1b71baa314 100644
--- a/_maps/RandomRuins/SpaceRuins/oldteleporter.dmm
+++ b/_maps/RandomRuins/SpaceRuins/oldteleporter.dmm
@@ -44,7 +44,7 @@
/area/ruin/space/oldteleporter)
"l" = (
/obj/structure/table,
-/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
/turf/open/floor/iron/airless,
/area/ruin/space/oldteleporter)
"n" = (
diff --git a/_maps/RandomRuins/SpaceRuins/russian_derelict.dmm b/_maps/RandomRuins/SpaceRuins/russian_derelict.dmm
index 45eee5cbe8b..58bad243690 100644
--- a/_maps/RandomRuins/SpaceRuins/russian_derelict.dmm
+++ b/_maps/RandomRuins/SpaceRuins/russian_derelict.dmm
@@ -300,7 +300,7 @@
/obj/structure/rack,
/obj/item/stack/cable_coil/five,
/obj/item/screwdriver,
-/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
/turf/open/floor/iron,
/area/ruin/space/ks13/engineering/sb_bow_solars_control)
"dx" = (
@@ -898,7 +898,7 @@
/area/ruin/space/ks13/service/chapel)
"lW" = (
/obj/structure/rack,
-/obj/item/stock_parts/cell/lead,
+/obj/item/stock_parts/power_store/cell/lead,
/obj/effect/mapping_helpers/broken_floor,
/obj/machinery/power/apc/auto_name/directional/south,
/obj/effect/mapping_helpers/apc/no_charge,
@@ -3880,23 +3880,23 @@
/area/ruin/space/ks13/ai/corridor)
"DL" = (
/obj/structure/table,
-/obj/item/stock_parts/cell/high{
+/obj/item/stock_parts/power_store/cell/high{
pixel_x = 7;
pixel_y = 7
},
-/obj/item/stock_parts/cell/high{
+/obj/item/stock_parts/power_store/cell/high{
pixel_x = 7;
pixel_y = 4
},
-/obj/item/stock_parts/cell/high{
+/obj/item/stock_parts/power_store/cell/high{
pixel_x = 7;
pixel_y = 1
},
-/obj/item/stock_parts/cell/high{
+/obj/item/stock_parts/power_store/cell/high{
pixel_x = -7;
pixel_y = 7
},
-/obj/item/stock_parts/cell/high{
+/obj/item/stock_parts/power_store/cell/high{
pixel_x = -7;
pixel_y = 4
},
@@ -5546,7 +5546,7 @@
/area/ruin/space/ks13/security/sec)
"MM" = (
/obj/structure/table,
-/obj/item/stock_parts/cell,
+/obj/item/stock_parts/power_store/cell,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/airless,
/area/ruin/space/ks13/dorms)
@@ -6410,7 +6410,7 @@
pixel_x = -7;
pixel_y = 9
},
-/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/airless,
/area/ruin/space/ks13/engineering/tech_storage)
@@ -6745,15 +6745,15 @@
/area/ruin/space/ks13/hallway/aft)
"SO" = (
/obj/structure/rack,
-/obj/item/stock_parts/cell/high{
+/obj/item/stock_parts/power_store/cell/high{
pixel_x = 7;
pixel_y = 7
},
-/obj/item/stock_parts/cell/high{
+/obj/item/stock_parts/power_store/cell/high{
pixel_x = 7;
pixel_y = 4
},
-/obj/item/stock_parts/cell/high{
+/obj/item/stock_parts/power_store/cell/high{
pixel_x = 7;
pixel_y = 1
},
diff --git a/_maps/RandomRuins/SpaceRuins/travelers_rest.dmm b/_maps/RandomRuins/SpaceRuins/travelers_rest.dmm
index 3837f245384..d36e65ddc22 100644
--- a/_maps/RandomRuins/SpaceRuins/travelers_rest.dmm
+++ b/_maps/RandomRuins/SpaceRuins/travelers_rest.dmm
@@ -437,7 +437,7 @@
/obj/item/storage/box/lights/tubes,
/obj/item/clothing/glasses/night,
/obj/item/stock_parts/capacitor/super,
-/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
/obj/effect/turf_decal/trimline/brown/filled/line{
dir = 6
},
diff --git a/_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm b/_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm
index 4be262c6fd0..dce2db8cffc 100644
--- a/_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm
+++ b/_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm
@@ -15,7 +15,7 @@
/area/ruin/space/has_grav/turretedoutpost)
"ae" = (
/obj/structure/table/reinforced,
-/obj/item/stock_parts/cell/hyper,
+/obj/item/stock_parts/power_store/cell/hyper,
/turf/open/floor/iron,
/area/ruin/space/has_grav/turretedoutpost)
"af" = (
diff --git a/_maps/RandomRuins/SpaceRuins/waystation.dmm b/_maps/RandomRuins/SpaceRuins/waystation.dmm
index e5262d32425..baa77a700d2 100644
--- a/_maps/RandomRuins/SpaceRuins/waystation.dmm
+++ b/_maps/RandomRuins/SpaceRuins/waystation.dmm
@@ -1505,7 +1505,7 @@
/area/ruin/space/has_grav/waystation/cargobay)
"zd" = (
/obj/structure/table,
-/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
/obj/machinery/cell_charger,
/turf/open/floor/plating,
/area/ruin/space/has_grav/waystation/power)
diff --git a/_maps/RandomZLevels/TheBeach.dmm b/_maps/RandomZLevels/TheBeach.dmm
index 22dab6907a6..3f18eb1d627 100644
--- a/_maps/RandomZLevels/TheBeach.dmm
+++ b/_maps/RandomZLevels/TheBeach.dmm
@@ -1919,7 +1919,7 @@
pixel_y = 12;
pixel_x = 3
},
-/obj/item/stock_parts/cell/emproof{
+/obj/item/stock_parts/power_store/cell/emproof{
pixel_x = -4;
pixel_y = 6
},
diff --git a/_maps/RandomZLevels/caves.dmm b/_maps/RandomZLevels/caves.dmm
index e54d1b87cba..c64aa99d1aa 100644
--- a/_maps/RandomZLevels/caves.dmm
+++ b/_maps/RandomZLevels/caves.dmm
@@ -505,7 +505,7 @@
"db" = (
/obj/structure/table,
/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/crap,
+/obj/item/stock_parts/power_store/cell/crap,
/turf/open/floor/iron{
initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
},
diff --git a/_maps/RandomZLevels/moonoutpost19.dmm b/_maps/RandomZLevels/moonoutpost19.dmm
index 7835def0dc2..721efba7619 100644
--- a/_maps/RandomZLevels/moonoutpost19.dmm
+++ b/_maps/RandomZLevels/moonoutpost19.dmm
@@ -3045,7 +3045,7 @@
"ty" = (
/obj/structure/table,
/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
/obj/effect/turf_decal/siding/thinplating_new/light,
/turf/open/floor/iron,
/area/awaymission/moonoutpost19/arrivals)
@@ -5428,7 +5428,7 @@
/obj/structure/table,
/obj/machinery/cell_charger,
/obj/machinery/light/small/directional/west,
-/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
/obj/item/paper/fluff/awaymissions/moonoutpost19/engineering,
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -5728,7 +5728,7 @@
/obj/structure/table,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
/obj/item/radio/off{
pixel_x = 8;
pixel_y = 17
@@ -5775,7 +5775,7 @@
/area/awaymission/moonoutpost19/arrivals)
"MW" = (
/obj/structure/table,
-/obj/item/stock_parts/cell/crap/empty{
+/obj/item/stock_parts/power_store/cell/crap/empty{
pixel_x = -4
},
/turf/open/floor/pod/dark,
@@ -6525,9 +6525,9 @@
/area/awaymission/moonoutpost19/arrivals)
"Ro" = (
/obj/structure/table,
-/obj/item/stock_parts/cell/crap/empty,
-/obj/item/stock_parts/cell/crap/empty,
-/obj/item/stock_parts/cell/crap/empty{
+/obj/item/stock_parts/power_store/cell/crap/empty,
+/obj/item/stock_parts/power_store/cell/crap/empty,
+/obj/item/stock_parts/power_store/cell/crap/empty{
pixel_x = -16;
pixel_y = 4
},
diff --git a/_maps/RandomZLevels/research.dmm b/_maps/RandomZLevels/research.dmm
index 154522d9c25..7f862487515 100644
--- a/_maps/RandomZLevels/research.dmm
+++ b/_maps/RandomZLevels/research.dmm
@@ -76,8 +76,8 @@
},
/obj/structure/frame/machine,
/obj/item/circuitboard/machine/smes,
-/obj/item/stock_parts/cell/high,
-/obj/item/stock_parts/cell/high/empty,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/item/stock_parts/power_store/cell/high/empty,
/turf/open/floor/plating,
/area/awaymission/research/interior/engineering)
"aw" = (
@@ -96,12 +96,12 @@
/area/awaymission/research/interior/engineering)
"az" = (
/obj/effect/gibspawner/human,
-/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
/turf/open/floor/plating,
/area/awaymission/research/interior/engineering)
"aA" = (
/obj/item/stack/sheet/plasteel,
-/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
/turf/open/floor/plating,
/area/awaymission/research/interior/engineering)
"aB" = (
@@ -125,11 +125,11 @@
"aF" = (
/obj/item/stack/rods,
/obj/item/stack/sheet/iron,
-/obj/item/stock_parts/cell/high/empty,
+/obj/item/stock_parts/power_store/cell/high/empty,
/turf/open/floor/plating,
/area/awaymission/research/interior/engineering)
"aG" = (
-/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
/turf/open/floor/plating,
/area/awaymission/research/interior/engineering)
"aH" = (
@@ -161,7 +161,7 @@
/turf/open/floor/mineral/plastitanium/red,
/area/awaymission/research/interior/engineering)
"aM" = (
-/obj/item/stock_parts/cell/high/empty,
+/obj/item/stock_parts/power_store/cell/high/empty,
/turf/open/floor/plating,
/area/awaymission/research/interior/engineering)
"aO" = (
diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm
index 7a15d946e02..ac13cf870c5 100644
--- a/_maps/RandomZLevels/snowdin.dmm
+++ b/_maps/RandomZLevels/snowdin.dmm
@@ -445,7 +445,7 @@
},
/obj/structure/table,
/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
/obj/item/storage/toolbox/electrical{
pixel_x = 4;
pixel_y = 8
diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm
index e444510605c..8ce159cb399 100644
--- a/_maps/RandomZLevels/undergroundoutpost45.dmm
+++ b/_maps/RandomZLevels/undergroundoutpost45.dmm
@@ -2161,8 +2161,8 @@
"iY" = (
/obj/structure/table,
/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
-/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
/obj/machinery/light/small/directional/west,
/turf/open/floor/iron/white,
/area/awaymission/undergroundoutpost45/research)
@@ -2996,8 +2996,8 @@
/obj/item/stack/sheet/mineral/plasma{
amount = 26
},
-/obj/item/stock_parts/cell/high,
-/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/awaymission/undergroundoutpost45/engineering)
@@ -3019,7 +3019,7 @@
"ma" = (
/obj/structure/table,
/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
/obj/item/stack/cable_coil{
pixel_x = 3;
pixel_y = -7
@@ -5957,7 +5957,7 @@
"vW" = (
/obj/structure/table,
/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
/obj/effect/turf_decal/tile/yellow/anticorner/contrasted,
/turf/open/floor/iron,
/area/awaymission/undergroundoutpost45/engineering)
diff --git a/_maps/map_files/Birdshot/birdshot.dmm b/_maps/map_files/Birdshot/birdshot.dmm
index ef02944be57..e830561e589 100644
--- a/_maps/map_files/Birdshot/birdshot.dmm
+++ b/_maps/map_files/Birdshot/birdshot.dmm
@@ -1543,6 +1543,23 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/central/lesser)
+"aGI" = (
+/obj/structure/table,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/trash/can/food/pine_nuts{
+ pixel_x = 16;
+ pixel_y = 6
+ },
+/obj/machinery/cell_charger{
+ pixel_x = -1;
+ pixel_y = 2
+ },
+/obj/item/stock_parts/power_store/cell/high{
+ pixel_x = -1;
+ pixel_y = 1
+ },
+/turf/open/floor/iron/dark,
+/area/station/commons/storage/tools)
"aGU" = (
/obj/machinery/light/small/directional/west,
/turf/open/floor/iron,
@@ -2242,15 +2259,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark/small,
/area/station/engineering/supermatter/room)
-"aXg" = (
-/obj/structure/cable,
-/obj/structure/table/reinforced,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
-/obj/machinery/status_display/ai/directional/north,
-/obj/machinery/camera/autoname/directional/north,
-/turf/open/floor/iron,
-/area/station/engineering/storage/tech)
"aXy" = (
/obj/effect/turf_decal/siding/wideplating{
dir = 1
@@ -3531,6 +3539,22 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/engineering/atmospherics_engine)
+"bBN" = (
+/obj/structure/window/spawner/directional/east,
+/obj/structure/table/wood,
+/obj/machinery/cell_charger{
+ pixel_y = 5
+ },
+/obj/item/stock_parts/power_store/cell/crap{
+ pixel_y = 5
+ },
+/obj/item/clothing/mask/cigarette/pipe/cobpipe{
+ pixel_x = 1;
+ pixel_y = -2
+ },
+/obj/structure/sign/poster/official/random/directional/north,
+/turf/open/floor/wood/tile,
+/area/station/command/corporate_showroom)
"bBX" = (
/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating,
@@ -3838,6 +3862,28 @@
/obj/machinery/chem_heater/withbuffer,
/turf/open/floor/iron/dark,
/area/station/medical/pharmacy)
+"bHp" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/crate,
+/obj/item/stock_parts/power_store/cell/high{
+ pixel_x = -11;
+ pixel_y = 2
+ },
+/obj/item/reagent_containers/cup/glass/bottle/vodka,
+/obj/item/food/grown/citrus/orange,
+/obj/item/food/grown/citrus/orange{
+ pixel_x = 4;
+ pixel_y = 2
+ },
+/obj/item/food/grown/grapes/green{
+ pixel_y = -4;
+ pixel_x = -6
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 8
+ },
+/turf/open/floor/iron/small,
+/area/station/maintenance/department/engine/atmos)
"bHs" = (
/obj/structure/rack,
/obj/effect/spawner/random/maintenance,
@@ -5280,6 +5326,18 @@
/obj/structure/cable,
/turf/open/floor/iron/white/small,
/area/station/command/heads_quarters/cmo)
+"clV" = (
+/obj/structure/table,
+/obj/effect/mapping_helpers/broken_floor,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/item/clothing/mask/breath{
+ pixel_x = 15;
+ pixel_y = 5
+ },
+/obj/machinery/light/small/directional/south,
+/turf/open/floor/iron/smooth,
+/area/station/command/gateway)
"clX" = (
/obj/structure/railing/corner,
/turf/open/floor/wood,
@@ -6321,22 +6379,6 @@
},
/turf/open/floor/iron/small,
/area/station/maintenance/port/lesser)
-"cGb" = (
-/obj/item/stack/sheet/iron/fifty,
-/obj/item/stack/rods/fifty,
-/obj/item/stack/sheet/glass/fifty,
-/obj/item/electronics/airlock,
-/obj/item/electronics/airlock,
-/obj/item/stock_parts/cell/high,
-/obj/item/stack/sheet/mineral/plasma{
- amount = 30
- },
-/obj/item/gps,
-/obj/structure/closet/crate/engineering,
-/obj/machinery/light/cold/directional/east,
-/obj/item/clothing/gloves/color/yellow,
-/turf/open/floor/iron/dark/small,
-/area/station/engineering/storage_shared)
"cGj" = (
/turf/closed/wall/r_wall,
/area/station/security/execution/education)
@@ -10333,6 +10375,15 @@
/obj/effect/landmark/navigate_destination/aiupload,
/turf/open/floor/iron/white,
/area/station/hallway/primary/starboard)
+"enq" = (
+/obj/structure/cable,
+/obj/structure/table/reinforced,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/machinery/status_display/ai/directional/north,
+/obj/machinery/camera/autoname/directional/north,
+/turf/open/floor/iron,
+/area/station/engineering/storage/tech)
"enD" = (
/obj/effect/turf_decal/tile/green{
dir = 8
@@ -11095,6 +11146,20 @@
},
/turf/open/floor/catwalk_floor,
/area/station/engineering/break_room)
+"eDr" = (
+/obj/structure/table/glass,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell,
+/obj/machinery/status_display/evac/directional/north,
+/obj/structure/sign/directions/supply/directional/west,
+/obj/structure/sign/directions/engineering/directional/west{
+ pixel_y = 8
+ },
+/obj/structure/sign/directions/command/directional/west{
+ pixel_y = -8
+ },
+/turf/open/floor/iron/white,
+/area/station/hallway/primary/starboard)
"eDt" = (
/obj/effect/turf_decal/stripes/white/line{
dir = 1
@@ -11681,12 +11746,6 @@
/obj/machinery/airalarm/directional/north,
/turf/open/floor/iron/showroomfloor,
/area/station/medical/coldroom)
-"ePg" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
-/turf/open/floor/circuit,
-/area/station/maintenance/port/aft)
"ePn" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/light/small/directional/south,
@@ -12778,13 +12837,6 @@
/obj/effect/landmark/start/depsec/science,
/turf/open/floor/iron,
/area/station/security/checkpoint/science)
-"fnm" = (
-/obj/structure/filingcabinet/chestdrawer,
-/obj/item/book/manual/wiki/engineering_guide{
- pixel_y = 6
- },
-/turf/open/floor/iron/grimy,
-/area/station/engineering/main)
"fnw" = (
/obj/structure/chair{
pixel_y = -2
@@ -17382,18 +17434,6 @@
},
/turf/open/floor/plating,
/area/station/service/chapel/funeral)
-"gSQ" = (
-/obj/structure/table/glass,
-/obj/item/stock_parts/cell/high{
- pixel_x = 11;
- pixel_y = 6
- },
-/obj/item/folder/blue{
- pixel_x = -3;
- pixel_y = 2
- },
-/turf/open/floor/carpet/executive,
-/area/station/command/meeting_room)
"gSX" = (
/obj/machinery/computer/piratepad_control/civilian{
dir = 1
@@ -17533,12 +17573,6 @@
/obj/item/kirbyplants/random,
/turf/open/floor/iron/white,
/area/station/medical/medbay/lobby)
-"gUo" = (
-/obj/structure/table/greyscale,
-/obj/item/clothing/gloves/color/yellow,
-/obj/item/wrench,
-/turf/open/floor/iron/grimy,
-/area/station/engineering/main)
"gUC" = (
/obj/structure/disposalpipe/segment{
dir = 6
@@ -17778,6 +17812,21 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/security/checkpoint/escape)
+"gZy" = (
+/obj/structure/table,
+/obj/machinery/cell_charger{
+ pixel_y = 18
+ },
+/obj/item/stock_parts/power_store/cell/high{
+ pixel_y = 18
+ },
+/obj/item/clothing/suit/hazardvest,
+/obj/effect/turf_decal/siding/thinplating_new/terracotta{
+ dir = 4
+ },
+/obj/machinery/firealarm/directional/west,
+/turf/open/floor/iron,
+/area/station/command/teleporter)
"gZM" = (
/obj/item/kirbyplants/random,
/obj/machinery/light/cold/directional/east,
@@ -18266,23 +18315,6 @@
dir = 4
},
/area/station/commons/storage/tools)
-"hgb" = (
-/obj/structure/table,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/trash/can/food/pine_nuts{
- pixel_x = 16;
- pixel_y = 6
- },
-/obj/machinery/cell_charger{
- pixel_x = -1;
- pixel_y = 2
- },
-/obj/item/stock_parts/cell/high{
- pixel_x = -1;
- pixel_y = 1
- },
-/turf/open/floor/iron/dark,
-/area/station/commons/storage/tools)
"hgd" = (
/obj/structure/table,
/obj/item/clothing/head/collectable/paper{
@@ -19626,18 +19658,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/maintenance/department/engine/atmos)
-"hAQ" = (
-/obj/structure/table,
-/obj/effect/mapping_helpers/broken_floor,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
-/obj/item/clothing/mask/breath{
- pixel_x = 15;
- pixel_y = 5
- },
-/obj/machinery/light/small/directional/south,
-/turf/open/floor/iron/smooth,
-/area/station/command/gateway)
"hAW" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -22824,6 +22844,30 @@
/obj/structure/chair/stool/directional/east,
/turf/open/floor/iron/cafeteria,
/area/station/security/prison/mess)
+"iGM" = (
+/obj/effect/turf_decal/bot,
+/obj/machinery/light/cold/dim/directional/east,
+/obj/machinery/newscaster/directional/east,
+/obj/structure/cable,
+/obj/structure/table/reinforced,
+/obj/item/paper_bin{
+ pixel_x = 5;
+ pixel_y = 19
+ },
+/obj/item/pen{
+ pixel_x = 5;
+ pixel_y = 20
+ },
+/obj/machinery/cell_charger{
+ pixel_x = 2;
+ pixel_y = 1
+ },
+/obj/item/stock_parts/power_store/cell/high{
+ pixel_x = 2;
+ pixel_y = 2
+ },
+/turf/open/floor/iron/smooth,
+/area/station/engineering/break_room)
"iGO" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/broken_flooring/pile/directional/east,
@@ -22891,6 +22935,22 @@
},
/turf/open/floor/iron/dark/textured_edge,
/area/station/command/heads_quarters/hop)
+"iIK" = (
+/obj/effect/turf_decal/bot,
+/obj/structure/rack,
+/obj/item/stack/sheet/plasteel/fifty,
+/obj/item/stack/sheet/plastic/five,
+/obj/item/stack/sheet/rglass/fifty,
+/obj/item/storage/medkit/fire{
+ pixel_x = 1;
+ pixel_y = 4
+ },
+/obj/machinery/airalarm/directional/east,
+/obj/item/stock_parts/power_store/cell/emproof{
+ pixel_y = 9
+ },
+/turf/open/floor/iron/small,
+/area/station/engineering/break_room)
"iIN" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -23156,6 +23216,12 @@
/obj/machinery/recharge_station,
/turf/open/floor/plating,
/area/station/maintenance/department/bridge)
+"iLZ" = (
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/turf/open/floor/circuit,
+/area/station/maintenance/port/aft)
"iMg" = (
/obj/structure/closet/crate,
/obj/effect/turf_decal/stripes/line{
@@ -24073,20 +24139,6 @@
"jaQ" = (
/turf/open/floor/catwalk_floor/iron_dark,
/area/station/security/processing)
-"jbc" = (
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/structure/table/reinforced,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high{
- pixel_x = 4;
- pixel_y = 5
- },
-/obj/item/stock_parts/cell/high,
-/turf/open/floor/iron/dark,
-/area/station/science/robotics/lab)
"jbd" = (
/obj/structure/cable,
/obj/effect/spawner/structure/window/reinforced,
@@ -24165,13 +24217,6 @@
/obj/machinery/door/window/right/directional/south,
/turf/open/floor/plating,
/area/station/service/chapel/funeral)
-"jcx" = (
-/obj/structure/filingcabinet/chestdrawer,
-/obj/item/stock_parts/cell/emproof{
- pixel_y = 9
- },
-/turf/open/floor/iron/grimy,
-/area/station/engineering/main)
"jcE" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -25555,22 +25600,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/smooth,
/area/station/cargo/warehouse)
-"jCY" = (
-/obj/structure/table/greyscale,
-/obj/item/screwdriver,
-/obj/item/stack/cable_coil/cut{
- pixel_x = 11;
- pixel_y = 7
- },
-/obj/machinery/camera/directional/west{
- c_tag = "Engineering - Office"
- },
-/obj/item/stock_parts/cell/emproof{
- pixel_x = -6;
- pixel_y = 9
- },
-/turf/open/floor/iron/grimy,
-/area/station/engineering/main)
"jCZ" = (
/obj/machinery/door/window/brigdoor/left/directional/west{
id = "Cell 1";
@@ -27118,6 +27147,12 @@
/obj/machinery/airalarm/directional/south,
/turf/open/floor/iron/smooth,
/area/station/maintenance/solars/starboard/fore)
+"kbI" = (
+/obj/structure/table/glass,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell,
+/turf/open/floor/iron/white,
+/area/station/science/auxlab/firing_range)
"kci" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -27769,6 +27804,18 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/small,
/area/station/maintenance/department/engine/atmos)
+"kmP" = (
+/obj/effect/turf_decal/tile/purple/opposingcorners,
+/obj/effect/turf_decal/siding/green{
+ dir = 9
+ },
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/cable,
+/turf/open/floor/iron/cafeteria,
+/area/station/science/circuits)
"kmT" = (
/obj/structure/closet/firecloset,
/turf/open/floor/plating,
@@ -29643,24 +29690,6 @@
/obj/effect/mapping_helpers/airlock/abandoned,
/turf/open/floor/wood,
/area/station/maintenance/starboard/greater)
-"kWg" = (
-/obj/structure/table/greyscale,
-/obj/item/pen{
- pixel_x = 13;
- pixel_y = 4
- },
-/obj/machinery/light/small/directional/south,
-/obj/item/flatpack{
- board = /obj/item/circuitboard/machine/flatpacker;
- pixel_x = -6;
- pixel_y = 5
- },
-/obj/item/multitool{
- pixel_x = 7;
- pixel_y = -2
- },
-/turf/open/floor/iron/grimy,
-/area/station/engineering/main)
"kWk" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -30636,22 +30665,6 @@
},
/turf/open/floor/iron,
/area/station/cargo/storage)
-"lkQ" = (
-/obj/effect/turf_decal/bot,
-/obj/structure/rack,
-/obj/item/stack/sheet/plasteel/fifty,
-/obj/item/stack/sheet/plastic/five,
-/obj/item/stack/sheet/rglass/fifty,
-/obj/item/storage/medkit/fire{
- pixel_x = 1;
- pixel_y = 4
- },
-/obj/machinery/airalarm/directional/east,
-/obj/item/stock_parts/cell/emproof{
- pixel_y = 9
- },
-/turf/open/floor/iron/small,
-/area/station/engineering/break_room)
"lkR" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -31914,6 +31927,13 @@
/obj/item/radio/intercom/directional/west,
/turf/open/floor/iron/smooth,
/area/station/command/gateway)
+"lGJ" = (
+/obj/structure/filingcabinet/chestdrawer,
+/obj/item/book/manual/wiki/engineering_guide{
+ pixel_y = 6
+ },
+/turf/open/floor/iron/grimy,
+/area/station/engineering/main)
"lGK" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -33408,6 +33428,17 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
+"mcj" = (
+/obj/effect/turf_decal/tile/yellow/opposingcorners,
+/obj/structure/table/reinforced/titaniumglass,
+/obj/item/rcl/pre_loaded,
+/obj/item/stock_parts/power_store/cell/high{
+ pixel_y = 17
+ },
+/obj/machinery/light/small/directional/south,
+/obj/structure/secure_safe/directional/east,
+/turf/open/floor/iron,
+/area/station/command/heads_quarters/ce)
"mcl" = (
/obj/structure/alien/weeds,
/obj/effect/gibspawner/xeno,
@@ -34657,6 +34688,12 @@
/obj/machinery/light/small/directional/east,
/turf/open/misc/sandy_dirt,
/area/station/hallway/primary/central/fore)
+"mAK" = (
+/obj/structure/table/greyscale,
+/obj/item/clothing/gloves/color/yellow,
+/obj/item/wrench,
+/turf/open/floor/iron/grimy,
+/area/station/engineering/main)
"mAL" = (
/obj/structure/window/reinforced/spawner/directional/north,
/turf/open/floor/iron,
@@ -34913,6 +34950,22 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/circuit,
/area/station/tcommsat/server)
+"mFH" = (
+/obj/structure/table/greyscale,
+/obj/item/screwdriver,
+/obj/item/stack/cable_coil/cut{
+ pixel_x = 11;
+ pixel_y = 7
+ },
+/obj/machinery/camera/directional/west{
+ c_tag = "Engineering - Office"
+ },
+/obj/item/stock_parts/power_store/cell/emproof{
+ pixel_x = -6;
+ pixel_y = 9
+ },
+/turf/open/floor/iron/grimy,
+/area/station/engineering/main)
"mFL" = (
/obj/structure/table,
/obj/effect/turf_decal/siding/thinplating_new/terracotta{
@@ -35459,6 +35512,22 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/station/hallway/primary/aft)
+"mOx" = (
+/obj/item/stack/sheet/iron/fifty,
+/obj/item/stack/rods/fifty,
+/obj/item/stack/sheet/glass/fifty,
+/obj/item/electronics/airlock,
+/obj/item/electronics/airlock,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/item/stack/sheet/mineral/plasma{
+ amount = 30
+ },
+/obj/item/gps,
+/obj/structure/closet/crate/engineering,
+/obj/machinery/light/cold/directional/east,
+/obj/item/clothing/gloves/color/yellow,
+/turf/open/floor/iron/dark/small,
+/area/station/engineering/storage_shared)
"mOI" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small/directional/south,
@@ -38159,6 +38228,19 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/smooth,
/area/station/cargo/warehouse)
+"nLM" = (
+/obj/structure/cable,
+/obj/structure/table/reinforced,
+/obj/item/stack/cable_coil{
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/stock_parts/power_store/cell/high,
+/obj/item/electronics/airlock{
+ pixel_y = 13
+ },
+/turf/open/floor/iron,
+/area/station/engineering/storage/tech)
"nLN" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment,
@@ -38946,6 +39028,20 @@
dir = 1
},
/area/station/hallway/primary/central/fore)
+"oaY" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/structure/table/reinforced,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high{
+ pixel_x = 4;
+ pixel_y = 5
+ },
+/obj/item/stock_parts/power_store/cell/high,
+/turf/open/floor/iron/dark,
+/area/station/science/robotics/lab)
"obd" = (
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{
dir = 10
@@ -40595,6 +40691,18 @@
/obj/machinery/atmospherics/pipe/layer_manifold/visible,
/turf/open/floor/plating,
/area/station/engineering/atmos/space_catwalk)
+"oGo" = (
+/obj/structure/table/glass,
+/obj/item/stock_parts/power_store/cell/high{
+ pixel_x = 11;
+ pixel_y = 6
+ },
+/obj/item/folder/blue{
+ pixel_x = -3;
+ pixel_y = 2
+ },
+/turf/open/floor/carpet/executive,
+/area/station/command/meeting_room)
"oGJ" = (
/obj/effect/turf_decal/trimline/neutral/line{
dir = 1
@@ -40655,6 +40763,24 @@
dir = 1
},
/area/station/security/execution/transfer)
+"oHJ" = (
+/obj/structure/table/greyscale,
+/obj/item/pen{
+ pixel_x = 13;
+ pixel_y = 4
+ },
+/obj/machinery/light/small/directional/south,
+/obj/item/flatpack{
+ board = /obj/item/circuitboard/machine/flatpacker;
+ pixel_x = -6;
+ pixel_y = 5
+ },
+/obj/item/multitool{
+ pixel_x = 7;
+ pixel_y = -2
+ },
+/turf/open/floor/iron/grimy,
+/area/station/engineering/main)
"oHO" = (
/obj/structure/chair/plastic{
dir = 1
@@ -42854,30 +42980,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/white/small,
/area/station/service/janitor)
-"psL" = (
-/obj/effect/turf_decal/bot,
-/obj/machinery/light/cold/dim/directional/east,
-/obj/machinery/newscaster/directional/east,
-/obj/structure/cable,
-/obj/structure/table/reinforced,
-/obj/item/paper_bin{
- pixel_x = 5;
- pixel_y = 19
- },
-/obj/item/pen{
- pixel_x = 5;
- pixel_y = 20
- },
-/obj/machinery/cell_charger{
- pixel_x = 2;
- pixel_y = 1
- },
-/obj/item/stock_parts/cell/high{
- pixel_x = 2;
- pixel_y = 2
- },
-/turf/open/floor/iron/smooth,
-/area/station/engineering/break_room)
"psP" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -43205,6 +43307,14 @@
/obj/machinery/duct,
/turf/open/floor/iron/freezer,
/area/station/service/kitchen/coldroom)
+"pxW" = (
+/obj/structure/table,
+/obj/machinery/cell_charger{
+ pixel_y = 5
+ },
+/obj/item/stock_parts/power_store/cell/high,
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"pxZ" = (
/obj/structure/rack,
/obj/effect/spawner/random/maintenance,
@@ -45114,17 +45224,6 @@
/obj/structure/mirror/directional/north,
/turf/open/floor/iron/white/small,
/area/station/maintenance/port/aft)
-"qaH" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/siding/dark_red/corner{
- dir = 1
- },
-/obj/structure/rack,
-/obj/effect/spawner/random/armory/riot_helmet,
-/obj/effect/spawner/random/armory/bulletproof_helmet,
-/obj/effect/spawner/random/armory/dragnet,
-/turf/open/floor/iron/dark/small,
-/area/station/ai_monitored/security/armory)
"qaV" = (
/obj/structure/disposalpipe/segment{
dir = 10
@@ -45719,14 +45818,6 @@
},
/turf/open/floor/plating,
/area/station/tcommsat/server)
-"qiO" = (
-/obj/structure/table,
-/obj/machinery/cell_charger{
- pixel_y = 5
- },
-/obj/item/stock_parts/cell/high,
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"qjh" = (
/obj/machinery/light_switch/directional/west,
/turf/open/floor/iron/white,
@@ -48397,12 +48488,6 @@
},
/turf/open/floor/iron/smooth,
/area/station/engineering/atmos)
-"qYq" = (
-/obj/structure/table/glass,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell,
-/turf/open/floor/iron/white,
-/area/station/science/auxlab/firing_range)
"qYu" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -51001,28 +51086,6 @@
/obj/structure/sign/poster/official/random/directional/north,
/turf/open/floor/plating,
/area/station/maintenance/department/engine)
-"rLu" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/crate,
-/obj/item/stock_parts/cell/high{
- pixel_x = -11;
- pixel_y = 2
- },
-/obj/item/reagent_containers/cup/glass/bottle/vodka,
-/obj/item/food/grown/citrus/orange,
-/obj/item/food/grown/citrus/orange{
- pixel_x = 4;
- pixel_y = 2
- },
-/obj/item/food/grown/grapes/green{
- pixel_y = -4;
- pixel_x = -6
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 8
- },
-/turf/open/floor/iron/small,
-/area/station/maintenance/department/engine/atmos)
"rLw" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -54091,18 +54154,6 @@
/obj/machinery/camera/autoname/directional/south,
/turf/open/floor/iron/cafeteria,
/area/station/security/prison/mess)
-"sFD" = (
-/obj/effect/turf_decal/tile/purple/opposingcorners,
-/obj/effect/turf_decal/siding/green{
- dir = 9
- },
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/structure/cable,
-/turf/open/floor/iron/cafeteria,
-/area/station/science/circuits)
"sFH" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -54519,6 +54570,17 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/exit/departure_lounge)
+"sNr" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/siding/dark_red/corner{
+ dir = 1
+ },
+/obj/structure/rack,
+/obj/effect/spawner/random/armory/riot_helmet,
+/obj/effect/spawner/random/armory/bulletproof_helmet,
+/obj/effect/spawner/random/armory/dragnet,
+/turf/open/floor/iron/dark/small,
+/area/station/ai_monitored/security/armory)
"sNv" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment,
@@ -55549,6 +55611,13 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
+"tcA" = (
+/obj/structure/filingcabinet/chestdrawer,
+/obj/item/stock_parts/power_store/cell/emproof{
+ pixel_y = 9
+ },
+/turf/open/floor/iron/grimy,
+/area/station/engineering/main)
"tcB" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -56787,20 +56856,6 @@
},
/turf/open/floor/tram,
/area/station/maintenance/department/medical/central)
-"twR" = (
-/obj/structure/table/glass,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell,
-/obj/machinery/status_display/evac/directional/north,
-/obj/structure/sign/directions/supply/directional/west,
-/obj/structure/sign/directions/engineering/directional/west{
- pixel_y = 8
- },
-/obj/structure/sign/directions/command/directional/west{
- pixel_y = -8
- },
-/turf/open/floor/iron/white,
-/area/station/hallway/primary/starboard)
"twZ" = (
/obj/structure/chair/sofa/bench/right,
/obj/machinery/newscaster/directional/north,
@@ -62907,21 +62962,6 @@
/obj/structure/alien/weeds,
/turf/open/floor/plating,
/area/station/maintenance/starboard/greater)
-"vjx" = (
-/obj/structure/table,
-/obj/machinery/cell_charger{
- pixel_y = 18
- },
-/obj/item/stock_parts/cell/high{
- pixel_y = 18
- },
-/obj/item/clothing/suit/hazardvest,
-/obj/effect/turf_decal/siding/thinplating_new/terracotta{
- dir = 4
- },
-/obj/machinery/firealarm/directional/west,
-/turf/open/floor/iron,
-/area/station/command/teleporter)
"vjI" = (
/obj/machinery/door/airlock{
name = "Bathrooms"
@@ -63856,19 +63896,6 @@
},
/turf/open/floor/iron,
/area/station/cargo/sorting)
-"vuK" = (
-/obj/structure/cable,
-/obj/structure/table/reinforced,
-/obj/item/stack/cable_coil{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/stock_parts/cell/high,
-/obj/item/electronics/airlock{
- pixel_y = 13
- },
-/turf/open/floor/iron,
-/area/station/engineering/storage/tech)
"vuL" = (
/obj/structure/disposalpipe/segment{
dir = 5
@@ -66659,22 +66686,6 @@
/obj/structure/flora/bush/sunny/style_random,
/turf/open/floor/grass,
/area/station/service/chapel)
-"wjY" = (
-/obj/structure/window/spawner/directional/east,
-/obj/structure/table/wood,
-/obj/machinery/cell_charger{
- pixel_y = 5
- },
-/obj/item/stock_parts/cell/crap{
- pixel_y = 5
- },
-/obj/item/clothing/mask/cigarette/pipe/cobpipe{
- pixel_x = 1;
- pixel_y = -2
- },
-/obj/structure/sign/poster/official/random/directional/north,
-/turf/open/floor/wood/tile,
-/area/station/command/corporate_showroom)
"wjZ" = (
/obj/structure/cable,
/obj/effect/spawner/structure/window/reinforced,
@@ -66729,17 +66740,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/chapel,
/area/station/maintenance/starboard/greater)
-"wld" = (
-/obj/effect/turf_decal/tile/yellow/opposingcorners,
-/obj/structure/table/reinforced/titaniumglass,
-/obj/item/rcl/pre_loaded,
-/obj/item/stock_parts/cell/high{
- pixel_y = 17
- },
-/obj/machinery/light/small/directional/south,
-/obj/structure/secure_safe/directional/east,
-/turf/open/floor/iron,
-/area/station/command/heads_quarters/ce)
"wlf" = (
/obj/effect/landmark/start/hangover,
/turf/open/floor/glass,
@@ -88401,7 +88401,7 @@ mVt
dIt
huN
jBr
-qaH
+sNr
syk
vYD
lox
@@ -89601,7 +89601,7 @@ ojz
sLu
urE
ess
-jCY
+mFH
vfG
oSw
jyl
@@ -89612,7 +89612,7 @@ obW
grF
ecn
kmH
-rLu
+bHp
cPe
obW
blb
@@ -90375,7 +90375,7 @@ euP
all
eWf
eIx
-kWg
+oHJ
bNq
wxG
uIX
@@ -90614,7 +90614,7 @@ ufR
xYG
xYG
rDV
-cGb
+mOx
dwC
iAk
sql
@@ -90628,11 +90628,11 @@ sHO
drI
cRq
rbl
-jcx
+tcA
uKO
vfG
-fnm
-gUo
+lGJ
+mAK
bNq
hOX
fEU
@@ -92198,7 +92198,7 @@ eEq
sRg
gQG
hbw
-hgb
+aGI
hmQ
pGE
jug
@@ -92286,7 +92286,7 @@ xAR
trp
etx
fwS
-ePg
+iLZ
trp
jRx
xul
@@ -92944,7 +92944,7 @@ paX
rdH
gpI
ceP
-wld
+mcj
gpI
qCT
rWH
@@ -93193,7 +93193,7 @@ cED
nQE
rLj
gNt
-lkQ
+iIK
gKL
fMA
gFF
@@ -95246,7 +95246,7 @@ gwl
pPm
jKU
qbP
-psL
+iGM
nck
tau
gKL
@@ -95537,7 +95537,7 @@ sUy
muW
mOk
iap
-gSQ
+oGo
iDk
sUy
jaK
@@ -97082,7 +97082,7 @@ xMk
xsh
hcc
xGJ
-wjY
+bBN
jwi
qtd
hOg
@@ -98890,7 +98890,7 @@ myT
iMg
iYj
sDp
-vjx
+gZy
kke
kgz
oGJ
@@ -104791,7 +104791,7 @@ gKg
xbl
uhI
yhW
-hAQ
+clV
gcz
hyv
fyH
@@ -109476,9 +109476,9 @@ aZL
ciR
mwu
yeP
-aXg
+enq
ivY
-vuK
+nLM
ssz
ssz
kHo
@@ -112024,7 +112024,7 @@ vDX
vDX
xww
vDX
-twR
+eDr
xdc
xtL
xQW
@@ -118461,7 +118461,7 @@ wHg
mbZ
xia
jYr
-jbc
+oaY
lZB
ivz
jYr
@@ -119244,7 +119244,7 @@ pXQ
kwA
xaR
sYa
-qiO
+pxW
xlP
gpy
xlP
@@ -121527,7 +121527,7 @@ oyQ
pVa
qjh
qzL
-qYq
+kbI
xok
vhC
sHV
@@ -122844,7 +122844,7 @@ ifa
ifa
ifa
ifa
-sFD
+kmP
vLi
tQr
ifa
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index 9f1a266b185..84d42a3ec31 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -386,22 +386,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/cargo/sorting)
-"aeE" = (
-/obj/structure/table/reinforced,
-/obj/item/stack/package_wrap,
-/obj/item/stack/cable_coil{
- pixel_x = 3;
- pixel_y = 3
- },
-/obj/item/stack/cable_coil,
-/obj/item/stock_parts/cell/high,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/radio/intercom/directional/north,
-/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/construction/mining/aux_base)
"aeF" = (
/turf/open/floor/plating,
/area/station/construction/mining/aux_base)
@@ -875,17 +859,6 @@
/obj/machinery/light/small/directional/east,
/turf/open/floor/iron,
/area/station/security/prison/visit)
-"ale" = (
-/obj/structure/rack,
-/obj/effect/turf_decal/bot,
-/obj/structure/window/reinforced/spawner/directional/east{
- pixel_x = 3
- },
-/obj/structure/window/reinforced/spawner/directional/north,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/spawner/random/armory/dragnet,
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/security/armory)
"alG" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -4466,6 +4439,14 @@
/obj/effect/mapping_helpers/airlock/access/all/command/hop,
/turf/open/floor/wood,
/area/station/command/heads_quarters/hop)
+"beI" = (
+/obj/structure/table/reinforced,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/machinery/cell_charger,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron,
+/area/station/engineering/main)
"beP" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -5383,14 +5364,6 @@
/obj/effect/turf_decal/box/red,
/turf/open/floor/iron/dark/textured_large,
/area/station/science/xenobiology)
-"bpL" = (
-/obj/structure/table/reinforced,
-/obj/item/stock_parts/cell/high,
-/obj/item/stock_parts/cell/high,
-/obj/machinery/cell_charger,
-/obj/effect/turf_decal/bot,
-/turf/open/floor/iron,
-/area/station/engineering/main)
"bpM" = (
/obj/effect/spawner/random/engineering/tracking_beacon,
/obj/effect/landmark/event_spawn,
@@ -6004,6 +5977,18 @@
},
/turf/open/floor/wood,
/area/station/engineering/break_room)
+"byI" = (
+/obj/structure/table/reinforced,
+/obj/machinery/cell_charger,
+/obj/effect/turf_decal/siding/purple{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/purple{
+ dir = 4
+ },
+/obj/item/stock_parts/power_store/cell/high,
+/turf/open/floor/iron,
+/area/station/science/lab)
"byP" = (
/obj/machinery/firealarm/directional/east,
/obj/machinery/camera{
@@ -7687,15 +7672,6 @@
/obj/machinery/airalarm/directional/north,
/turf/open/floor/plating,
/area/station/ai_monitored/turret_protected/aisat_interior)
-"bRC" = (
-/obj/machinery/cell_charger,
-/obj/structure/table/reinforced,
-/obj/item/stock_parts/cell/high,
-/obj/effect/turf_decal/stripes/corner{
- dir = 1
- },
-/turf/open/floor/plating,
-/area/station/ai_monitored/turret_protected/aisat_interior)
"bRD" = (
/obj/structure/sign/nanotrasen,
/turf/closed/wall/r_wall,
@@ -8311,15 +8287,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/maintenance/port)
-"bYv" = (
-/obj/structure/table/reinforced,
-/obj/item/stack/cable_coil,
-/obj/item/electronics/airalarm,
-/obj/item/electronics/firealarm,
-/obj/item/stock_parts/cell/high,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron,
-/area/station/maintenance/port)
"bYG" = (
/obj/item/clipboard,
/obj/item/folder/yellow,
@@ -8841,6 +8808,15 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/plating,
/area/station/hallway/secondary/construction)
+"cfW" = (
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/secondary/construction)
"cgf" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -12531,17 +12507,6 @@
/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
/turf/open/floor/iron,
/area/station/engineering/atmos)
-"dbC" = (
-/obj/structure/table/reinforced,
-/obj/item/folder/white,
-/obj/item/stock_parts/cell/high,
-/obj/item/stack/sheet/glass,
-/obj/item/stack/sheet/glass,
-/obj/item/stack/sheet/glass,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/machinery/airalarm/directional/east,
-/turf/open/floor/iron/dark,
-/area/station/engineering/storage/tech)
"dbO" = (
/obj/structure/chair/sofa/bench/right{
dir = 8
@@ -13578,6 +13543,17 @@
/obj/structure/sign/poster/random/directional/south,
/turf/open/floor/iron/dark,
/area/station/maintenance/department/engine/atmos)
+"dpR" = (
+/obj/structure/rack,
+/obj/effect/turf_decal/bot,
+/obj/structure/window/reinforced/spawner/directional/east{
+ pixel_x = 3
+ },
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/spawner/random/armory/dragnet,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
"dqc" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable,
@@ -18064,6 +18040,14 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/central/aft)
+"ewl" = (
+/obj/structure/table,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/machinery/cell_charger,
+/obj/structure/extinguisher_cabinet/directional/west,
+/turf/open/floor/iron,
+/area/station/science/robotics/mechbay)
"ewQ" = (
/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden{
dir = 4
@@ -19551,6 +19535,14 @@
/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
/turf/open/floor/engine,
/area/station/engineering/supermatter)
+"ePX" = (
+/obj/structure/table/reinforced,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/machinery/cell_charger,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/station/engineering/storage/tech)
"ePZ" = (
/obj/structure/window/reinforced/spawner/directional/south,
/obj/structure/window/reinforced/spawner/directional/north,
@@ -21470,6 +21462,21 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/command/bridge)
+"fnC" = (
+/obj/structure/cable,
+/obj/machinery/firealarm/directional/east,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/flatpack{
+ board = /obj/item/circuitboard/machine/flatpacker;
+ pixel_x = -6;
+ pixel_y = 5
+ },
+/obj/item/multitool{
+ pixel_x = 8
+ },
+/obj/structure/table,
+/turf/open/floor/iron,
+/area/station/engineering/storage_shared)
"fnD" = (
/obj/structure/table,
/obj/machinery/requests_console/directional/north{
@@ -22650,6 +22657,44 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/station/engineering/main)
+"fDT" = (
+/obj/item/stack/cable_coil,
+/obj/item/bodypart/arm/right/robot{
+ pixel_x = 3
+ },
+/obj/item/bodypart/arm/left/robot{
+ pixel_x = -3
+ },
+/obj/structure/table,
+/obj/item/radio/intercom/directional/west,
+/obj/item/assembly/prox_sensor{
+ pixel_x = 5
+ },
+/obj/item/assembly/prox_sensor{
+ pixel_x = 5
+ },
+/obj/item/assembly/prox_sensor{
+ pixel_x = 5
+ },
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/stock_parts/power_store/cell/high{
+ pixel_x = 3;
+ pixel_y = 16
+ },
+/obj/item/stock_parts/power_store/cell/high{
+ pixel_x = -3;
+ pixel_y = 16
+ },
+/obj/item/stock_parts/power_store/cell/high{
+ pixel_y = 15
+ },
+/turf/open/floor/iron,
+/area/station/science/robotics/lab)
"fEd" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/sign/warning/vacuum/directional/west,
@@ -28382,6 +28427,14 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/command/gateway)
+"gWT" = (
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/structure/table,
+/obj/machinery/newscaster/directional/west,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/station/science/circuits)
"gWV" = (
/obj/machinery/door/firedoor,
/obj/effect/mapping_helpers/airlock/access/all/medical/morgue,
@@ -30204,6 +30257,15 @@
},
/turf/open/floor/iron,
/area/station/commons/storage/tools)
+"hwJ" = (
+/obj/structure/table/reinforced,
+/obj/item/stack/cable_coil,
+/obj/item/electronics/airalarm,
+/obj/item/electronics/firealarm,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron,
+/area/station/maintenance/port)
"hwK" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
@@ -31756,6 +31818,13 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/grimy,
/area/station/service/abandoned_gambling_den)
+"hSF" = (
+/obj/structure/table/reinforced,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/machinery/airalarm/directional/east,
+/turf/open/floor/plating,
+/area/station/maintenance/department/electrical)
"hST" = (
/obj/structure/destructible/cult/item_dispenser/archives/library,
/obj/effect/decal/cleanable/cobweb,
@@ -31937,6 +32006,20 @@
/obj/structure/sign/warning/no_smoking,
/turf/closed/wall,
/area/station/engineering/atmos/storage)
+"hUZ" = (
+/obj/structure/table,
+/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/machinery/cell_charger,
+/obj/item/screwdriver{
+ pixel_y = -1
+ },
+/obj/effect/turf_decal/siding/purple{
+ dir = 8
+ },
+/obj/item/stock_parts/power_store/cell/high,
+/turf/open/floor/iron,
+/area/station/science/robotics/lab)
"hVi" = (
/obj/machinery/power/apc/auto_name/directional/west,
/obj/structure/cable,
@@ -35750,25 +35833,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/medical/coldroom)
-"iTM" = (
-/obj/structure/table/reinforced,
-/obj/item/stack/sheet/rglass{
- amount = 50;
- pixel_x = 2;
- pixel_y = -2
- },
-/obj/item/stock_parts/cell/emproof{
- pixel_x = 1;
- pixel_y = 3
- },
-/obj/effect/turf_decal/bot,
-/obj/machinery/newscaster/directional/east,
-/obj/item/mod/module/plasma_stabilizer,
-/obj/item/mod/module/thermal_regulator,
-/obj/item/mod/module/magboot,
-/obj/item/mod/module/signlang_radio,
-/turf/open/floor/iron,
-/area/station/engineering/storage)
"iTW" = (
/obj/structure/closet/emcloset,
/obj/effect/decal/cleanable/dirt,
@@ -36254,6 +36318,25 @@
},
/turf/open/floor/iron,
/area/station/security/execution/transfer)
+"iZH" = (
+/obj/structure/table/reinforced,
+/obj/item/stack/cable_coil{
+ pixel_x = 3;
+ pixel_y = 3
+ },
+/obj/item/stack/cable_coil,
+/obj/item/electronics/airlock,
+/obj/item/electronics/airlock,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/stock_parts/power_store/cell/emproof{
+ pixel_x = -3;
+ pixel_y = 5
+ },
+/obj/effect/turf_decal/bot,
+/obj/item/clothing/gloves/color/yellow,
+/obj/machinery/newscaster/directional/east,
+/turf/open/floor/iron,
+/area/station/engineering/storage)
"iZN" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -38196,6 +38279,18 @@
},
/turf/open/floor/iron,
/area/station/engineering/main)
+"jwW" = (
+/obj/structure/table/reinforced,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/machinery/firealarm/directional/south,
+/obj/machinery/light_switch/directional/east,
+/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 1
+ },
+/turf/open/floor/iron/dark,
+/area/station/engineering/break_room)
"jxd" = (
/obj/docking_port/stationary/mining_home/common,
/turf/open/space/basic,
@@ -38528,13 +38623,6 @@
},
/turf/open/floor/iron,
/area/station/maintenance/starboard/aft)
-"jBs" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
-/obj/item/radio/intercom/directional/north,
-/turf/open/floor/iron,
-/area/station/command/teleporter)
"jBt" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -40383,18 +40471,6 @@
/obj/effect/turf_decal/tile/red/opposingcorners,
/turf/open/floor/iron,
/area/station/service/theater)
-"jYv" = (
-/obj/structure/table/reinforced,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
-/obj/machinery/firealarm/directional/south,
-/obj/machinery/light_switch/directional/east,
-/obj/effect/turf_decal/bot,
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
- dir = 1
- },
-/turf/open/floor/iron/dark,
-/area/station/engineering/break_room)
"jYA" = (
/obj/effect/turf_decal/box/red/corners{
dir = 1
@@ -40834,15 +40910,6 @@
},
/turf/open/floor/iron,
/area/station/cargo/storage)
-"kdL" = (
-/obj/machinery/cell_charger,
-/obj/structure/table/reinforced,
-/obj/item/stock_parts/cell/high,
-/obj/structure/window/reinforced/spawner/directional/south,
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/command/storage/eva)
"kdM" = (
/obj/structure/sign/poster/official/do_not_question/directional/south,
/obj/effect/turf_decal/tile/blue/half/contrasted,
@@ -41076,25 +41143,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/service/chapel/funeral)
-"kgi" = (
-/obj/structure/table/reinforced,
-/obj/item/stack/cable_coil{
- pixel_x = 3;
- pixel_y = 3
- },
-/obj/item/stack/cable_coil,
-/obj/item/electronics/airlock,
-/obj/item/electronics/airlock,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/stock_parts/cell/emproof{
- pixel_x = -3;
- pixel_y = 5
- },
-/obj/effect/turf_decal/bot,
-/obj/item/clothing/gloves/color/yellow,
-/obj/machinery/newscaster/directional/east,
-/turf/open/floor/iron,
-/area/station/engineering/storage)
"kgm" = (
/obj/structure/table/wood,
/obj/item/folder/red,
@@ -41207,6 +41255,15 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/department/science)
+"khr" = (
+/obj/machinery/cell_charger,
+/obj/structure/table/reinforced,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/structure/window/reinforced/spawner/directional/south,
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/command/storage/eva)
"khB" = (
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
@@ -42451,44 +42508,6 @@
/obj/machinery/duct,
/turf/open/floor/iron/white,
/area/station/science/research)
-"kyI" = (
-/obj/item/stack/cable_coil,
-/obj/item/bodypart/arm/right/robot{
- pixel_x = 3
- },
-/obj/item/bodypart/arm/left/robot{
- pixel_x = -3
- },
-/obj/structure/table,
-/obj/item/radio/intercom/directional/west,
-/obj/item/assembly/prox_sensor{
- pixel_x = 5
- },
-/obj/item/assembly/prox_sensor{
- pixel_x = 5
- },
-/obj/item/assembly/prox_sensor{
- pixel_x = 5
- },
-/obj/item/assembly/flash/handheld,
-/obj/item/assembly/flash/handheld,
-/obj/item/assembly/flash/handheld,
-/obj/item/assembly/flash/handheld,
-/obj/item/assembly/flash/handheld,
-/obj/item/assembly/flash/handheld,
-/obj/item/stock_parts/cell/high{
- pixel_x = 3;
- pixel_y = 16
- },
-/obj/item/stock_parts/cell/high{
- pixel_x = -3;
- pixel_y = 16
- },
-/obj/item/stock_parts/cell/high{
- pixel_y = 15
- },
-/turf/open/floor/iron,
-/area/station/science/robotics/lab)
"kyR" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/railing/corner,
@@ -43800,14 +43819,6 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/iron,
/area/station/maintenance/department/eva/abandoned)
-"kSn" = (
-/obj/structure/table/reinforced,
-/obj/item/stock_parts/cell/high,
-/obj/item/stock_parts/cell/high,
-/obj/machinery/cell_charger,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/station/engineering/storage/tech)
"kSt" = (
/obj/machinery/atmospherics/pipe/smart/simple/dark/visible,
/obj/effect/turf_decal/stripes/line{
@@ -48560,6 +48571,13 @@
},
/turf/open/floor/iron,
/area/station/cargo/storage)
+"mcm" = (
+/obj/structure/table/reinforced,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/structure/sign/poster/contraband/self_ai_liberation/directional/north,
+/turf/open/floor/iron,
+/area/station/science/research/abandoned)
"mcp" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{
@@ -49251,6 +49269,17 @@
"mlE" = (
/turf/closed/wall/r_wall,
/area/station/ai_monitored/command/storage/eva)
+"mlR" = (
+/obj/structure/table/reinforced,
+/obj/item/folder/white,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/item/stack/sheet/glass,
+/obj/item/stack/sheet/glass,
+/obj/item/stack/sheet/glass,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/machinery/airalarm/directional/east,
+/turf/open/floor/iron/dark,
+/area/station/engineering/storage/tech)
"mlW" = (
/obj/structure/sign/nanotrasen{
pixel_y = 32
@@ -50975,18 +51004,6 @@
"mHE" = (
/turf/open/floor/iron/dark,
/area/station/service/chapel)
-"mHL" = (
-/obj/structure/table/reinforced,
-/obj/machinery/cell_charger,
-/obj/effect/turf_decal/siding/purple{
- dir = 8
- },
-/obj/effect/turf_decal/siding/purple{
- dir = 4
- },
-/obj/item/stock_parts/cell/high,
-/turf/open/floor/iron,
-/area/station/science/lab)
"mHM" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -52347,6 +52364,13 @@
/obj/effect/spawner/random/trash/grille_or_waste,
/turf/open/floor/plating,
/area/station/maintenance/fore)
+"nba" = (
+/obj/structure/table/reinforced,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/dark,
+/area/station/engineering/atmos/storage)
"nbc" = (
/turf/open/floor/plating,
/area/station/service/theater/abandoned)
@@ -52503,17 +52527,6 @@
/obj/effect/turf_decal/tile/neutral/half/contrasted,
/turf/open/floor/iron/dark,
/area/station/service/chapel)
-"ncT" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/table/reinforced,
-/obj/item/storage/box/lights/mixed,
-/obj/machinery/airalarm/directional/north,
-/obj/item/stock_parts/cell/high/empty,
-/obj/effect/turf_decal/tile/brown/half/contrasted{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"ncY" = (
/obj/structure/table/wood,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -57243,15 +57256,6 @@
/obj/machinery/airalarm/directional/north,
/turf/open/floor/iron,
/area/station/command/gateway)
-"ooJ" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/hallway/secondary/construction)
"ooP" = (
/obj/machinery/power/apc/auto_name/directional/west,
/obj/structure/cable,
@@ -58921,13 +58925,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/maintenance/port)
-"oNm" = (
-/obj/structure/table/reinforced,
-/obj/item/stock_parts/cell/high,
-/obj/item/stock_parts/cell/high,
-/obj/machinery/cell_charger,
-/turf/open/floor/iron,
-/area/station/commons/storage/primary)
"oNy" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/disposalpipe/segment,
@@ -59278,13 +59275,6 @@
},
/turf/open/floor/iron,
/area/station/engineering/main)
-"oSo" = (
-/obj/structure/table/reinforced,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
-/obj/structure/sign/poster/contraband/self_ai_liberation/directional/north,
-/turf/open/floor/iron,
-/area/station/science/research/abandoned)
"oSv" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
@@ -62129,14 +62119,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/science/xenobiology)
-"pDi" = (
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
-/obj/structure/table,
-/obj/machinery/newscaster/directional/west,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/station/science/circuits)
"pDt" = (
/obj/machinery/flasher/portable,
/obj/effect/turf_decal/bot,
@@ -66707,14 +66689,6 @@
/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos,
/turf/open/floor/iron,
/area/station/engineering/atmos/pumproom)
-"qHo" = (
-/obj/structure/table,
-/obj/item/stock_parts/cell/high,
-/obj/item/stock_parts/cell/high,
-/obj/machinery/cell_charger,
-/obj/structure/extinguisher_cabinet/directional/west,
-/turf/open/floor/iron,
-/area/station/science/robotics/mechbay)
"qHs" = (
/obj/structure/statue/sandstone/venus{
dir = 1;
@@ -68820,6 +68794,25 @@
},
/turf/open/floor/wood,
/area/station/service/electronic_marketing_den)
+"rjN" = (
+/obj/structure/table/reinforced,
+/obj/item/stack/sheet/rglass{
+ amount = 50;
+ pixel_x = 2;
+ pixel_y = -2
+ },
+/obj/item/stock_parts/power_store/cell/emproof{
+ pixel_x = 1;
+ pixel_y = 3
+ },
+/obj/effect/turf_decal/bot,
+/obj/machinery/newscaster/directional/east,
+/obj/item/mod/module/plasma_stabilizer,
+/obj/item/mod/module/thermal_regulator,
+/obj/item/mod/module/magboot,
+/obj/item/mod/module/signlang_radio,
+/turf/open/floor/iron,
+/area/station/engineering/storage)
"rjO" = (
/obj/effect/turf_decal/siding/blue{
dir = 9
@@ -69356,19 +69349,6 @@
},
/turf/open/floor/iron,
/area/station/maintenance/starboard/aft)
-"rpm" = (
-/obj/structure/rack,
-/obj/item/tank/internals/emergency_oxygen/engi,
-/obj/item/tank/internals/emergency_oxygen/engi,
-/obj/item/wrench,
-/obj/item/stock_parts/cell/emproof{
- pixel_x = 4;
- pixel_y = 2
- },
-/obj/item/lightreplacer,
-/obj/effect/turf_decal/bot,
-/turf/open/floor/iron/dark,
-/area/station/engineering/atmos/storage)
"rpK" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -70246,6 +70226,19 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/command/bridge)
+"rBY" = (
+/obj/structure/rack,
+/obj/item/tank/internals/emergency_oxygen/engi,
+/obj/item/tank/internals/emergency_oxygen/engi,
+/obj/item/wrench,
+/obj/item/stock_parts/power_store/cell/emproof{
+ pixel_x = 4;
+ pixel_y = 2
+ },
+/obj/item/lightreplacer,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/dark,
+/area/station/engineering/atmos/storage)
"rCc" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -70822,6 +70815,22 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/white,
/area/station/security/medical)
+"rJY" = (
+/obj/structure/table/reinforced,
+/obj/item/stack/package_wrap,
+/obj/item/stack/cable_coil{
+ pixel_x = 3;
+ pixel_y = 3
+ },
+/obj/item/stack/cable_coil,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/radio/intercom/directional/north,
+/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/construction/mining/aux_base)
"rKb" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible,
@@ -72260,6 +72269,15 @@
},
/turf/open/floor/iron,
/area/station/service/hydroponics)
+"sas" = (
+/obj/machinery/cell_charger,
+/obj/structure/table/reinforced,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/effect/turf_decal/stripes/corner{
+ dir = 1
+ },
+/turf/open/floor/plating,
+/area/station/ai_monitored/turret_protected/aisat_interior)
"sau" = (
/obj/machinery/blackbox_recorder,
/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
@@ -73890,16 +73908,6 @@
/obj/effect/turf_decal/tile/red/fourcorners,
/turf/open/floor/iron/dark/side,
/area/station/security/checkpoint/medical/medsci)
-"swg" = (
-/obj/machinery/cell_charger,
-/obj/structure/table/reinforced,
-/obj/machinery/status_display/ai/directional/north,
-/obj/item/rcl/pre_loaded,
-/obj/effect/turf_decal/bot,
-/obj/item/stock_parts/cell/high,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/station/command/heads_quarters/ce)
"swj" = (
/obj/structure/table/wood,
/obj/machinery/fax{
@@ -77992,6 +78000,17 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/security/interrogation)
+"tyF" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/table/reinforced,
+/obj/item/storage/box/lights/mixed,
+/obj/machinery/airalarm/directional/north,
+/obj/item/stock_parts/power_store/cell/high/empty,
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"tyK" = (
/obj/machinery/vending/wardrobe/jani_wardrobe,
/turf/open/floor/iron/dark,
@@ -78114,6 +78133,16 @@
/obj/structure/sign/poster/contraband/random/directional/east,
/turf/open/floor/iron,
/area/station/service/hydroponics/garden)
+"tAB" = (
+/obj/machinery/cell_charger,
+/obj/structure/table/reinforced,
+/obj/machinery/status_display/ai/directional/north,
+/obj/item/rcl/pre_loaded,
+/obj/effect/turf_decal/bot,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/station/command/heads_quarters/ce)
"tAL" = (
/obj/structure/sign/nanotrasen{
pixel_y = 32
@@ -78137,6 +78166,13 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"tAO" = (
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/item/radio/intercom/directional/north,
+/turf/open/floor/iron,
+/area/station/command/teleporter)
"tAS" = (
/obj/effect/turf_decal/siding/white,
/obj/structure/cable,
@@ -78570,21 +78606,6 @@
/obj/structure/sign/poster/official/random/directional/west,
/turf/open/floor/wood,
/area/station/maintenance/port/fore)
-"tFu" = (
-/obj/structure/cable,
-/obj/machinery/firealarm/directional/east,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/flatpack{
- board = /obj/item/circuitboard/machine/flatpacker;
- pixel_x = -6;
- pixel_y = 5
- },
-/obj/item/multitool{
- pixel_x = 8
- },
-/obj/structure/table,
-/turf/open/floor/iron,
-/area/station/engineering/storage_shared)
"tFG" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 1
@@ -78913,13 +78934,6 @@
},
/turf/open/floor/iron,
/area/station/security/courtroom)
-"tJB" = (
-/obj/structure/table/reinforced,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
-/obj/machinery/airalarm/directional/east,
-/turf/open/floor/plating,
-/area/station/maintenance/department/electrical)
"tJE" = (
/obj/structure/table/wood,
/obj/item/folder,
@@ -88366,6 +88380,13 @@
},
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
+"wdm" = (
+/obj/structure/table/reinforced,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/machinery/cell_charger,
+/turf/open/floor/iron,
+/area/station/commons/storage/primary)
"wdt" = (
/obj/structure/cable,
/obj/effect/turf_decal/stripes/line{
@@ -93023,20 +93044,6 @@
/obj/structure/closet/crate/freezer/blood,
/turf/open/floor/iron/freezer,
/area/station/medical/coldroom)
-"xkV" = (
-/obj/structure/table,
-/obj/structure/cable,
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/machinery/cell_charger,
-/obj/item/screwdriver{
- pixel_y = -1
- },
-/obj/effect/turf_decal/siding/purple{
- dir = 8
- },
-/obj/item/stock_parts/cell/high,
-/turf/open/floor/iron,
-/area/station/science/robotics/lab)
"xkW" = (
/obj/structure/window/reinforced/spawner/directional/west,
/obj/structure/window/reinforced/spawner/directional/north,
@@ -95705,13 +95712,6 @@
/obj/effect/turf_decal/tile/neutral/half/contrasted,
/turf/open/floor/iron,
/area/station/command/heads_quarters/rd)
-"xTC" = (
-/obj/structure/table/reinforced,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
-/obj/effect/turf_decal/bot,
-/turf/open/floor/iron/dark,
-/area/station/engineering/atmos/storage)
"xTD" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -104082,7 +104082,7 @@ ueB
uhL
btH
bPC
-bRC
+sas
bTs
rPe
vvL
@@ -119755,7 +119755,7 @@ jLx
dFw
mPr
bAR
-swg
+tAB
gsV
auh
tMl
@@ -120524,7 +120524,7 @@ pQo
uCa
wkj
bqP
-jYv
+jwW
bAR
gHt
bAV
@@ -121547,7 +121547,7 @@ wiZ
fXF
xkz
hwe
-tFu
+fnC
vpV
uCa
gQk
@@ -122298,10 +122298,10 @@ sID
pUW
qSm
wIf
-rpm
+rBY
lvJ
jYA
-xTC
+nba
eVG
wqF
npE
@@ -122893,7 +122893,7 @@ wEI
qNb
naL
nEc
-oSo
+mcm
kGQ
bGz
nzb
@@ -123117,7 +123117,7 @@ grl
iJU
pJM
pec
-bpL
+beI
fii
fii
lBz
@@ -124405,11 +124405,11 @@ swD
baw
fii
iqz
-kgi
+iZH
hps
hkJ
tum
-iTM
+rjN
abO
pTC
sNd
@@ -125944,7 +125944,7 @@ rnr
lRx
gRl
iQr
-bYv
+hwJ
pTC
qcM
vcB
@@ -126178,7 +126178,7 @@ aJU
keE
tbf
sdB
-kSn
+ePX
urC
aZo
jPJ
@@ -127005,7 +127005,7 @@ jqt
qub
uFt
elq
-pDi
+gWT
bWH
jDd
plP
@@ -127488,7 +127488,7 @@ pTC
pTC
unj
fKQ
-kyI
+fDT
xGw
iCI
pTC
@@ -127722,7 +127722,7 @@ tlp
nLY
uyf
klO
-dbC
+mlR
iNR
bCj
tjp
@@ -127992,7 +127992,7 @@ vcB
vcB
vcB
pTC
-qHo
+ewl
ydp
uTm
nfR
@@ -130295,7 +130295,7 @@ uQt
nia
vBY
eYN
-oNm
+wdm
iyq
iCO
uED
@@ -130572,7 +130572,7 @@ fHD
tCD
khb
rNZ
-xkV
+hUZ
ryp
khb
gmZ
@@ -132131,7 +132131,7 @@ bgL
mfI
fvi
tpg
-mHL
+byI
oZz
bpM
vzA
@@ -134170,7 +134170,7 @@ bMB
drM
mlE
odw
-kdL
+khr
eAY
fot
mpb
@@ -139045,7 +139045,7 @@ nrd
ivA
cVy
kSu
-jBs
+tAO
dsT
qBq
fQw
@@ -139216,7 +139216,7 @@ coH
xrr
adR
abi
-aeE
+rJY
aff
afG
afY
@@ -140272,7 +140272,7 @@ xGK
jdL
juz
jdL
-ncT
+tyF
hTl
tjl
kdE
@@ -146537,7 +146537,7 @@ feV
wZE
xvr
rmI
-tJB
+hSF
vTn
wZE
dre
@@ -148849,7 +148849,7 @@ iBx
nXH
qAu
kZE
-ooJ
+cfW
mzX
xin
dJP
@@ -150855,7 +150855,7 @@ aWO
bLs
iRi
nIV
-ale
+dpR
vyj
snW
auW
diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm
index 89d24404100..3207e159113 100644
--- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm
+++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm
@@ -1856,6 +1856,22 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/maintenance/port/greater)
+"aCV" = (
+/obj/machinery/door/airlock/medical/glass{
+ name = "Medbay Chemistry Access"
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/door/firedoor,
+/obj/structure/cable,
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/mapping_helpers/airlock/access/all/medical/general,
+/obj/effect/turf_decal/tile/yellow/full,
+/turf/open/floor/iron/large,
+/area/station/medical/treatment_center)
"aCX" = (
/obj/structure/table,
/obj/item/stock_parts/subspace/filter,
@@ -2144,6 +2160,12 @@
dir = 9
},
/area/station/science/explab)
+"aIv" = (
+/obj/structure/railing/wooden_fence{
+ dir = 1
+ },
+/turf/open/misc/hay/icemoon,
+/area/icemoon/underground/explored)
"aIA" = (
/obj/effect/turf_decal/siding/thinplating/dark{
dir = 9
@@ -3789,6 +3811,10 @@
},
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
+"bhs" = (
+/obj/item/flashlight/lantern/on,
+/turf/open/misc/hay/icemoon,
+/area/icemoon/underground/explored)
"bht" = (
/obj/structure/closet/lasertag/red,
/obj/effect/spawner/random/contraband/permabrig_gear,
@@ -3842,10 +3868,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/engineering/atmos/hfr_room)
-"bil" = (
-/obj/structure/railing/wooden_fence,
-/turf/open/misc/hay/icemoon,
-/area/icemoon/underground/explored)
"bin" = (
/obj/effect/turf_decal/stripes/asteroid/line{
dir = 4
@@ -5066,6 +5088,12 @@
/obj/structure/girder,
/turf/open/floor/plating,
/area/station/maintenance/fore)
+"byV" = (
+/obj/structure/railing/wooden_fence{
+ dir = 8
+ },
+/turf/open/misc/hay/icemoon,
+/area/icemoon/underground/explored)
"bzc" = (
/obj/machinery/status_display/evac/directional/east,
/obj/effect/turf_decal/tile/blue,
@@ -5212,6 +5240,16 @@
},
/turf/open/floor/iron,
/area/station/command/heads_quarters/ce)
+"bAW" = (
+/obj/machinery/light_switch/directional/north{
+ pixel_x = -7
+ },
+/obj/structure/table,
+/obj/item/stock_parts/power_store/cell/high/empty,
+/obj/machinery/cell_charger,
+/obj/effect/turf_decal/tile/brown/fourcorners,
+/turf/open/floor/iron/dark,
+/area/station/engineering/lobby)
"bAX" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
@@ -6109,16 +6147,6 @@
},
/turf/open/misc/asteroid/snow/icemoon,
/area/icemoon/surface/outdoors/nospawn)
-"bMC" = (
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
-/obj/item/radio/intercom/directional/north,
-/obj/structure/table/reinforced,
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
- dir = 1
- },
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/command/storage/eva)
"bMF" = (
/obj/machinery/door/airlock/maintenance,
/obj/effect/mapping_helpers/airlock/abandoned,
@@ -6350,12 +6378,6 @@
/obj/effect/turf_decal/tile/green/full,
/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/virology)
-"bPR" = (
-/obj/structure/railing/wooden_fence{
- dir = 1
- },
-/turf/open/misc/hay/icemoon,
-/area/icemoon/underground/explored)
"bPV" = (
/obj/item/kirbyplants/random/dead,
/turf/open/floor/plating/snowed/icemoon,
@@ -7863,6 +7885,17 @@
},
/turf/open/floor/iron,
/area/station/science/ordnance/testlab)
+"clX" = (
+/obj/structure/rack,
+/obj/item/lighter,
+/obj/item/clothing/glasses/meson{
+ pixel_y = 4
+ },
+/obj/item/stock_parts/power_store/cell/high,
+/obj/item/reagent_containers/pill/patch/aiuri,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/station/command/heads_quarters/ce)
"clY" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -9083,14 +9116,6 @@
/obj/machinery/newscaster/directional/east,
/turf/open/floor/iron/white/smooth_large,
/area/station/science/genetics)
-"cCC" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/potato{
- name = "\improper Beepsky's emergency battery"
- },
-/turf/open/floor/plating,
-/area/station/maintenance/fore)
"cCD" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 1
@@ -9894,6 +9919,14 @@
/obj/effect/mapping_helpers/airlock/unres,
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
+"cOY" = (
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/potato{
+ name = "\improper Beepsky's emergency battery"
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/fore)
"cPd" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -10295,6 +10328,27 @@
},
/turf/open/floor/wood/parquet,
/area/station/service/theater)
+"cWn" = (
+/obj/effect/turf_decal/bot{
+ dir = 1
+ },
+/obj/structure/table,
+/obj/item/clothing/gloves/color/yellow,
+/obj/item/clothing/gloves/color/yellow,
+/obj/item/clothing/gloves/color/yellow,
+/obj/item/clothing/gloves/color/yellow,
+/obj/item/clothing/gloves/color/yellow,
+/obj/structure/cable,
+/obj/item/mod/module/plasma_stabilizer,
+/obj/item/stock_parts/power_store/cell/emproof{
+ pixel_x = -4;
+ pixel_y = -1
+ },
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/item/mod/module/signlang_radio,
+/obj/item/mod/module/thermal_regulator,
+/turf/open/floor/iron/dark,
+/area/station/engineering/engine_smes)
"cWq" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/obj/effect/turf_decal/tile/green/half/contrasted{
@@ -11343,9 +11397,6 @@
/obj/structure/marker_beacon/burgundy,
/turf/open/floor/plating/snowed/icemoon,
/area/icemoon/surface/outdoors/nospawn)
-"dlu" = (
-/turf/closed/wall/mineral/wood/nonmetal,
-/area/icemoon/underground/explored)
"dlB" = (
/obj/structure/table/wood,
/obj/item/storage/photo_album/chapel,
@@ -11547,6 +11598,34 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood/large,
/area/mine/eva/lower)
+"doO" = (
+/obj/structure/table,
+/obj/item/assembly/prox_sensor{
+ pixel_x = -8;
+ pixel_y = 4
+ },
+/obj/item/assembly/prox_sensor{
+ pixel_x = -8;
+ pixel_y = 4
+ },
+/obj/item/assembly/prox_sensor{
+ pixel_x = -8;
+ pixel_y = 4
+ },
+/obj/item/assembly/prox_sensor{
+ pixel_x = -8;
+ pixel_y = 4
+ },
+/obj/item/stock_parts/power_store/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/item/crowbar,
+/obj/item/radio/headset/headset_sci{
+ pixel_x = -3
+ },
+/obj/machinery/newscaster/directional/east,
+/obj/machinery/light/directional/east,
+/turf/open/floor/iron,
+/area/station/science/robotics/lab)
"doW" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -12214,19 +12293,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/catwalk_floor/iron_smooth,
/area/station/maintenance/port/lesser)
-"dxJ" = (
-/obj/structure/table,
-/obj/item/crowbar/red,
-/obj/item/stock_parts/cell/high{
- pixel_x = 6;
- pixel_y = -3
- },
-/obj/structure/sign/poster/random/directional/west,
-/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/hallway/primary/aft)
"dxK" = (
/turf/closed/wall/r_wall,
/area/station/command/meeting_room)
@@ -12583,18 +12649,6 @@
},
/turf/open/floor/plating,
/area/station/maintenance/department/medical/central)
-"dDQ" = (
-/obj/structure/table,
-/obj/machinery/cell_charger{
- pixel_y = 3
- },
-/obj/item/stock_parts/cell/high{
- pixel_y = 3
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/obj/machinery/airalarm/directional/north,
-/turf/open/floor/iron/textured,
-/area/mine/mechbay)
"dDV" = (
/obj/effect/spawner/random/structure/girder,
/turf/open/floor/plating,
@@ -14826,15 +14880,6 @@
},
/turf/open/floor/iron,
/area/station/commons/locker)
-"epd" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
-/obj/item/stock_parts/cell/high,
-/turf/open/floor/iron,
-/area/station/maintenance/department/electrical)
"eph" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -16954,6 +16999,12 @@
/obj/structure/table/wood,
/turf/open/floor/carpet,
/area/station/command/meeting_room)
+"eYU" = (
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high/empty,
+/turf/open/floor/iron/dark,
+/area/station/engineering/storage)
"eYX" = (
/obj/effect/turf_decal/trimline/green/filled/corner{
dir = 1
@@ -20636,12 +20687,6 @@
/obj/structure/closet/crate,
/turf/open/floor/plating,
/area/station/maintenance/department/medical/central)
-"ghA" = (
-/obj/structure/railing/wooden_fence{
- dir = 5
- },
-/turf/open/misc/hay/icemoon,
-/area/icemoon/underground/explored)
"ghE" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/camera/directional/west{
@@ -21820,6 +21865,27 @@
/obj/effect/landmark/generic_maintenance_landmark,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
+"gBg" = (
+/obj/structure/table/glass,
+/obj/item/assembly/signaler{
+ pixel_x = 6;
+ pixel_y = 5
+ },
+/obj/item/reagent_containers/dropper{
+ pixel_x = -4;
+ pixel_y = 4
+ },
+/obj/item/stock_parts/power_store/cell/high,
+/obj/item/stack/cable_coil,
+/obj/item/pen{
+ pixel_x = -5;
+ pixel_y = 3
+ },
+/obj/machinery/newscaster/directional/west,
+/turf/open/floor/iron/cafeteria{
+ dir = 8
+ },
+/area/station/science/research)
"gBl" = (
/obj/structure/sign/warning/electric_shock,
/turf/closed/wall/r_wall,
@@ -22049,16 +22115,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/science/server)
-"gEo" = (
-/obj/structure/table,
-/obj/item/stock_parts/cell/high,
-/obj/machinery/cell_charger{
- pixel_y = 5
- },
-/turf/open/floor/iron/white/corner{
- dir = 4
- },
-/area/station/science/explab)
"gEq" = (
/obj/structure/chair/office{
dir = 4
@@ -23039,22 +23095,6 @@
/obj/machinery/light/directional/west,
/turf/open/floor/plating,
/area/station/cargo/storage)
-"gTi" = (
-/obj/machinery/door/airlock/medical/glass{
- name = "Medbay Chemistry Access"
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/door/firedoor,
-/obj/structure/cable,
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/effect/mapping_helpers/airlock/access/all/medical/general,
-/obj/effect/turf_decal/tile/yellow/full,
-/turf/open/floor/iron/large,
-/area/station/medical/treatment_center)
"gTq" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -24214,6 +24254,12 @@
/obj/structure/mirror/directional/east,
/turf/open/floor/iron/freezer,
/area/station/commons/toilet/locker)
+"hnc" = (
+/obj/structure/railing/wooden_fence{
+ dir = 9
+ },
+/turf/open/misc/hay/icemoon,
+/area/icemoon/underground/explored)
"hnd" = (
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/plating,
@@ -24288,6 +24334,12 @@
/obj/machinery/hydroponics/constructable,
/turf/open/floor/iron/dark,
/area/station/service/hydroponics)
+"hop" = (
+/obj/structure/railing/wooden_fence{
+ dir = 6
+ },
+/turf/open/misc/hay/icemoon,
+/area/icemoon/underground/explored)
"hos" = (
/obj/structure/disposalpipe/trunk/multiz/down{
dir = 1
@@ -24663,13 +24715,12 @@
/obj/structure/tank_holder/oxygen,
/turf/open/floor/plating,
/area/station/maintenance/port/greater)
-"htc" = (
-/obj/structure/table/reinforced,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
-/obj/item/rcl/pre_loaded,
-/turf/open/floor/iron,
-/area/station/command/heads_quarters/ce)
+"hsU" = (
+/obj/structure/railing/wooden_fence{
+ dir = 4
+ },
+/turf/open/misc/hay/icemoon,
+/area/icemoon/underground/explored)
"htd" = (
/obj/structure/sign/warning/docking/directional/north,
/turf/open/misc/asteroid/snow/icemoon,
@@ -24910,6 +24961,9 @@
},
/turf/open/floor/iron,
/area/station/cargo/office)
+"hwL" = (
+/turf/open/misc/hay/icemoon,
+/area/icemoon/underground/explored)
"hwR" = (
/obj/machinery/camera/directional/west{
c_tag = "Security - Equipment Room"
@@ -26587,6 +26641,19 @@
},
/turf/open/floor/plating/snowed/icemoon,
/area/icemoon/underground/explored)
+"hYU" = (
+/obj/effect/turf_decal/siding/yellow/corner,
+/obj/machinery/status_display/evac/directional/south,
+/obj/structure/table,
+/obj/item/flatpack{
+ board = /obj/item/circuitboard/machine/flatpacker;
+ pixel_x = -5
+ },
+/obj/item/multitool{
+ pixel_x = 8
+ },
+/turf/open/floor/iron,
+/area/station/engineering/lobby)
"hZe" = (
/obj/effect/turf_decal/trimline/yellow/warning{
dir = 1
@@ -26927,12 +26994,6 @@
},
/turf/open/floor/iron/smooth,
/area/station/security/holding_cell)
-"idH" = (
-/obj/structure/railing/wooden_fence{
- dir = 6
- },
-/turf/open/misc/hay/icemoon,
-/area/icemoon/underground/explored)
"idN" = (
/obj/structure/window/reinforced/spawner/directional/north,
/obj/machinery/door/window/brigdoor/left/directional/south{
@@ -27184,28 +27245,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/maintenance/starboard/fore)
-"iji" = (
-/obj/structure/table,
-/obj/item/multitool/circuit{
- pixel_x = -8
- },
-/obj/item/multitool/circuit{
- pixel_x = -4
- },
-/obj/item/multitool/circuit,
-/obj/item/stock_parts/cell/high{
- pixel_x = 8;
- pixel_y = 9
- },
-/obj/item/stock_parts/cell/high{
- pixel_x = 8;
- pixel_y = -2
- },
-/obj/item/radio/intercom/directional/west,
-/turf/open/floor/iron/white/side{
- dir = 4
- },
-/area/station/science/explab)
"ijj" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -27948,6 +27987,16 @@
},
/turf/open/misc/asteroid/snow/icemoon,
/area/icemoon/surface/outdoors/nospawn)
+"itQ" = (
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/item/radio/intercom/directional/north,
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 1
+ },
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/command/storage/eva)
"itY" = (
/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating/snowed/icemoon,
@@ -28299,26 +28348,6 @@
"izC" = (
/turf/closed/wall,
/area/station/service/bar/atrium)
-"izF" = (
-/obj/effect/turf_decal/bot{
- dir = 1
- },
-/obj/structure/cable,
-/obj/structure/table,
-/obj/item/storage/box/lights/mixed,
-/obj/item/stack/cable_coil,
-/obj/item/stack/cable_coil,
-/obj/item/stock_parts/cell/emproof,
-/obj/item/stock_parts/cell/emproof{
- pixel_x = 6;
- pixel_y = -2
- },
-/obj/machinery/light_switch/directional/south{
- pixel_x = 10
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/station/engineering/engine_smes)
"izI" = (
/obj/machinery/door/airlock/maintenance,
/obj/structure/disposalpipe/segment,
@@ -28877,12 +28906,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/central)
-"iIW" = (
-/obj/structure/table,
-/obj/item/plant_analyzer,
-/obj/item/stock_parts/cell/high,
-/turf/open/floor/plating,
-/area/station/engineering/storage/tech)
"iJl" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/turf_decal/siding/wood{
@@ -29739,16 +29762,6 @@
/obj/structure/table/reinforced,
/turf/open/floor/iron/dark,
/area/station/medical/morgue)
-"iWO" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
-/obj/machinery/requests_console/auto_name/directional/north,
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
- dir = 1
- },
-/turf/open/floor/iron/dark,
-/area/station/commons/storage/primary)
"iWP" = (
/obj/effect/turf_decal/trimline/blue/filled/warning{
dir = 1
@@ -30518,17 +30531,6 @@
/obj/effect/turf_decal/tile/dark/fourcorners,
/turf/open/floor/iron,
/area/mine/living_quarters)
-"jko" = (
-/obj/structure/railing,
-/obj/structure/rack,
-/obj/structure/cable,
-/obj/machinery/door/firedoor/border_only,
-/obj/effect/turf_decal/tile/red/half/contrasted{
- dir = 1
- },
-/obj/effect/spawner/random/armory/dragnet,
-/turf/open/floor/iron/dark/textured,
-/area/station/ai_monitored/security/armory/upper)
"jkx" = (
/obj/machinery/computer/security/telescreen/engine{
dir = 8;
@@ -30546,12 +30548,6 @@
/obj/effect/landmark/blobstart,
/turf/open/floor/engine,
/area/station/science/explab)
-"jkK" = (
-/obj/structure/railing/wooden_fence{
- dir = 9
- },
-/turf/open/misc/hay/icemoon,
-/area/icemoon/underground/explored)
"jkN" = (
/obj/effect/spawner/random/entertainment/arcade,
/obj/machinery/status_display/ai/directional/north,
@@ -31082,34 +31078,6 @@
dir = 1
},
/area/station/service/bar)
-"jth" = (
-/obj/structure/table,
-/obj/item/assembly/prox_sensor{
- pixel_x = -8;
- pixel_y = 4
- },
-/obj/item/assembly/prox_sensor{
- pixel_x = -8;
- pixel_y = 4
- },
-/obj/item/assembly/prox_sensor{
- pixel_x = -8;
- pixel_y = 4
- },
-/obj/item/assembly/prox_sensor{
- pixel_x = -8;
- pixel_y = 4
- },
-/obj/item/stock_parts/cell/high,
-/obj/item/stock_parts/cell/high,
-/obj/item/crowbar,
-/obj/item/radio/headset/headset_sci{
- pixel_x = -3
- },
-/obj/machinery/newscaster/directional/east,
-/obj/machinery/light/directional/east,
-/turf/open/floor/iron,
-/area/station/science/robotics/lab)
"jtm" = (
/obj/machinery/porta_turret/ai{
dir = 4;
@@ -31817,6 +31785,9 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/command/nuke_storage)
+"jEa" = (
+/turf/closed/wall/mineral/wood/nonmetal,
+/area/icemoon/underground/explored)
"jEf" = (
/obj/effect/turf_decal/trimline/green/filled/line{
dir = 5
@@ -33377,6 +33348,18 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
+"kck" = (
+/obj/machinery/cell_charger{
+ pixel_y = 5
+ },
+/obj/item/stock_parts/power_store/cell/high{
+ pixel_y = 6
+ },
+/obj/structure/table/glass,
+/turf/open/floor/iron/white/side{
+ dir = 9
+ },
+/area/station/science/lab)
"kcm" = (
/obj/structure/rack,
/obj/effect/spawner/random/techstorage/command_all,
@@ -33572,16 +33555,6 @@
dir = 4
},
/area/station/maintenance/port/fore)
-"keX" = (
-/obj/structure/table,
-/obj/item/stack/cable_coil{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/stack/cable_coil,
-/obj/item/stock_parts/cell/high,
-/turf/open/floor/plating,
-/area/station/engineering/storage/tech)
"keZ" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -35022,6 +34995,12 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/central)
+"kyM" = (
+/obj/structure/table,
+/obj/item/plant_analyzer,
+/obj/item/stock_parts/power_store/cell/high,
+/turf/open/floor/plating,
+/area/station/engineering/storage/tech)
"kyU" = (
/obj/machinery/modular_computer/preset/id,
/obj/machinery/light/directional/north,
@@ -35191,6 +35170,13 @@
},
/turf/open/floor/iron,
/area/station/command/bridge)
+"kBw" = (
+/obj/structure/table/reinforced,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/item/rcl/pre_loaded,
+/turf/open/floor/iron,
+/area/station/command/heads_quarters/ce)
"kBL" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 1
@@ -36847,11 +36833,6 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/iron/large,
/area/station/engineering/engine_smes)
-"kYN" = (
-/obj/structure/table/wood,
-/obj/item/flashlight/lantern/on,
-/turf/open/misc/hay/icemoon,
-/area/icemoon/underground/explored)
"kZa" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -40269,6 +40250,17 @@
/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
/turf/open/floor/plating,
/area/station/engineering/storage_shared)
+"mci" = (
+/obj/structure/railing,
+/obj/structure/rack,
+/obj/structure/cable,
+/obj/machinery/door/firedoor/border_only,
+/obj/effect/turf_decal/tile/red/half/contrasted{
+ dir = 1
+ },
+/obj/effect/spawner/random/armory/dragnet,
+/turf/open/floor/iron/dark/textured,
+/area/station/ai_monitored/security/armory/upper)
"mco" = (
/obj/structure/closet/emcloset,
/turf/open/floor/plating,
@@ -40487,16 +40479,6 @@
/obj/effect/turf_decal/tile/blue,
/turf/open/floor/iron,
/area/station/hallway/primary/central)
-"mgu" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
-/obj/machinery/ecto_sniffer{
- pixel_x = 6;
- pixel_y = 6
- },
-/turf/open/floor/iron,
-/area/station/science/robotics/lab)
"mgy" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -40534,12 +40516,6 @@
},
/turf/open/floor/iron,
/area/station/ai_monitored/command/storage/eva)
-"mhj" = (
-/obj/structure/railing/wooden_fence{
- dir = 10
- },
-/turf/open/misc/hay/icemoon,
-/area/icemoon/underground/explored)
"mhq" = (
/obj/structure/closet,
/obj/effect/spawner/random/maintenance,
@@ -41526,27 +41502,6 @@
},
/turf/open/floor/iron,
/area/station/service/hydroponics)
-"myU" = (
-/obj/structure/table/glass,
-/obj/item/assembly/signaler{
- pixel_x = 6;
- pixel_y = 5
- },
-/obj/item/reagent_containers/dropper{
- pixel_x = -4;
- pixel_y = 4
- },
-/obj/item/stock_parts/cell/high,
-/obj/item/stack/cable_coil,
-/obj/item/pen{
- pixel_x = -5;
- pixel_y = 3
- },
-/obj/machinery/newscaster/directional/west,
-/turf/open/floor/iron/cafeteria{
- dir = 8
- },
-/area/station/science/research)
"myX" = (
/obj/machinery/light/directional/north,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -42208,6 +42163,19 @@
/obj/machinery/duct,
/turf/open/floor/iron/kitchen/diagonal,
/area/station/service/kitchen)
+"mMj" = (
+/obj/structure/closet/crate,
+/obj/item/stack/sheet/iron/fifty,
+/obj/item/stack/rods/fifty,
+/obj/item/stack/sheet/glass/fifty,
+/obj/item/electronics/airlock,
+/obj/item/electronics/airlock,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/item/stack/sheet/mineral/plasma{
+ amount = 30
+ },
+/turf/open/floor/plating,
+/area/station/engineering/engine_smes)
"mMk" = (
/obj/machinery/telecomms/message_server/preset,
/turf/open/floor/iron/dark/telecomms,
@@ -43312,17 +43280,6 @@
/obj/item/kirbyplants/random,
/turf/open/floor/iron,
/area/station/commons/locker)
-"ncx" = (
-/obj/structure/table/wood,
-/obj/item/soap/deluxe{
- pixel_y = 11
- },
-/obj/item/soap/deluxe{
- pixel_y = 6
- },
-/obj/item/soap/deluxe,
-/turf/open/misc/hay/icemoon,
-/area/icemoon/underground/explored)
"ncB" = (
/obj/machinery/door/airlock/security/glass{
name = "Brig Walkway"
@@ -45440,10 +45397,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/entry)
-"nEI" = (
-/obj/item/flashlight/lantern/on,
-/turf/open/misc/hay/icemoon,
-/area/icemoon/underground/explored)
"nEV" = (
/obj/machinery/vending/wardrobe/sec_wardrobe,
/obj/structure/cable,
@@ -47288,16 +47241,6 @@
/obj/structure/urinal/directional/north,
/turf/open/floor/iron/freezer,
/area/station/commons/toilet)
-"oiB" = (
-/obj/machinery/door/airlock/maintenance{
- name = "Chemistry Lab Utilities"
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/mapping_helpers/airlock/access/all/medical/general,
-/turf/open/floor/iron/smooth,
-/area/station/maintenance/department/medical/central)
"oiD" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -48564,6 +48507,17 @@
/obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1,
/turf/open/floor/iron,
/area/station/engineering/atmos/storage)
+"oAJ" = (
+/obj/structure/table/wood,
+/obj/item/raptor_dex{
+ pixel_y = 13
+ },
+/obj/item/raptor_dex{
+ pixel_y = 7
+ },
+/obj/item/raptor_dex,
+/turf/open/misc/hay/icemoon,
+/area/icemoon/underground/explored)
"oAM" = (
/obj/structure/fluff/tram_rail/end{
dir = 4
@@ -48642,6 +48596,28 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/solars/starboard/fore)
+"oCm" = (
+/obj/structure/table,
+/obj/item/multitool/circuit{
+ pixel_x = -8
+ },
+/obj/item/multitool/circuit{
+ pixel_x = -4
+ },
+/obj/item/multitool/circuit,
+/obj/item/stock_parts/power_store/cell/high{
+ pixel_x = 8;
+ pixel_y = 9
+ },
+/obj/item/stock_parts/power_store/cell/high{
+ pixel_x = 8;
+ pixel_y = -2
+ },
+/obj/item/radio/intercom/directional/west,
+/turf/open/floor/iron/white/side{
+ dir = 4
+ },
+/area/station/science/explab)
"oCs" = (
/obj/structure/table,
/obj/item/radio/headset/headset_med{
@@ -49502,18 +49478,6 @@
/obj/item/soap/nanotrasen,
/turf/open/floor/iron/dark,
/area/station/security/execution/education)
-"oPq" = (
-/obj/machinery/cell_charger{
- pixel_y = 5
- },
-/obj/item/stock_parts/cell/high{
- pixel_y = 6
- },
-/obj/structure/table/glass,
-/turf/open/floor/iron/white/side{
- dir = 9
- },
-/area/station/science/lab)
"oPr" = (
/obj/effect/landmark/start/bartender,
/obj/effect/turf_decal/siding/wood{
@@ -51029,6 +50993,16 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/smooth,
/area/station/security/holding_cell)
+"pmA" = (
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/machinery/ecto_sniffer{
+ pixel_x = 6;
+ pixel_y = 6
+ },
+/turf/open/floor/iron,
+/area/station/science/robotics/lab)
"pna" = (
/obj/machinery/door/poddoor/preopen{
id = "Engineering";
@@ -51430,19 +51404,6 @@
/obj/effect/turf_decal/siding/wood,
/turf/open/floor/stone,
/area/station/service/bar/atrium)
-"ptx" = (
-/obj/structure/closet/crate,
-/obj/item/stack/sheet/iron/fifty,
-/obj/item/stack/rods/fifty,
-/obj/item/stack/sheet/glass/fifty,
-/obj/item/electronics/airlock,
-/obj/item/electronics/airlock,
-/obj/item/stock_parts/cell/high,
-/obj/item/stack/sheet/mineral/plasma{
- amount = 30
- },
-/turf/open/floor/plating,
-/area/station/engineering/engine_smes)
"ptB" = (
/obj/machinery/modular_computer/preset/id{
dir = 8
@@ -51515,27 +51476,6 @@
/obj/effect/mapping_helpers/airlock/access/all/medical/cmo,
/turf/open/floor/plating,
/area/station/maintenance/aft/greater)
-"puI" = (
-/obj/effect/turf_decal/bot{
- dir = 1
- },
-/obj/structure/table,
-/obj/item/clothing/gloves/color/yellow,
-/obj/item/clothing/gloves/color/yellow,
-/obj/item/clothing/gloves/color/yellow,
-/obj/item/clothing/gloves/color/yellow,
-/obj/item/clothing/gloves/color/yellow,
-/obj/structure/cable,
-/obj/item/mod/module/plasma_stabilizer,
-/obj/item/stock_parts/cell/emproof{
- pixel_x = -4;
- pixel_y = -1
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/item/mod/module/signlang_radio,
-/obj/item/mod/module/thermal_regulator,
-/turf/open/floor/iron/dark,
-/area/station/engineering/engine_smes)
"puN" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -51566,6 +51506,16 @@
/obj/machinery/firealarm/directional/north,
/turf/open/floor/iron/dark,
/area/station/cargo/drone_bay)
+"pvd" = (
+/obj/machinery/door/airlock/maintenance{
+ name = "Chemistry Lab Utilities"
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/mapping_helpers/airlock/access/all/medical/general,
+/turf/open/floor/iron/smooth,
+/area/station/maintenance/department/medical/central)
"pve" = (
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
@@ -52450,17 +52400,6 @@
/obj/machinery/vending/wardrobe/curator_wardrobe,
/turf/open/floor/engine/cult,
/area/station/service/library)
-"pIF" = (
-/obj/structure/rack,
-/obj/item/lighter,
-/obj/item/clothing/glasses/meson{
- pixel_y = 4
- },
-/obj/item/stock_parts/cell/high,
-/obj/item/reagent_containers/pill/patch/aiuri,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/station/command/heads_quarters/ce)
"pJb" = (
/obj/structure/sign/nanotrasen{
pixel_x = -32
@@ -53707,10 +53646,6 @@
/obj/effect/mapping_helpers/airlock/access/any/engineering/external,
/turf/open/floor/plating,
/area/station/medical/morgue)
-"qbM" = (
-/obj/structure/ore_container/food_trough/raptor_trough,
-/turf/open/misc/hay/icemoon,
-/area/icemoon/underground/explored)
"qbO" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -53770,12 +53705,6 @@
/obj/machinery/plumbing/sender,
/turf/open/floor/plating,
/area/station/medical/chemistry)
-"qde" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high/empty,
-/turf/open/floor/iron/dark,
-/area/station/engineering/storage)
"qdl" = (
/obj/machinery/light/small/directional/east,
/obj/effect/decal/cleanable/dirt,
@@ -55510,6 +55439,12 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/wood,
/area/station/commons/dorms)
+"qBi" = (
+/obj/structure/railing/wooden_fence{
+ dir = 10
+ },
+/turf/open/misc/hay/icemoon,
+/area/icemoon/underground/explored)
"qBj" = (
/obj/structure/cable,
/turf/open/floor/iron/white,
@@ -55891,6 +55826,11 @@
/obj/effect/turf_decal/bot_white,
/turf/open/floor/iron/checker,
/area/station/commons/storage/emergency/port)
+"qGX" = (
+/obj/structure/table/wood,
+/obj/item/flashlight/lantern/on,
+/turf/open/misc/hay/icemoon,
+/area/icemoon/underground/explored)
"qHg" = (
/obj/structure/transit_tube/curved/flipped{
dir = 1
@@ -55933,6 +55873,10 @@
/obj/structure/flora/bush/fullgrass/style_random,
/turf/open/floor/grass,
/area/station/service/hydroponics)
+"qHt" = (
+/obj/structure/railing/wooden_fence,
+/turf/open/misc/hay/icemoon,
+/area/icemoon/underground/explored)
"qHz" = (
/obj/machinery/light_switch/directional/west,
/obj/machinery/disposal/bin{
@@ -58935,17 +58879,6 @@
/obj/machinery/digital_clock/directional/south,
/turf/open/openspace,
/area/station/medical/medbay/lobby)
-"rzY" = (
-/obj/structure/table/wood,
-/obj/item/raptor_dex{
- pixel_y = 13
- },
-/obj/item/raptor_dex{
- pixel_y = 7
- },
-/obj/item/raptor_dex,
-/turf/open/misc/hay/icemoon,
-/area/icemoon/underground/explored)
"rAr" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -59329,12 +59262,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/science/ordnance)
-"rEn" = (
-/obj/structure/railing/wooden_fence{
- dir = 4
- },
-/turf/open/misc/hay/icemoon,
-/area/icemoon/underground/explored)
"rEp" = (
/obj/structure/table,
/obj/item/hand_labeler,
@@ -59950,6 +59877,18 @@
"rQf" = (
/turf/open/floor/plating,
/area/station/engineering/supermatter/room)
+"rQh" = (
+/obj/structure/table,
+/obj/machinery/cell_charger{
+ pixel_y = 3
+ },
+/obj/item/stock_parts/power_store/cell/high{
+ pixel_y = 3
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/iron/textured,
+/area/mine/mechbay)
"rQl" = (
/obj/structure/lattice/catwalk,
/obj/structure/railing/corner,
@@ -66991,6 +66930,19 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/iron/dark,
/area/mine/mechbay)
+"tWF" = (
+/obj/structure/table,
+/obj/item/crowbar/red,
+/obj/item/stock_parts/power_store/cell/high{
+ pixel_x = 6;
+ pixel_y = -3
+ },
+/obj/structure/sign/poster/random/directional/west,
+/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/aft)
"tWK" = (
/obj/structure/cable,
/turf/open/floor/plating/snowed/icemoon,
@@ -67114,6 +67066,16 @@
/obj/machinery/light/directional/north,
/turf/open/floor/iron,
/area/station/security/prison/garden)
+"tYL" = (
+/obj/structure/table,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/machinery/cell_charger{
+ pixel_y = 5
+ },
+/turf/open/floor/iron/white/corner{
+ dir = 4
+ },
+/area/station/science/explab)
"tYZ" = (
/obj/machinery/door/airlock/external{
name = "External Airlock"
@@ -69498,6 +69460,26 @@
},
/turf/open/floor/iron/dark,
/area/mine/storage)
+"uMw" = (
+/obj/effect/turf_decal/bot{
+ dir = 1
+ },
+/obj/structure/cable,
+/obj/structure/table,
+/obj/item/storage/box/lights/mixed,
+/obj/item/stack/cable_coil,
+/obj/item/stack/cable_coil,
+/obj/item/stock_parts/power_store/cell/emproof,
+/obj/item/stock_parts/power_store/cell/emproof{
+ pixel_x = 6;
+ pixel_y = -2
+ },
+/obj/machinery/light_switch/directional/south{
+ pixel_x = 10
+ },
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/station/engineering/engine_smes)
"uMx" = (
/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk,
@@ -70667,6 +70649,10 @@
},
/turf/open/floor/iron,
/area/station/science/ordnance)
+"vfO" = (
+/obj/structure/ore_container/food_trough/raptor_trough,
+/turf/open/misc/hay/icemoon,
+/area/icemoon/underground/explored)
"vfS" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -71360,6 +71346,15 @@
/obj/item/kirbyplants/random,
/turf/open/floor/iron,
/area/station/security/courtroom)
+"vrl" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable,
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
+/turf/open/floor/iron,
+/area/station/maintenance/department/electrical)
"vrr" = (
/obj/machinery/computer/operating{
dir = 8
@@ -72260,6 +72255,16 @@
},
/turf/open/floor/iron,
/area/mine/laborcamp)
+"vDG" = (
+/obj/structure/table,
+/obj/item/stack/cable_coil{
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/stack/cable_coil,
+/obj/item/stock_parts/power_store/cell/high,
+/turf/open/floor/plating,
+/area/station/engineering/storage/tech)
"vDQ" = (
/obj/effect/spawner/random/decoration/flower,
/obj/structure/flora/rock/pile/icy/style_random,
@@ -74884,19 +74889,6 @@
},
/turf/open/floor/iron/dark/textured,
/area/station/security/prison)
-"wuV" = (
-/obj/effect/turf_decal/siding/yellow/corner,
-/obj/machinery/status_display/evac/directional/south,
-/obj/structure/table,
-/obj/item/flatpack{
- board = /obj/item/circuitboard/machine/flatpacker;
- pixel_x = -5
- },
-/obj/item/multitool{
- pixel_x = 8
- },
-/turf/open/floor/iron,
-/area/station/engineering/lobby)
"wve" = (
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/iron/white,
@@ -74905,9 +74897,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/carpet,
/area/station/service/chapel)
-"wvu" = (
-/turf/open/misc/hay/icemoon,
-/area/icemoon/underground/explored)
"wvv" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -76590,16 +76579,6 @@
/obj/effect/mapping_helpers/no_atoms_ontop,
/turf/open/misc/asteroid/snow/icemoon,
/area/icemoon/surface/outdoors/nospawn)
-"wUE" = (
-/obj/machinery/light_switch/directional/north{
- pixel_x = -7
- },
-/obj/structure/table,
-/obj/item/stock_parts/cell/high/empty,
-/obj/machinery/cell_charger,
-/obj/effect/turf_decal/tile/brown/fourcorners,
-/turf/open/floor/iron/dark,
-/area/station/engineering/lobby)
"wUJ" = (
/obj/machinery/computer/atmos_alert,
/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
@@ -77911,6 +77890,16 @@
/obj/item/stack/sheet/leather,
/turf/open/floor/iron,
/area/station/maintenance/starboard/fore)
+"xpH" = (
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/machinery/requests_console/auto_name/directional/north,
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 1
+ },
+/turf/open/floor/iron/dark,
+/area/station/commons/storage/primary)
"xpJ" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -78456,12 +78445,6 @@
},
/turf/open/floor/iron/dark,
/area/station/engineering/atmos/hfr_room)
-"xxH" = (
-/obj/structure/railing/wooden_fence{
- dir = 8
- },
-/turf/open/misc/hay/icemoon,
-/area/icemoon/underground/explored)
"xxI" = (
/obj/machinery/airalarm/directional/north,
/obj/item/kirbyplants/random,
@@ -79732,6 +79715,12 @@
dir = 1
},
/area/station/security/processing)
+"xQJ" = (
+/obj/structure/railing/wooden_fence{
+ dir = 5
+ },
+/turf/open/misc/hay/icemoon,
+/area/icemoon/underground/explored)
"xQK" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 1
@@ -80076,6 +80065,17 @@
/obj/item/plate,
/turf/open/floor/iron,
/area/station/security/prison/mess)
+"xWC" = (
+/obj/structure/table/wood,
+/obj/item/soap/deluxe{
+ pixel_y = 11
+ },
+/obj/item/soap/deluxe{
+ pixel_y = 6
+ },
+/obj/item/soap/deluxe,
+/turf/open/misc/hay/icemoon,
+/area/icemoon/underground/explored)
"xWG" = (
/obj/machinery/light/small/directional/south,
/turf/open/floor/iron/freezer,
@@ -169290,7 +169290,7 @@ hdb
avh
qGg
uUT
-dDQ
+rQh
lQh
diI
uUT
@@ -170290,14 +170290,14 @@ thA
thA
thA
thA
-dlu
-dlu
-dlu
-dlu
-dlu
-dlu
-dlu
-dlu
+jEa
+jEa
+jEa
+jEa
+jEa
+jEa
+jEa
+jEa
qgQ
qgQ
rrl
@@ -170547,14 +170547,14 @@ thA
thA
thA
thA
-dlu
-qbM
-wvu
-wvu
-bPR
-qbM
-wvu
-bil
+jEa
+vfO
+hwL
+hwL
+aIv
+vfO
+hwL
+qHt
ijY
iDt
iDt
@@ -170804,14 +170804,14 @@ thA
thA
thA
thA
-dlu
-nEI
-wvu
-wvu
-bPR
-nEI
-wvu
-bil
+jEa
+bhs
+hwL
+hwL
+aIv
+bhs
+hwL
+qHt
iDt
iDt
iDt
@@ -171061,14 +171061,14 @@ thA
thA
thA
thA
-dlu
-wvu
-wvu
-wvu
-bPR
-wvu
-wvu
-bil
+jEa
+hwL
+hwL
+hwL
+aIv
+hwL
+hwL
+qHt
iDt
iDt
ayJ
@@ -171318,14 +171318,14 @@ tjo
thA
thA
thA
-dlu
-rEn
-rEn
-wvu
-ghA
-rEn
-wvu
-idH
+jEa
+hsU
+hsU
+hwL
+xQJ
+hsU
+hwL
+hop
iDt
iDt
iDt
@@ -171575,14 +171575,14 @@ tjo
thA
thA
thA
-dlu
-wvu
-wvu
-wvu
-wvu
-wvu
-wvu
-wvu
+jEa
+hwL
+hwL
+hwL
+hwL
+hwL
+hwL
+hwL
iDt
iDt
iDt
@@ -171832,14 +171832,14 @@ tjo
thA
thA
thA
-dlu
-ncx
-kYN
-wvu
-wvu
-rzY
-kYN
-wvu
+jEa
+xWC
+qGX
+hwL
+hwL
+oAJ
+qGX
+hwL
ayJ
iDt
iDt
@@ -172089,14 +172089,14 @@ tjo
thA
thA
thA
-dlu
-wvu
-wvu
-wvu
-wvu
-wvu
-wvu
-wvu
+jEa
+hwL
+hwL
+hwL
+hwL
+hwL
+hwL
+hwL
iDt
iDt
iDt
@@ -172346,14 +172346,14 @@ tjo
thA
thA
thA
-dlu
-xxH
-xxH
-wvu
-jkK
-xxH
-wvu
-mhj
+jEa
+byV
+byV
+hwL
+hnc
+byV
+hwL
+qBi
iDt
iDt
iDt
@@ -172603,14 +172603,14 @@ tjo
thA
thA
thA
-dlu
-wvu
-wvu
-wvu
-bPR
-wvu
-wvu
-bil
+jEa
+hwL
+hwL
+hwL
+aIv
+hwL
+hwL
+qHt
iDt
iDt
ayJ
@@ -172860,14 +172860,14 @@ tjo
thA
thA
thA
-dlu
-nEI
-wvu
-wvu
-bPR
-nEI
-wvu
-bil
+jEa
+bhs
+hwL
+hwL
+aIv
+bhs
+hwL
+qHt
iDt
iDt
iDt
@@ -173117,14 +173117,14 @@ tjo
thA
thA
thA
-dlu
-qbM
-wvu
-wvu
-bPR
-qbM
-wvu
-bil
+jEa
+vfO
+hwL
+hwL
+aIv
+vfO
+hwL
+qHt
iDt
iDt
iDt
@@ -173374,14 +173374,14 @@ tjo
thA
thA
thA
-dlu
-dlu
-dlu
-dlu
-dlu
-dlu
-dlu
-dlu
+jEa
+jEa
+jEa
+jEa
+jEa
+jEa
+jEa
+jEa
iDx
rrl
iDx
@@ -230670,7 +230670,7 @@ lJO
qzs
jnV
lJO
-iWO
+xpH
gHS
iMT
hqx
@@ -237678,7 +237678,7 @@ mNY
kCn
mNY
dUn
-ptx
+mMj
cpH
kbJ
kbJ
@@ -237689,7 +237689,7 @@ epY
vWe
kIt
kMY
-qde
+eYU
lha
kAK
iLY
@@ -238093,7 +238093,7 @@ aWk
diC
bJj
lyG
-jko
+mci
bXy
feJ
xWb
@@ -238708,7 +238708,7 @@ mNY
akL
tvF
tvF
-izF
+uMw
gTK
ruO
fKe
@@ -238935,7 +238935,7 @@ ylU
bep
paM
xxQ
-keX
+vDG
kzO
gdP
ykL
@@ -239405,7 +239405,7 @@ wqx
gEb
gYp
bWn
-bMC
+itQ
cGt
wRI
qdE
@@ -239962,7 +239962,7 @@ dnq
vrX
pua
paM
-iIW
+kyM
vJI
uud
gdP
@@ -239993,7 +239993,7 @@ mNY
ixG
aPf
dzJ
-puI
+cWn
twt
mEw
sSJ
@@ -240237,7 +240237,7 @@ dPT
pRj
pMu
gVD
-dxJ
+tWF
ajF
qwe
uJH
@@ -241779,7 +241779,7 @@ vvv
tTV
jtA
bID
-wUE
+bAW
miw
gCK
cMd
@@ -242044,7 +242044,7 @@ dcC
jGB
akz
sCA
-pIF
+clX
ojv
bAT
eri
@@ -242303,7 +242303,7 @@ wHj
mBB
juH
ojv
-htc
+kBw
mDw
jDT
qKQ
@@ -242813,7 +242813,7 @@ bDz
rSC
inE
oPU
-wuV
+hYU
qnC
qnC
sCA
@@ -245559,7 +245559,7 @@ bln
bln
fsm
bUx
-cCC
+cOY
wph
fnS
skl
@@ -246895,7 +246895,7 @@ veU
vEQ
kRP
kRP
-oiB
+pvd
kRP
pao
cGA
@@ -247664,7 +247664,7 @@ sEz
jFZ
uoV
gnb
-gTi
+aCV
whh
pQL
nCV
@@ -257426,8 +257426,8 @@ gqK
nxU
gjg
dxg
-jth
-mgu
+doO
+pmA
dkr
cHQ
jDm
@@ -257708,7 +257708,7 @@ kLy
bGA
lKq
bNu
-myU
+gBg
bKm
xMT
hjE
@@ -257716,8 +257716,8 @@ sJP
bkS
pJc
iBO
-iji
-gEo
+oCm
+tYL
bgx
buv
jhC
@@ -259192,7 +259192,7 @@ fLb
oHh
kKL
bpQ
-epd
+vrl
oih
dmL
lUC
@@ -260254,7 +260254,7 @@ mrw
kuV
cAi
qWn
-oPq
+kck
fOR
tFF
tia
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 6cd01a35c9d..5e7ab642c27 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -216,13 +216,6 @@
},
/turf/open/floor/iron,
/area/station/engineering/main)
-"aev" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/disposalpipe/segment,
-/obj/item/stock_parts/cell/high,
-/turf/open/floor/plating,
-/area/station/maintenance/starboard/greater)
"aez" = (
/obj/effect/turf_decal/stripes/line{
dir = 10
@@ -1105,14 +1098,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/wood,
/area/station/command/corporate_showroom)
-"avJ" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
-/obj/item/stock_parts/cell/high,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/ai_monitored/command/storage/eva)
"avK" = (
/turf/closed/wall,
/area/station/maintenance/fore/lesser)
@@ -4887,6 +4872,15 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/primary/central)
+"bKi" = (
+/obj/structure/rack,
+/obj/effect/turf_decal/tile/blue/half/contrasted{
+ dir = 4
+ },
+/obj/machinery/light/small/directional/west,
+/obj/effect/spawner/random/armory/dragnet,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
"bKv" = (
/obj/item/pen,
/obj/structure/table/reinforced,
@@ -5167,16 +5161,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/security/brig)
-"bPu" = (
-/obj/structure/table,
-/obj/machinery/cell_charger{
- pixel_y = 5
- },
-/obj/item/stack/cable_coil,
-/obj/item/multitool,
-/obj/item/stock_parts/cell/high,
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"bPB" = (
/obj/structure/sign/warning/biohazard,
/turf/closed/wall,
@@ -7433,6 +7417,12 @@
},
/turf/open/floor/plating,
/area/station/science/genetics)
+"cIl" = (
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/turf/open/floor/plating,
+/area/station/maintenance/port/aft)
"cIK" = (
/obj/machinery/smartfridge/chemistry/preloaded,
/obj/effect/turf_decal/tile/yellow/fourcorners,
@@ -7459,12 +7449,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/aft/greater)
-"cIS" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
-/turf/open/floor/plating,
-/area/station/maintenance/port/aft)
"cIU" = (
/obj/machinery/vending/coffee,
/turf/open/floor/wood,
@@ -9208,20 +9192,6 @@
/obj/structure/closet/emcloset,
/turf/open/floor/plating,
/area/station/hallway/secondary/entry)
-"dqE" = (
-/obj/structure/closet/toolcloset,
-/obj/effect/turf_decal/bot,
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/obj/machinery/light/small/directional/north,
-/obj/item/lightreplacer{
- pixel_y = 7
- },
-/turf/open/floor/iron/dark/corner{
- dir = 1
- },
-/area/station/engineering/storage_shared)
"dqI" = (
/obj/effect/turf_decal/bot,
/obj/machinery/vending/cigarette,
@@ -9843,6 +9813,22 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/iron,
/area/station/science/robotics/mechbay)
+"dEk" = (
+/obj/effect/turf_decal/bot,
+/obj/structure/rack,
+/obj/machinery/status_display/evac/directional/east,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
+/obj/item/flatpack{
+ board = /obj/item/circuitboard/machine/flatpacker;
+ pixel_x = -5
+ },
+/obj/item/multitool{
+ pixel_x = 8
+ },
+/turf/open/floor/iron/checker,
+/area/station/engineering/storage_shared)
"dEx" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -10986,6 +10972,30 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/plating,
/area/station/security/prison)
+"dXp" = (
+/obj/structure/table,
+/obj/item/stack/sheet/iron/fifty,
+/obj/item/stack/sheet/iron/fifty,
+/obj/item/stack/sheet/iron/fifty,
+/obj/item/stack/sheet/glass/fifty,
+/obj/item/stack/sheet/glass/fifty,
+/obj/item/stack/sheet/glass/fifty,
+/obj/item/crowbar,
+/obj/item/grenade/chem_grenade/smart_metal_foam,
+/obj/item/grenade/chem_grenade/smart_metal_foam,
+/obj/effect/turf_decal/bot{
+ dir = 1
+ },
+/obj/item/stock_parts/power_store/cell/emproof{
+ pixel_x = -6;
+ pixel_y = 2
+ },
+/obj/item/stock_parts/power_store/cell/emproof{
+ pixel_x = 4;
+ pixel_y = 6
+ },
+/turf/open/floor/iron,
+/area/station/engineering/main)
"dXs" = (
/obj/structure/secure_safe/directional/north{
name = "armory safe A"
@@ -11675,6 +11685,18 @@
dir = 8
},
/area/station/service/chapel)
+"ehL" = (
+/obj/effect/turf_decal/trimline/purple/filled/warning{
+ dir = 1
+ },
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/effect/turf_decal/siding/purple{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/science/explab)
"ehX" = (
/turf/open/floor/iron/dark,
/area/station/medical/storage)
@@ -12669,6 +12691,15 @@
/obj/effect/turf_decal/tile/blue/fourcorners,
/turf/open/floor/iron/white,
/area/station/medical/surgery/theatre)
+"eyz" = (
+/obj/machinery/cell_charger{
+ pixel_y = 4
+ },
+/obj/structure/table/glass,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/structure/window/reinforced/spawner/directional/west,
+/turf/open/floor/iron/dark,
+/area/station/command/bridge)
"eyD" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible,
@@ -14326,6 +14357,20 @@
/obj/item/aquarium_kit,
/turf/open/floor/iron,
/area/station/hallway/secondary/service)
+"ffO" = (
+/obj/structure/closet/toolcloset,
+/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
+/obj/machinery/light/small/directional/north,
+/obj/item/lightreplacer{
+ pixel_y = 7
+ },
+/turf/open/floor/iron/dark/corner{
+ dir = 1
+ },
+/area/station/engineering/storage_shared)
"ffP" = (
/obj/effect/spawner/random/structure/grille,
/turf/open/floor/plating/foam{
@@ -15169,6 +15214,19 @@
/obj/effect/mapping_helpers/airlock/access/all/security/entrance,
/turf/open/floor/iron,
/area/station/security/brig)
+"frK" = (
+/obj/structure/table/glass,
+/obj/machinery/cell_charger,
+/obj/item/stack/cable_coil,
+/obj/item/assembly/igniter,
+/obj/item/stock_parts/power_store/cell,
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/purple/anticorner/contrasted{
+ dir = 4
+ },
+/turf/open/floor/iron/white,
+/area/station/science/lobby)
"frZ" = (
/obj/effect/turf_decal/delivery,
/obj/machinery/atmospherics/components/binary/pump{
@@ -15344,6 +15402,20 @@
/obj/structure/marker_beacon/olive,
/turf/open/space/basic,
/area/space/nearstation)
+"fxE" = (
+/obj/structure/table/reinforced,
+/obj/item/stock_parts/power_store/cell/high{
+ pixel_x = 4;
+ pixel_y = 5
+ },
+/obj/item/stock_parts/power_store/cell/high{
+ pixel_x = -8;
+ pixel_y = 9
+ },
+/obj/item/stock_parts/power_store/cell/high,
+/obj/machinery/cell_charger,
+/turf/open/floor/iron,
+/area/station/science/robotics/lab)
"fxI" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -16126,6 +16198,13 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/ce)
+"fMR" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/disposalpipe/segment,
+/obj/item/stock_parts/power_store/cell/high,
+/turf/open/floor/plating,
+/area/station/maintenance/starboard/greater)
"fMT" = (
/obj/structure/table,
/obj/item/radio/intercom/directional/south,
@@ -16762,6 +16841,20 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
+"gaP" = (
+/obj/item/stack/sheet/iron/fifty,
+/obj/item/stack/rods/fifty,
+/obj/item/stack/sheet/glass/fifty,
+/obj/item/electronics/airlock,
+/obj/item/electronics/airlock,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/item/stack/sheet/mineral/plasma{
+ amount = 30
+ },
+/obj/item/gps,
+/obj/structure/closet/crate/engineering,
+/turf/open/floor/plating,
+/area/station/engineering/main)
"gaU" = (
/obj/machinery/button/door/directional/west{
id = "hop";
@@ -16818,6 +16911,20 @@
/obj/effect/mapping_helpers/airlock/unres,
/turf/open/floor/plating,
/area/station/science/research)
+"gcz" = (
+/obj/structure/closet/crate,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/item/stack/cable_coil{
+ pixel_x = 3;
+ pixel_y = -7
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 9
+ },
+/obj/effect/spawner/random/engineering/flashlight,
+/obj/effect/spawner/random/engineering/flashlight,
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
"gcA" = (
/obj/machinery/navbeacon{
codes_txt = "patrol;next_patrol=5-Customs";
@@ -19642,6 +19749,16 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/primary/central)
+"hcA" = (
+/obj/structure/table,
+/obj/machinery/cell_charger{
+ pixel_y = 5
+ },
+/obj/item/stack/cable_coil,
+/obj/item/multitool,
+/obj/item/stock_parts/power_store/cell/high,
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"hcP" = (
/obj/structure/reagent_dispensers/watertank,
/turf/open/floor/plating,
@@ -22689,19 +22806,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/maintenance/space_hut)
-"igr" = (
-/obj/structure/table/glass,
-/obj/machinery/cell_charger,
-/obj/item/stack/cable_coil,
-/obj/item/assembly/igniter,
-/obj/item/stock_parts/cell,
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/purple/anticorner/contrasted{
- dir = 4
- },
-/turf/open/floor/iron/white,
-/area/station/science/lobby)
"igy" = (
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible,
/obj/machinery/requests_console/directional/east{
@@ -22787,25 +22891,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/engineering/storage/tech)
-"ihF" = (
-/obj/effect/turf_decal/stripes/corner{
- dir = 4
- },
-/obj/structure/table/reinforced,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
-/obj/machinery/firealarm/directional/west,
-/obj/machinery/camera/directional/north{
- c_tag = "Science Mechbay";
- network = list("ss13","rd")
- },
-/obj/machinery/button/door/directional/north{
- id = "mechbay";
- name = "Mech Bay Shutters Control";
- req_access = list("robotics")
- },
-/turf/open/floor/iron,
-/area/station/science/robotics/mechbay)
"ihW" = (
/obj/structure/lattice/catwalk,
/obj/structure/disposalpipe/trunk{
@@ -25564,13 +25649,6 @@
/obj/machinery/light/small/directional/east,
/turf/open/floor/carpet,
/area/station/command/heads_quarters/captain/private)
-"jdB" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/iron,
-/area/station/engineering/main)
"jdH" = (
/obj/structure/closet/crate/freezer/blood,
/obj/effect/turf_decal/siding/white,
@@ -26388,20 +26466,6 @@
},
/turf/open/floor/iron,
/area/station/commons/locker)
-"jrR" = (
-/obj/structure/table/reinforced,
-/obj/item/stock_parts/cell/high{
- pixel_x = 4;
- pixel_y = 5
- },
-/obj/item/stock_parts/cell/high{
- pixel_x = -8;
- pixel_y = 9
- },
-/obj/item/stock_parts/cell/high,
-/obj/machinery/cell_charger,
-/turf/open/floor/iron,
-/area/station/science/robotics/lab)
"jrY" = (
/obj/machinery/door/airlock/external{
name = "Transport Airlock"
@@ -27201,16 +27265,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/fore)
-"jEh" = (
-/obj/structure/table/reinforced,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
-/obj/item/rcl/pre_loaded,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/command/heads_quarters/ce)
"jEr" = (
/obj/machinery/holopad/secure,
/obj/machinery/flasher/directional/west{
@@ -29971,23 +30025,6 @@
/obj/machinery/airalarm/directional/east,
/turf/open/floor/iron,
/area/station/hallway/primary/aft)
-"kAh" = (
-/obj/structure/closet/crate,
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/item/stack/cable_coil{
- pixel_x = 3;
- pixel_y = -7
- },
-/obj/item/stock_parts/cell/high,
-/obj/machinery/light_switch/directional/north,
-/obj/effect/spawner/random/engineering/flashlight,
-/obj/effect/spawner/random/engineering/flashlight,
-/obj/effect/turf_decal/tile/brown/half/contrasted{
- dir = 4
- },
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"kAp" = (
/obj/machinery/door/window/left/directional/west{
name = "Disposals Chute"
@@ -30853,30 +30890,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/commons/locker)
-"kRc" = (
-/obj/structure/table,
-/obj/item/multitool{
- pixel_x = 4;
- pixel_y = 12
- },
-/obj/item/multitool{
- pixel_x = -4;
- pixel_y = 8
- },
-/obj/item/stock_parts/cell/high{
- pixel_y = -4
- },
-/obj/item/stock_parts/cell/high{
- pixel_x = -4;
- pixel_y = -6
- },
-/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer5,
-/obj/machinery/atmospherics/pipe/smart/simple/purple/visible,
-/obj/item/multitool{
- pixel_y = 10
- },
-/turf/open/floor/iron/dark/textured,
-/area/station/engineering/atmos)
"kRe" = (
/turf/open/floor/iron,
/area/station/cargo/miningoffice)
@@ -32128,15 +32141,6 @@
},
/turf/open/floor/plating,
/area/station/maintenance/fore)
-"loY" = (
-/obj/structure/rack,
-/obj/effect/turf_decal/tile/blue/half/contrasted{
- dir = 4
- },
-/obj/machinery/light/small/directional/west,
-/obj/effect/spawner/random/armory/dragnet,
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/security/armory)
"lpo" = (
/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
dir = 4
@@ -33579,15 +33583,6 @@
/obj/machinery/airalarm/directional/east,
/turf/open/floor/iron/dark,
/area/station/security/courtroom)
-"lUo" = (
-/obj/machinery/cell_charger{
- pixel_y = 4
- },
-/obj/structure/table/glass,
-/obj/item/stock_parts/cell/high,
-/obj/structure/window/reinforced/spawner/directional/west,
-/turf/open/floor/iron/dark,
-/area/station/command/bridge)
"lUp" = (
/obj/structure/sink/kitchen/directional/south{
desc = "A sink used for washing one's hands and face. It looks rusty and home-made";
@@ -37199,30 +37194,6 @@
/obj/structure/cable,
/turf/open/floor/iron/white,
/area/station/security/prison)
-"ngY" = (
-/obj/structure/table,
-/obj/item/stack/sheet/iron/fifty,
-/obj/item/stack/sheet/iron/fifty,
-/obj/item/stack/sheet/iron/fifty,
-/obj/item/stack/sheet/glass/fifty,
-/obj/item/stack/sheet/glass/fifty,
-/obj/item/stack/sheet/glass/fifty,
-/obj/item/crowbar,
-/obj/item/grenade/chem_grenade/smart_metal_foam,
-/obj/item/grenade/chem_grenade/smart_metal_foam,
-/obj/effect/turf_decal/bot{
- dir = 1
- },
-/obj/item/stock_parts/cell/emproof{
- pixel_x = -6;
- pixel_y = 2
- },
-/obj/item/stock_parts/cell/emproof{
- pixel_x = 4;
- pixel_y = 6
- },
-/turf/open/floor/iron,
-/area/station/engineering/main)
"nhh" = (
/obj/structure/table/wood,
/obj/item/gavelblock,
@@ -37566,6 +37537,13 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/security/office)
+"nnu" = (
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/iron,
+/area/station/engineering/main)
"nnD" = (
/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{
dir = 4
@@ -39812,20 +39790,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/science/research)
-"oaC" = (
-/obj/item/stack/sheet/iron/fifty,
-/obj/item/stack/rods/fifty,
-/obj/item/stack/sheet/glass/fifty,
-/obj/item/electronics/airlock,
-/obj/item/electronics/airlock,
-/obj/item/stock_parts/cell/high,
-/obj/item/stack/sheet/mineral/plasma{
- amount = 30
- },
-/obj/item/gps,
-/obj/structure/closet/crate/engineering,
-/turf/open/floor/plating,
-/area/station/engineering/main)
"obk" = (
/obj/item/target/alien,
/turf/open/floor/plating,
@@ -39900,6 +39864,12 @@
/obj/structure/window/reinforced/spawner/directional/east,
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/rd)
+"obU" = (
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/crap,
+/obj/structure/table/wood,
+/turf/open/floor/carpet,
+/area/station/command/corporate_showroom)
"ocg" = (
/obj/structure/extinguisher_cabinet/directional/south,
/obj/structure/cable,
@@ -42020,12 +41990,6 @@
/obj/structure/window/reinforced/spawner/directional/east,
/turf/open/floor/iron,
/area/station/science/xenobiology)
-"oQS" = (
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/crap,
-/obj/structure/table/wood,
-/turf/open/floor/carpet,
-/area/station/command/corporate_showroom)
"oQZ" = (
/obj/machinery/navbeacon{
codes_txt = "patrol;next_patrol=1.5-Fore-Central";
@@ -42049,6 +42013,32 @@
},
/turf/open/floor/iron/cafeteria,
/area/station/service/kitchen)
+"oRA" = (
+/obj/structure/table,
+/obj/item/stack/cable_coil{
+ pixel_x = 3;
+ pixel_y = -7
+ },
+/obj/item/stack/cable_coil,
+/obj/item/electronics/airlock,
+/obj/item/electronics/airlock,
+/obj/item/clothing/ears/earmuffs{
+ pixel_x = -3;
+ pixel_y = -2
+ },
+/obj/item/clothing/ears/earmuffs{
+ pixel_x = -5;
+ pixel_y = 6
+ },
+/obj/effect/turf_decal/bot{
+ dir = 1
+ },
+/obj/item/stock_parts/power_store/cell/emproof{
+ pixel_x = -4;
+ pixel_y = 6
+ },
+/turf/open/floor/iron,
+/area/station/engineering/main)
"oRM" = (
/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{
dir = 4
@@ -42624,6 +42614,15 @@
},
/turf/open/floor/iron/white,
/area/station/command/heads_quarters/cmo)
+"pcP" = (
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/effect/turf_decal/bot{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/command/gateway)
"pcS" = (
/obj/item/stack/ore/silver,
/obj/item/stack/ore/silver,
@@ -46153,20 +46152,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/carpet,
/area/station/service/library)
-"qqp" = (
-/obj/structure/closet/crate,
-/obj/item/stock_parts/cell/high,
-/obj/item/stack/cable_coil{
- pixel_x = 3;
- pixel_y = -7
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 9
- },
-/obj/effect/spawner/random/engineering/flashlight,
-/obj/effect/spawner/random/engineering/flashlight,
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
"qqr" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/turf_decal/stripes/line,
@@ -46940,15 +46925,6 @@
},
/turf/open/floor/iron/dark,
/area/station/security/courtroom)
-"qGc" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
-/obj/effect/turf_decal/bot{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/command/gateway)
"qGn" = (
/obj/structure/table,
/obj/item/hfr_box/body/waste_output,
@@ -49578,13 +49554,6 @@
},
/turf/open/floor/iron,
/area/station/medical/medbay/lobby)
-"ryp" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/machinery/airalarm/directional/east,
-/obj/item/stock_parts/cell/high,
-/turf/open/floor/iron/dark,
-/area/station/engineering/storage/tech)
"ryA" = (
/obj/item/cigbutt,
/obj/structure/table/reinforced,
@@ -49753,32 +49722,6 @@
"rAW" = (
/turf/closed/wall,
/area/station/security/prison/work)
-"rBe" = (
-/obj/structure/table,
-/obj/item/stack/cable_coil{
- pixel_x = 3;
- pixel_y = -7
- },
-/obj/item/stack/cable_coil,
-/obj/item/electronics/airlock,
-/obj/item/electronics/airlock,
-/obj/item/clothing/ears/earmuffs{
- pixel_x = -3;
- pixel_y = -2
- },
-/obj/item/clothing/ears/earmuffs{
- pixel_x = -5;
- pixel_y = 6
- },
-/obj/effect/turf_decal/bot{
- dir = 1
- },
-/obj/item/stock_parts/cell/emproof{
- pixel_x = -4;
- pixel_y = 6
- },
-/turf/open/floor/iron,
-/area/station/engineering/main)
"rBi" = (
/obj/machinery/airalarm/directional/west,
/obj/effect/turf_decal/stripes/line{
@@ -52680,6 +52623,13 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
+"sDl" = (
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/machinery/airalarm/directional/east,
+/obj/item/stock_parts/power_store/cell/high,
+/turf/open/floor/iron/dark,
+/area/station/engineering/storage/tech)
"sDo" = (
/obj/structure/cable,
/obj/effect/landmark/event_spawn,
@@ -54592,6 +54542,30 @@
/obj/item/radio/intercom/prison/directional/north,
/turf/open/floor/iron,
/area/station/security/prison)
+"tkT" = (
+/obj/structure/table,
+/obj/item/multitool{
+ pixel_x = 4;
+ pixel_y = 12
+ },
+/obj/item/multitool{
+ pixel_x = -4;
+ pixel_y = 8
+ },
+/obj/item/stock_parts/power_store/cell/high{
+ pixel_y = -4
+ },
+/obj/item/stock_parts/power_store/cell/high{
+ pixel_x = -4;
+ pixel_y = -6
+ },
+/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer5,
+/obj/machinery/atmospherics/pipe/smart/simple/purple/visible,
+/obj/item/multitool{
+ pixel_y = 10
+ },
+/turf/open/floor/iron/dark/textured,
+/area/station/engineering/atmos)
"tlh" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -54984,6 +54958,14 @@
/obj/item/knife/kitchen,
/turf/open/floor/iron/white,
/area/station/science/cytology)
+"tsN" = (
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/machinery/light_switch/directional/north,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/station/command/teleporter)
"tsT" = (
/obj/effect/turf_decal/stripes/corner{
dir = 1
@@ -56717,17 +56699,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/maintenance/starboard/greater)
-"tXl" = (
-/obj/structure/table,
-/obj/item/stack/cable_coil{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/stack/cable_coil,
-/obj/item/stock_parts/cell/high,
-/obj/structure/extinguisher_cabinet/directional/east,
-/turf/open/floor/iron/dark,
-/area/station/engineering/storage/tech)
"tXx" = (
/obj/effect/turf_decal/trimline/green/filled/corner{
dir = 8
@@ -57829,6 +57800,25 @@
/obj/structure/chair/stool/directional/east,
/turf/open/floor/iron,
/area/station/commons/dorms)
+"urN" = (
+/obj/effect/turf_decal/stripes/corner{
+ dir = 4
+ },
+/obj/structure/table/reinforced,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/machinery/firealarm/directional/west,
+/obj/machinery/camera/directional/north{
+ c_tag = "Science Mechbay";
+ network = list("ss13","rd")
+ },
+/obj/machinery/button/door/directional/north{
+ id = "mechbay";
+ name = "Mech Bay Shutters Control";
+ req_access = list("robotics")
+ },
+/turf/open/floor/iron,
+/area/station/science/robotics/mechbay)
"urQ" = (
/obj/structure/lattice/catwalk,
/obj/item/stack/cable_coil,
@@ -58914,22 +58904,6 @@
/obj/machinery/computer/accounting,
/turf/open/floor/wood,
/area/station/command/heads_quarters/hop)
-"uJz" = (
-/obj/effect/turf_decal/bot,
-/obj/structure/rack,
-/obj/machinery/status_display/evac/directional/east,
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/obj/item/flatpack{
- board = /obj/item/circuitboard/machine/flatpacker;
- pixel_x = -5
- },
-/obj/item/multitool{
- pixel_x = 8
- },
-/turf/open/floor/iron/checker,
-/area/station/engineering/storage_shared)
"uJB" = (
/obj/structure/chair/stool/directional/east,
/turf/open/floor/iron,
@@ -59286,6 +59260,14 @@
},
/turf/open/floor/iron,
/area/station/service/hydroponics/garden)
+"uPS" = (
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/ai_monitored/command/storage/eva)
"uQe" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -61572,18 +61554,6 @@
},
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/rd)
-"vCR" = (
-/obj/effect/turf_decal/trimline/purple/filled/warning{
- dir = 1
- },
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
-/obj/effect/turf_decal/siding/purple{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/science/explab)
"vDc" = (
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
@@ -63552,6 +63522,16 @@
/obj/effect/landmark/start/hangover/closet,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
+"wiQ" = (
+/obj/structure/table/reinforced,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/item/rcl/pre_loaded,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/station/command/heads_quarters/ce)
"wiS" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
@@ -64452,6 +64432,17 @@
},
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
+"wAc" = (
+/obj/structure/table,
+/obj/item/stack/cable_coil{
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/stack/cable_coil,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/structure/extinguisher_cabinet/directional/east,
+/turf/open/floor/iron/dark,
+/area/station/engineering/storage/tech)
"wAk" = (
/obj/machinery/status_display/evac/directional/south,
/obj/structure/disposalpipe/segment{
@@ -67049,14 +67040,6 @@
/obj/structure/disposalpipe/trunk,
/turf/open/floor/iron/dark,
/area/station/hallway/primary/central)
-"xxn" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
-/obj/machinery/light_switch/directional/north,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/station/command/teleporter)
"xxF" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -68571,6 +68554,23 @@
/obj/item/radio/intercom/directional/north,
/turf/open/floor/iron,
/area/station/security/courtroom)
+"xZe" = (
+/obj/structure/closet/crate,
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/item/stack/cable_coil{
+ pixel_x = 3;
+ pixel_y = -7
+ },
+/obj/item/stock_parts/power_store/cell/high,
+/obj/machinery/light_switch/directional/north,
+/obj/effect/spawner/random/engineering/flashlight,
+/obj/effect/spawner/random/engineering/flashlight,
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 4
+ },
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
"xZu" = (
/obj/structure/sink/kitchen/directional/east{
desc = "A sink used for washing one's hands and face. It looks rusty and home-made";
@@ -85318,7 +85318,7 @@ lMJ
lMJ
lMJ
pnI
-qqp
+gcz
xDu
pcS
pnI
@@ -86859,7 +86859,7 @@ jXu
bZz
vRr
paD
-kAh
+xZe
dSG
apC
sUD
@@ -88201,7 +88201,7 @@ kRA
jUb
xYq
dqN
-cIS
+cIl
jUb
rvI
jUb
@@ -93073,7 +93073,7 @@ jIg
dTr
rIL
bwN
-avJ
+uPS
ukk
rGm
gqX
@@ -94353,7 +94353,7 @@ ndS
urA
pFG
gBD
-xxn
+tsN
fRu
hVE
xXw
@@ -96100,7 +96100,7 @@ aaa
aaa
aeq
xCo
-loY
+bKi
tTP
fdQ
uou
@@ -96142,7 +96142,7 @@ gGy
qVc
dMY
jYL
-lUo
+eyz
aAt
duI
pCO
@@ -96414,7 +96414,7 @@ haP
jzN
fEC
eQe
-oQS
+obU
iAA
oSo
cgF
@@ -97455,7 +97455,7 @@ rgZ
suW
hJF
cZK
-ihF
+urN
cXg
nyy
gVl
@@ -98490,7 +98490,7 @@ cBV
xlv
eut
bUo
-jrR
+fxE
jtS
bFH
mMl
@@ -98985,7 +98985,7 @@ nse
bmb
lwg
aAK
-qGc
+pcP
tvE
qJU
hPM
@@ -99506,7 +99506,7 @@ kON
ylQ
bGC
wHu
-igr
+frK
ibw
ibw
nIP
@@ -102083,7 +102083,7 @@ ftj
wXF
doM
tZo
-vCR
+ehL
oFT
gvS
oYZ
@@ -107697,10 +107697,10 @@ psZ
psZ
qXB
gAU
-tXl
+wAc
oUK
eRR
-ryp
+sDl
cdX
sDE
hjS
@@ -107711,7 +107711,7 @@ ggM
ggM
dLq
lzL
-aev
+fMR
lzL
lzL
scG
@@ -108454,7 +108454,7 @@ rpx
dPy
loA
poc
-ngY
+dXp
uXd
tfg
tfg
@@ -108711,12 +108711,12 @@ oKx
gLK
joo
sHT
-rBe
+oRA
uXd
dVc
bYp
gXu
-oaC
+gaP
uXd
gMG
dWG
@@ -109239,7 +109239,7 @@ woL
jLo
nwC
nLz
-jEh
+wiQ
hYE
rEd
sby
@@ -109487,7 +109487,7 @@ cnK
jPe
dPy
poc
-jdB
+nnu
cnK
giH
aJj
@@ -111293,7 +111293,7 @@ qLw
tdf
mdk
kYG
-dqE
+ffO
oFH
oFH
sSz
@@ -111807,7 +111807,7 @@ hko
uLp
qTX
kYG
-uJz
+dEk
iHy
vSC
eKw
@@ -113630,7 +113630,7 @@ efd
nwK
fFC
uVf
-kRc
+tkT
gDq
ich
jnQ
@@ -118805,7 +118805,7 @@ aaa
lMJ
jlU
jlU
-bPu
+hcA
aYl
kcu
jlU
diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm
index 1ae71b1799f..b38b99867ab 100644
--- a/_maps/map_files/Mining/Lavaland.dmm
+++ b/_maps/map_files/Mining/Lavaland.dmm
@@ -1006,15 +1006,15 @@
/obj/structure/cable,
/obj/effect/decal/cleanable/dirt,
/obj/structure/rack,
-/obj/item/stock_parts/cell/high{
+/obj/item/stock_parts/power_store/cell/high{
pixel_x = 6;
pixel_y = 7
},
-/obj/item/stock_parts/cell/high{
+/obj/item/stock_parts/power_store/cell/high{
pixel_x = -3;
pixel_y = 5
},
-/obj/item/stock_parts/cell/high{
+/obj/item/stock_parts/power_store/cell/high{
pixel_x = 3
},
/turf/open/floor/plating,
@@ -4390,7 +4390,7 @@
/area/mine/maintenance/public/south)
"zd" = (
/obj/effect/decal/cleanable/dirt,
-/obj/item/stock_parts/cell/crap{
+/obj/item/stock_parts/power_store/cell/crap{
desc = "A legendary infinite-capacity power cell. This one looks like a poor quality AA battery with a coat of flaking gold paint.";
icon_state = "icell";
name = "infinite-capacity power cell"
@@ -6728,8 +6728,8 @@
/obj/machinery/cell_charger{
pixel_y = 3
},
-/obj/item/stock_parts/cell/high,
-/obj/item/stock_parts/cell/high{
+/obj/item/stock_parts/power_store/cell/high,
+/obj/item/stock_parts/power_store/cell/high{
pixel_y = 3
},
/obj/effect/turf_decal/trimline/purple/filled/line{
diff --git a/_maps/map_files/NorthStar/north_star.dmm b/_maps/map_files/NorthStar/north_star.dmm
index 7ce411f102f..0791f34e05b 100644
--- a/_maps/map_files/NorthStar/north_star.dmm
+++ b/_maps/map_files/NorthStar/north_star.dmm
@@ -2709,28 +2709,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/textured_large,
/area/station/cargo/storage)
-"aJO" = (
-/obj/structure/window/reinforced/plasma/spawner/directional/east,
-/obj/structure/table/reinforced/plasmarglass,
-/obj/item/stock_parts/cell/lead{
- pixel_x = -5;
- pixel_y = 8
- },
-/obj/item/usb_cable{
- name = "jumper cable";
- pixel_x = -10;
- pixel_y = 12
- },
-/obj/item/lead_pipe{
- pixel_x = -5
- },
-/obj/item/reagent_containers/spray/cleaner{
- pixel_x = 6;
- pixel_y = 7
- },
-/obj/item/reagent_containers/syringe,
-/turf/open/floor/pod/dark,
-/area/station/service/kitchen/abandoned)
"aJT" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -3270,20 +3248,6 @@
/obj/machinery/newscaster/directional/north,
/turf/open/floor/iron/dark,
/area/station/maintenance/disposal/incinerator)
-"aRG" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
-/obj/effect/turf_decal/stripes/white/line{
- dir = 4
- },
-/obj/item/folder/white{
- pixel_y = 13
- },
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/structure/cable,
-/turf/open/floor/iron/dark,
-/area/station/science/lab)
"aRI" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -4468,14 +4432,6 @@
},
/turf/open/floor/pod/light,
/area/station/maintenance/floor4/starboard/fore)
-"bfA" = (
-/obj/effect/turf_decal/bot,
-/obj/structure/table/reinforced,
-/obj/item/stock_parts/cell/high,
-/obj/machinery/cell_charger,
-/obj/structure/window/reinforced/spawner/directional/south,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/science/robotics/mechbay)
"bfC" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 1
@@ -5284,13 +5240,6 @@
/obj/item/radio/intercom/directional/east,
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
-"bnI" = (
-/obj/structure/table/reinforced,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
-/obj/item/radio/intercom/directional/west,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/science/robotics/lab)
"bnL" = (
/obj/effect/turf_decal/siding/wood/corner{
dir = 1
@@ -5442,14 +5391,6 @@
/obj/item/crowbar/mechremoval,
/turf/open/floor/iron/large,
/area/station/science/robotics/lab)
-"bpD" = (
-/obj/effect/turf_decal/siding/white,
-/obj/structure/railing,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
-/obj/structure/table/reinforced/rglass,
-/turf/open/floor/iron/large,
-/area/station/science/robotics/lab)
"bpE" = (
/obj/effect/spawner/random/trash/mess,
/obj/effect/decal/cleanable/dirt,
@@ -20604,6 +20545,11 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/white,
/area/station/medical/virology)
+"frG" = (
+/obj/structure/rack,
+/obj/effect/spawner/random/armory/dragnet,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
"frL" = (
/turf/closed/wall,
/area/station/engineering/gravity_generator)
@@ -24323,6 +24269,24 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/security/prison/visit)
+"gra" = (
+/obj/structure/rack,
+/obj/item/stock_parts/micro_laser{
+ pixel_y = 7
+ },
+/obj/item/stock_parts/power_store/cell/high{
+ pixel_x = -4;
+ pixel_y = -6
+ },
+/obj/item/vending_refill/wardrobe/science_wardrobe{
+ pixel_y = 18
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 8
+ },
+/obj/item/radio/intercom/directional/east,
+/turf/open/floor/iron/white,
+/area/station/science/lower)
"grb" = (
/obj/effect/turf_decal/trimline/green/filled/line,
/obj/effect/turf_decal/trimline/green/filled/line{
@@ -25328,14 +25292,6 @@
},
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/cmo)
-"gEo" = (
-/obj/structure/table/reinforced,
-/obj/item/stock_parts/cell/high,
-/obj/machinery/cell_charger,
-/obj/effect/turf_decal/tile/blue/fourcorners,
-/obj/machinery/airalarm/directional/east,
-/turf/open/floor/iron/dark,
-/area/station/command/bridge)
"gEv" = (
/obj/machinery/camera/directional/south{
c_tag = "Genetics Lab"
@@ -26255,6 +26211,21 @@
initial_gas_mix = "TEMP=2.7"
},
/area/station/science/ordnance/bomb)
+"gQW" = (
+/obj/effect/turf_decal/tile/yellow{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/brown{
+ dir = 4
+ },
+/obj/structure/cable,
+/obj/machinery/airalarm/directional/north,
+/obj/structure/rack,
+/obj/item/stock_parts/power_store/cell/lead,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"gRf" = (
/obj/machinery/door/airlock/public/glass{
name = "Public Airlock"
@@ -26749,21 +26720,6 @@
dir = 4
},
/area/station/engineering/storage/tech)
-"gYy" = (
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/effect/turf_decal/tile/brown{
- dir = 4
- },
-/obj/structure/cable,
-/obj/machinery/airalarm/directional/north,
-/obj/structure/rack,
-/obj/item/stock_parts/cell/lead,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"gYI" = (
/obj/structure/fluff/shower_drain,
/obj/machinery/duct,
@@ -28966,12 +28922,6 @@
/obj/machinery/duct,
/turf/open/floor/iron/white,
/area/station/command/heads_quarters/captain/private)
-"hBF" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/ai_monitored/command/storage/eva)
"hBG" = (
/obj/structure/railing{
dir = 1
@@ -30903,6 +30853,14 @@
/obj/item/radio/intercom/directional/west,
/turf/open/floor/iron,
/area/station/engineering/engine_smes)
+"ibO" = (
+/obj/structure/table,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high/empty,
+/obj/structure/sign/poster/contraband/random/directional/east,
+/turf/open/floor/iron/dark,
+/area/station/commons/vacant_room/commissary)
"ibT" = (
/obj/effect/turf_decal/delivery,
/obj/effect/decal/cleanable/dirt,
@@ -31320,20 +31278,6 @@
/obj/machinery/vending/drugs,
/turf/open/floor/iron/white,
/area/station/medical/pharmacy)
-"iht" = (
-/obj/item/stack/sheet/iron/fifty,
-/obj/item/stack/rods/fifty,
-/obj/item/stack/sheet/glass/fifty,
-/obj/item/electronics/airlock,
-/obj/item/electronics/airlock,
-/obj/item/stock_parts/cell/high,
-/obj/item/stack/sheet/mineral/plasma{
- amount = 30
- },
-/obj/item/gps,
-/obj/structure/closet/crate/engineering,
-/turf/open/floor/plating,
-/area/station/engineering/lobby)
"ihC" = (
/obj/item/stack/sheet/iron,
/turf/open/floor/plating,
@@ -42024,6 +41968,14 @@
},
/turf/open/floor/iron/dark/side,
/area/station/engineering/engine_smes)
+"kSG" = (
+/obj/effect/turf_decal/bot,
+/obj/structure/table/reinforced,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/machinery/cell_charger,
+/obj/structure/window/reinforced/spawner/directional/south,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/science/robotics/mechbay)
"kSN" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -42140,26 +42092,6 @@
},
/turf/open/floor/catwalk_floor,
/area/station/maintenance/floor1/port/aft)
-"kUf" = (
-/obj/effect/turf_decal/tile/blue/fourcorners,
-/obj/structure/table/reinforced/rglass,
-/obj/machinery/cell_charger{
- pixel_y = 10
- },
-/obj/machinery/cell_charger{
- pixel_y = 1;
- layer = 2.91
- },
-/obj/item/stock_parts/cell/high{
- pixel_y = 9;
- pixel_x = -1
- },
-/obj/item/stock_parts/cell/high{
- pixel_x = -1;
- layer = 3.01
- },
-/turf/open/floor/iron/white/textured,
-/area/station/medical/treatment_center)
"kUh" = (
/obj/item/paper_bin,
/obj/structure/table/reinforced/rglass,
@@ -42606,6 +42538,14 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/hallway/floor3/fore)
+"kZI" = (
+/obj/structure/table/reinforced,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/machinery/cell_charger,
+/obj/effect/turf_decal/tile/blue/fourcorners,
+/obj/machinery/airalarm/directional/east,
+/turf/open/floor/iron/dark,
+/area/station/command/bridge)
"kZS" = (
/obj/effect/turf_decal/siding/wood,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -47566,22 +47506,6 @@
dir = 4
},
/area/station/hallway/secondary/exit)
-"mlC" = (
-/obj/structure/table,
-/obj/item/storage/toolbox/emergency{
- pixel_y = 12
- },
-/obj/item/stack/cable_coil/cut{
- pixel_y = 7
- },
-/obj/item/stock_parts/cell/lead{
- pixel_x = 5;
- pixel_y = 4
- },
-/obj/item/wirecutters,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor1/starboard/fore)
"mlH" = (
/obj/structure/sign/departments/court{
pixel_y = 32
@@ -49279,12 +49203,6 @@
},
/turf/open/floor/iron/dark,
/area/station/security/execution/education)
-"mHo" = (
-/obj/structure/rack,
-/obj/item/mod/core/standard,
-/obj/item/stock_parts/cell/high,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor3/port/aft)
"mHu" = (
/obj/effect/turf_decal/trimline/green/filled/line{
dir = 10
@@ -50918,16 +50836,6 @@
},
/turf/open/floor/iron/dark,
/area/station/hallway/floor1/aft)
-"ndG" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
-/obj/effect/turf_decal/stripes/white/line{
- dir = 8
- },
-/obj/machinery/status_display/ai/directional/east,
-/turf/open/floor/iron/dark,
-/area/station/science/auxlab)
"ndL" = (
/obj/effect/turf_decal/trimline/green/warning{
dir = 1
@@ -52483,6 +52391,12 @@
dir = 4
},
/area/station/hallway/floor1/fore)
+"nwk" = (
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/ai_monitored/command/storage/eva)
"nwx" = (
/obj/item/wallframe/button,
/obj/effect/mapping_helpers/burnt_floor,
@@ -52539,6 +52453,28 @@
},
/turf/open/floor/plating,
/area/station/maintenance/disposal)
+"nxB" = (
+/obj/structure/window/reinforced/plasma/spawner/directional/east,
+/obj/structure/table/reinforced/plasmarglass,
+/obj/item/stock_parts/power_store/cell/lead{
+ pixel_x = -5;
+ pixel_y = 8
+ },
+/obj/item/usb_cable{
+ name = "jumper cable";
+ pixel_x = -10;
+ pixel_y = 12
+ },
+/obj/item/lead_pipe{
+ pixel_x = -5
+ },
+/obj/item/reagent_containers/spray/cleaner{
+ pixel_x = 6;
+ pixel_y = 7
+ },
+/obj/item/reagent_containers/syringe,
+/turf/open/floor/pod/dark,
+/area/station/service/kitchen/abandoned)
"nxC" = (
/obj/effect/turf_decal/stripes/full,
/obj/machinery/door/airlock{
@@ -53015,30 +52951,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/pod/light,
/area/station/maintenance/floor1/starboard/fore)
-"nDQ" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/obj/structure/table/reinforced,
-/obj/structure/window/spawner/directional/south,
-/obj/effect/turf_decal/trimline/yellow/corner{
- dir = 4
- },
-/obj/item/storage/toolbox/mechanical{
- pixel_x = 8;
- pixel_y = -4
- },
-/obj/item/flatpack{
- board = /obj/item/circuitboard/machine/flatpacker;
- pixel_x = -6;
- pixel_y = 5
- },
-/obj/item/multitool{
- pixel_x = 7;
- pixel_y = 10
- },
-/turf/open/floor/iron/corner{
- dir = 4
- },
-/area/station/engineering/lobby)
"nEa" = (
/obj/structure/table/wood,
/obj/item/flashlight/lamp/green,
@@ -53499,6 +53411,16 @@
/obj/structure/foamedmetal,
/turf/open/floor/engine,
/area/station/maintenance/floor1/port/aft)
+"nJz" = (
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 8
+ },
+/obj/machinery/status_display/ai/directional/east,
+/turf/open/floor/iron/dark,
+/area/station/science/auxlab)
"nJC" = (
/obj/item/restraints/handcuffs,
/obj/item/restraints/handcuffs,
@@ -54681,6 +54603,26 @@
},
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/exit/departure_lounge)
+"nYQ" = (
+/obj/effect/turf_decal/tile/blue/fourcorners,
+/obj/structure/table/reinforced/rglass,
+/obj/machinery/cell_charger{
+ pixel_y = 10
+ },
+/obj/machinery/cell_charger{
+ pixel_y = 1;
+ layer = 2.91
+ },
+/obj/item/stock_parts/power_store/cell/high{
+ pixel_y = 9;
+ pixel_x = -1
+ },
+/obj/item/stock_parts/power_store/cell/high{
+ pixel_x = -1;
+ layer = 3.01
+ },
+/turf/open/floor/iron/white/textured,
+/area/station/medical/treatment_center)
"nYZ" = (
/obj/effect/turf_decal/tile/red/half/contrasted,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -56058,6 +56000,17 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/carpet,
/area/station/medical/psychology)
+"orW" = (
+/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/east{
+ cell_type = /obj/item/stock_parts/power_store/battery/hyper
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 8
+ },
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/iron/smooth_large,
+/area/station/tcommsat/server)
"osk" = (
/obj/effect/turf_decal/siding/wood,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -56749,16 +56702,6 @@
},
/turf/open/floor/pod/dark,
/area/station/maintenance/floor1/port)
-"oCb" = (
-/obj/effect/turf_decal/trimline/neutral/warning{
- dir = 8
- },
-/obj/machinery/airalarm/directional/east,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
-/obj/structure/table/reinforced,
-/turf/open/floor/iron/dark,
-/area/station/command/gateway)
"oCc" = (
/obj/effect/turf_decal/tile/red/anticorner/contrasted,
/obj/machinery/flasher/directional/east{
@@ -57666,11 +57609,6 @@
/obj/structure/extinguisher_cabinet/directional/north,
/turf/open/floor/iron/white,
/area/station/science/lower)
-"oOW" = (
-/obj/structure/rack,
-/obj/effect/spawner/random/armory/dragnet,
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/security/armory)
"oOY" = (
/obj/structure/table/wood/fancy/red,
/obj/item/flashlight/flare/candle,
@@ -58794,13 +58732,6 @@
/obj/machinery/atmospherics/pipe/smart/simple/green/visible,
/turf/open/floor/plating,
/area/station/engineering/atmos)
-"peN" = (
-/obj/structure/table,
-/obj/effect/turf_decal/tile/purple/opposingcorners,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
-/turf/open/floor/iron/white,
-/area/station/science/circuits)
"pfd" = (
/obj/structure/cable,
/obj/effect/decal/cleanable/blood/old,
@@ -63144,6 +63075,20 @@
},
/turf/open/floor/iron,
/area/station/cargo/miningdock)
+"qlT" = (
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 4
+ },
+/obj/item/folder/white{
+ pixel_y = 13
+ },
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/science/lab)
"qmb" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
dir = 1
@@ -64283,6 +64228,20 @@
/obj/machinery/door/firedoor,
/turf/open/floor/iron/white,
/area/station/science/cytology)
+"qzq" = (
+/obj/item/stack/sheet/iron/fifty,
+/obj/item/stack/rods/fifty,
+/obj/item/stack/sheet/glass/fifty,
+/obj/item/electronics/airlock,
+/obj/item/electronics/airlock,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/item/stack/sheet/mineral/plasma{
+ amount = 30
+ },
+/obj/item/gps,
+/obj/structure/closet/crate/engineering,
+/turf/open/floor/plating,
+/area/station/engineering/lobby)
"qzx" = (
/obj/structure/bookcase/random/fiction,
/turf/open/floor/carpet/royalblack,
@@ -65381,6 +65340,12 @@
/obj/effect/turf_decal/trimline/blue/filled/corner,
/turf/open/floor/iron/dark/side,
/area/station/hallway/floor2/aft)
+"qOL" = (
+/obj/structure/rack,
+/obj/item/mod/core/standard,
+/obj/item/stock_parts/power_store/cell/high,
+/turf/open/floor/pod/light,
+/area/station/maintenance/floor3/port/aft)
"qON" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/airalarm/directional/south,
@@ -70272,6 +70237,22 @@
dir = 9
},
/area/station/security/brig)
+"sfE" = (
+/obj/structure/table,
+/obj/item/storage/toolbox/emergency{
+ pixel_y = 12
+ },
+/obj/item/stack/cable_coil/cut{
+ pixel_y = 7
+ },
+/obj/item/stock_parts/power_store/cell/lead{
+ pixel_x = 5;
+ pixel_y = 4
+ },
+/obj/item/wirecutters,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/pod/light,
+/area/station/maintenance/floor1/starboard/fore)
"sfG" = (
/obj/item/radio/intercom/directional/north,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
@@ -71668,6 +71649,13 @@
},
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/exit/departure_lounge)
+"sAf" = (
+/obj/structure/table/reinforced,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/item/radio/intercom/directional/west,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/science/robotics/lab)
"sAi" = (
/obj/effect/turf_decal/trimline/red/filled/line,
/obj/effect/turf_decal/trimline/red/arrow_ccw{
@@ -74094,24 +74082,6 @@
/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating,
/area/station/maintenance/floor2/starboard)
-"tdM" = (
-/obj/structure/rack,
-/obj/item/stock_parts/micro_laser{
- pixel_y = 7
- },
-/obj/item/stock_parts/cell/high{
- pixel_x = -4;
- pixel_y = -6
- },
-/obj/item/vending_refill/wardrobe/science_wardrobe{
- pixel_y = 18
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 8
- },
-/obj/item/radio/intercom/directional/east,
-/turf/open/floor/iron/white,
-/area/station/science/lower)
"tdN" = (
/obj/machinery/door/airlock/hatch{
name = "Maintenance Bulkhead"
@@ -74610,17 +74580,6 @@
name = "lab floor"
},
/area/station/science/genetics)
-"tlq" = (
-/obj/structure/cable,
-/obj/machinery/power/apc/auto_name/directional/east{
- cell_type = /obj/item/stock_parts/cell/hyper
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 8
- },
-/obj/machinery/light/small/directional/north,
-/turf/open/floor/iron/smooth_large,
-/area/station/tcommsat/server)
"tlr" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -75733,6 +75692,16 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/white,
/area/station/medical/abandoned)
+"tzz" = (
+/obj/effect/turf_decal/trimline/neutral/warning{
+ dir = 8
+ },
+/obj/machinery/airalarm/directional/east,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/structure/table/reinforced,
+/turf/open/floor/iron/dark,
+/area/station/command/gateway)
"tzA" = (
/obj/effect/turf_decal/siding/wood{
dir = 9
@@ -87476,6 +87445,30 @@
/obj/effect/spawner/random/maintenance,
/turf/open/floor/pod/light,
/area/station/maintenance/floor2/port/aft)
+"wyg" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/obj/structure/table/reinforced,
+/obj/structure/window/spawner/directional/south,
+/obj/effect/turf_decal/trimline/yellow/corner{
+ dir = 4
+ },
+/obj/item/storage/toolbox/mechanical{
+ pixel_x = 8;
+ pixel_y = -4
+ },
+/obj/item/flatpack{
+ board = /obj/item/circuitboard/machine/flatpacker;
+ pixel_x = -6;
+ pixel_y = 5
+ },
+/obj/item/multitool{
+ pixel_x = 7;
+ pixel_y = 10
+ },
+/turf/open/floor/iron/corner{
+ dir = 4
+ },
+/area/station/engineering/lobby)
"wym" = (
/obj/effect/turf_decal/siding/wood{
dir = 10
@@ -88118,16 +88111,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/textured_large,
/area/station/engineering/lobby)
-"wHe" = (
-/obj/structure/table,
-/obj/machinery/cell_charger{
- pixel_y = 5
- },
-/obj/item/stack/cable_coil,
-/obj/item/multitool,
-/obj/item/stock_parts/cell/high,
-/turf/open/floor/pod,
-/area/station/maintenance/floor4/port/fore)
"wHj" = (
/obj/structure/table,
/obj/item/hfr_box/body/waste_output,
@@ -88216,6 +88199,14 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/pod/light,
/area/station/maintenance/floor4/port/aft)
+"wIf" = (
+/obj/effect/turf_decal/siding/white,
+/obj/structure/railing,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/structure/table/reinforced/rglass,
+/turf/open/floor/iron/large,
+/area/station/science/robotics/lab)
"wIn" = (
/obj/structure/sign/poster/official/random/directional/west,
/obj/structure/easel,
@@ -90610,6 +90601,16 @@
},
/turf/open/floor/pod/light,
/area/station/maintenance/floor1/starboard/fore)
+"xof" = (
+/obj/structure/table,
+/obj/machinery/cell_charger{
+ pixel_y = 5
+ },
+/obj/item/stack/cable_coil,
+/obj/item/multitool,
+/obj/item/stock_parts/power_store/cell/high,
+/turf/open/floor/pod,
+/area/station/maintenance/floor4/port/fore)
"xoj" = (
/obj/effect/turf_decal/trimline/green/filled/line{
dir = 6
@@ -93702,6 +93703,13 @@
/obj/structure/table/reinforced,
/turf/open/floor/iron/kitchen/herringbone,
/area/station/service/kitchen)
+"ydf" = (
+/obj/structure/table,
+/obj/effect/turf_decal/tile/purple/opposingcorners,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/turf/open/floor/iron/white,
+/area/station/science/circuits)
"ydi" = (
/obj/machinery/firealarm/directional/south,
/obj/effect/landmark/navigate_destination/chapel,
@@ -94094,14 +94102,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/smooth,
/area/station/cargo/warehouse)
-"yjm" = (
-/obj/structure/table,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high/empty,
-/obj/structure/sign/poster/contraband/random/directional/east,
-/turf/open/floor/iron/dark,
-/area/station/commons/vacant_room/commissary)
"yjJ" = (
/obj/effect/turf_decal/siding/wideplating_new/dark/corner,
/turf/open/floor/engine/co2,
@@ -116266,7 +116266,7 @@ owI
owI
oic
oic
-mlC
+sfE
laR
oic
jdc
@@ -118591,7 +118591,7 @@ eaW
lSJ
mxC
jUP
-gYy
+gQW
myW
kga
uTH
@@ -131976,7 +131976,7 @@ nor
rcc
sHG
uxT
-tlq
+orW
qkL
snO
jRp
@@ -137886,7 +137886,7 @@ wmU
pVZ
uKL
rGe
-nDQ
+wyg
wWw
xFR
gPc
@@ -138639,7 +138639,7 @@ kDg
vsL
kDg
rBP
-iht
+qzq
ykU
mMO
tCC
@@ -181592,7 +181592,7 @@ lQI
lQI
ozr
jJu
-aJO
+nxB
qiR
rkZ
kms
@@ -182071,7 +182071,7 @@ mKZ
sxl
naI
lNN
-peN
+ydf
xuv
jBm
xuv
@@ -182850,7 +182850,7 @@ oFY
mBZ
ijS
obj
-ndG
+nJz
sEL
biW
xWe
@@ -184650,7 +184650,7 @@ kJg
kmR
lcB
kGf
-aRG
+qlT
wXC
ePa
rNg
@@ -189018,7 +189018,7 @@ kXZ
wbS
eGF
dpL
-tdM
+gra
bvx
btp
dpL
@@ -197257,7 +197257,7 @@ woE
biz
dzM
kUl
-kUf
+nYQ
dzM
dYM
scx
@@ -200859,7 +200859,7 @@ bet
iAb
bif
fSi
-bnI
+sAf
aal
aAK
ybG
@@ -203168,7 +203168,7 @@ igE
hcr
jbR
cqR
-bfA
+kSG
aFs
jeF
blv
@@ -204200,7 +204200,7 @@ bgz
bid
grk
bmL
-bpD
+wIf
mOH
jhU
btW
@@ -262026,7 +262026,7 @@ oNV
eLw
cmh
kSU
-yjm
+ibO
piR
piR
roj
@@ -267688,7 +267688,7 @@ hLo
piR
xRs
bKR
-mHo
+qOL
piR
mom
hcT
@@ -309554,7 +309554,7 @@ bfx
eGK
onE
aNs
-gEo
+kZI
wFT
gaJ
qOq
@@ -309566,7 +309566,7 @@ qNY
iTN
qGF
uIx
-wHe
+xof
lvm
vSG
mpK
@@ -316234,7 +316234,7 @@ fkN
fQx
nTJ
iXS
-hBF
+nwk
hNh
hNh
hNh
@@ -317777,7 +317777,7 @@ xvr
hIB
nTo
hns
-oCb
+tzz
jbr
iXS
eHr
@@ -322683,7 +322683,7 @@ cbw
lOp
ira
dtX
-oOW
+frG
qjr
qjr
qjr
diff --git a/_maps/map_files/debug/runtimestation.dmm b/_maps/map_files/debug/runtimestation.dmm
index 584ba1eb7ee..a2d6ba70275 100644
--- a/_maps/map_files/debug/runtimestation.dmm
+++ b/_maps/map_files/debug/runtimestation.dmm
@@ -162,7 +162,7 @@
pixel_y = 5
},
/obj/item/storage/toolbox/syndicate,
-/obj/item/stock_parts/cell/infinite,
+/obj/item/stock_parts/power_store/cell/infinite,
/turf/open/floor/iron,
/area/station/engineering/main)
"aT" = (
@@ -2338,9 +2338,9 @@
"Ov" = (
/obj/structure/table,
/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/bluespace,
-/obj/item/stock_parts/cell/bluespace,
-/obj/item/stock_parts/cell/bluespace,
+/obj/item/stock_parts/power_store/cell/bluespace,
+/obj/item/stock_parts/power_store/cell/bluespace,
+/obj/item/stock_parts/power_store/cell/bluespace,
/turf/open/floor/iron/dark,
/area/station/science/explab)
"OU" = (
diff --git a/_maps/map_files/tramstation/maintenance_modules/atmoscilower_attachment_a_3.dmm b/_maps/map_files/tramstation/maintenance_modules/atmoscilower_attachment_a_3.dmm
index 45f4b361a61..670386ca829 100644
--- a/_maps/map_files/tramstation/maintenance_modules/atmoscilower_attachment_a_3.dmm
+++ b/_maps/map_files/tramstation/maintenance_modules/atmoscilower_attachment_a_3.dmm
@@ -177,7 +177,7 @@
"Q" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/oil,
-/obj/item/stock_parts/cell/empty,
+/obj/item/stock_parts/power_store/cell/empty,
/obj/item/screwdriver{
pixel_y = -10;
pixel_x = 7
diff --git a/_maps/map_files/tramstation/maintenance_modules/cargoscilower_3.dmm b/_maps/map_files/tramstation/maintenance_modules/cargoscilower_3.dmm
index 12b320b2844..53d727123ce 100644
--- a/_maps/map_files/tramstation/maintenance_modules/cargoscilower_3.dmm
+++ b/_maps/map_files/tramstation/maintenance_modules/cargoscilower_3.dmm
@@ -179,7 +179,7 @@
dir = 8
},
/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high/empty,
+/obj/item/stock_parts/power_store/cell/high/empty,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/maintenance/starboard/central)
diff --git a/_maps/map_files/tramstation/maintenance_modules/cargoscilower_attachment_a_3.dmm b/_maps/map_files/tramstation/maintenance_modules/cargoscilower_attachment_a_3.dmm
index c37683fdf40..b11609c9d35 100644
--- a/_maps/map_files/tramstation/maintenance_modules/cargoscilower_attachment_a_3.dmm
+++ b/_maps/map_files/tramstation/maintenance_modules/cargoscilower_attachment_a_3.dmm
@@ -21,7 +21,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/structure/table,
/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high/empty,
+/obj/item/stock_parts/power_store/cell/high/empty,
/turf/open/floor/iron/smooth,
/area/station/maintenance/starboard/central)
"n" = (
@@ -86,14 +86,14 @@
"Y" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/table,
-/obj/item/stock_parts/cell/empty{
+/obj/item/stock_parts/power_store/cell/empty{
pixel_x = -5
},
-/obj/item/stock_parts/cell/empty{
+/obj/item/stock_parts/power_store/cell/empty{
pixel_x = 2;
pixel_y = 8
},
-/obj/item/stock_parts/cell/empty{
+/obj/item/stock_parts/power_store/cell/empty{
pixel_x = 7
},
/turf/open/floor/iron/smooth,
diff --git a/_maps/map_files/tramstation/maintenance_modules/dormenginelower_2.dmm b/_maps/map_files/tramstation/maintenance_modules/dormenginelower_2.dmm
index 6f30c2bb7be..e7c0c22ad05 100644
--- a/_maps/map_files/tramstation/maintenance_modules/dormenginelower_2.dmm
+++ b/_maps/map_files/tramstation/maintenance_modules/dormenginelower_2.dmm
@@ -321,7 +321,7 @@
/obj/structure/closet/crate,
/obj/item/wallframe/apc,
/obj/item/electronics/apc,
-/obj/item/stock_parts/cell/empty,
+/obj/item/stock_parts/power_store/cell/empty,
/obj/item/stack/cable_coil/five,
/obj/item/wallframe/apc,
/obj/item/electronics/apc,
diff --git a/_maps/map_files/tramstation/maintenance_modules/dormenginelower_attachment_b_1.dmm b/_maps/map_files/tramstation/maintenance_modules/dormenginelower_attachment_b_1.dmm
index 0be86766e3f..bfe09556131 100644
--- a/_maps/map_files/tramstation/maintenance_modules/dormenginelower_attachment_b_1.dmm
+++ b/_maps/map_files/tramstation/maintenance_modules/dormenginelower_attachment_b_1.dmm
@@ -91,7 +91,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/structure/table,
/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high/empty,
+/obj/item/stock_parts/power_store/cell/high/empty,
/obj/effect/turf_decal/trimline/yellow/filled/line{
dir = 4
},
diff --git a/_maps/map_files/tramstation/maintenance_modules/medsciupper_attachment_a_1.dmm b/_maps/map_files/tramstation/maintenance_modules/medsciupper_attachment_a_1.dmm
index 32d140f88c9..f58d6cd2a20 100644
--- a/_maps/map_files/tramstation/maintenance_modules/medsciupper_attachment_a_1.dmm
+++ b/_maps/map_files/tramstation/maintenance_modules/medsciupper_attachment_a_1.dmm
@@ -122,7 +122,7 @@
},
/obj/structure/table,
/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high/empty,
+/obj/item/stock_parts/power_store/cell/high/empty,
/turf/open/floor/iron,
/area/station/maintenance/department/science)
"V" = (
diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm
index a8b81413f9c..9dd8fc2958e 100644
--- a/_maps/map_files/tramstation/tramstation.dmm
+++ b/_maps/map_files/tramstation/tramstation.dmm
@@ -3736,23 +3736,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/hallway/secondary/service)
-"axh" = (
-/obj/structure/rack,
-/obj/item/clothing/glasses/meson{
- pixel_y = 4
- },
-/obj/item/lighter,
-/obj/item/reagent_containers/pill/patch/aiuri,
-/obj/item/stock_parts/cell/high,
-/obj/effect/turf_decal/trimline/yellow/filled/line{
- dir = 1
- },
-/obj/structure/window/reinforced/spawner/directional/west,
-/obj/item/computer_disk/engineering,
-/obj/item/computer_disk/engineering,
-/obj/item/computer_disk/engineering,
-/turf/open/floor/iron,
-/area/station/command/heads_quarters/ce)
"axp" = (
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 8
@@ -6707,6 +6690,15 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/carpet,
/area/station/commons/dorms)
+"bmd" = (
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/effect/turf_decal/trimline/white/filled/line{
+ dir = 1
+ },
+/turf/open/floor/iron/dark,
+/area/station/engineering/storage/tech)
"bmp" = (
/obj/effect/turf_decal/trimline/green/corner{
dir = 1
@@ -6825,21 +6817,6 @@
/obj/effect/turf_decal/tile/blue,
/turf/open/floor/iron/dark,
/area/station/command/bridge)
-"bpa" = (
-/obj/structure/table/reinforced,
-/obj/item/stock_parts/cell/high{
- pixel_x = -5;
- pixel_y = 8
- },
-/obj/item/stock_parts/cell/high{
- pixel_x = 7;
- pixel_y = 8
- },
-/obj/item/stock_parts/cell/high,
-/obj/machinery/cell_charger,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/station/science/robotics/lab)
"bpl" = (
/obj/effect/turf_decal/bot,
/obj/effect/turf_decal/trimline/yellow/filled/line{
@@ -7892,6 +7869,13 @@
/obj/effect/turf_decal/siding/thinplating/dark,
/turf/open/floor/iron/white,
/area/station/science/research)
+"bJN" = (
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/effect/turf_decal/trimline/neutral/filled/line,
+/turf/open/floor/iron,
+/area/station/commons/storage/primary)
"bJP" = (
/obj/structure/railing{
dir = 10
@@ -13695,6 +13679,13 @@
},
/turf/open/floor/iron/dark,
/area/station/service/chapel/monastery)
+"dGP" = (
+/obj/structure/table,
+/obj/structure/extinguisher_cabinet/directional/north,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/turf/open/floor/iron,
+/area/station/ai_monitored/command/storage/eva)
"dHc" = (
/obj/structure/window/reinforced/spawner/directional/west,
/obj/structure/table,
@@ -15812,13 +15803,6 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos)
-"exq" = (
-/obj/structure/table,
-/obj/structure/extinguisher_cabinet/directional/north,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
-/turf/open/floor/iron,
-/area/station/ai_monitored/command/storage/eva)
"exr" = (
/obj/machinery/computer/mech_bay_power_console,
/obj/effect/turf_decal/siding/thinplating/corner{
@@ -17395,6 +17379,16 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/cargo/miningdock/oresilo)
+"fcZ" = (
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/storage/toolbox/electrical{
+ pixel_x = 4;
+ pixel_y = 9
+ },
+/obj/item/stock_parts/power_store/cell/high,
+/turf/open/floor/iron/dark,
+/area/station/science/explab)
"fdc" = (
/obj/machinery/brm,
/obj/machinery/conveyor{
@@ -19631,17 +19625,6 @@
},
/turf/open/floor/iron/dark/herringbone,
/area/station/commons/vacant_room)
-"fTM" = (
-/obj/structure/table,
-/obj/machinery/requests_console/directional/east{
- name = "EVA Requests Console";
- department = "EVA"
- },
-/obj/effect/mapping_helpers/requests_console/assistance,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
-/turf/open/floor/iron,
-/area/station/ai_monitored/command/storage/eva)
"fUh" = (
/obj/structure/chair,
/obj/structure/sign/poster/official/random/directional/north,
@@ -20331,6 +20314,13 @@
},
/turf/open/floor/iron/dark,
/area/station/service/chapel)
+"ggW" = (
+/obj/structure/rack,
+/obj/item/radio/intercom/directional/north,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/spawner/random/armory/dragnet,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
"ghg" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/catwalk_floor,
@@ -23545,6 +23535,17 @@
/obj/machinery/computer/security/telescreen/entertainment/directional/east,
/turf/open/floor/wood/large,
/area/station/service/barber)
+"hqw" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/bot,
+/obj/structure/closet/crate/preopen,
+/obj/item/stock_parts/power_store/cell/empty,
+/obj/effect/spawner/random/engineering/flashlight,
+/turf/open/floor/iron,
+/area/station/cargo/warehouse)
"hqx" = (
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 8
@@ -23587,6 +23588,16 @@
/obj/structure/table/wood,
/turf/open/floor/wood,
/area/station/service/theater)
+"hrq" = (
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 8
+ },
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron,
+/area/station/engineering/main)
"hrr" = (
/obj/structure/table/reinforced,
/obj/machinery/microwave/engineering/cell_included,
@@ -24518,17 +24529,6 @@
},
/turf/open/floor/iron/dark,
/area/station/ai_monitored/command/nuke_storage)
-"hMU" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/trimline/neutral/filled/line{
- dir = 4
- },
-/obj/effect/turf_decal/bot,
-/obj/structure/closet/crate/preopen,
-/obj/item/stock_parts/cell/empty,
-/obj/effect/spawner/random/engineering/flashlight,
-/turf/open/floor/iron,
-/area/station/cargo/warehouse)
"hNe" = (
/obj/effect/turf_decal/trimline/neutral/filled/line{
dir = 4
@@ -25648,16 +25648,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/service/hydroponics)
-"iih" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/storage/toolbox/electrical{
- pixel_x = 4;
- pixel_y = 9
- },
-/obj/item/stock_parts/cell/high,
-/turf/open/floor/iron/dark,
-/area/station/science/explab)
"iij" = (
/obj/machinery/door/airlock/command{
name = "Research Director's Office"
@@ -26018,29 +26008,6 @@
/obj/machinery/transport/crossing_signal/northwest,
/turf/open/floor/iron,
/area/station/hallway/primary/tram/right)
-"ipP" = (
-/obj/structure/table,
-/obj/item/multitool/circuit{
- pixel_x = -8
- },
-/obj/item/multitool/circuit{
- pixel_x = -4
- },
-/obj/item/multitool/circuit,
-/obj/item/stock_parts/cell/high{
- pixel_x = 8;
- pixel_y = 9
- },
-/obj/item/stock_parts/cell/high{
- pixel_x = 8;
- pixel_y = -2
- },
-/obj/machinery/camera/directional/south{
- network = list("ss13","rd");
- c_tag = "Science - Testing Lab"
- },
-/turf/open/floor/iron,
-/area/station/science/explab)
"iqg" = (
/obj/machinery/airalarm/directional/west,
/turf/open/floor/iron/freezer,
@@ -27220,6 +27187,16 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/iron,
/area/station/hallway/primary/tram/center)
+"iNs" = (
+/obj/structure/table,
+/obj/machinery/cell_charger{
+ pixel_y = 5
+ },
+/obj/item/stack/cable_coil,
+/obj/item/multitool,
+/obj/item/stock_parts/power_store/cell/high,
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
"iNB" = (
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
@@ -27587,19 +27564,6 @@
/obj/item/kirbyplants/photosynthetic,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/aisat_interior)
-"iTL" = (
-/obj/structure/closet/crate,
-/obj/item/stack/sheet/iron/fifty,
-/obj/item/stack/rods/fifty,
-/obj/item/stack/sheet/glass/fifty,
-/obj/item/electronics/airlock,
-/obj/item/electronics/airlock,
-/obj/item/stock_parts/cell/high,
-/obj/item/stack/sheet/mineral/plasma{
- amount = 30
- },
-/turf/open/floor/plating,
-/area/station/engineering/engine_smes)
"iTQ" = (
/obj/effect/turf_decal/trimline/neutral/filled/line{
dir = 8
@@ -28694,13 +28658,6 @@
},
/turf/open/floor/iron,
/area/station/cargo/storage)
-"jlQ" = (
-/obj/structure/rack,
-/obj/item/radio/intercom/directional/north,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/spawner/random/armory/dragnet,
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/security/armory)
"jlX" = (
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 8
@@ -29697,6 +29654,24 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/cafeteria,
/area/station/security/prison/mess)
+"jCi" = (
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 5
+ },
+/obj/effect/turf_decal/trimline/yellow/filled/warning{
+ dir = 5
+ },
+/obj/structure/cable,
+/obj/structure/table,
+/obj/item/multitool{
+ pixel_x = 8
+ },
+/obj/item/flatpack{
+ board = /obj/item/circuitboard/machine/flatpacker;
+ pixel_x = -5
+ },
+/turf/open/floor/iron,
+/area/station/engineering/break_room)
"jCn" = (
/obj/effect/turf_decal/trimline/neutral/filled/line{
dir = 1
@@ -29713,18 +29688,6 @@
/obj/machinery/power/apc/auto_name/directional/north,
/turf/open/floor/iron,
/area/station/maintenance/tram/mid)
-"jCw" = (
-/obj/effect/turf_decal/trimline/purple/filled/line{
- dir = 1
- },
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/potato{
- pixel_x = 6;
- pixel_y = 10
- },
-/turf/open/floor/iron/white,
-/area/station/science/lobby)
"jCH" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/obj/effect/turf_decal/tile/bar/opposingcorners,
@@ -30636,6 +30599,18 @@
},
/turf/open/floor/iron/dark,
/area/station/ai_monitored/command/nuke_storage)
+"jVK" = (
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ dir = 1
+ },
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/potato{
+ pixel_x = 6;
+ pixel_y = 10
+ },
+/turf/open/floor/iron/white,
+/area/station/science/lobby)
"jVT" = (
/obj/structure/table,
/obj/effect/turf_decal/trimline/neutral/filled/line{
@@ -31808,6 +31783,29 @@
/obj/machinery/newscaster/directional/south,
/turf/open/floor/iron,
/area/station/hallway/primary/tram/left)
+"klq" = (
+/obj/structure/table,
+/obj/item/multitool/circuit{
+ pixel_x = -8
+ },
+/obj/item/multitool/circuit{
+ pixel_x = -4
+ },
+/obj/item/multitool/circuit,
+/obj/item/stock_parts/power_store/cell/high{
+ pixel_x = 8;
+ pixel_y = 9
+ },
+/obj/item/stock_parts/power_store/cell/high{
+ pixel_x = 8;
+ pixel_y = -2
+ },
+/obj/machinery/camera/directional/south{
+ network = list("ss13","rd");
+ c_tag = "Science - Testing Lab"
+ },
+/turf/open/floor/iron,
+/area/station/science/explab)
"kly" = (
/obj/structure/cable,
/obj/structure/disposalpipe/junction/flip{
@@ -31825,19 +31823,6 @@
},
/turf/open/floor/iron/dark,
/area/station/engineering/storage/tech)
-"klY" = (
-/obj/structure/table,
-/obj/item/stack/cable_coil{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/stack/cable_coil,
-/obj/item/stock_parts/cell/high,
-/obj/effect/turf_decal/trimline/white/filled/corner{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/station/engineering/storage/tech)
"kmb" = (
/obj/machinery/door/airlock/engineering/glass{
name = "Tram Mechanical Room"
@@ -31920,6 +31905,13 @@
/obj/structure/sink/kitchen/directional/south,
/turf/open/floor/iron/white,
/area/station/commons/vacant_room)
+"knq" = (
+/obj/structure/table/wood,
+/obj/structure/sign/flag/nanotrasen/directional/north,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/crap,
+/turf/open/floor/wood,
+/area/station/command/meeting_room)
"knO" = (
/obj/effect/turf_decal/trimline/blue/filled/corner,
/obj/effect/turf_decal/trimline/blue/filled/corner{
@@ -34058,6 +34050,23 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/white,
/area/station/medical/virology)
+"kXU" = (
+/obj/structure/rack,
+/obj/item/clothing/glasses/meson{
+ pixel_y = 4
+ },
+/obj/item/lighter,
+/obj/item/reagent_containers/pill/patch/aiuri,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/effect/turf_decal/trimline/yellow/filled/line{
+ dir = 1
+ },
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/item/computer_disk/engineering,
+/obj/item/computer_disk/engineering,
+/obj/item/computer_disk/engineering,
+/turf/open/floor/iron,
+/area/station/command/heads_quarters/ce)
"kXZ" = (
/obj/machinery/door/airlock{
name = "Private Quarters L";
@@ -37619,6 +37628,25 @@
/obj/structure/cable,
/turf/open/floor/engine,
/area/station/engineering/supermatter/room)
+"mgK" = (
+/obj/structure/table,
+/obj/item/clothing/gloves/color/yellow,
+/obj/item/clothing/gloves/color/yellow,
+/obj/item/clothing/gloves/color/yellow,
+/obj/item/clothing/gloves/color/yellow,
+/obj/item/clothing/gloves/color/yellow,
+/obj/item/storage/box/lights/mixed,
+/obj/item/stack/cable_coil,
+/obj/item/stock_parts/power_store/cell/emproof,
+/obj/item/stock_parts/power_store/cell/emproof,
+/obj/machinery/camera/emp_proof{
+ dir = 10;
+ network = list("ss13","engineering");
+ c_tag = "Engineering - SMES Misc"
+ },
+/obj/machinery/light/small/directional/west,
+/turf/open/floor/iron/dark,
+/area/station/engineering/engine_smes)
"mgS" = (
/turf/open/floor/iron/cafeteria,
/area/station/security/prison/mess)
@@ -38434,13 +38462,6 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/iron,
/area/station/science/explab)
-"myN" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
-/obj/effect/turf_decal/trimline/neutral/filled/line,
-/turf/open/floor/iron,
-/area/station/commons/storage/primary)
"mzb" = (
/obj/effect/turf_decal/siding/thinplating/dark{
dir = 5
@@ -40306,6 +40327,21 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
+"njk" = (
+/obj/structure/table/reinforced,
+/obj/item/stock_parts/power_store/cell/high{
+ pixel_x = -5;
+ pixel_y = 8
+ },
+/obj/item/stock_parts/power_store/cell/high{
+ pixel_x = 7;
+ pixel_y = 8
+ },
+/obj/item/stock_parts/power_store/cell/high,
+/obj/machinery/cell_charger,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/station/science/robotics/lab)
"njl" = (
/obj/machinery/duct,
/obj/effect/turf_decal/trimline/neutral/filled/corner{
@@ -41150,6 +41186,17 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/exit)
+"nxM" = (
+/obj/structure/table,
+/obj/machinery/requests_console/directional/east{
+ name = "EVA Requests Console";
+ department = "EVA"
+ },
+/obj/effect/mapping_helpers/requests_console/assistance,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/turf/open/floor/iron,
+/area/station/ai_monitored/command/storage/eva)
"nxN" = (
/obj/item/radio/intercom/directional/west,
/turf/open/floor/iron,
@@ -44033,6 +44080,27 @@
},
/turf/open/space/openspace,
/area/station/solars/starboard/fore)
+"ozH" = (
+/obj/structure/table,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/stock_parts/power_store/cell/crap/empty{
+ pixel_x = 6;
+ pixel_y = 10
+ },
+/obj/item/stock_parts/power_store/cell/crap/empty{
+ pixel_x = 6;
+ pixel_y = 2
+ },
+/obj/item/stock_parts/power_store/cell/crap/empty{
+ pixel_x = -7;
+ pixel_y = 7
+ },
+/obj/item/stock_parts/power_store/cell/crap/empty{
+ pixel_x = -2;
+ pixel_y = -2
+ },
+/turf/open/floor/iron/smooth,
+/area/station/security/mechbay)
"ozM" = (
/obj/structure/table/wood/poker,
/obj/item/storage/dice,
@@ -48105,6 +48173,13 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/catwalk_floor,
/area/station/maintenance/starboard/greater)
+"pZg" = (
+/obj/effect/turf_decal/bot,
+/obj/effect/spawner/random/structure/closet_empty/crate,
+/obj/effect/spawner/random/maintenance/two,
+/obj/item/stock_parts/power_store/cell/high/empty,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"pZr" = (
/mob/living/basic/mouse/brown/tom,
/turf/open/misc/asteroid,
@@ -48330,6 +48405,19 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
+"qdr" = (
+/obj/structure/closet/crate,
+/obj/item/stack/sheet/iron/fifty,
+/obj/item/stack/rods/fifty,
+/obj/item/stack/sheet/glass/fifty,
+/obj/item/electronics/airlock,
+/obj/item/electronics/airlock,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/item/stack/sheet/mineral/plasma{
+ amount = 30
+ },
+/turf/open/floor/plating,
+/area/station/engineering/engine_smes)
"qdy" = (
/obj/structure/cable,
/turf/open/floor/iron,
@@ -48543,14 +48631,6 @@
"qgt" = (
/turf/closed/wall/rock/porous,
/area/station/medical/chemistry)
-"qgy" = (
-/obj/structure/table/reinforced,
-/obj/machinery/cell_charger{
- pixel_y = 4
- },
-/obj/item/stock_parts/cell/high,
-/turf/open/floor/iron,
-/area/station/command/bridge)
"qgB" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -49188,13 +49268,6 @@
/obj/structure/sign/poster/official/safety_report/directional/south,
/turf/open/floor/iron,
/area/station/security/checkpoint/science)
-"qsI" = (
-/obj/structure/table/wood,
-/obj/structure/sign/flag/nanotrasen/directional/north,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/crap,
-/turf/open/floor/wood,
-/area/station/command/meeting_room)
"qsJ" = (
/obj/structure/window/reinforced/spawner/directional/north,
/obj/structure/table,
@@ -49376,24 +49449,6 @@
},
/turf/open/floor/iron,
/area/station/security/prison/work)
-"qwn" = (
-/obj/effect/turf_decal/trimline/brown/filled/line{
- dir = 5
- },
-/obj/effect/turf_decal/trimline/yellow/filled/warning{
- dir = 5
- },
-/obj/structure/cable,
-/obj/structure/table,
-/obj/item/multitool{
- pixel_x = 8
- },
-/obj/item/flatpack{
- board = /obj/item/circuitboard/machine/flatpacker;
- pixel_x = -5
- },
-/turf/open/floor/iron,
-/area/station/engineering/break_room)
"qwq" = (
/obj/structure/table/wood,
/obj/item/radio/intercom,
@@ -50908,27 +50963,6 @@
/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible,
/turf/open/floor/iron,
/area/station/engineering/atmos)
-"qXK" = (
-/obj/structure/table,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/stock_parts/cell/crap/empty{
- pixel_x = 6;
- pixel_y = 10
- },
-/obj/item/stock_parts/cell/crap/empty{
- pixel_x = 6;
- pixel_y = 2
- },
-/obj/item/stock_parts/cell/crap/empty{
- pixel_x = -7;
- pixel_y = 7
- },
-/obj/item/stock_parts/cell/crap/empty{
- pixel_x = -2;
- pixel_y = -2
- },
-/turf/open/floor/iron/smooth,
-/area/station/security/mechbay)
"qXS" = (
/obj/structure/disposalpipe/segment{
dir = 5
@@ -51406,6 +51440,14 @@
/obj/effect/landmark/navigate_destination/aiupload,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/ai_upload)
+"reJ" = (
+/obj/structure/table/reinforced,
+/obj/machinery/cell_charger{
+ pixel_y = 4
+ },
+/obj/item/stock_parts/power_store/cell/high,
+/turf/open/floor/iron,
+/area/station/command/bridge)
"reU" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/camera/directional/south{
@@ -52516,16 +52558,6 @@
/obj/machinery/disposal/bin,
/turf/open/floor/iron,
/area/station/command/bridge)
-"rAB" = (
-/obj/structure/table,
-/obj/machinery/cell_charger{
- pixel_y = 5
- },
-/obj/item/stack/cable_coil,
-/obj/item/multitool,
-/obj/item/stock_parts/cell/high,
-/turf/open/floor/engine,
-/area/station/science/xenobiology)
"rAS" = (
/turf/closed/wall,
/area/station/service/library/lounge)
@@ -53637,6 +53669,19 @@
},
/turf/open/floor/iron/cafeteria,
/area/station/commons/dorms/laundry)
+"rVw" = (
+/obj/structure/table,
+/obj/item/stack/cable_coil{
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/stack/cable_coil,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/effect/turf_decal/trimline/white/filled/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/dark,
+/area/station/engineering/storage/tech)
"rVD" = (
/obj/effect/turf_decal/trimline/green/corner,
/obj/effect/turf_decal/trimline/green/corner{
@@ -53985,15 +54030,6 @@
},
/turf/open/floor/iron,
/area/station/maintenance/port/central)
-"scn" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
-/obj/effect/turf_decal/trimline/white/filled/line{
- dir = 1
- },
-/turf/open/floor/iron/dark,
-/area/station/engineering/storage/tech)
"sct" = (
/obj/structure/table/reinforced,
/obj/structure/window/spawner/directional/north,
@@ -56816,16 +56852,6 @@
"tby" = (
/turf/open/floor/iron/white,
/area/station/science/research)
-"tbC" = (
-/obj/effect/turf_decal/trimline/yellow/filled/line{
- dir = 8
- },
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
-/area/station/engineering/main)
"tbK" = (
/obj/structure/table,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -61538,25 +61564,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/carpet,
/area/station/cargo/miningdock)
-"uEx" = (
-/obj/structure/table,
-/obj/item/clothing/gloves/color/yellow,
-/obj/item/clothing/gloves/color/yellow,
-/obj/item/clothing/gloves/color/yellow,
-/obj/item/clothing/gloves/color/yellow,
-/obj/item/clothing/gloves/color/yellow,
-/obj/item/storage/box/lights/mixed,
-/obj/item/stack/cable_coil,
-/obj/item/stock_parts/cell/emproof,
-/obj/item/stock_parts/cell/emproof,
-/obj/machinery/camera/emp_proof{
- dir = 10;
- network = list("ss13","engineering");
- c_tag = "Engineering - SMES Misc"
- },
-/obj/machinery/light/small/directional/west,
-/turf/open/floor/iron/dark,
-/area/station/engineering/engine_smes)
"uEB" = (
/obj/structure/closet/secure_closet/freezer/fridge,
/obj/effect/turf_decal/bot_white,
@@ -71407,13 +71414,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/exit)
-"yiX" = (
-/obj/effect/turf_decal/bot,
-/obj/effect/spawner/random/structure/closet_empty/crate,
-/obj/effect/spawner/random/maintenance/two,
-/obj/item/stock_parts/cell/high/empty,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"yjf" = (
/obj/structure/window/reinforced/spawner/directional/east,
/obj/structure/window/reinforced/spawner/directional/north,
@@ -99252,7 +99252,7 @@ jIG
jHb
tPW
tPW
-uEx
+mgK
jIG
abM
abM
@@ -100015,7 +100015,7 @@ mOW
iwV
nav
fEK
-scn
+bmd
pkp
jYz
kSp
@@ -100531,7 +100531,7 @@ bUj
kdb
yih
pkp
-iTL
+qdr
ifX
iRe
wJt
@@ -101040,7 +101040,7 @@ abM
jnq
jIy
tsa
-klY
+rVw
hJa
kdb
msU
@@ -101576,7 +101576,7 @@ lku
oxs
sna
gRQ
-tbC
+hrq
cuQ
arO
arT
@@ -103874,7 +103874,7 @@ ixT
gYI
cgR
ial
-qwn
+jCi
amV
mvy
iXQ
@@ -103884,7 +103884,7 @@ dor
fSp
vKv
roB
-axh
+kXU
iHK
bAK
jsW
@@ -106141,7 +106141,7 @@ pCM
kzx
oSl
kzx
-myN
+bJN
alg
aes
khE
@@ -119036,7 +119036,7 @@ cJS
nhj
cVU
oRz
-ipP
+klq
sQZ
nhj
prI
@@ -119290,7 +119290,7 @@ owO
owO
owO
cJS
-iih
+fcZ
cVU
cFW
cFW
@@ -150854,7 +150854,7 @@ fLY
tFk
kcV
xNL
-qXK
+ozH
tFk
aaa
aaa
@@ -151122,8 +151122,8 @@ hzN
hzN
hzN
hzN
-exq
-fTM
+dGP
+nxM
rcx
hzN
xQv
@@ -154718,7 +154718,7 @@ mwg
ceF
avX
qyZ
-qsI
+knq
joF
kSZ
bvq
@@ -156237,7 +156237,7 @@ aaa
aaa
aaa
dEv
-jlQ
+ggW
sne
ubk
hgn
@@ -156532,7 +156532,7 @@ aQO
rup
wzm
rAh
-qgy
+reJ
eUy
mgq
nhV
@@ -180203,7 +180203,7 @@ ixu
eeE
muZ
gSF
-bpa
+njk
uje
dLO
dLO
@@ -181221,7 +181221,7 @@ mEd
kuq
aHq
lfQ
-jCw
+jVK
aHQ
tFB
vnu
@@ -182472,7 +182472,7 @@ cdy
iWz
hFV
gDr
-yiX
+pZg
uax
axG
bTx
@@ -183561,7 +183561,7 @@ vSa
cJR
qVr
qVr
-rAB
+iNs
qVL
tBo
qVr
@@ -185303,7 +185303,7 @@ udQ
udQ
aWL
tft
-hMU
+hqw
qyg
utY
fHV
diff --git a/_maps/map_files/wawastation/wawastation.dmm b/_maps/map_files/wawastation/wawastation.dmm
index fca387c581a..7cd10a421e4 100644
--- a/_maps/map_files/wawastation/wawastation.dmm
+++ b/_maps/map_files/wawastation/wawastation.dmm
@@ -9,18 +9,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
/area/station/security/office)
-"aat" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/structure/window/reinforced/survival_pod/spawner/directional/south,
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
-/obj/effect/turf_decal/bot{
- dir = 1
- },
-/obj/machinery/airalarm/directional/west,
-/turf/open/floor/iron,
-/area/station/command/gateway)
"aaB" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -787,13 +775,6 @@
/obj/machinery/firealarm/directional/south,
/turf/open/floor/iron/white/textured,
/area/station/science/genetics)
-"amE" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central)
"amJ" = (
/obj/machinery/iv_drip,
/obj/effect/turf_decal/tile/blue/fourcorners,
@@ -3983,13 +3964,6 @@
},
/turf/open/floor/iron/herringbone,
/area/station/hallway/primary/central)
-"btY" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
-/obj/machinery/light_switch/directional/south,
-/turf/open/floor/iron/white,
-/area/station/science/lab)
"btZ" = (
/obj/machinery/computer/atmos_control/nocontrol/master,
/turf/open/floor/iron,
@@ -4503,16 +4477,6 @@
/obj/structure/girder/displaced,
/turf/open/misc/asteroid,
/area/station/maintenance/central/greater)
-"bCr" = (
-/obj/machinery/computer/security/mining{
- dir = 8
- },
-/obj/machinery/keycard_auth/directional/east,
-/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/station/command/bridge)
"bCv" = (
/obj/effect/decal/cleanable/blood/old,
/obj/item/restraints/handcuffs,
@@ -5794,6 +5758,17 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/catwalk_floor/iron_dark,
/area/station/ai_monitored/turret_protected/aisat_interior)
+"cbT" = (
+/obj/structure/cable,
+/obj/machinery/door/airlock/command,
+/obj/effect/mapping_helpers/airlock/access/any/command/general,
+/obj/effect/mapping_helpers/airlock/autoname,
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/mapping_helpers/airlock/access/any/admin/general,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/command/emergency_closet)
"cca" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -6629,23 +6604,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/construction/mining/aux_base)
-"ctE" = (
-/obj/machinery/door/airlock/research{
- name = "Research Division Access"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
- cycle_id = "sci-entrance"
- },
-/obj/effect/mapping_helpers/airlock/unres{
- dir = 4
- },
-/obj/machinery/door/firedoor,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/mapping_helpers/airlock/access/all/science/general,
-/turf/open/floor/iron/white,
-/area/station/science/research)
"ctL" = (
/obj/structure/window/reinforced/spawner/directional/west,
/obj/structure/cable,
@@ -6925,17 +6883,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/plating,
/area/station/cargo/storage)
-"cAy" = (
-/obj/structure/table/glass,
-/obj/item/flatpack{
- board = /obj/item/circuitboard/machine/flatpacker;
- pixel_x = -5
- },
-/obj/item/multitool{
- pixel_x = 8
- },
-/turf/open/floor/iron,
-/area/station/engineering/lobby)
"cAC" = (
/obj/effect/turf_decal/stripes/end{
dir = 4
@@ -7125,6 +7072,22 @@
/obj/effect/turf_decal/stripes,
/turf/open/floor/engine,
/area/station/engineering/atmospherics_engine)
+"cEi" = (
+/obj/machinery/light/small/directional/north,
+/obj/machinery/cell_charger,
+/obj/structure/table/reinforced,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/machinery/camera/autoname/directional/east{
+ network = list("ss13","rd")
+ },
+/obj/effect/turf_decal/siding/purple/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/corner{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/science/robotics/mechbay)
"cEr" = (
/obj/structure/chair/sofa/bench/right{
dir = 1
@@ -8364,19 +8327,6 @@
},
/turf/open/floor/iron/dark,
/area/station/science/ordnance)
-"dbJ" = (
-/obj/machinery/door/airlock/command/glass{
- name = "Bridge"
- },
-/obj/effect/mapping_helpers/airlock/access/any/command/general,
-/obj/machinery/door/firedoor,
-/obj/structure/cable,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
- cycle_id = "bridgec"
- },
-/obj/effect/mapping_helpers/airlock/access/any/admin/general,
-/turf/open/floor/iron,
-/area/station/hallway/secondary/command)
"dbN" = (
/obj/effect/turf_decal/tile/neutral{
dir = 4
@@ -9064,24 +9014,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/central)
-"dmE" = (
-/obj/machinery/door/airlock/research{
- name = "Research Division Access"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
- cycle_id = "sci-entrance"
- },
-/obj/effect/mapping_helpers/airlock/unres{
- dir = 4
- },
-/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/mapping_helpers/airlock/access/all/science/general,
-/turf/open/floor/iron/white,
-/area/station/science/research)
"dmH" = (
/obj/effect/turf_decal/siding/white{
dir = 4
@@ -9242,11 +9174,6 @@
},
/turf/open/floor/iron/white,
/area/station/medical/virology)
-"dpf" = (
-/obj/structure/transport/linear/public,
-/obj/machinery/light/floor/transport,
-/turf/open/floor/plating/elevatorshaft,
-/area/station/medical/treatment_center)
"dpj" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
@@ -9572,12 +9499,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/fore)
-"duB" = (
-/obj/structure/cable,
-/obj/structure/window/reinforced/spawner/directional/west,
-/obj/machinery/firealarm/directional/east,
-/turf/open/floor/iron/dark,
-/area/station/security/prison)
"duS" = (
/obj/machinery/duct,
/obj/structure/cable,
@@ -10547,6 +10468,18 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/hallway/secondary/command)
+"dLy" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/machinery/button/door/directional/south{
+ id = "evashutter";
+ name = "E.V.A. Storage Shutter Control";
+ req_access = list("command")
+ },
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/command/storage/eva)
"dLI" = (
/obj/effect/landmark/event_spawn,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -11060,6 +10993,28 @@
/obj/machinery/computer/security/telescreen/entertainment/directional/east,
/turf/open/floor/iron,
/area/station/hallway/primary/central)
+"dTV" = (
+/obj/machinery/light/dim/directional/west,
+/obj/structure/cable,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/disposalpipe/segment,
+/obj/item/holosign_creator/atmos{
+ pixel_y = 5
+ },
+/obj/structure/table,
+/obj/item/holosign_creator/atmos{
+ pixel_y = 7
+ },
+/turf/open/floor/iron/dark/corner{
+ dir = 8
+ },
+/area/station/engineering/atmos/upper)
"dUb" = (
/obj/machinery/airalarm/directional/west,
/obj/item/kirbyplants/random,
@@ -12436,6 +12391,15 @@
},
/turf/open/floor/iron,
/area/station/service/hydroponics)
+"etE" = (
+/obj/machinery/door/airlock/engineering/glass{
+ name = "Primary Tool Storage"
+ },
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/commons/storage/primary)
"etI" = (
/obj/structure/table,
/obj/effect/spawner/random/food_or_drink/snack,
@@ -12725,6 +12689,17 @@
},
/turf/open/floor/iron/white/smooth_large,
/area/station/command/heads_quarters/cmo)
+"ezH" = (
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 1
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 4
+ },
+/obj/machinery/requests_console/auto_name/directional/north,
+/obj/effect/mapping_helpers/requests_console/assistance,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"ezL" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -13232,13 +13207,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/central)
-"eHa" = (
-/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
- dir = 4
- },
-/obj/structure/sign/poster/official/random/directional/east,
-/turf/open/floor/iron,
-/area/station/command/bridge)
"eHc" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 1
@@ -13588,15 +13556,6 @@
/obj/structure/sign/poster/random/directional/west,
/turf/open/floor/plating,
/area/station/maintenance/department/medical)
-"eQJ" = (
-/obj/structure/rack,
-/obj/effect/turf_decal/tile/red/half/contrasted{
- dir = 1
- },
-/obj/item/radio/intercom/directional/south,
-/obj/effect/spawner/random/armory/dragnet,
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/security/armory)
"eQQ" = (
/obj/machinery/door/firedoor/border_only{
dir = 4
@@ -14333,6 +14292,20 @@
/obj/effect/turf_decal/sand/plating,
/turf/open/floor/plating,
/area/station/maintenance/solars/port/fore)
+"fgZ" = (
+/obj/machinery/door/airlock/engineering/glass{
+ name = "Engineering Foyer"
+ },
+/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
+/obj/structure/cable,
+/obj/machinery/door/firedoor,
+/obj/effect/landmark/navigate_destination/engineering,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/mapping_helpers/airlock/access/any/engineering/construction,
+/turf/open/floor/iron,
+/area/station/engineering/lobby)
"fhs" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 8
@@ -14570,6 +14543,17 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"flW" = (
+/obj/structure/table/wood,
+/obj/item/stock_parts/power_store/cell/crap,
+/obj/item/clothing/head/collectable/hop{
+ name = "novelty HoP hat"
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/turf/open/floor/wood/tile,
+/area/station/command/corporate_showroom)
"flZ" = (
/obj/structure/cable,
/obj/structure/disposalpipe/sorting/mail/flip{
@@ -14581,15 +14565,6 @@
"fma" = (
/turf/closed/wall,
/area/station/medical/coldroom)
-"fmm" = (
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/structure/table,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/cable/multilayer/connected,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/command/storage/satellite)
"fmr" = (
/obj/structure/grille,
/obj/structure/lattice,
@@ -16014,14 +15989,6 @@
/obj/machinery/camera/autoname/directional/west,
/turf/open/floor/plating,
/area/station/engineering/storage)
-"fJs" = (
-/obj/item/stock_parts/cell/bluespace{
- rigged = 1;
- pixel_x = -5;
- pixel_y = -8
- },
-/turf/open/misc/asteroid,
-/area/station/asteroid)
"fJz" = (
/obj/item/reagent_containers/condiment/vegetable_oil,
/obj/machinery/grill,
@@ -16054,6 +16021,13 @@
},
/turf/open/floor/carpet/purple,
/area/station/service/library)
+"fKp" = (
+/obj/structure/table/wood,
+/obj/item/flashlight/lamp,
+/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/keycard_auth/directional/north,
+/turf/open/floor/carpet/green,
+/area/station/command/heads_quarters/hop)
"fKs" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 4
@@ -16100,11 +16074,6 @@
},
/turf/open/floor/iron/half,
/area/station/security/breakroom)
-"fLM" = (
-/obj/structure/transport/linear/public,
-/obj/machinery/light/floor/transport,
-/turf/open/floor/plating/elevatorshaft,
-/area/station/cargo/storage)
"fLU" = (
/obj/effect/spawner/random/trash/mess,
/obj/effect/mapping_helpers/broken_floor,
@@ -16546,6 +16515,26 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/science/ordnance)
+"fSH" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/obj/machinery/button/door/directional/south{
+ id = "capshut";
+ pixel_x = -8;
+ name = "shutter control"
+ },
+/obj/machinery/fax{
+ fax_name = "Captain's Office";
+ name = "Captain's Fax Machine"
+ },
+/obj/structure/table/reinforced,
+/obj/machinery/keycard_auth/directional/south{
+ pixel_y = -24;
+ pixel_x = 8
+ },
+/turf/open/floor/carpet/royalblue,
+/area/station/command/heads_quarters/captain/private)
"fSK" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 6
@@ -17198,6 +17187,13 @@
},
/turf/open/floor/wood/parquet,
/area/station/medical/psychology)
+"gez" = (
+/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
+ dir = 4
+ },
+/obj/structure/sign/poster/official/random/directional/east,
+/turf/open/floor/iron,
+/area/station/command/bridge)
"geB" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -17410,6 +17406,18 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/cargo/drone_bay)
+"giX" = (
+/obj/effect/turf_decal/tile/yellow/fourcorners,
+/obj/structure/table,
+/obj/item/stock_parts/power_store/cell/emproof{
+ pixel_y = 6
+ },
+/obj/item/stock_parts/power_store/cell/emproof{
+ pixel_y = 3
+ },
+/obj/item/stock_parts/power_store/cell/emproof,
+/turf/open/floor/iron,
+/area/station/engineering/main)
"gjo" = (
/obj/structure/cable,
/obj/machinery/button/door/directional/east{
@@ -19860,6 +19868,21 @@
"hbV" = (
/turf/open/floor/iron/dark,
/area/station/science/xenobiology)
+"hcd" = (
+/obj/machinery/door/airlock/research{
+ name = "Research Division Access"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+ cycle_id = "sci-entrance"
+ },
+/obj/effect/mapping_helpers/airlock/unres{
+ dir = 4
+ },
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/mapping_helpers/airlock/access/all/science/general,
+/turf/open/floor/iron/white,
+/area/station/science/research)
"hce" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -20057,6 +20080,19 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/engineering/atmos)
+"hfq" = (
+/obj/machinery/door/airlock/engineering/glass{
+ name = "Break Room"
+ },
+/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/yellow/fourcorners,
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/mapping_helpers/airlock/access/any/engineering/construction,
+/turf/open/floor/iron,
+/area/station/engineering/break_room)
"hfv" = (
/obj/effect/mapping_helpers/broken_floor,
/obj/effect/decal/cleanable/dirt/dust,
@@ -20139,6 +20175,16 @@
},
/turf/open/floor/plating,
/area/station/science/lobby)
+"hgE" = (
+/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
+ dir = 8
+ },
+/obj/machinery/computer/security/telescreen/minisat{
+ dir = 4;
+ pixel_x = -29
+ },
+/turf/open/floor/iron,
+/area/station/command/bridge)
"hgN" = (
/obj/structure/cable,
/obj/machinery/power/apc/auto_name/directional/west,
@@ -20477,6 +20523,19 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/aisat/teleporter)
+"hng" = (
+/obj/machinery/portable_atmospherics/canister/anesthetic_mix,
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
+ dir = 1
+ },
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/machinery/door/window/right/directional/north{
+ req_access = list("medical");
+ name = "Anti Assistant Protection Door"
+ },
+/obj/effect/turf_decal/tile/blue/fourcorners,
+/turf/open/floor/iron/white,
+/area/station/medical/treatment_center)
"hnh" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 4
@@ -22386,6 +22445,14 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/engine,
/area/station/science/xenobiology)
+"hVb" = (
+/obj/item/stock_parts/power_store/cell/bluespace{
+ rigged = 1;
+ pixel_x = -5;
+ pixel_y = -8
+ },
+/turf/open/misc/asteroid,
+/area/station/asteroid)
"hVe" = (
/obj/effect/turf_decal/bot{
dir = 1
@@ -24211,6 +24278,17 @@
dir = 1
},
/area/station/service/chapel)
+"iEL" = (
+/obj/structure/table/glass,
+/obj/item/flatpack{
+ board = /obj/item/circuitboard/machine/flatpacker;
+ pixel_x = -5
+ },
+/obj/item/multitool{
+ pixel_x = 8
+ },
+/turf/open/floor/iron,
+/area/station/engineering/lobby)
"iEO" = (
/turf/closed/wall,
/area/station/security/prison/mess)
@@ -24266,24 +24344,6 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/maintenance/solars/port/aft)
-"iFD" = (
-/obj/structure/table/reinforced,
-/obj/item/stock_parts/cell/high{
- pixel_x = 4;
- pixel_y = 5
- },
-/obj/item/stock_parts/cell/high{
- pixel_x = -8;
- pixel_y = 9
- },
-/obj/item/stock_parts/cell/high,
-/obj/machinery/cell_charger,
-/obj/item/borg/upgrade/rename{
- pixel_x = 3;
- pixel_y = 18
- },
-/turf/open/floor/iron/dark/textured,
-/area/station/science/robotics/lab)
"iFK" = (
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/oxygen_output{
dir = 8
@@ -26026,6 +26086,17 @@
},
/turf/open/floor/iron/textured,
/area/station/cargo/storage)
+"jnV" = (
+/obj/machinery/disposal/bin,
+/obj/effect/turf_decal/tile/blue/fourcorners,
+/obj/effect/turf_decal/box/white{
+ color = "#52B4E9"
+ },
+/obj/structure/disposalpipe/trunk,
+/obj/machinery/requests_console/auto_name/directional/north,
+/obj/effect/mapping_helpers/requests_console/assistance,
+/turf/open/floor/iron/white,
+/area/station/medical/storage)
"jnY" = (
/obj/effect/spawner/structure/window/reinforced/plasma,
/obj/structure/cable,
@@ -26461,6 +26532,13 @@
},
/turf/open/floor/wood,
/area/station/commons/lounge)
+"jvU" = (
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central)
"jvV" = (
/obj/machinery/computer/operating{
dir = 8
@@ -27052,6 +27130,11 @@
/obj/machinery/camera/autoname/directional/east,
/turf/open/floor/iron/freezer,
/area/station/security/prison/shower)
+"jEO" = (
+/obj/structure/transport/linear/public,
+/obj/machinery/light/floor/transport,
+/turf/open/floor/plating/elevatorshaft,
+/area/station/medical/treatment_center)
"jEX" = (
/obj/machinery/newscaster/directional/west,
/turf/open/floor/carpet/orange,
@@ -27831,21 +27914,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/commons/vacant_room/commissary)
-"jSs" = (
-/obj/machinery/door/airlock/command{
- name = "Head of Personnel's Booth"
- },
-/obj/effect/turf_decal/siding/wood,
-/obj/effect/mapping_helpers/airlock/access/any/command/hop,
-/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
- cycle_id = "bridgehop"
- },
-/turf/open/floor/carpet/green,
-/area/station/command/heads_quarters/hop)
"jSu" = (
/obj/machinery/atmospherics/pipe/smart/simple/green/visible{
dir = 8
@@ -28289,6 +28357,22 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/hallway/secondary/command)
+"kaD" = (
+/obj/item/circuitboard/machine/thermomachine,
+/obj/item/circuitboard/machine/thermomachine,
+/obj/item/storage/bag/construction,
+/obj/item/storage/bag/construction,
+/obj/item/storage/bag/construction,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/structure/closet/crate,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/light/dim/directional/south,
+/turf/open/floor/iron/large,
+/area/station/engineering/atmos)
"kaJ" = (
/obj/effect/turf_decal/tile/red/half/contrasted,
/obj/structure/cable,
@@ -28331,6 +28415,18 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron/dark,
/area/station/command/bridge)
+"kbU" = (
+/obj/machinery/door/airlock/command{
+ name = "Head of Personnel's Quarters"
+ },
+/obj/effect/turf_decal/siding/wood,
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/access/any/command/hop,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+ cycle_id = "bridgehop"
+ },
+/turf/open/floor/iron,
+/area/station/command/heads_quarters/hop)
"kbW" = (
/obj/structure/chair/plastic{
dir = 8
@@ -30519,6 +30615,13 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/aft/upper)
+"kKS" = (
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/machinery/light_switch/directional/south,
+/turf/open/floor/iron/white,
+/area/station/science/lab)
"kLi" = (
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/station/maintenance/department/medical/central)
@@ -30624,6 +30727,16 @@
},
/turf/open/floor/engine,
/area/station/command/corporate_dock)
+"kNM" = (
+/obj/machinery/door/airlock/multi_tile/public{
+ name = "Corporate Private Dock"
+ },
+/obj/structure/cable,
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/access/any/command/general,
+/obj/effect/mapping_helpers/airlock/access/any/admin/general,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/command/corporate_dock)
"kNO" = (
/obj/effect/turf_decal/siding/wood,
/obj/machinery/newscaster/directional/south,
@@ -32056,18 +32169,6 @@
/obj/item/toy/figure/borg,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/aisat/teleporter)
-"loC" = (
-/obj/machinery/door/airlock/command{
- name = "Head of Personnel's Quarters"
- },
-/obj/effect/turf_decal/siding/wood,
-/obj/machinery/door/firedoor,
-/obj/effect/mapping_helpers/airlock/access/any/command/hop,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
- cycle_id = "bridgehop"
- },
-/turf/open/floor/iron,
-/area/station/command/heads_quarters/hop)
"loR" = (
/obj/effect/mapping_helpers/broken_floor,
/obj/machinery/power/port_gen/pacman/pre_loaded,
@@ -32160,16 +32261,6 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/solars/starboard/fore)
-"lqP" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell,
-/obj/effect/turf_decal/tile/purple/half/contrasted{
- dir = 1
- },
-/obj/machinery/airalarm/directional/north,
-/turf/open/floor/iron/white,
-/area/station/science/lobby)
"lqR" = (
/obj/effect/landmark/event_spawn,
/turf/open/floor/iron,
@@ -33112,28 +33203,6 @@
/obj/structure/table/reinforced/rglass,
/turf/open/floor/iron/dark,
/area/station/security/office)
-"lHF" = (
-/obj/machinery/light/dim/directional/west,
-/obj/structure/cable,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment,
-/obj/item/holosign_creator/atmos{
- pixel_y = 5
- },
-/obj/structure/table,
-/obj/item/holosign_creator/atmos{
- pixel_y = 7
- },
-/turf/open/floor/iron/dark/corner{
- dir = 8
- },
-/area/station/engineering/atmos/upper)
"lHX" = (
/obj/machinery/holopad,
/obj/effect/turf_decal/box/white{
@@ -34088,6 +34157,10 @@
/obj/machinery/firealarm/directional/west,
/turf/open/floor/wood,
/area/station/commons/lounge)
+"maT" = (
+/obj/structure/window/reinforced/spawner/directional/west,
+/turf/open/floor/glass/reinforced,
+/area/station/security/prison)
"maY" = (
/obj/structure/table/wood,
/obj/effect/turf_decal/tile/red/half/contrasted{
@@ -34252,15 +34325,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/security/lockers)
-"meT" = (
-/obj/effect/turf_decal/tile/brown/half/contrasted,
-/obj/machinery/disposal/bin,
-/obj/structure/disposalpipe/trunk{
- dir = 1
- },
-/obj/machinery/digital_clock/directional/south,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"mff" = (
/obj/effect/turf_decal/tile/blue/half/contrasted,
/turf/open/floor/iron,
@@ -35089,21 +35153,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/fore)
-"mtG" = (
-/obj/machinery/door/airlock/command,
-/obj/machinery/door/firedoor,
-/obj/effect/mapping_helpers/airlock/access/any/command/general,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
- cycle_id = "bridgec"
- },
-/obj/effect/mapping_helpers/airlock/access/any/admin/general,
-/turf/open/floor/iron/dark/side{
- dir = 4
- },
-/area/station/command/corporate_showroom)
"mtH" = (
/turf/open/floor/plating/airless,
/area/station/solars/port)
@@ -35542,20 +35591,6 @@
/obj/structure/weightmachine,
/turf/open/floor/iron/white/textured_large,
/area/station/commons/fitness/recreation)
-"mBX" = (
-/obj/machinery/door/airlock/engineering/glass{
- name = "Engineering Foyer"
- },
-/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
-/obj/structure/cable,
-/obj/machinery/door/firedoor,
-/obj/effect/landmark/navigate_destination/engineering,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/mapping_helpers/airlock/access/any/engineering/construction,
-/turf/open/floor/iron,
-/area/station/engineering/lobby)
"mBY" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 4
@@ -35615,6 +35650,16 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/kitchen,
/area/station/service/kitchen)
+"mCH" = (
+/obj/machinery/computer/security{
+ dir = 4
+ },
+/obj/structure/sign/poster/official/random/directional/west,
+/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
+ dir = 8
+ },
+/turf/open/floor/iron/dark,
+/area/station/command/bridge)
"mCN" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable,
@@ -35805,6 +35850,21 @@
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
/area/station/hallway/primary/central)
+"mGw" = (
+/obj/machinery/door/airlock/command,
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/access/any/command/general,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+ cycle_id = "bridgec"
+ },
+/obj/effect/mapping_helpers/airlock/access/any/admin/general,
+/turf/open/floor/iron/dark/side{
+ dir = 4
+ },
+/area/station/command/corporate_showroom)
"mGG" = (
/turf/closed/wall,
/area/station/security/breakroom)
@@ -36211,20 +36271,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/security/courtroom)
-"mOc" = (
-/obj/machinery/door/airlock/research{
- name = "Research Division Access"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
- cycle_id = "sci-entrance"
- },
-/obj/effect/mapping_helpers/airlock/unres{
- dir = 4
- },
-/obj/machinery/door/firedoor,
-/obj/effect/mapping_helpers/airlock/access/all/science/general,
-/turf/open/floor/iron/white,
-/area/station/science/research)
"mOo" = (
/obj/effect/turf_decal/tile/brown/half/contrasted,
/turf/open/floor/iron,
@@ -36518,6 +36564,15 @@
/obj/machinery/camera/autoname/directional/south,
/turf/open/floor/iron/dark/corner,
/area/station/engineering/atmos)
+"mVR" = (
+/obj/structure/rack,
+/obj/effect/turf_decal/tile/red/half/contrasted{
+ dir = 1
+ },
+/obj/item/radio/intercom/directional/south,
+/obj/effect/spawner/random/armory/dragnet,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
"mVU" = (
/obj/effect/spawner/random/maintenance/two,
/obj/effect/spawner/random/structure/crate,
@@ -36650,6 +36705,18 @@
},
/turf/open/floor/plating/airless,
/area/station/maintenance/department/medical/central)
+"mXT" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/structure/window/reinforced/survival_pod/spawner/directional/south,
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/effect/turf_decal/bot{
+ dir = 1
+ },
+/obj/machinery/airalarm/directional/west,
+/turf/open/floor/iron,
+/area/station/command/gateway)
"mXV" = (
/obj/effect/turf_decal/tile/red/anticorner/contrasted{
dir = 4
@@ -37038,6 +37105,12 @@
},
/turf/closed/wall,
/area/station/service/bar)
+"ndC" = (
+/obj/structure/table/glass,
+/obj/effect/spawner/random/food_or_drink/snack,
+/obj/effect/spawner/random/food_or_drink/refreshing_beverage,
+/turf/open/floor/iron,
+/area/station/engineering/lobby)
"ndI" = (
/obj/structure/table,
/obj/item/hand_labeler,
@@ -37330,6 +37403,20 @@
dir = 10
},
/area/station/maintenance/radshelter/medical)
+"nhc" = (
+/obj/machinery/door/airlock/research{
+ name = "Research Division Access"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+ cycle_id = "sci-entrance"
+ },
+/obj/effect/mapping_helpers/airlock/unres{
+ dir = 4
+ },
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/access/all/science/general,
+/turf/open/floor/iron/white,
+/area/station/science/research)
"nhf" = (
/obj/machinery/computer/records/medical/laptop{
dir = 8;
@@ -37564,6 +37651,16 @@
/obj/structure/cable/multilayer/multiz,
/turf/open/floor/plating,
/area/station/maintenance/port/greater)
+"nmF" = (
+/obj/machinery/computer/security/mining{
+ dir = 8
+ },
+/obj/machinery/keycard_auth/directional/east,
+/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
+ dir = 4
+ },
+/turf/open/floor/iron/dark,
+/area/station/command/bridge)
"nmG" = (
/obj/effect/turf_decal/trimline/blue/filled/end,
/obj/structure/cable,
@@ -38034,6 +38131,16 @@
/obj/machinery/camera/autoname/directional/south,
/turf/open/floor/iron,
/area/station/security/detectives_office)
+"nwi" = (
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell,
+/obj/effect/turf_decal/tile/purple/half/contrasted{
+ dir = 1
+ },
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/iron/white,
+/area/station/science/lobby)
"nwp" = (
/obj/effect/turf_decal/tile/blue/anticorner/contrasted{
dir = 8
@@ -38707,17 +38814,6 @@
/obj/effect/spawner/random/clothing/pirate_or_bandana,
/turf/open/floor/plating,
/area/station/maintenance/aft/upper)
-"nKa" = (
-/obj/machinery/disposal/bin,
-/obj/effect/turf_decal/tile/blue/fourcorners,
-/obj/effect/turf_decal/box/white{
- color = "#52B4E9"
- },
-/obj/structure/disposalpipe/trunk,
-/obj/machinery/requests_console/auto_name/directional/north,
-/obj/effect/mapping_helpers/requests_console/assistance,
-/turf/open/floor/iron/white,
-/area/station/medical/storage)
"nKc" = (
/obj/effect/turf_decal/tile/yellow/half/contrasted{
dir = 1
@@ -39148,6 +39244,15 @@
/obj/machinery/portable_atmospherics/scrubber,
/turf/open/floor/iron/dark/smooth_large,
/area/station/science/ordnance)
+"nTb" = (
+/obj/effect/turf_decal/tile/brown/half/contrasted,
+/obj/machinery/disposal/bin,
+/obj/structure/disposalpipe/trunk{
+ dir = 1
+ },
+/obj/machinery/digital_clock/directional/south,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"nTm" = (
/obj/structure/chair/office{
dir = 1
@@ -39989,12 +40094,6 @@
/obj/machinery/quantum_server,
/turf/open/floor/circuit,
/area/station/cargo/bitrunning/den)
-"omE" = (
-/obj/structure/table/glass,
-/obj/effect/spawner/random/food_or_drink/snack,
-/obj/effect/spawner/random/food_or_drink/refreshing_beverage,
-/turf/open/floor/iron,
-/area/station/engineering/lobby)
"omL" = (
/obj/machinery/door/firedoor/border_only{
dir = 8
@@ -40560,20 +40659,6 @@
/obj/machinery/light_switch/directional/south,
/turf/open/floor/iron,
/area/station/service/hydroponics)
-"oxN" = (
-/obj/machinery/door/airlock/multi_tile/public{
- dir = 4
- },
-/obj/effect/mapping_helpers/airlock/access/any/command/general,
-/obj/machinery/door/firedoor,
-/obj/effect/mapping_helpers/airlock/unres{
- dir = 8
- },
-/obj/structure/cable,
-/obj/effect/mapping_helpers/airlock/autoname,
-/obj/effect/mapping_helpers/airlock/access/any/admin/general,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/command/meeting_room)
"oxU" = (
/obj/effect/turf_decal/siding/wood{
dir = 1
@@ -41305,17 +41390,6 @@
/obj/effect/spawner/random/engineering/tracking_beacon,
/turf/open/floor/plating/airless,
/area/station/science/ordnance/bomb)
-"oLg" = (
-/obj/structure/table/wood,
-/obj/item/stock_parts/cell/crap,
-/obj/item/clothing/head/collectable/hop{
- name = "novelty HoP hat"
- },
-/obj/effect/turf_decal/siding/wood{
- dir = 8
- },
-/turf/open/floor/wood/tile,
-/area/station/command/corporate_showroom)
"oLh" = (
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
@@ -41960,6 +42034,16 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/solars/port)
+"oWw" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 9
+ },
+/obj/effect/turf_decal/siding/thinplating/dark{
+ dir = 9
+ },
+/obj/machinery/firealarm/directional/west,
+/turf/open/floor/iron/checker,
+/area/station/science/research)
"oWy" = (
/obj/effect/turf_decal/box/corners,
/turf/open/floor/iron/dark,
@@ -42505,16 +42589,6 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/iron,
/area/station/maintenance/department/cargo)
-"pgS" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 9
- },
-/obj/effect/turf_decal/siding/thinplating/dark{
- dir = 9
- },
-/obj/machinery/firealarm/directional/west,
-/turf/open/floor/iron/checker,
-/area/station/science/research)
"pgW" = (
/obj/effect/turf_decal/trimline/blue/filled/corner,
/obj/effect/landmark/start/medical_doctor,
@@ -42652,6 +42726,20 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
/area/station/hallway/secondary/exit/departure_lounge)
+"pjf" = (
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 9
+ },
+/obj/machinery/lift_indicator/directional/south{
+ linked_elevator_id = "medbay1";
+ pixel_x = -32
+ },
+/obj/machinery/button/elevator/directional/south{
+ id = "medbay1";
+ pixel_x = -32
+ },
+/turf/open/floor/iron/white,
+/area/station/medical/treatment_center)
"pjk" = (
/obj/machinery/portable_atmospherics/canister/nitrogen,
/turf/open/floor/engine/n2,
@@ -43662,6 +43750,19 @@
/obj/machinery/newscaster/directional/south,
/turf/open/floor/iron,
/area/station/security/prison/garden)
+"pBf" = (
+/obj/structure/closet/crate,
+/obj/item/stack/sheet/iron/fifty,
+/obj/item/stack/rods/fifty,
+/obj/item/stack/sheet/glass/fifty,
+/obj/item/electronics/airlock,
+/obj/item/electronics/airlock,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/item/stack/sheet/mineral/plasma{
+ amount = 30
+ },
+/turf/open/floor/plating,
+/area/station/engineering/storage)
"pBg" = (
/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
dir = 1
@@ -44108,6 +44209,10 @@
},
/turf/open/floor/iron/white,
/area/station/science/research)
+"pIB" = (
+/obj/structure/window/reinforced/spawner/directional/south,
+/turf/open/floor/glass/reinforced,
+/area/station/security/prison)
"pIF" = (
/obj/structure/table/reinforced,
/obj/machinery/door/window/brigdoor/right/directional/north{
@@ -45507,17 +45612,6 @@
/obj/effect/mapping_helpers/airalarm/tlv_no_checks,
/turf/open/floor/iron/dark,
/area/station/science/ordnance)
-"qhg" = (
-/obj/structure/cable,
-/obj/machinery/door/airlock/command,
-/obj/effect/mapping_helpers/airlock/access/any/command/general,
-/obj/effect/mapping_helpers/airlock/autoname,
-/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/mapping_helpers/airlock/access/any/admin/general,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/command/emergency_closet)
"qhm" = (
/obj/effect/turf_decal/sand/plating,
/obj/effect/turf_decal/stripes/asteroid/line{
@@ -45813,15 +45907,6 @@
/obj/machinery/door/firedoor,
/turf/open/floor/plating,
/area/station/hallway/secondary/command)
-"qmD" = (
-/obj/machinery/door/airlock/engineering/glass{
- name = "Primary Tool Storage"
- },
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/commons/storage/primary)
"qmI" = (
/obj/effect/turf_decal/tile/purple/fourcorners,
/obj/machinery/light/small/directional/north,
@@ -46762,10 +46847,6 @@
},
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/aisat/teleporter)
-"qFS" = (
-/obj/structure/window/reinforced/spawner/directional/south,
-/turf/open/floor/glass/reinforced,
-/area/station/security/prison)
"qGk" = (
/turf/closed/wall/r_wall,
/area/station/hallway/secondary/command)
@@ -47202,16 +47283,6 @@
/obj/item/airlock_painter/decal,
/turf/open/floor/iron,
/area/station/cargo/warehouse)
-"qOO" = (
-/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
- dir = 8
- },
-/obj/machinery/computer/security/telescreen/minisat{
- dir = 4;
- pixel_x = -29
- },
-/turf/open/floor/iron,
-/area/station/command/bridge)
"qOP" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/rack,
@@ -48019,16 +48090,6 @@
},
/turf/open/floor/iron/checker,
/area/station/maintenance/department/medical)
-"rcz" = (
-/obj/machinery/computer/security{
- dir = 4
- },
-/obj/structure/sign/poster/official/random/directional/west,
-/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
- dir = 8
- },
-/turf/open/floor/iron/dark,
-/area/station/command/bridge)
"rcG" = (
/obj/machinery/mech_bay_recharge_port{
dir = 1
@@ -48564,6 +48625,12 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/iron,
/area/station/security/brig/entrance)
+"rjP" = (
+/obj/structure/table/glass,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/turf/open/floor/iron,
+/area/station/engineering/lobby)
"rjX" = (
/turf/closed/wall,
/area/station/security/courtroom)
@@ -48821,6 +48888,15 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/security)
+"roH" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/structure/table,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable/multilayer/connected,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/power_store/cell/high,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/command/storage/satellite)
"roO" = (
/obj/machinery/door/airlock/security/glass{
name = "Prison Wing"
@@ -49203,6 +49279,12 @@
},
/turf/open/floor/iron/white/textured,
/area/station/maintenance/department/medical/central)
+"rvu" = (
+/obj/structure/cable,
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/machinery/firealarm/directional/east,
+/turf/open/floor/iron/dark,
+/area/station/security/prison)
"rwf" = (
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
@@ -49395,19 +49477,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
-"ryG" = (
-/obj/structure/cable,
-/obj/machinery/door/airlock/engineering/glass{
- name = "Break Room"
- },
-/obj/effect/turf_decal/tile/yellow/fourcorners,
-/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
-/obj/effect/mapping_helpers/airlock/access/any/engineering/construction,
-/turf/open/floor/iron,
-/area/station/engineering/break_room)
"ryP" = (
/obj/structure/closet/secure_closet/brig{
id = "Cell 2";
@@ -50267,18 +50336,6 @@
},
/turf/open/floor/iron/textured,
/area/station/hallway/primary/central)
-"rOz" = (
-/obj/effect/turf_decal/tile/yellow/fourcorners,
-/obj/structure/table,
-/obj/item/stock_parts/cell/emproof{
- pixel_y = 6
- },
-/obj/item/stock_parts/cell/emproof{
- pixel_y = 3
- },
-/obj/item/stock_parts/cell/emproof,
-/turf/open/floor/iron,
-/area/station/engineering/main)
"rOF" = (
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 4
@@ -51486,17 +51543,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/engineering/main)
-"sgR" = (
-/obj/effect/turf_decal/tile/brown/half/contrasted{
- dir = 1
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 4
- },
-/obj/machinery/requests_console/auto_name/directional/north,
-/obj/effect/mapping_helpers/requests_console/assistance,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"sgW" = (
/obj/structure/chair/office/tactical{
dir = 8
@@ -53173,18 +53219,6 @@
"sJT" = (
/turf/closed/wall/r_wall,
/area/station/ai_monitored/turret_protected/aisat/uppersouth)
-"sJV" = (
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
-/obj/machinery/button/door/directional/south{
- id = "evashutter";
- name = "E.V.A. Storage Shutter Control";
- req_access = list("command")
- },
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/command/storage/eva)
"sJX" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/turf/open/floor/iron,
@@ -54225,6 +54259,23 @@
"tdq" = (
/turf/open/floor/plating,
/area/station/maintenance/department/cargo)
+"tdN" = (
+/obj/machinery/door/airlock/research{
+ name = "Research Division Access"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+ cycle_id = "sci-entrance"
+ },
+/obj/effect/mapping_helpers/airlock/unres{
+ dir = 4
+ },
+/obj/machinery/door/firedoor,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/mapping_helpers/airlock/access/all/science/general,
+/turf/open/floor/iron/white,
+/area/station/science/research)
"tdW" = (
/obj/effect/turf_decal/tile/red/anticorner/contrasted{
dir = 4
@@ -54299,6 +54350,23 @@
},
/turf/open/space/basic,
/area/space/nearstation)
+"tgn" = (
+/obj/machinery/computer/pod/old/mass_driver_controller/trash{
+ pixel_x = -32;
+ pixel_y = 6;
+ range = 5
+ },
+/obj/structure/cable,
+/obj/machinery/button/door/directional/west{
+ id = "Disposal Exit";
+ name = "Disposal Vent Control";
+ req_access = list("maint_tunnels");
+ pixel_x = -32;
+ pixel_y = -6
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plating,
+/area/station/maintenance/disposal)
"tgr" = (
/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
dir = 6
@@ -55190,19 +55258,6 @@
/obj/effect/landmark/start/prisoner,
/turf/open/floor/iron,
/area/station/security/prison)
-"tvW" = (
-/obj/structure/closet/crate,
-/obj/item/stack/sheet/iron/fifty,
-/obj/item/stack/rods/fifty,
-/obj/item/stack/sheet/glass/fifty,
-/obj/item/electronics/airlock,
-/obj/item/electronics/airlock,
-/obj/item/stock_parts/cell/high,
-/obj/item/stack/sheet/mineral/plasma{
- amount = 30
- },
-/turf/open/floor/plating,
-/area/station/engineering/storage)
"twf" = (
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "soup";
@@ -55380,6 +55435,15 @@
},
/turf/open/floor/iron/large,
/area/station/hallway/secondary/exit/departure_lounge)
+"tAs" = (
+/obj/machinery/suit_storage_unit/standard_unit,
+/obj/machinery/door/window/brigdoor/right/directional/east{
+ req_access = list("command")
+ },
+/obj/effect/turf_decal/bot,
+/obj/machinery/light/small/dim/directional/west,
+/turf/open/floor/iron,
+/area/station/command/bridge)
"tAt" = (
/obj/machinery/power/smes,
/turf/open/floor/plating,
@@ -55426,23 +55490,6 @@
},
/turf/open/floor/engine,
/area/station/engineering/supermatter/room)
-"tBe" = (
-/obj/machinery/computer/pod/old/mass_driver_controller/trash{
- pixel_x = -32;
- pixel_y = 6;
- range = 5
- },
-/obj/structure/cable,
-/obj/machinery/button/door/directional/west{
- id = "Disposal Exit";
- name = "Disposal Vent Control";
- req_access = list("maint_tunnels");
- pixel_x = -32;
- pixel_y = -6
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plating,
-/area/station/maintenance/disposal)
"tBg" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -55681,6 +55728,13 @@
"tEy" = (
/turf/open/floor/plating,
/area/station/maintenance/department/bridge)
+"tEB" = (
+/obj/machinery/door/airlock/engineering/glass{
+ name = "Primary Tool Storage"
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron,
+/area/station/commons/storage/primary)
"tEH" = (
/obj/machinery/light/directional/east,
/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
@@ -55820,6 +55874,19 @@
/obj/machinery/light_switch/directional/west,
/turf/open/floor/iron/white/smooth_large,
/area/station/medical/chemistry)
+"tGU" = (
+/obj/structure/cable,
+/obj/machinery/door/airlock/engineering/glass{
+ name = "Break Room"
+ },
+/obj/effect/turf_decal/tile/yellow/fourcorners,
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
+/obj/effect/mapping_helpers/airlock/access/any/engineering/construction,
+/turf/open/floor/iron,
+/area/station/engineering/break_room)
"tGW" = (
/obj/machinery/atmospherics/pipe/smart/simple/dark/visible,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -56503,6 +56570,14 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/science/xenobiology)
+"tRT" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/medkit/regular,
+/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
+ dir = 1
+ },
+/turf/open/floor/iron/dark,
+/area/station/command/bridge)
"tRX" = (
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 8
@@ -56639,13 +56714,6 @@
dir = 4
},
/area/station/command/meeting_room)
-"tUF" = (
-/obj/structure/table/wood,
-/obj/item/flashlight/lamp,
-/obj/machinery/camera/autoname/directional/north,
-/obj/machinery/keycard_auth/directional/north,
-/turf/open/floor/carpet/green,
-/area/station/command/heads_quarters/hop)
"tUG" = (
/obj/structure/chair/stool/bar/directional/west,
/obj/effect/turf_decal/siding/wood{
@@ -57072,6 +57140,24 @@
/obj/effect/landmark/start/hangover/closet,
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
+"uby" = (
+/obj/structure/transport/linear/public,
+/obj/machinery/light/floor/transport,
+/turf/open/floor/plating/elevatorshaft,
+/area/station/cargo/storage)
+"ubF" = (
+/obj/machinery/door/airlock/command/glass{
+ name = "Bridge"
+ },
+/obj/effect/mapping_helpers/airlock/access/any/command/general,
+/obj/machinery/door/firedoor,
+/obj/structure/cable,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+ cycle_id = "bridgec"
+ },
+/obj/effect/mapping_helpers/airlock/access/any/admin/general,
+/turf/open/floor/iron,
+/area/station/hallway/secondary/command)
"ubV" = (
/obj/structure/chair{
dir = 1
@@ -59254,20 +59340,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron/large,
/area/station/service/hydroponics/garden)
-"uPg" = (
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 9
- },
-/obj/machinery/lift_indicator/directional/south{
- linked_elevator_id = "medbay1";
- pixel_x = -32
- },
-/obj/machinery/button/elevator/directional/south{
- id = "medbay1";
- pixel_x = -32
- },
-/turf/open/floor/iron/white,
-/area/station/medical/treatment_center)
"uPi" = (
/obj/effect/turf_decal/tile/brown/half/contrasted,
/obj/effect/decal/cleanable/dirt,
@@ -59853,14 +59925,6 @@
},
/turf/open/floor/iron/white,
/area/station/medical/virology)
-"vay" = (
-/obj/structure/table/reinforced,
-/obj/item/storage/medkit/regular,
-/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
- dir = 1
- },
-/turf/open/floor/iron/dark,
-/area/station/command/bridge)
"vaC" = (
/turf/open/floor/catwalk_floor/iron_dark,
/area/station/command/corporate_dock)
@@ -60143,12 +60207,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/catwalk_floor/iron_dark,
/area/station/maintenance/department/engine)
-"vgS" = (
-/obj/structure/table/glass,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
-/turf/open/floor/iron,
-/area/station/engineering/lobby)
"vgW" = (
/obj/structure/lattice,
/turf/open/floor/engine/airless,
@@ -60348,6 +60406,22 @@
/obj/structure/tank_dispenser/oxygen,
/turf/open/floor/plating,
/area/station/engineering/supermatter/room)
+"vkP" = (
+/obj/machinery/door/airlock/command/glass{
+ name = "Bridge"
+ },
+/obj/effect/mapping_helpers/airlock/access/any/command/general,
+/obj/structure/cable,
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/disposalpipe/segment,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+ cycle_id = "bridgec"
+ },
+/obj/effect/mapping_helpers/airlock/access/any/admin/general,
+/turf/open/floor/iron,
+/area/station/hallway/secondary/command)
"vkR" = (
/obj/machinery/firealarm/directional/west,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -61154,22 +61228,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/department/engine)
-"vCq" = (
-/obj/machinery/light/small/directional/north,
-/obj/machinery/cell_charger,
-/obj/structure/table/reinforced,
-/obj/item/stock_parts/cell/high,
-/obj/machinery/camera/autoname/directional/east{
- network = list("ss13","rd")
- },
-/obj/effect/turf_decal/siding/purple/corner{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/corner{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/science/robotics/mechbay)
"vCw" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -61737,19 +61795,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/service/bar)
-"vME" = (
-/obj/machinery/door/airlock/engineering/glass{
- name = "Break Room"
- },
-/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/yellow/fourcorners,
-/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/mapping_helpers/airlock/access/any/engineering/construction,
-/turf/open/floor/iron,
-/area/station/engineering/break_room)
"vMN" = (
/obj/structure/flora/coconuts,
/turf/open/floor/grass,
@@ -62003,15 +62048,6 @@
/obj/structure/grille,
/turf/open/floor/plating,
/area/station/engineering/supermatter/room)
-"vQf" = (
-/obj/machinery/suit_storage_unit/standard_unit,
-/obj/machinery/door/window/brigdoor/right/directional/east{
- req_access = list("command")
- },
-/obj/effect/turf_decal/bot,
-/obj/machinery/light/small/dim/directional/west,
-/turf/open/floor/iron,
-/area/station/command/bridge)
"vQn" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 1
@@ -62433,6 +62469,21 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/department/medical/central)
+"vXW" = (
+/obj/machinery/door/airlock/command{
+ name = "Head of Personnel's Booth"
+ },
+/obj/effect/turf_decal/siding/wood,
+/obj/effect/mapping_helpers/airlock/access/any/command/hop,
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+ cycle_id = "bridgehop"
+ },
+/turf/open/floor/carpet/green,
+/area/station/command/heads_quarters/hop)
"vYg" = (
/obj/effect/turf_decal/bot/right,
/turf/open/floor/engine,
@@ -62655,6 +62706,14 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/fore)
+"wcl" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/spawner/random/structure/closet_empty/crate,
+/obj/item/stock_parts/power_store/cell,
+/obj/structure/broken_flooring,
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/plating,
+/area/station/cargo/warehouse)
"wcm" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/machinery/light/cold/directional/north,
@@ -63848,6 +63907,24 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/command/storage/satellite)
+"wzW" = (
+/obj/machinery/door/airlock/research{
+ name = "Research Division Access"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+ cycle_id = "sci-entrance"
+ },
+/obj/effect/mapping_helpers/airlock/unres{
+ dir = 4
+ },
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/mapping_helpers/airlock/access/all/science/general,
+/turf/open/floor/iron/white,
+/area/station/science/research)
"wzX" = (
/obj/structure/flora/tree/palm/style_random,
/turf/open/floor/grass,
@@ -64455,6 +64532,24 @@
},
/turf/open/floor/iron/dark,
/area/station/medical/chemistry/minisat)
+"wJo" = (
+/obj/structure/table/reinforced,
+/obj/item/stock_parts/power_store/cell/high{
+ pixel_x = 4;
+ pixel_y = 5
+ },
+/obj/item/stock_parts/power_store/cell/high{
+ pixel_x = -8;
+ pixel_y = 9
+ },
+/obj/item/stock_parts/power_store/cell/high,
+/obj/machinery/cell_charger,
+/obj/item/borg/upgrade/rename{
+ pixel_x = 3;
+ pixel_y = 18
+ },
+/turf/open/floor/iron/dark/textured,
+/area/station/science/robotics/lab)
"wJy" = (
/turf/closed/wall,
/area/station/medical/storage)
@@ -65040,21 +65135,6 @@
/obj/effect/spawner/structure/window/reinforced/plasma,
/turf/open/floor/plating,
/area/station/engineering/atmos)
-"wVL" = (
-/obj/machinery/door/airlock/research{
- name = "Research Division Access"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
- cycle_id = "sci-entrance"
- },
-/obj/effect/mapping_helpers/airlock/unres{
- dir = 4
- },
-/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/mapping_helpers/airlock/access/all/science/general,
-/turf/open/floor/iron/white,
-/area/station/science/research)
"wWk" = (
/obj/effect/turf_decal/stripes{
dir = 1
@@ -65353,19 +65433,6 @@
/obj/effect/turf_decal/siding/purple/corner,
/turf/open/floor/iron/white/smooth_large,
/area/station/science/research)
-"xaC" = (
-/obj/machinery/portable_atmospherics/canister/anesthetic_mix,
-/obj/machinery/atmospherics/components/unary/portables_connector/visible{
- dir = 1
- },
-/obj/structure/window/reinforced/spawner/directional/east,
-/obj/machinery/door/window/right/directional/north{
- req_access = list("medical");
- name = "Anti Assistant Protection Door"
- },
-/obj/effect/turf_decal/tile/blue/fourcorners,
-/turf/open/floor/iron/white,
-/area/station/medical/treatment_center)
"xaH" = (
/obj/structure/filingcabinet,
/obj/machinery/button/ticket_machine{
@@ -65440,10 +65507,6 @@
/obj/structure/rack,
/turf/open/floor/plating,
/area/station/asteroid)
-"xbr" = (
-/obj/structure/window/reinforced/spawner/directional/west,
-/turf/open/floor/glass/reinforced,
-/area/station/security/prison)
"xbs" = (
/obj/machinery/airalarm/directional/south,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -66078,22 +66141,6 @@
/obj/item/tank/internals/anesthetic,
/turf/open/floor/engine,
/area/station/science/xenobiology)
-"xnc" = (
-/obj/machinery/door/airlock/command/glass{
- name = "Bridge"
- },
-/obj/effect/mapping_helpers/airlock/access/any/command/general,
-/obj/structure/cable,
-/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
- cycle_id = "bridgec"
- },
-/obj/effect/mapping_helpers/airlock/access/any/admin/general,
-/turf/open/floor/iron,
-/area/station/hallway/secondary/command)
"xne" = (
/obj/structure/cable,
/obj/effect/spawner/random/maintenance/two,
@@ -66636,16 +66683,6 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos/pumproom)
-"xxs" = (
-/obj/machinery/door/airlock/multi_tile/public{
- name = "Corporate Private Dock"
- },
-/obj/structure/cable,
-/obj/machinery/door/firedoor,
-/obj/effect/mapping_helpers/airlock/access/any/command/general,
-/obj/effect/mapping_helpers/airlock/access/any/admin/general,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/command/corporate_dock)
"xxH" = (
/obj/machinery/firealarm/directional/south,
/obj/effect/turf_decal/stripes/line{
@@ -66735,22 +66772,6 @@
},
/turf/open/floor/engine,
/area/station/command/corporate_dock)
-"xzC" = (
-/obj/item/circuitboard/machine/thermomachine,
-/obj/item/circuitboard/machine/thermomachine,
-/obj/item/storage/bag/construction,
-/obj/item/storage/bag/construction,
-/obj/item/storage/bag/construction,
-/obj/item/stock_parts/cell/high,
-/obj/item/stock_parts/cell/high,
-/obj/item/stock_parts/cell/high,
-/obj/structure/closet/crate,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/machinery/light/dim/directional/south,
-/turf/open/floor/iron/large,
-/area/station/engineering/atmos)
"xzG" = (
/obj/item/kirbyplants/random,
/turf/open/floor/iron/white,
@@ -67104,14 +67125,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/plating,
/area/station/maintenance/port/lesser)
-"xFj" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/random/structure/closet_empty/crate,
-/obj/item/stock_parts/cell,
-/obj/structure/broken_flooring,
-/obj/machinery/airalarm/directional/north,
-/turf/open/floor/plating,
-/area/station/cargo/warehouse)
"xFt" = (
/obj/structure/railing/corner{
dir = 4
@@ -67428,26 +67441,6 @@
},
/turf/open/floor/iron/dark/textured,
/area/station/medical/morgue)
-"xNb" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 8
- },
-/obj/machinery/button/door/directional/south{
- id = "capshut";
- pixel_x = -8;
- name = "shutter control"
- },
-/obj/machinery/fax{
- fax_name = "Captain's Office";
- name = "Captain's Fax Machine"
- },
-/obj/structure/table/reinforced,
-/obj/machinery/keycard_auth/directional/south{
- pixel_y = -24;
- pixel_x = 8
- },
-/turf/open/floor/carpet/royalblue,
-/area/station/command/heads_quarters/captain/private)
"xNh" = (
/obj/effect/turf_decal/stripes/corner{
dir = 4
@@ -67766,6 +67759,20 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
/area/station/cargo/storage)
+"xTN" = (
+/obj/machinery/door/airlock/multi_tile/public{
+ dir = 4
+ },
+/obj/effect/mapping_helpers/airlock/access/any/command/general,
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/unres{
+ dir = 8
+ },
+/obj/structure/cable,
+/obj/effect/mapping_helpers/airlock/autoname,
+/obj/effect/mapping_helpers/airlock/access/any/admin/general,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/command/meeting_room)
"xTP" = (
/obj/machinery/atmospherics/pipe/smart/simple/green/visible{
dir = 5
@@ -68333,13 +68340,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/plating,
/area/station/service/theater)
-"ydy" = (
-/obj/machinery/door/airlock/engineering/glass{
- name = "Primary Tool Storage"
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron,
-/area/station/commons/storage/primary)
"ydC" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/holosign/barrier,
@@ -80520,7 +80520,7 @@ uMa
sdc
sdc
hCS
-xFj
+wcl
lLk
lLk
sWd
@@ -81782,7 +81782,7 @@ eio
eio
mxq
iPw
-tBe
+tgn
vjZ
jtd
bPP
@@ -82563,7 +82563,7 @@ jch
oey
dhN
sdc
-sgR
+ezH
eQQ
vSt
umh
@@ -82604,7 +82604,7 @@ jPO
osT
dci
piH
-xaC
+hng
dKw
dKw
dKw
@@ -82861,10 +82861,10 @@ pwn
eaL
eUB
dgR
-uPg
+pjf
bui
yit
-dpf
+jEO
yit
dKw
miD
@@ -83849,11 +83849,11 @@ uDB
uDB
uDB
sdc
-fLM
+uby
soZ
jCX
jCX
-fLM
+uby
sdc
guF
uyL
@@ -84372,7 +84372,7 @@ xSE
twR
uyL
dUS
-meT
+nTb
sdc
mHU
cAQ
@@ -84386,7 +84386,7 @@ ylV
wdx
rnk
rnk
-nKa
+jnV
kxa
gwA
mcl
@@ -84877,11 +84877,11 @@ iHv
rZJ
rAK
sdc
-fLM
+uby
jCX
qzF
jCX
-fLM
+uby
sdc
dro
uyL
@@ -88997,7 +88997,7 @@ axi
bAw
cGP
ygb
-aat
+mXT
lQN
qsI
haf
@@ -91576,7 +91576,7 @@ tWs
acc
oRa
hWx
-amE
+jvU
acc
vjq
pKb
@@ -94360,11 +94360,11 @@ jpd
jRc
ruc
jcW
-xNb
+fSH
axD
eKR
sgz
-tUF
+fKp
sPv
eoo
iLG
@@ -94619,13 +94619,13 @@ aEP
axD
axD
axD
-vQf
+tAs
sgz
vlD
puT
tsP
wNa
-jSs
+vXW
jzC
mcw
aKg
@@ -94869,15 +94869,15 @@ cLf
bqX
bqX
bhY
-rcz
+mCH
eYO
mrq
eBK
bQc
-qOO
+hgE
nZB
fCY
-loC
+kbU
ejb
fZr
bUM
@@ -95910,7 +95910,7 @@ alc
jZj
nAx
kaz
-dbJ
+ubF
mMH
sPS
jww
@@ -96167,7 +96167,7 @@ cgo
wHs
odL
wHs
-xnc
+vkP
rEp
qgd
xaI
@@ -96679,7 +96679,7 @@ oOP
eKR
eKR
juw
-mtG
+mGw
juw
juw
juw
@@ -96924,7 +96924,7 @@ cLf
cLf
bqX
cQP
-vay
+tRT
eon
sZK
sZK
@@ -97182,12 +97182,12 @@ cLf
bqX
bqX
tsJ
-bCr
+nmF
kYU
jTd
rkz
lrc
-eHa
+gez
vQP
ita
hOb
@@ -98483,7 +98483,7 @@ juw
juw
juw
wxW
-oLg
+flW
dTd
npg
juw
@@ -101058,7 +101058,7 @@ lnZ
dCu
xUR
vRm
-sJV
+dLy
utM
xsv
tHF
@@ -102130,7 +102130,7 @@ nSH
oqz
kXz
oqz
-ydy
+tEB
dct
hqk
jFc
@@ -102339,7 +102339,7 @@ vfJ
vfJ
vfJ
vfJ
-lqP
+nwi
grl
pJN
iKc
@@ -102874,7 +102874,7 @@ nJF
stw
azv
dZd
-iFD
+wJo
lYm
azv
azv
@@ -103158,7 +103158,7 @@ uLY
teG
sHg
sHg
-qmD
+etE
wKY
iFq
jFc
@@ -103599,7 +103599,7 @@ cLf
vxX
dZy
fhG
-fmm
+roH
qrt
rmx
wHJ
@@ -103890,7 +103890,7 @@ ipv
tdk
hkc
swi
-vCq
+cEi
cBB
trL
nMP
@@ -104143,9 +104143,9 @@ qIQ
irJ
rBI
cPt
-ctE
+tdN
ixU
-mOc
+nhc
swi
swi
swi
@@ -104398,12 +104398,12 @@ cPt
lcj
tCz
dfr
-btY
+kKS
cPt
iQZ
oqp
dfM
-pgS
+oWw
lMT
ixU
ixU
@@ -105171,9 +105171,9 @@ hEw
irJ
cPt
cPt
-dmE
+wzW
ixU
-wVL
+hcd
ixU
ixU
ixU
@@ -105730,7 +105730,7 @@ cwk
joB
dUi
nCe
-mBX
+fgZ
xma
dUi
xma
@@ -106505,7 +106505,7 @@ gEJ
jEc
sJo
xKC
-omE
+ndC
jxd
mQk
dUi
@@ -106756,13 +106756,13 @@ qsu
kFp
csB
pAB
-ryG
+tGU
sIx
cFc
iCM
grv
dUi
-cAy
+iEL
vqI
ger
dUi
@@ -107017,7 +107017,7 @@ gTV
aGQ
kEn
jxd
-vgS
+rjP
gur
mkE
jxd
@@ -107525,7 +107525,7 @@ vIi
dpU
eyg
gTV
-vME
+hfq
gTV
eyg
wpn
@@ -110338,7 +110338,7 @@ rFZ
bND
mjR
bND
-xzC
+kaD
fTX
fTX
fTX
@@ -111918,7 +111918,7 @@ cvL
mCm
cpG
hRX
-tvW
+pBf
prc
prc
prc
@@ -150635,7 +150635,7 @@ jOV
kDb
ctL
qCU
-duB
+rvu
nvR
fDi
uEX
@@ -151403,8 +151403,8 @@ hHw
uRG
oyP
dAq
-xbr
-qFS
+maT
+pIB
wSc
jOV
vxX
@@ -151424,7 +151424,7 @@ mqA
uaT
tGw
ipc
-eQJ
+mVR
hED
vxX
vxX
@@ -161188,7 +161188,7 @@ jxE
ttt
ttt
ttt
-qhg
+cbT
ttt
wcH
fib
@@ -161442,7 +161442,7 @@ tot
pWn
ylD
rTc
-xxs
+kNM
xeF
flm
qeA
@@ -162979,7 +162979,7 @@ fIv
fIv
fIv
iEQ
-oxN
+xTN
fIv
fIv
fIv
@@ -170732,7 +170732,7 @@ vxX
vxX
vxX
gMk
-fJs
+hVb
vxX
dtQ
vxX
@@ -173072,7 +173072,7 @@ vHa
aWD
aWD
aWD
-rOz
+giX
gCT
kgb
gaI
@@ -174343,7 +174343,7 @@ kHU
kHU
kHU
ouG
-lHF
+dTV
dBp
bPH
dUi
diff --git a/_maps/shuttles/emergency_birdshot.dmm b/_maps/shuttles/emergency_birdshot.dmm
index 20ffeb679d7..cb50d42c56d 100644
--- a/_maps/shuttles/emergency_birdshot.dmm
+++ b/_maps/shuttles/emergency_birdshot.dmm
@@ -697,7 +697,7 @@
/obj/structure/window/reinforced/survival_pod/spawner/directional/north,
/obj/structure/table,
/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell,
+/obj/item/stock_parts/power_store/cell,
/turf/open/floor/glass/reinforced,
/area/shuttle/escape)
"Id" = (
diff --git a/_maps/shuttles/emergency_delta.dmm b/_maps/shuttles/emergency_delta.dmm
index 5cca48f0d8f..854f76f7a15 100644
--- a/_maps/shuttles/emergency_delta.dmm
+++ b/_maps/shuttles/emergency_delta.dmm
@@ -533,7 +533,7 @@
"bs" = (
/obj/structure/table,
/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
/obj/effect/turf_decal/bot,
/obj/machinery/camera/autoname,
/turf/open/floor/iron,
@@ -1058,7 +1058,7 @@
"Rz" = (
/obj/structure/table/reinforced,
/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/shuttle/escape)
diff --git a/_maps/shuttles/emergency_lance.dmm b/_maps/shuttles/emergency_lance.dmm
index 56aa9fb25f5..c17d1767b13 100644
--- a/_maps/shuttles/emergency_lance.dmm
+++ b/_maps/shuttles/emergency_lance.dmm
@@ -1285,7 +1285,7 @@
"Nx" = (
/obj/structure/table/reinforced,
/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
/obj/effect/turf_decal/tile/dark_blue/opposingcorners{
dir = 1
},
diff --git a/_maps/shuttles/emergency_northstar.dmm b/_maps/shuttles/emergency_northstar.dmm
index 85b807d8431..e934a65b722 100644
--- a/_maps/shuttles/emergency_northstar.dmm
+++ b/_maps/shuttles/emergency_northstar.dmm
@@ -559,7 +559,7 @@
"Wd" = (
/obj/structure/table/reinforced,
/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
/turf/open/floor/iron/smooth_large,
/area/shuttle/escape)
"Wz" = (
diff --git a/_maps/shuttles/emergency_omega.dmm b/_maps/shuttles/emergency_omega.dmm
index e3f867a6130..7a183d4ac44 100644
--- a/_maps/shuttles/emergency_omega.dmm
+++ b/_maps/shuttles/emergency_omega.dmm
@@ -337,7 +337,7 @@
"bm" = (
/obj/structure/table,
/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
/obj/structure/extinguisher_cabinet/directional/east,
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/bot,
diff --git a/_maps/shuttles/emergency_raven.dmm b/_maps/shuttles/emergency_raven.dmm
index ce552c3764b..7e393756800 100644
--- a/_maps/shuttles/emergency_raven.dmm
+++ b/_maps/shuttles/emergency_raven.dmm
@@ -1524,7 +1524,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/bot,
/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
/obj/structure/table/reinforced,
/turf/open/floor/plating,
/area/shuttle/escape)
diff --git a/_maps/shuttles/emergency_shadow.dmm b/_maps/shuttles/emergency_shadow.dmm
index 19bbf8f786e..de99a937b35 100644
--- a/_maps/shuttles/emergency_shadow.dmm
+++ b/_maps/shuttles/emergency_shadow.dmm
@@ -69,10 +69,10 @@
pixel_y = 9
},
/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high{
+/obj/item/stock_parts/power_store/cell/high{
pixel_y = 9
},
-/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
/obj/effect/turf_decal/tile/neutral/opposingcorners,
/turf/open/floor/iron/dark/smooth_large,
/area/shuttle/escape)
diff --git a/_maps/shuttles/emergency_zeta.dmm b/_maps/shuttles/emergency_zeta.dmm
index 399b40156ce..720a906a767 100644
--- a/_maps/shuttles/emergency_zeta.dmm
+++ b/_maps/shuttles/emergency_zeta.dmm
@@ -23,7 +23,7 @@
pixel_x = -10;
pixel_y = 6
},
-/obj/item/stock_parts/cell/infinite/abductor{
+/obj/item/stock_parts/power_store/cell/infinite/abductor{
pixel_x = 5
},
/turf/open/floor/plating/abductor,
diff --git a/_maps/shuttles/infiltrator_advanced.dmm b/_maps/shuttles/infiltrator_advanced.dmm
index c9123066874..9f93df25b04 100644
--- a/_maps/shuttles/infiltrator_advanced.dmm
+++ b/_maps/shuttles/infiltrator_advanced.dmm
@@ -1219,11 +1219,11 @@
pixel_x = 32
},
/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high{
+/obj/item/stock_parts/power_store/cell/high{
pixel_x = 4;
pixel_y = 4
},
-/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
/obj/item/multitool,
/turf/open/floor/pod/dark,
/area/shuttle/syndicate/armory)
diff --git a/_maps/shuttles/infiltrator_basic.dmm b/_maps/shuttles/infiltrator_basic.dmm
index 31b85a89f2c..805f9053e24 100644
--- a/_maps/shuttles/infiltrator_basic.dmm
+++ b/_maps/shuttles/infiltrator_basic.dmm
@@ -462,11 +462,11 @@
/area/shuttle/syndicate/medical)
"ce" = (
/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high{
+/obj/item/stock_parts/power_store/cell/high{
pixel_x = -3;
pixel_y = 3
},
-/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
/obj/structure/extinguisher_cabinet/directional/west,
/obj/structure/table/reinforced/plastitaniumglass,
/obj/effect/turf_decal/tile/yellow{
diff --git a/_maps/shuttles/mining_kilo.dmm b/_maps/shuttles/mining_kilo.dmm
index 3352abdf14d..f52a5c947f3 100644
--- a/_maps/shuttles/mining_kilo.dmm
+++ b/_maps/shuttles/mining_kilo.dmm
@@ -102,7 +102,7 @@
/area/shuttle/mining/large)
"p" = (
/obj/effect/decal/cleanable/dirt,
-/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
/obj/item/screwdriver{
pixel_y = 18
},
diff --git a/_maps/shuttles/mining_large.dmm b/_maps/shuttles/mining_large.dmm
index 3be1c617cfc..56cf2ef7d33 100644
--- a/_maps/shuttles/mining_large.dmm
+++ b/_maps/shuttles/mining_large.dmm
@@ -128,7 +128,7 @@
"p" = (
/obj/structure/table/reinforced,
/obj/effect/decal/cleanable/dirt,
-/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
/obj/item/screwdriver{
pixel_y = 18
},
diff --git a/_maps/shuttles/pirate_default.dmm b/_maps/shuttles/pirate_default.dmm
index 0f588e1df27..6acff639725 100644
--- a/_maps/shuttles/pirate_default.dmm
+++ b/_maps/shuttles/pirate_default.dmm
@@ -451,7 +451,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/structure/table,
/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
/turf/open/floor/pod/light,
/area/shuttle/pirate)
"bm" = (
diff --git a/_maps/shuttles/pirate_ex_interdyne.dmm b/_maps/shuttles/pirate_ex_interdyne.dmm
index 77f5ddecaab..e5e576e3d65 100644
--- a/_maps/shuttles/pirate_ex_interdyne.dmm
+++ b/_maps/shuttles/pirate_ex_interdyne.dmm
@@ -154,7 +154,7 @@
/area/shuttle/pirate)
"aD" = (
/obj/machinery/power/apc/auto_name/directional/north{
- cell_type = /obj/item/stock_parts/cell/bluespace;
+ cell_type = /obj/item/stock_parts/power_store/battery/bluespace;
start_charge = 100
},
/obj/effect/mapping_helpers/apc/cut_AI_wire,
diff --git a/_maps/shuttles/pirate_geode.dmm b/_maps/shuttles/pirate_geode.dmm
index 3a75c427794..afb582e4322 100644
--- a/_maps/shuttles/pirate_geode.dmm
+++ b/_maps/shuttles/pirate_geode.dmm
@@ -237,9 +237,9 @@
},
/obj/structure/table/wood,
/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
-/obj/item/stock_parts/cell/high,
-/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
/turf/open/floor/plating,
/area/shuttle/pirate)
"oa" = (
diff --git a/_maps/shuttles/pirate_grey.dmm b/_maps/shuttles/pirate_grey.dmm
index 522576fdf02..23bc06b5dc9 100644
--- a/_maps/shuttles/pirate_grey.dmm
+++ b/_maps/shuttles/pirate_grey.dmm
@@ -861,7 +861,7 @@
/area/shuttle/pirate)
"Bu" = (
/obj/machinery/power/apc/auto_name/directional/north{
- cell_type = /obj/item/stock_parts/cell/bluespace
+ cell_type = /obj/item/stock_parts/power_store/battery/bluespace
},
/obj/structure/reagent_dispensers/watertank,
/obj/effect/turf_decal/bot,
@@ -927,7 +927,7 @@
"De" = (
/obj/structure/table/reinforced,
/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
/obj/machinery/airalarm/directional/east,
/turf/open/floor/plating,
/area/shuttle/pirate)
diff --git a/_maps/shuttles/pirate_irs.dmm b/_maps/shuttles/pirate_irs.dmm
index c352bb02c3e..e01639a9a9f 100644
--- a/_maps/shuttles/pirate_irs.dmm
+++ b/_maps/shuttles/pirate_irs.dmm
@@ -281,7 +281,7 @@
pixel_x = -9;
pixel_y = -4
},
-/obj/item/stock_parts/cell/lead{
+/obj/item/stock_parts/power_store/cell/lead{
pixel_y = -8;
pixel_x = 2
},
diff --git a/_maps/shuttles/ruin_cyborg_mothership.dmm b/_maps/shuttles/ruin_cyborg_mothership.dmm
index cb12e49ee63..8ee4eb11a6a 100644
--- a/_maps/shuttles/ruin_cyborg_mothership.dmm
+++ b/_maps/shuttles/ruin_cyborg_mothership.dmm
@@ -59,7 +59,7 @@
pixel_y = 10
},
/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
/turf/open/floor/circuit/green/airless,
/area/shuttle/ruin/cyborg_mothership)
"eO" = (
diff --git a/_maps/shuttles/ruin_pirate_cutter.dmm b/_maps/shuttles/ruin_pirate_cutter.dmm
index 2777f06ce8c..422d5bfb2cd 100644
--- a/_maps/shuttles/ruin_pirate_cutter.dmm
+++ b/_maps/shuttles/ruin_pirate_cutter.dmm
@@ -266,7 +266,7 @@
/obj/structure/table,
/obj/machinery/cell_charger,
/obj/item/stack/cable_coil,
-/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
/obj/effect/turf_decal/bot,
/turf/open/floor/plating,
/area/shuttle/ruin/caravan/pirate)
diff --git a/_maps/shuttles/whiteship_birdshot.dmm b/_maps/shuttles/whiteship_birdshot.dmm
index b6bb7f6155b..593b84827bf 100644
--- a/_maps/shuttles/whiteship_birdshot.dmm
+++ b/_maps/shuttles/whiteship_birdshot.dmm
@@ -1033,7 +1033,7 @@
pixel_x = 4;
pixel_y = 11
},
-/obj/item/stock_parts/cell/high{
+/obj/item/stock_parts/power_store/cell/high{
pixel_x = 4;
pixel_y = 11
},
@@ -1199,7 +1199,7 @@
/obj/machinery/cell_charger{
pixel_y = 11
},
-/obj/item/stock_parts/cell/high{
+/obj/item/stock_parts/power_store/cell/high{
pixel_y = 11
},
/obj/item/stack/cable_coil{
diff --git a/_maps/shuttles/whiteship_cere.dmm b/_maps/shuttles/whiteship_cere.dmm
index 4e53e54651e..aac0c4d7ada 100644
--- a/_maps/shuttles/whiteship_cere.dmm
+++ b/_maps/shuttles/whiteship_cere.dmm
@@ -502,7 +502,7 @@
/obj/structure/table/reinforced/titaniumglass,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
/turf/open/floor/catwalk_floor/iron_dark,
/area/shuttle/abandoned/cargo)
"wN" = (
diff --git a/_maps/shuttles/whiteship_delta.dmm b/_maps/shuttles/whiteship_delta.dmm
index 53e09ce34d3..efc23023797 100644
--- a/_maps/shuttles/whiteship_delta.dmm
+++ b/_maps/shuttles/whiteship_delta.dmm
@@ -1168,7 +1168,7 @@
/obj/structure/table,
/obj/machinery/cell_charger,
/obj/item/stack/cable_coil,
-/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
/obj/item/multitool{
pixel_y = -13
},
@@ -1819,7 +1819,7 @@
pixel_x = -3;
pixel_y = 8
},
-/obj/item/stock_parts/cell/high{
+/obj/item/stock_parts/power_store/cell/high{
pixel_x = 3;
pixel_y = -1
},
diff --git a/_maps/shuttles/whiteship_donut.dmm b/_maps/shuttles/whiteship_donut.dmm
index ff9d17b5e36..eff7c2bfaad 100644
--- a/_maps/shuttles/whiteship_donut.dmm
+++ b/_maps/shuttles/whiteship_donut.dmm
@@ -55,7 +55,7 @@
/area/shuttle/abandoned)
"cm" = (
/obj/effect/decal/cleanable/dirt,
-/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
/turf/open/floor/iron/airless,
/area/shuttle/abandoned)
"da" = (
@@ -389,7 +389,7 @@
/area/shuttle/abandoned)
"NG" = (
/obj/effect/decal/cleanable/dirt,
-/obj/item/stock_parts/cell/high/empty,
+/obj/item/stock_parts/power_store/cell/high/empty,
/turf/open/floor/plating/airless,
/area/shuttle/abandoned)
"Ot" = (
diff --git a/_maps/shuttles/whiteship_kilo.dmm b/_maps/shuttles/whiteship_kilo.dmm
index cbc214f21d8..8034d78126d 100644
--- a/_maps/shuttles/whiteship_kilo.dmm
+++ b/_maps/shuttles/whiteship_kilo.dmm
@@ -570,7 +570,7 @@
/obj/machinery/cell_charger,
/obj/structure/table,
/obj/effect/decal/cleanable/dirt,
-/obj/item/stock_parts/cell/emproof/empty{
+/obj/item/stock_parts/power_store/cell/emproof/empty{
pixel_y = 7;
pixel_x = 5
},
diff --git a/_maps/shuttles/whiteship_meta.dmm b/_maps/shuttles/whiteship_meta.dmm
index c01d6742975..9939b4b55ff 100644
--- a/_maps/shuttles/whiteship_meta.dmm
+++ b/_maps/shuttles/whiteship_meta.dmm
@@ -792,7 +792,7 @@
pixel_x = 2;
pixel_y = 6
},
-/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
/turf/open/floor/iron/dark,
/area/shuttle/abandoned/engine)
"cy" = (
@@ -836,7 +836,7 @@
/obj/machinery/light/small/built/directional/west,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
/obj/item/radio/off{
pixel_x = 6;
pixel_y = 7
@@ -1000,7 +1000,7 @@
/obj/structure/table,
/obj/machinery/cell_charger,
/obj/item/stack/cable_coil,
-/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
/obj/item/multitool,
/obj/structure/cable,
/turf/open/floor/plating,
@@ -1933,7 +1933,7 @@
/obj/item/stack/cable_coil{
pixel_x = 2
},
-/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/shuttle/abandoned/cargo)
diff --git a/_maps/shuttles/whiteship_pubby.dmm b/_maps/shuttles/whiteship_pubby.dmm
index 807d1385899..56f85fcd802 100644
--- a/_maps/shuttles/whiteship_pubby.dmm
+++ b/_maps/shuttles/whiteship_pubby.dmm
@@ -406,7 +406,7 @@
"qS" = (
/obj/structure/table,
/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
/obj/effect/turf_decal/bot_white,
/obj/effect/turf_decal/siding/purple{
dir = 9
diff --git a/_maps/shuttles/whiteship_tram.dmm b/_maps/shuttles/whiteship_tram.dmm
index 0dfa8b414bd..84f438accfd 100644
--- a/_maps/shuttles/whiteship_tram.dmm
+++ b/_maps/shuttles/whiteship_tram.dmm
@@ -500,7 +500,7 @@
/obj/structure/cable,
/obj/structure/table,
/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
/obj/item/multitool{
pixel_x = 7;
pixel_y = 5
diff --git a/_maps/templates/battlecruiser_starfury.dmm b/_maps/templates/battlecruiser_starfury.dmm
index 001a937e97b..ca9ff385887 100644
--- a/_maps/templates/battlecruiser_starfury.dmm
+++ b/_maps/templates/battlecruiser_starfury.dmm
@@ -648,7 +648,7 @@
"cy" = (
/obj/structure/table,
/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
/obj/effect/turf_decal/siding/thinplating_new/dark,
/obj/effect/turf_decal/stripes/red/line,
/turf/open/floor/mineral/plastitanium/red,
@@ -1735,7 +1735,7 @@
"gN" = (
/obj/structure/table,
/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
/obj/structure/cable,
/obj/effect/turf_decal/siding/thinplating_new/dark{
dir = 8
@@ -3279,7 +3279,7 @@
"lg" = (
/obj/structure/table/reinforced,
/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/power_store/cell/high,
/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
dir = 8
},
@@ -5090,8 +5090,8 @@
/area/shuttle/sbc_starfury)
"MQ" = (
/obj/structure/closet/crate,
-/obj/item/stock_parts/cell/high,
-/obj/item/stock_parts/cell/high{
+/obj/item/stock_parts/power_store/cell/high,
+/obj/item/stock_parts/power_store/cell/high{
pixel_x = -3;
pixel_y = -3
},
diff --git a/_maps/virtual_domains/abductor_ship.dmm b/_maps/virtual_domains/abductor_ship.dmm
index ebb4a042bb9..35bf563eb45 100644
--- a/_maps/virtual_domains/abductor_ship.dmm
+++ b/_maps/virtual_domains/abductor_ship.dmm
@@ -153,7 +153,7 @@
"sv" = (
/obj/structure/table/abductor,
/obj/item/crowbar/abductor,
-/obj/item/stock_parts/cell/infinite/abductor{
+/obj/item/stock_parts/power_store/cell/infinite/abductor{
pixel_x = 5;
pixel_y = -3
},
diff --git a/code/__DEFINES/modular_computer.dm b/code/__DEFINES/modular_computer.dm
index a8e5c38ffc6..9659e7e0d7a 100644
--- a/code/__DEFINES/modular_computer.dm
+++ b/code/__DEFINES/modular_computer.dm
@@ -41,7 +41,7 @@
#define PROGRAM_CATEGORY_SCIENCE "Science"
///The default amount a program should take in cell use.
-#define PROGRAM_BASIC_CELL_USE 15
+#define PROGRAM_BASIC_CELL_USE 2 WATTS
///This app grants a minor protection against being PDA bombed if installed.
///(can sometimes prevent it from being sent, while wasting a PDA bomb from the sender).
diff --git a/code/__DEFINES/power.dm b/code/__DEFINES/power.dm
index f22d756d375..2476906d913 100644
--- a/code/__DEFINES/power.dm
+++ b/code/__DEFINES/power.dm
@@ -20,11 +20,18 @@
#define JOULES * JOULE
///The capacity of a standard power cell
-#define STANDARD_CELL_VALUE (1 MEGA)
+#define STANDARD_CELL_VALUE (10 KILO)
///The amount of energy, in joules, a standard powercell has.
- #define STANDARD_CELL_CHARGE (STANDARD_CELL_VALUE JOULES) // 1 MJ.
+ #define STANDARD_CELL_CHARGE (STANDARD_CELL_VALUE JOULES) // 10 KJ.
///The amount of power, in watts, a standard powercell can give.
- #define STANDARD_CELL_RATE (STANDARD_CELL_VALUE WATTS) // 1 MW.
+ #define STANDARD_CELL_RATE (STANDARD_CELL_VALUE WATTS) // 10 KW.
+
+/// Capacity of a standard battery
+#define STANDARD_BATTERY_VALUE (STANDARD_CELL_VALUE * 100)
+ /// The amount of energy, in joules, a standard battery has.
+ #define STANDARD_BATTERY_CHARGE (STANDARD_BATTERY_VALUE JOULES) // 1 MJ
+ /// The amount of energy, in watts, a standard battery can give.
+ #define STANDARD_BATTERY_RATE (STANDARD_BATTERY_VALUE WATTS) // 1 MW
// Converts cable layer to its human readable name
GLOBAL_LIST_INIT(cable_layer_to_name, list(
diff --git a/code/__DEFINES/robots.dm b/code/__DEFINES/robots.dm
index 4ec8e1294c3..bcca92e6060 100644
--- a/code/__DEFINES/robots.dm
+++ b/code/__DEFINES/robots.dm
@@ -35,9 +35,9 @@
/// Special value to reset cyborg's lamp_cooldown
#define BORG_LAMP_CD_RESET -1
/// How many watts per lamp power is consumed while the lamp is on.
-#define BORG_LAMP_POWER_CONSUMPTION (1000 WATTS)
+#define BORG_LAMP_POWER_CONSUMPTION (5 WATTS)
/// The minimum power consumption of a cyborg.
-#define BORG_MINIMUM_POWER_CONSUMPTION (500 WATTS)
+#define BORG_MINIMUM_POWER_CONSUMPTION (1 WATTS)
//Module slot define
///The third module slots is disabed.
diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm
index 36f96bcc563..76c69425bf5 100644
--- a/code/_globalvars/lists/maintenance_loot.dm
+++ b/code/_globalvars/lists/maintenance_loot.dm
@@ -111,7 +111,7 @@ GLOBAL_LIST_INIT(common_loot, list( //common: basic items
/obj/item/stack/rods/twentyfive = 1,
/obj/item/stack/sheet/iron/twenty = 1,
/obj/item/stack/sheet/mineral/plasma = 1,
- /obj/item/stock_parts/cell = 1,
+ /obj/item/stock_parts/power_store/cell = 1,
//assemblies
/obj/item/assembly/health = 1,
@@ -133,7 +133,7 @@ GLOBAL_LIST_INIT(common_loot, list( //common: basic items
/obj/item/reagent_containers/cup/rag = 1,
/obj/item/reagent_containers/hypospray/medipen/pumpup = 2,
/obj/item/reagent_containers/syringe = 1,
- /obj/item/stock_parts/cell/lead = 1,
+ /obj/item/stock_parts/power_store/cell/lead = 1,
/obj/item/storage/box/matches = 1,
/obj/item/storage/fancy/cigarettes/dromedaryco = 1,
) = 1,
@@ -205,7 +205,7 @@ GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items
/obj/item/seeds/kronkus = 1,
/obj/item/seeds/odious_puffball = 1,
/obj/item/stack/sheet/mineral/wood/fifty = 1,
- /obj/item/stock_parts/cell/high = 1,
+ /obj/item/stock_parts/power_store/cell/high = 1,
/obj/item/storage/box/clown = 1,
/obj/item/weaponcrafting/receiver = 1,
/obj/item/book/granter/crafting_recipe/death_sandwich = 1,
diff --git a/code/datums/components/crafting/chemistry.dm b/code/datums/components/crafting/chemistry.dm
index fc4d833be3f..70d6c76dea2 100644
--- a/code/datums/components/crafting/chemistry.dm
+++ b/code/datums/components/crafting/chemistry.dm
@@ -150,7 +150,7 @@
category = CAT_CHEMISTRY
/datum/crafting_recipe/improvised_chem_heater/on_craft_completion(mob/user, atom/result)
- var/obj/item/stock_parts/cell/cell = locate(/obj/item/stock_parts/cell) in range(1)
+ var/obj/item/stock_parts/power_store/cell/cell = locate(/obj/item/stock_parts/power_store/cell) in range(1)
if(!cell)
return
var/obj/machinery/space_heater/improvised_chem_heater/heater = result
diff --git a/code/datums/components/crafting/equipment.dm b/code/datums/components/crafting/equipment.dm
index 7e7b7aca26f..bd2b8b1d8b6 100644
--- a/code/datums/components/crafting/equipment.dm
+++ b/code/datums/components/crafting/equipment.dm
@@ -58,12 +58,12 @@
/obj/item/stack/rods = 8,
/obj/item/stock_parts/servo = 2,
/obj/item/stock_parts/capacitor = 1,
- /obj/item/stock_parts/cell = 1,
+ /obj/item/stock_parts/power_store/cell = 1,
)
parts = list(
/obj/item/stock_parts/servo = 2,
/obj/item/stock_parts/capacitor = 1,
- /obj/item/stock_parts/cell = 1,
+ /obj/item/stock_parts/power_store/cell = 1,
)
tool_behaviors = list(TOOL_WELDER, TOOL_SCREWDRIVER, TOOL_WRENCH)
time = 20 SECONDS
diff --git a/code/datums/components/crafting/ranged_weapon.dm b/code/datums/components/crafting/ranged_weapon.dm
index 666e84964c5..c49900df07a 100644
--- a/code/datums/components/crafting/ranged_weapon.dm
+++ b/code/datums/components/crafting/ranged_weapon.dm
@@ -354,7 +354,7 @@
/obj/item/stack/cable_coil = 5,
/obj/item/pipe = 1,
/obj/item/stock_parts/micro_laser = 1,
- /obj/item/stock_parts/cell = 1,
+ /obj/item/stock_parts/power_store/cell = 1,
/obj/item/assembly/mousetrap = 1,
)
tool_behaviors = list(TOOL_SCREWDRIVER, TOOL_WRENCH)
@@ -367,7 +367,7 @@
reqs = list(
/obj/item/gun/energy/disabler/smoothbore = 1,
/obj/item/stack/sheet/mineral/gold = 5,
- /obj/item/stock_parts/cell/hyper = 1,
+ /obj/item/stock_parts/power_store/cell/hyper = 1,
/datum/reagent/reaction_agent/speed_agent = 10,
)
tool_behaviors = list(TOOL_SCREWDRIVER)
diff --git a/code/datums/components/crank_recharge.dm b/code/datums/components/crank_recharge.dm
index 10449a337e1..1f2272a8deb 100644
--- a/code/datums/components/crank_recharge.dm
+++ b/code/datums/components/crank_recharge.dm
@@ -1,7 +1,7 @@
// Cranking feature on the laser musket and smoothbore disabler, could probably be used on more than guns
/datum/component/crank_recharge
/// Our cell to charge
- var/obj/item/stock_parts/cell/charging_cell
+ var/obj/item/stock_parts/power_store/charging_cell
/// Whether we spin our gun to reload (and therefore need the relevant trait)
var/spin_to_win = FALSE
/// How much charge we give our cell on each crank
@@ -20,7 +20,7 @@
. = ..()
if(!isitem(parent))
return COMPONENT_INCOMPATIBLE
- if(isnull(charging_cell) || !istype(charging_cell, /obj/item/stock_parts/cell))
+ if(isnull(charging_cell) || !istype(charging_cell, /obj/item/stock_parts/power_store))
return COMPONENT_INCOMPATIBLE
src.charging_cell = charging_cell
src.spin_to_win = spin_to_win
diff --git a/code/datums/components/shell.dm b/code/datums/components/shell.dm
index 20fbeb73927..2e9ee73c32a 100644
--- a/code/datums/components/shell.dm
+++ b/code/datums/components/shell.dm
@@ -137,7 +137,7 @@
examine_text += span_notice("There is an integrated circuit attached. Use a multitool to access the wiring. Use a screwdriver to remove it from [source].")
examine_text += span_notice("The cover panel to the integrated circuit is [locked? "locked" : "unlocked"].")
- var/obj/item/stock_parts/cell/cell = attached_circuit.cell
+ var/obj/item/stock_parts/power_store/cell = attached_circuit.cell
examine_text += span_notice("The charge meter reads [cell ? round(cell.percent(), 1) : 0]%.")
if (shell_flags & SHELL_FLAG_USB_PORT)
@@ -167,7 +167,7 @@
if(!is_authorized(attacker))
return
- if(istype(item, /obj/item/stock_parts/cell))
+ if(istype(item, /obj/item/stock_parts/power_store/cell))
source.balloon_alert(attacker, "can't put cell in directly!")
return
diff --git a/code/datums/quirks/neutral_quirks/transhumanist.dm b/code/datums/quirks/neutral_quirks/transhumanist.dm
index 046c2bb30f0..a898a2d2020 100644
--- a/code/datums/quirks/neutral_quirks/transhumanist.dm
+++ b/code/datums/quirks/neutral_quirks/transhumanist.dm
@@ -23,7 +23,7 @@
lose_text = span_danger("Robots don't seem all that great anymore.")
medical_record_text = "Patient reports hating pathetic creatures of meat and bone."
mail_goodies = list(
- /obj/item/stock_parts/cell/potato,
+ /obj/item/stock_parts/power_store/cell/potato,
/obj/item/stack/cable_coil,
/obj/item/toy/talking/ai,
/obj/item/toy/figure/borg,
diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm
index 4b513a22036..a8ae65ef24c 100644
--- a/code/game/machinery/_machinery.dm
+++ b/code/game/machinery/_machinery.dm
@@ -1014,8 +1014,8 @@
if(!istype(secondary_part, required_type))
continue
// If it's a corrupt or rigged cell, attempting to send it through Bluespace could have unforeseen consequences.
- if(istype(secondary_part, /obj/item/stock_parts/cell) && replacer_tool.works_from_distance)
- var/obj/item/stock_parts/cell/checked_cell = secondary_part
+ if(istype(secondary_part, /obj/item/stock_parts/power_store/cell) && replacer_tool.works_from_distance)
+ var/obj/item/stock_parts/power_store/cell/checked_cell = secondary_part
// If it's rigged or corrupted, max the charge. Then explode it.
if(checked_cell.rigged || checked_cell.corrupted)
checked_cell.charge = checked_cell.maxcharge
diff --git a/code/game/machinery/cell_charger.dm b/code/game/machinery/cell_charger.dm
index 27812f53dba..83075d69326 100644
--- a/code/game/machinery/cell_charger.dm
+++ b/code/game/machinery/cell_charger.dm
@@ -6,7 +6,7 @@
power_channel = AREA_USAGE_EQUIP
circuit = /obj/item/circuitboard/machine/cell_charger
pass_flags = PASSTABLE
- var/obj/item/stock_parts/cell/charging = null
+ var/obj/item/stock_parts/power_store/cell/charging = null
var/charge_rate = 0.25 * STANDARD_CELL_RATE
/obj/machinery/cell_charger/update_overlays()
@@ -42,7 +42,7 @@
return ITEM_INTERACT_SUCCESS
/obj/machinery/cell_charger/attackby(obj/item/W, mob/user, params)
- if(istype(W, /obj/item/stock_parts/cell) && !panel_open)
+ if(istype(W, /obj/item/stock_parts/power_store/cell) && !panel_open)
if(machine_stat & BROKEN)
to_chat(user, span_warning("[src] is broken!"))
return
diff --git a/code/game/machinery/defibrillator_mount.dm b/code/game/machinery/defibrillator_mount.dm
index 785357e3b5b..47729c5c0cb 100644
--- a/code/game/machinery/defibrillator_mount.dm
+++ b/code/game/machinery/defibrillator_mount.dm
@@ -57,7 +57,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/defibrillator_mount, 28)
var/mutable_appearance/defib_overlay = mutable_appearance(icon, "defib", layer = layer+0.01, offset_spokesman = src)
if(defib.powered)
- var/obj/item/stock_parts/cell/cell = defib.cell
+ var/obj/item/stock_parts/power_store/cell = defib.cell
var/mutable_appearance/safety = mutable_appearance(icon, defib.safety ? "online" : "emagged", offset_spokesman = src)
var/mutable_appearance/charge_overlay = mutable_appearance(icon, "charge[CEILING((cell.charge / cell.maxcharge) * 4, 1) * 25]", offset_spokesman = src)
@@ -194,7 +194,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/defibrillator_mount, 28)
/obj/machinery/defibrillator_mount/charging/process(seconds_per_tick)
- var/obj/item/stock_parts/cell/cell = get_cell()
+ var/obj/item/stock_parts/power_store/cell = get_cell()
if(!cell || !is_operational)
return PROCESS_KILL
if(cell.charge < cell.maxcharge)
diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm
index f310c1afd3e..7454f185511 100644
--- a/code/game/machinery/recharger.dm
+++ b/code/game/machinery/recharger.dm
@@ -47,7 +47,7 @@
if(!status_display_message_shown)
. += span_notice("The status display reads:")
- var/obj/item/stock_parts/cell/charging_cell = charging.get_cell()
+ var/obj/item/stock_parts/power_store/charging_cell = charging.get_cell()
if(charging_cell)
. += span_notice("- \The [charging]'s cell is at [charging_cell.percent()]%.")
return
@@ -143,7 +143,7 @@
using_power = FALSE
if(isnull(charging))
return PROCESS_KILL
- var/obj/item/stock_parts/cell/charging_cell = charging.get_cell()
+ var/obj/item/stock_parts/power_store/charging_cell = charging.get_cell()
if(charging_cell)
if(charging_cell.charge < charging_cell.maxcharge)
charge_cell(charging_cell.chargerate * recharge_coeff * seconds_per_tick, charging_cell)
diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm
index 4e16a1946c7..45610b47e7a 100644
--- a/code/game/machinery/rechargestation.dm
+++ b/code/game/machinery/rechargestation.dm
@@ -54,10 +54,10 @@
* Mobs & borgs invoke this through a callback to recharge their cells
* Arguments
*
- * * obj/item/stock_parts/cell/target - the cell to charge, optional if provided else will draw power used directly
+ * * obj/item/stock_parts/power_store/cell/target - the cell to charge, optional if provided else will draw power used directly
* * seconds_per_tick - supplied from process()
*/
-/obj/machinery/recharge_station/proc/charge_target_cell(obj/item/stock_parts/cell/target, seconds_per_tick)
+/obj/machinery/recharge_station/proc/charge_target_cell(obj/item/stock_parts/power_store/cell/target, seconds_per_tick)
PRIVATE_PROC(TRUE)
//charge the cell, account for heat loss from work done
@@ -75,7 +75,7 @@
recharge_speed += 5e-3 * capacitor.tier
for(var/datum/stock_part/servo/servo in component_parts)
repairs += servo.tier - 1
- for(var/obj/item/stock_parts/cell/cell in component_parts)
+ for(var/obj/item/stock_parts/power_store/cell in component_parts)
recharge_speed *= cell.maxcharge
/obj/machinery/recharge_station/examine(mob/user)
diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm
index 3e83890d755..2d6c5339de4 100644
--- a/code/game/machinery/spaceheater.dm
+++ b/code/game/machinery/spaceheater.dm
@@ -20,7 +20,7 @@
//We don't use area power, we always use the cell
use_power = NO_POWER_USE
///The cell we spawn with
- var/obj/item/stock_parts/cell/cell = /obj/item/stock_parts/cell
+ var/obj/item/stock_parts/power_store/cell = /obj/item/stock_parts/power_store/cell
///Is the machine on?
var/on = FALSE
///What is the mode we are in now?
@@ -208,7 +208,7 @@
if(default_deconstruction_crowbar(I))
return TRUE
- if(istype(I, /obj/item/stock_parts/cell))
+ if(istype(I, /obj/item/stock_parts/power_store/cell))
if(!panel_open)
to_chat(user, span_warning("The hatch must be open to insert a power cell!"))
return
@@ -389,7 +389,7 @@
add_fingerprint(user)
if(default_deconstruction_crowbar(item))
return
- if(istype(item, /obj/item/stock_parts/cell))
+ if(istype(item, /obj/item/stock_parts/power_store/cell))
if(cell)
to_chat(user, span_warning("There is already a power cell inside!"))
return
diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm
index 0b61b81bc11..6b04b2c6f34 100644
--- a/code/game/machinery/suit_storage_unit.dm
+++ b/code/game/machinery/suit_storage_unit.dm
@@ -553,7 +553,7 @@
/obj/machinery/suit_storage_unit/process(seconds_per_tick)
var/list/cells_to_charge = list()
for(var/obj/item/charging in list(mod, suit, helmet, mask, storage))
- var/obj/item/stock_parts/cell/cell_charging = charging.get_cell()
+ var/obj/item/stock_parts/power_store/cell_charging = charging.get_cell()
if(!istype(cell_charging) || cell_charging.charge == cell_charging.maxcharge)
continue
@@ -564,7 +564,7 @@
return
var/charge_per_item = (final_charge_rate * seconds_per_tick) / cell_count
- for(var/obj/item/stock_parts/cell/cell as anything in cells_to_charge)
+ for(var/obj/item/stock_parts/power_store/cell as anything in cells_to_charge)
charge_cell(charge_per_item, cell, grid_only = TRUE)
/obj/machinery/suit_storage_unit/proc/shock(mob/user, prb)
diff --git a/code/game/machinery/transformer.dm b/code/game/machinery/transformer.dm
index ecb7ef941aa..238994004de 100644
--- a/code/game/machinery/transformer.dm
+++ b/code/game/machinery/transformer.dm
@@ -101,7 +101,7 @@
use_energy(active_power_usage) // Use a lot of power.
var/mob/living/silicon/robot/new_borg = victim.Robotize()
- new_borg.cell = new /obj/item/stock_parts/cell/upgraded/plus(new_borg, robot_cell_charge)
+ new_borg.cell = new /obj/item/stock_parts/power_store/cell/upgraded/plus(new_borg, robot_cell_charge)
// So he can't jump out the gate right away.
new_borg.SetLockdown()
diff --git a/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm
index 5eb1acdf029..a36fa9d2c37 100644
--- a/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm
+++ b/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm
@@ -340,9 +340,9 @@
build_path = /obj/machinery/power/smes
req_components = list(
/obj/item/stack/cable_coil = 5,
- /obj/item/stock_parts/cell = 5,
+ /obj/item/stock_parts/power_store/battery = 5,
/datum/stock_part/capacitor = 1)
- def_components = list(/obj/item/stock_parts/cell = /obj/item/stock_parts/cell/high/empty)
+ def_components = list(/obj/item/stock_parts/power_store/battery = /obj/item/stock_parts/power_store/battery/high/empty)
/obj/item/circuitboard/machine/techfab/department/engineering
name = "\improper Departmental Techfab - Engineering"
@@ -350,7 +350,7 @@
build_path = /obj/machinery/rnd/production/techfab/department/engineering
/obj/item/circuitboard/machine/smes/super
- def_components = list(/obj/item/stock_parts/cell = /obj/item/stock_parts/cell/super/empty)
+ def_components = list(/obj/item/stock_parts/power_store/battery = /obj/item/stock_parts/power_store/battery/super/empty)
/obj/item/circuitboard/machine/thermomachine
name = "Thermomachine"
@@ -750,8 +750,8 @@
/datum/stock_part/capacitor = 1,
/datum/stock_part/servo = 1,
/obj/item/stack/sheet/glass = 1,
- /obj/item/stock_parts/cell = 1)
- def_components = list(/obj/item/stock_parts/cell = /obj/item/stock_parts/cell/high)
+ /obj/item/stock_parts/power_store/cell = 1)
+ def_components = list(/obj/item/stock_parts/power_store/cell = /obj/item/stock_parts/power_store/cell/high)
needs_anchored = FALSE
/obj/item/circuitboard/machine/chem_dispenser/fullupgrade
@@ -762,7 +762,7 @@
/datum/stock_part/capacitor/tier4 = 2,
/datum/stock_part/servo/tier4 = 2,
/obj/item/stack/sheet/glass = 1,
- /obj/item/stock_parts/cell/bluespace = 1,
+ /obj/item/stock_parts/power_store/cell/bluespace = 1,
)
/obj/item/circuitboard/machine/chem_dispenser/mutagensaltpeter
@@ -773,7 +773,7 @@
/datum/stock_part/capacitor/tier4 = 2,
/datum/stock_part/servo/tier4 = 2,
/obj/item/stack/sheet/glass = 1,
- /obj/item/stock_parts/cell/bluespace = 1,
+ /obj/item/stock_parts/power_store/cell/bluespace = 1,
)
/obj/item/circuitboard/machine/chem_dispenser/abductor
@@ -787,7 +787,7 @@
/datum/stock_part/capacitor/tier4 = 2,
/datum/stock_part/servo/tier4 = 2,
/obj/item/stack/sheet/glass = 1,
- /obj/item/stock_parts/cell/bluespace = 1,
+ /obj/item/stock_parts/power_store/cell/bluespace = 1,
)
needs_anchored = FALSE
@@ -967,9 +967,9 @@
build_path = /obj/machinery/recharge_station
req_components = list(
/datum/stock_part/capacitor = 2,
- /obj/item/stock_parts/cell = 1,
+ /obj/item/stock_parts/power_store/cell = 1,
/datum/stock_part/servo = 1)
- def_components = list(/obj/item/stock_parts/cell = /obj/item/stock_parts/cell/high)
+ def_components = list(/obj/item/stock_parts/power_store/cell = /obj/item/stock_parts/power_store/cell/high)
/obj/item/circuitboard/machine/destructive_analyzer
name = "Destructive Analyzer"
@@ -1166,7 +1166,7 @@
/datum/stock_part/capacitor/tier4 = 2,
/datum/stock_part/servo/tier4 = 2,
/obj/item/stack/sheet/glass = 1,
- /obj/item/stock_parts/cell/bluespace = 1,
+ /obj/item/stock_parts/power_store/cell/bluespace = 1,
)
/obj/item/circuitboard/machine/chem_dispenser/drinks/beer
@@ -1181,7 +1181,7 @@
/datum/stock_part/capacitor/tier4 = 2,
/datum/stock_part/servo/tier4 = 2,
/obj/item/stack/sheet/glass = 1,
- /obj/item/stock_parts/cell/bluespace = 1,
+ /obj/item/stock_parts/power_store/cell/bluespace = 1,
)
/obj/item/circuitboard/machine/chem_master/condi
@@ -1454,7 +1454,7 @@
req_components = list(
/datum/stock_part/capacitor = 1,
/datum/stock_part/micro_laser = 1,
- /obj/item/stock_parts/cell/infinite/abductor = 1)
+ /obj/item/stock_parts/power_store/cell/infinite/abductor = 1)
def_components = list(
/datum/stock_part/capacitor = /datum/stock_part/capacitor/tier4,
/datum/stock_part/micro_laser = /datum/stock_part/micro_laser/tier4)
diff --git a/code/game/objects/items/defib.dm b/code/game/objects/items/defib.dm
index cbac185f675..871892558b9 100644
--- a/code/game/objects/items/defib.dm
+++ b/code/game/objects/items/defib.dm
@@ -28,7 +28,7 @@
/// If the cell can be removed via screwdriver
var/cell_removable = TRUE
var/obj/item/shockpaddles/paddles
- var/obj/item/stock_parts/cell/cell
+ var/obj/item/stock_parts/power_store/cell
/// If true, revive through space suits, allow for combat shocking
var/combat = FALSE
/// How long does it take to recharge
@@ -111,7 +111,7 @@
/obj/item/defibrillator/CheckParts(list/parts_list)
..()
- cell = locate(/obj/item/stock_parts/cell) in contents
+ cell = locate(/obj/item/stock_parts/power_store) in contents
update_power()
/obj/item/defibrillator/ui_action_click()
@@ -158,8 +158,8 @@
/obj/item/defibrillator/attackby(obj/item/W, mob/user, params)
if(W == paddles)
toggle_paddles()
- else if(istype(W, /obj/item/stock_parts/cell))
- var/obj/item/stock_parts/cell/C = W
+ else if(istype(W, /obj/item/stock_parts/power_store/cell))
+ var/obj/item/stock_parts/power_store/cell/C = W
if(cell)
to_chat(user, span_warning("[src] already has a cell!"))
else
@@ -311,7 +311,7 @@
/obj/item/defibrillator/compact/combat/loaded/Initialize(mapload)
. = ..()
- cell = new /obj/item/stock_parts/cell/infinite(src)
+ cell = new /obj/item/stock_parts/power_store/cell/infinite(src)
update_power()
/obj/item/defibrillator/compact/combat/loaded/attackby(obj/item/W, mob/user, params)
diff --git a/code/game/objects/items/inducer.dm b/code/game/objects/items/inducer.dm
index 086b965e1ac..ea312fc0df8 100644
--- a/code/game/objects/items/inducer.dm
+++ b/code/game/objects/items/inducer.dm
@@ -1,16 +1,17 @@
/obj/item/inducer
name = "inducer"
- desc = "A tool for inductively charging internal power cells."
+ desc = "A tool for inductively charging internal power cells and batteries."
icon = 'icons/obj/tools.dmi'
icon_state = "inducer-engi"
inhand_icon_state = "inducer-engi"
lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
force = 7
- var/powertransfer = STANDARD_CELL_CHARGE
+ /// Multiplier that determines the speed at which this inducer works at.
+ var/power_transfer_multiplier = 1
var/opened = FALSE
- var/cell_type = /obj/item/stock_parts/cell/high
- var/obj/item/stock_parts/cell/cell
+ var/cell_type = /obj/item/stock_parts/power_store/battery/high
+ var/obj/item/stock_parts/power_store/cell
var/recharging = FALSE
/obj/item/inducer/Initialize(mapload)
@@ -18,9 +19,10 @@
if(!cell && cell_type)
cell = new cell_type
-/obj/item/inducer/proc/induce(obj/item/stock_parts/cell/target, coefficient)
- var/obj/item/stock_parts/cell/our_cell = get_cell()
- var/totransfer = min(our_cell.charge, (powertransfer * coefficient))
+/obj/item/inducer/proc/induce(obj/item/stock_parts/power_store/target, coefficient)
+ var/obj/item/stock_parts/power_store/our_cell = get_cell()
+ var/rating_base = target.rating_base
+ var/totransfer = min(our_cell.charge, (rating_base * coefficient * power_transfer_multiplier))
var/transferred = target.give(totransfer)
our_cell.use(transferred)
@@ -32,7 +34,7 @@
/obj/item/inducer/emp_act(severity)
. = ..()
- var/obj/item/stock_parts/cell/our_cell = get_cell()
+ var/obj/item/stock_parts/power_store/our_cell = get_cell()
if(!isnull(our_cell) && !(. & EMP_PROTECT_CONTENTS))
our_cell.emp_act(severity)
@@ -53,7 +55,7 @@
to_chat(user, span_warning("You don't have the dexterity to use [src]!"))
return TRUE
- var/obj/item/stock_parts/cell/our_cell = get_cell()
+ var/obj/item/stock_parts/power_store/our_cell = get_cell()
if(isnull(our_cell))
balloon_alert(user, "no cell installed!")
@@ -79,9 +81,9 @@
return
/obj/item/inducer/attackby(obj/item/used_item, mob/user)
- if(istype(used_item, /obj/item/stock_parts/cell))
+ if(istype(used_item, /obj/item/stock_parts/power_store/cell))
if(opened)
- var/obj/item/stock_parts/cell/our_cell = get_cell()
+ var/obj/item/stock_parts/power_store/our_cell = get_cell()
if(isnull(our_cell))
if(!user.transferItemToLoc(used_item, src))
return
@@ -108,8 +110,8 @@
return TRUE
recharging = TRUE
- var/obj/item/stock_parts/cell/our_cell = get_cell()
- var/obj/item/stock_parts/cell/target_cell = target.get_cell()
+ var/obj/item/stock_parts/power_store/our_cell = get_cell()
+ var/obj/item/stock_parts/power_store/target_cell = target.get_cell()
var/obj/target_as_object = target
var/coefficient = 1
@@ -166,7 +168,7 @@
/obj/item/inducer/examine(mob/living/user)
. = ..()
- var/obj/item/stock_parts/cell/our_cell = get_cell()
+ var/obj/item/stock_parts/power_store/our_cell = get_cell()
if(!isnull(our_cell))
. += span_notice("Its display shows: [display_energy(our_cell.charge)].")
else
@@ -185,7 +187,7 @@
opened = TRUE
/obj/item/inducer/orderable
- cell_type = /obj/item/stock_parts/cell/inducer_supply
+ cell_type = /obj/item/stock_parts/power_store/cell/inducer_supply
opened = FALSE
/obj/item/inducer/sci
@@ -203,5 +205,5 @@
icon_state = "inducer-syndi"
inhand_icon_state = "inducer-syndi"
desc = "A tool for inductively charging internal power cells. This one has a suspicious colour scheme, and seems to be rigged to transfer charge at a much faster rate."
- powertransfer = 2 * STANDARD_CELL_CHARGE
- cell_type = /obj/item/stock_parts/cell/super
+ power_transfer_multiplier = 2 // 2x the base speed
+ cell_type = /obj/item/stock_parts/power_store/cell/super
diff --git a/code/game/objects/items/inspector.dm b/code/game/objects/items/inspector.dm
index fec567071fc..82a36336c42 100644
--- a/code/game/objects/items/inspector.dm
+++ b/code/game/objects/items/inspector.dm
@@ -27,7 +27,7 @@
///determines the sound that plays when printing a report
var/print_sound_mode = INSPECTOR_PRINT_SOUND_MODE_NORMAL
///Power cell used to power the scanner. Paths g
- var/obj/item/stock_parts/cell/cell = /obj/item/stock_parts/cell/crap
+ var/obj/item/stock_parts/power_store/cell = /obj/item/stock_parts/power_store/cell/crap
///Cell cover status
var/cell_cover_open = FALSE
///Energy used per print.
@@ -62,7 +62,7 @@
return TRUE
/obj/item/inspector/attackby(obj/item/I, mob/user, params)
- if(cell_cover_open && istype(I, /obj/item/stock_parts/cell))
+ if(cell_cover_open && istype(I, /obj/item/stock_parts/power_store/cell))
if(cell)
to_chat(user, span_warning("[src] already has a cell installed."))
return
diff --git a/code/game/objects/items/maintenance_loot.dm b/code/game/objects/items/maintenance_loot.dm
index e667aca6007..51a27250996 100644
--- a/code/game/objects/items/maintenance_loot.dm
+++ b/code/game/objects/items/maintenance_loot.dm
@@ -23,14 +23,14 @@
//A good battery early in the shift. Source of lead & sulfuric acid reagents.
//Add lead material to this once implemented.
-/obj/item/stock_parts/cell/lead
+/obj/item/stock_parts/power_store/cell/lead
name = "lead-acid battery"
desc = "A primitive battery. It is quite large and feels unexpectedly heavy."
icon = 'icons/obj/maintenance_loot.dmi'
icon_state = "lead_battery"
throwforce = 10
- maxcharge = STANDARD_CELL_CHARGE * 20 //decent max charge
- chargerate = STANDARD_CELL_RATE * 0.7 //charging is about 30% less efficient than lithium batteries.
+ maxcharge = STANDARD_BATTERY_VALUE //decent max charge
+ chargerate = STANDARD_BATTERY_RATE * 0.3 //charging is about 70% less efficient than lithium batteries.
charge_light_type = null
connector_type = "leadacid"
rating = 2 //Kind of a mid-tier battery
@@ -38,7 +38,7 @@
grind_results = list(/datum/reagent/lead = 15, /datum/reagent/toxin/acid = 15, /datum/reagent/water = 20)
//starts partially discharged
-/obj/item/stock_parts/cell/lead/Initialize(mapload)
+/obj/item/stock_parts/power_store/cell/lead/Initialize(mapload)
AddElement(/datum/element/update_icon_blocker)
. = ..()
var/initial_percent = rand(20, 80) / 100
diff --git a/code/game/objects/items/melee/baton.dm b/code/game/objects/items/melee/baton.dm
index 112c527ec28..eca126fc6ae 100644
--- a/code/game/objects/items/melee/baton.dm
+++ b/code/game/objects/items/melee/baton.dm
@@ -435,7 +435,7 @@
var/throw_stun_chance = 35
- var/obj/item/stock_parts/cell/cell
+ var/obj/item/stock_parts/power_store/cell
var/preload_cell_type //if not empty the baton starts with this type of cell
var/cell_hit_cost = STANDARD_CELL_CHARGE
var/can_remove_cell = TRUE
@@ -449,7 +449,7 @@
/obj/item/melee/baton/security/Initialize(mapload)
. = ..()
if(preload_cell_type)
- if(!ispath(preload_cell_type, /obj/item/stock_parts/cell))
+ if(!ispath(preload_cell_type, /obj/item/stock_parts/power_store/cell))
log_mapping("[src] at [AREACOORD(src)] had an invalid preload_cell_type: [preload_cell_type].")
else
cell = new preload_cell_type(src)
@@ -528,8 +528,8 @@
return TRUE
/obj/item/melee/baton/security/attackby(obj/item/item, mob/user, params)
- if(istype(item, /obj/item/stock_parts/cell))
- var/obj/item/stock_parts/cell/active_cell = item
+ if(istype(item, /obj/item/stock_parts/power_store/cell))
+ var/obj/item/stock_parts/power_store/cell/active_cell = item
if(cell)
to_chat(user, span_warning("[src] already has a cell!"))
else
@@ -678,7 +678,7 @@
update_appearance()
/obj/item/melee/baton/security/loaded //this one starts with a cell pre-installed.
- preload_cell_type = /obj/item/stock_parts/cell/high
+ preload_cell_type = /obj/item/stock_parts/power_store/cell/high
//Makeshift stun baton. Replacement for stun gloves.
/obj/item/melee/baton/security/cattleprod
@@ -776,7 +776,7 @@
finalize_baton_attack(hit_atom, thrown_by, in_attack_chain = FALSE)
/obj/item/melee/baton/security/boomerang/loaded //Same as above, comes with a cell.
- preload_cell_type = /obj/item/stock_parts/cell/high
+ preload_cell_type = /obj/item/stock_parts/power_store/cell/high
/obj/item/melee/baton/security/cattleprod/teleprod
name = "teleprod"
diff --git a/code/game/objects/items/melee/energy.dm b/code/game/objects/items/melee/energy.dm
index 440b2b74037..228f359729c 100644
--- a/code/game/objects/items/melee/energy.dm
+++ b/code/game/objects/items/melee/energy.dm
@@ -210,7 +210,7 @@
if(!user.cell)
return
- var/obj/item/stock_parts/cell/our_cell = user.cell
+ var/obj/item/stock_parts/power_store/our_cell = user.cell
if(HAS_TRAIT(src, TRAIT_TRANSFORM_ACTIVE) && !(our_cell.use(hitcost)))
attack_self(user)
to_chat(user, span_notice("It's out of charge!"))
diff --git a/code/game/objects/items/robot/items/generic.dm b/code/game/objects/items/robot/items/generic.dm
index c3338ecc91c..a98d13770b7 100644
--- a/code/game/objects/items/robot/items/generic.dm
+++ b/code/game/objects/items/robot/items/generic.dm
@@ -220,7 +220,7 @@
/// Whitelist of charging machines
var/static/list/charge_machines = typecacheof(list(/obj/machinery/cell_charger, /obj/machinery/recharger, /obj/machinery/recharge_station, /obj/machinery/mech_bay_recharge_port))
/// Whitelist of chargable items
- var/static/list/charge_items = typecacheof(list(/obj/item/stock_parts/cell, /obj/item/gun/energy))
+ var/static/list/charge_items = typecacheof(list(/obj/item/stock_parts/power_store, /obj/item/gun/energy))
/obj/item/borg/charger/update_icon_state()
icon_state = "charger_[mode]"
@@ -259,9 +259,9 @@
to_chat(user, span_notice("You stop charging yourself."))
else if(is_type_in_list(target, charge_items))
- var/obj/item/stock_parts/cell/cell = target
+ var/obj/item/stock_parts/power_store/cell = target
if(!istype(cell))
- cell = locate(/obj/item/stock_parts/cell) in target
+ cell = locate(/obj/item/stock_parts/power_store) in target
if(!cell)
to_chat(user, span_warning("[target] has no power cell!"))
return
@@ -298,9 +298,9 @@
to_chat(user, span_notice("You stop charging yourself."))
else if(is_type_in_list(target, charge_items))
- var/obj/item/stock_parts/cell/cell = target
+ var/obj/item/stock_parts/power_store/cell = target
if(!istype(cell))
- cell = locate(/obj/item/stock_parts/cell) in target
+ cell = locate(/obj/item/stock_parts/power_store) in target
if(!cell)
to_chat(user, span_warning("[target] has no power cell!"))
return
diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm
index d74c9f98dd3..25c83d1b963 100644
--- a/code/game/objects/items/robot/robot_parts.dm
+++ b/code/game/objects/items/robot/robot_parts.dm
@@ -76,7 +76,7 @@
head.flash2 = new(head)
chest = new(src)
chest.wired = TRUE
- chest.cell = new /obj/item/stock_parts/cell/high(chest)
+ chest.cell = new /obj/item/stock_parts/power_store/cell/high(chest)
update_appearance()
/obj/item/robot_suit/update_overlays()
@@ -145,7 +145,7 @@
to_chat(user, span_warning("[src] has no attached torso!"))
return
- var/obj/item/stock_parts/cell/temp_cell = user.is_holding_item_of_type(/obj/item/stock_parts/cell)
+ var/obj/item/stock_parts/power_store/cell/temp_cell = user.is_holding_item_of_type(/obj/item/stock_parts/power_store/cell)
var/swap_failed = FALSE
if(!temp_cell) //if we're not holding a cell
swap_failed = TRUE
diff --git a/code/game/objects/structures/crates_lockers/closets/gimmick.dm b/code/game/objects/structures/crates_lockers/closets/gimmick.dm
index fecacd678c7..f2171b2e8b1 100644
--- a/code/game/objects/structures/crates_lockers/closets/gimmick.dm
+++ b/code/game/objects/structures/crates_lockers/closets/gimmick.dm
@@ -113,7 +113,7 @@
new /obj/item/clothing/head/helmet/space/nasavoid(src)
new /obj/item/clothing/suit/space/nasavoid(src)
new /obj/item/crowbar(src)
- new /obj/item/stock_parts/cell(src)
+ new /obj/item/stock_parts/power_store/cell(src)
new /obj/item/multitool(src)
/obj/structure/closet/mini_fridge
diff --git a/code/modules/admin/verbs/borgpanel.dm b/code/modules/admin/verbs/borgpanel.dm
index f0f2fc4a8f0..ffeb1cce273 100644
--- a/code/modules/admin/verbs/borgpanel.dm
+++ b/code/modules/admin/verbs/borgpanel.dm
@@ -81,7 +81,7 @@ ADMIN_VERB(borg_panel, R_ADMIN, "Show Borg Panel", ADMIN_VERB_NO_DESCRIPTION, AD
message_admins("[key_name_admin(user)] deleted the cell of [ADMIN_LOOKUPFLW(borg)].")
log_silicon("[key_name(user)] deleted the cell of [key_name(borg)].")
if ("change_cell")
- var/chosen = pick_closest_path(null, make_types_fancy(typesof(/obj/item/stock_parts/cell)))
+ var/chosen = pick_closest_path(null, make_types_fancy(typesof(/obj/item/stock_parts/power_store/cell)))
if (!ispath(chosen))
chosen = text2path(chosen)
if (chosen)
diff --git a/code/modules/antagonists/ninja/ninjaDrainAct.dm b/code/modules/antagonists/ninja/ninjaDrainAct.dm
index 0aaf5dbbfcf..f160ebb9c62 100644
--- a/code/modules/antagonists/ninja/ninjaDrainAct.dm
+++ b/code/modules/antagonists/ninja/ninjaDrainAct.dm
@@ -85,13 +85,13 @@
hacking_module.charge_message(src, drain_total)
//CELL//
-/obj/item/stock_parts/cell/ninjadrain_act(mob/living/carbon/human/ninja, obj/item/mod/module/hacker/hacking_module)
+/obj/item/stock_parts/power_store/cell/ninjadrain_act(mob/living/carbon/human/ninja, obj/item/mod/module/hacker/hacking_module)
if(!ninja || !hacking_module)
return NONE
INVOKE_ASYNC(src, PROC_REF(ninjadrain_charge), ninja, hacking_module)
return COMPONENT_CANCEL_ATTACK_CHAIN
-/obj/item/stock_parts/cell/proc/ninjadrain_charge(mob/living/carbon/human/ninja, obj/item/mod/module/hacker/hacking_module)
+/obj/item/stock_parts/power_store/cell/proc/ninjadrain_charge(mob/living/carbon/human/ninja, obj/item/mod/module/hacker/hacking_module)
var/drain_total = 0
if(charge && !do_after(ninja, 3 SECONDS, target = src, hidden = TRUE))
drain_total = charge
diff --git a/code/modules/atmospherics/machinery/components/electrolyzer/electrolyzer.dm b/code/modules/atmospherics/machinery/components/electrolyzer/electrolyzer.dm
index 2da9ac752b5..4a811c3435c 100644
--- a/code/modules/atmospherics/machinery/components/electrolyzer/electrolyzer.dm
+++ b/code/modules/atmospherics/machinery/components/electrolyzer/electrolyzer.dm
@@ -15,7 +15,7 @@
/// We don't use area power, we always use the cell
use_power = NO_POWER_USE
///used to check if there is a cell in the machine
- var/obj/item/stock_parts/cell/cell
+ var/obj/item/stock_parts/power_store/cell
///check if the machine is on or off
var/on = FALSE
///check what mode the machine should be (WORKING, STANDBY)
@@ -170,7 +170,7 @@
/obj/machinery/electrolyzer/attackby(obj/item/I, mob/user, params)
add_fingerprint(user)
- if(istype(I, /obj/item/stock_parts/cell))
+ if(istype(I, /obj/item/stock_parts/power_store/cell))
if(!panel_open)
balloon_alert(user, "open panel!")
return
diff --git a/code/modules/atmospherics/machinery/components/fusion/hfr_procs.dm b/code/modules/atmospherics/machinery/components/fusion/hfr_procs.dm
index 71e5a8bcc5f..9f2f6a96f4b 100644
--- a/code/modules/atmospherics/machinery/components/fusion/hfr_procs.dm
+++ b/code/modules/atmospherics/machinery/components/fusion/hfr_procs.dm
@@ -330,7 +330,7 @@
var/obj/machinery/power/apc/apc = area.apc
if (!apc)
return 0
- var/obj/item/stock_parts/cell/cell = apc.cell
+ var/obj/item/stock_parts/power_store/cell = apc.cell
if (!cell)
return 0
return cell.percent()
diff --git a/code/modules/atmospherics/machinery/components/gas_recipe_machines/atmos_machines_recipes.dm b/code/modules/atmospherics/machinery/components/gas_recipe_machines/atmos_machines_recipes.dm
index 184d7680c91..13c872199dc 100644
--- a/code/modules/atmospherics/machinery/components/gas_recipe_machines/atmos_machines_recipes.dm
+++ b/code/modules/atmospherics/machinery/components/gas_recipe_machines/atmos_machines_recipes.dm
@@ -134,7 +134,7 @@ GLOBAL_LIST_INIT(gas_recipe_meta, gas_recipes_list())
max_temp = 90
energy_release = -800000
requirements = list(/datum/gas/plasma = 800, /datum/gas/helium = 100, /datum/gas/bz = 50)
- products = list(/obj/item/stock_parts/cell/crystal_cell = 1)
+ products = list(/obj/item/stock_parts/power_store/cell/crystal_cell = 1)
/datum/gas_recipe/crystallizer/zaukerite
id = "zaukerite"
diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm
index 5d2d5f6f1f9..0b1e7c2768a 100644
--- a/code/modules/atmospherics/machinery/portable/canister.dm
+++ b/code/modules/atmospherics/machinery/portable/canister.dm
@@ -35,7 +35,7 @@
///Is shielding turned on/off
var/shielding_powered = FALSE
///The powercell used to enable shielding
- var/obj/item/stock_parts/cell/internal_cell
+ var/obj/item/stock_parts/power_store/internal_cell
///used while processing to update appearance only when its pressure state changes
var/current_pressure_state
@@ -52,7 +52,7 @@
. = ..()
if(mapload)
- internal_cell = new /obj/item/stock_parts/cell/high(src)
+ internal_cell = new /obj/item/stock_parts/power_store/cell/high(src)
if(existing_mixture)
air_contents.copy_from(existing_mixture)
@@ -85,7 +85,7 @@
context[SCREENTIP_CONTEXT_ALT_LMB] = "Remove tank"
if(!held_item)
return CONTEXTUAL_SCREENTIP_SET
- if(istype(held_item, /obj/item/stock_parts/cell))
+ if(istype(held_item, /obj/item/stock_parts/power_store/cell))
context[SCREENTIP_CONTEXT_LMB] = "Insert cell"
switch(held_item.tool_behaviour)
if(TOOL_SCREWDRIVER)
@@ -367,8 +367,8 @@
internal_cell.forceMove(drop_location())
/obj/machinery/portable_atmospherics/canister/attackby(obj/item/item, mob/user, params)
- if(istype(item, /obj/item/stock_parts/cell))
- var/obj/item/stock_parts/cell/active_cell = item
+ if(istype(item, /obj/item/stock_parts/power_store/cell))
+ var/obj/item/stock_parts/power_store/cell/active_cell = item
if(!panel_open)
balloon_alert(user, "open hatch first!")
return TRUE
diff --git a/code/modules/autowiki/pages/stockparts.dm b/code/modules/autowiki/pages/stockparts.dm
index fd92ecfaef4..7d2b68b236b 100644
--- a/code/modules/autowiki/pages/stockparts.dm
+++ b/code/modules/autowiki/pages/stockparts.dm
@@ -3,11 +3,16 @@
page = "Template:Autowiki/Content/StockParts"
var/list/battery_whitelist = list(
- /obj/item/stock_parts/cell,
- /obj/item/stock_parts/cell/high,
- /obj/item/stock_parts/cell/super,
- /obj/item/stock_parts/cell/hyper,
- /obj/item/stock_parts/cell/bluespace,
+ /obj/item/stock_parts/power_store/cell,
+ /obj/item/stock_parts/power_store/cell/high,
+ /obj/item/stock_parts/power_store/cell/super,
+ /obj/item/stock_parts/power_store/cell/hyper,
+ /obj/item/stock_parts/power_store/cell/bluespace,
+ /obj/item/stock_parts/power_store/battery,
+ /obj/item/stock_parts/power_store/battery/high,
+ /obj/item/stock_parts/power_store/battery/super,
+ /obj/item/stock_parts/power_store/battery/hyper,
+ /obj/item/stock_parts/power_store/battery/bluespace,
)
/datum/autowiki/stock_parts/generate()
@@ -18,7 +23,7 @@
if(initial(type_to_check.abstract_type) == part_type)
continue
- if(!battery_whitelist.Find(part_type) && ispath(part_type, /obj/item/stock_parts/cell))
+ if(!battery_whitelist.Find(part_type) && ispath(part_type, /obj/item/stock_parts/power_store))
continue
var/obj/item/stock_parts/stock_part = new part_type()
diff --git a/code/modules/cargo/exports/xenobio.dm b/code/modules/cargo/exports/xenobio.dm
index fdd8d38aa4f..4b83e97567e 100644
--- a/code/modules/cargo/exports/xenobio.dm
+++ b/code/modules/cargo/exports/xenobio.dm
@@ -23,12 +23,12 @@
/datum/export/slime/charged
cost = CARGO_CRATE_VALUE
unit_name = "\improper EMP-proof slime core"
- export_types = list(/obj/item/stock_parts/cell/emproof/slime)
+ export_types = list(/obj/item/stock_parts/power_store/cell/emproof/slime)
/datum/export/slime/hypercharged
cost = CARGO_CRATE_VALUE * 1.2
unit_name = "hypercharged slime core"
- export_types = list(/obj/item/stock_parts/cell/high/slime_hypercharged)
+ export_types = list(/obj/item/stock_parts/power_store/cell/high/slime_hypercharged)
/datum/export/slime/epic //EPIIIIIIC
cost = CARGO_CRATE_VALUE * 0.44
diff --git a/code/modules/cargo/packs/engineering.dm b/code/modules/cargo/packs/engineering.dm
index 98e1162b5f6..771cba47df6 100644
--- a/code/modules/cargo/packs/engineering.dm
+++ b/code/modules/cargo/packs/engineering.dm
@@ -92,7 +92,7 @@
name = "Power Cell Crate"
desc = "Looking for power overwhelming? Look no further. Contains three high-voltage power cells."
cost = CARGO_CRATE_VALUE * 3
- contains = list(/obj/item/stock_parts/cell/high = 3)
+ contains = list(/obj/item/stock_parts/power_store/cell/high = 3)
crate_name = "power cell crate"
crate_type = /obj/structure/closet/crate/engineering/electrical
diff --git a/code/modules/clothing/spacesuits/_spacesuits.dm b/code/modules/clothing/spacesuits/_spacesuits.dm
index a30156abe1f..703000a1f91 100644
--- a/code/modules/clothing/spacesuits/_spacesuits.dm
+++ b/code/modules/clothing/spacesuits/_spacesuits.dm
@@ -62,7 +62,7 @@
/// The default temperature setting
var/temperature_setting = BODYTEMP_NORMAL
/// If this is a path, this gets created as an object in Initialize.
- var/obj/item/stock_parts/cell/cell = /obj/item/stock_parts/cell/high
+ var/obj/item/stock_parts/power_store/cell = /obj/item/stock_parts/power_store/cell/high
/// Status of the cell cover on the suit
var/cell_cover_open = FALSE
/// Status of the thermal regulator
@@ -185,7 +185,7 @@
// object handling for accessing features of the suit
/obj/item/clothing/suit/space/attackby(obj/item/I, mob/user, params)
- if(!cell_cover_open || !istype(I, /obj/item/stock_parts/cell))
+ if(!cell_cover_open || !istype(I, /obj/item/stock_parts/power_store/cell))
return ..()
if(cell)
to_chat(user, span_warning("[src] already has a cell installed."))
diff --git a/code/modules/clothing/spacesuits/bountyhunter.dm b/code/modules/clothing/spacesuits/bountyhunter.dm
index 9218deb5633..cb8498dac14 100644
--- a/code/modules/clothing/spacesuits/bountyhunter.dm
+++ b/code/modules/clothing/spacesuits/bountyhunter.dm
@@ -7,7 +7,7 @@
armor_type = /datum/armor/space_hunter
strip_delay = 130
resistance_flags = FIRE_PROOF | ACID_PROOF
- cell = /obj/item/stock_parts/cell/hyper
+ cell = /obj/item/stock_parts/power_store/cell/hyper
/datum/armor/space_hunter
melee = 60
diff --git a/code/modules/clothing/spacesuits/syndi.dm b/code/modules/clothing/spacesuits/syndi.dm
index cbacf064052..67702582ff8 100644
--- a/code/modules/clothing/spacesuits/syndi.dm
+++ b/code/modules/clothing/spacesuits/syndi.dm
@@ -40,7 +40,7 @@ GLOBAL_LIST_INIT(syndicate_space_suits_to_helmets,list(
w_class = WEIGHT_CLASS_NORMAL
allowed = list(/obj/item/gun, /obj/item/melee/baton, /obj/item/melee/energy/sword/saber, /obj/item/restraints/handcuffs, /obj/item/tank/internals)
armor_type = /datum/armor/space_syndicate
- cell = /obj/item/stock_parts/cell/hyper
+ cell = /obj/item/stock_parts/power_store/cell/hyper
var/helmet_type = /obj/item/clothing/head/helmet/space/syndicate
//Green syndicate space suit
diff --git a/code/modules/deathmatch/deathmatch_loadouts.dm b/code/modules/deathmatch/deathmatch_loadouts.dm
index 9e86bf9befb..b4c6af04304 100644
--- a/code/modules/deathmatch/deathmatch_loadouts.dm
+++ b/code/modules/deathmatch/deathmatch_loadouts.dm
@@ -653,7 +653,7 @@
shoes = /obj/item/clothing/shoes/sneakers/black
gloves = /obj/item/clothing/gloves/cut
l_pocket = /obj/item/reagent_containers/hypospray/medipen/methamphetamine
- r_pocket = /obj/item/stock_parts/cell/high
+ r_pocket = /obj/item/stock_parts/power_store/cell/high
belt = /obj/item/storage/belt/utility/full
/datum/outfit/deathmatch_loadout/abductor
diff --git a/code/modules/experisci/experiment/experiments.dm b/code/modules/experisci/experiment/experiments.dm
index 7a7c073b75a..a025d90b44f 100644
--- a/code/modules/experisci/experiment/experiments.dm
+++ b/code/modules/experisci/experiment/experiments.dm
@@ -305,7 +305,7 @@
/obj/machinery/chem_dispenser/drinks/beer = 1,
/obj/machinery/power/smes = 2
)
- required_stock_part = /obj/item/stock_parts/cell/hyper
+ required_stock_part = /obj/item/stock_parts/power_store/cell/hyper
/datum/experiment/scanning/points/machinery_pinpoint_scan/tier3_microlaser
name = "Ultra-high-power Micro-lasers Calibration"
diff --git a/code/modules/explorer_drone/exploration_events/trader.dm b/code/modules/explorer_drone/exploration_events/trader.dm
index 626411cb935..b686a53582d 100644
--- a/code/modules/explorer_drone/exploration_events/trader.dm
+++ b/code/modules/explorer_drone/exploration_events/trader.dm
@@ -61,7 +61,7 @@
required_site_traits = list(EXPLORATION_SITE_TECHNOLOGY)
band_values = list(EXOSCANNER_BAND_TECH=2)
requires_translator = FALSE
- required_path = /obj/item/stock_parts/cell/high
+ required_path = /obj/item/stock_parts/power_store/cell/high
traded_path = /obj/item/storage/pill_bottle/happy
amount = 3
@@ -80,7 +80,7 @@
deep_scan_description = "You spot a giant \"FRESH FISH\" sign on site."
required_site_traits = list(EXPLORATION_SITE_HABITABLE,EXPLORATION_SITE_SURFACE)
band_values = list(EXOSCANNER_BAND_LIFE=2)
- required_path = /obj/item/stock_parts/cell/high
+ required_path = /obj/item/stock_parts/power_store/cell/high
traded_path = /obj/item/storage/fish_case/random
amount = 3
diff --git a/code/modules/explorer_drone/loot.dm b/code/modules/explorer_drone/loot.dm
index b616f4dbf99..b6aaa26c6c6 100644
--- a/code/modules/explorer_drone/loot.dm
+++ b/code/modules/explorer_drone/loot.dm
@@ -152,11 +152,11 @@ GLOBAL_LIST_INIT(adventure_loot_generator_index,generate_generator_index())
lefthand_file = 'icons/mob/inhands/items/firelance_lefthand.dmi'
var/windup_time = 10 SECONDS
var/melt_range = 3
- var/obj/item/stock_parts/cell/cell
+ var/obj/item/stock_parts/power_store/cell
/obj/item/firelance/Initialize(mapload)
. = ..()
- cell = new /obj/item/stock_parts/cell(src)
+ cell = new /obj/item/stock_parts/power_store/cell(src)
AddComponent(/datum/component/two_handed)
/obj/item/firelance/attack(mob/living/M, mob/living/user, params)
diff --git a/code/modules/fishing/fish/fish_types.dm b/code/modules/fishing/fish/fish_types.dm
index 27d43ea7dd2..f61cb43b224 100644
--- a/code/modules/fishing/fish/fish_types.dm
+++ b/code/modules/fishing/fish/fish_types.dm
@@ -316,7 +316,7 @@
random_case_rarity = FISH_RARITY_GOOD_LUCK_FINDING_THIS
required_temperature_min = MIN_AQUARIUM_TEMP+10
required_temperature_max = MIN_AQUARIUM_TEMP+30
- favorite_bait = list(/obj/item/stock_parts/cell/lead)
+ favorite_bait = list(/obj/item/stock_parts/power_store/cell/lead)
fish_traits = list(
/datum/fish_trait/parthenogenesis,
/datum/fish_trait/mixotroph,
@@ -651,7 +651,7 @@
average_size = 30
average_weight = 500
random_case_rarity = FISH_RARITY_VERY_RARE
- favorite_bait = list(/obj/item/stock_parts/cell/lead)
+ favorite_bait = list(/obj/item/stock_parts/power_store/cell/lead)
required_temperature_min = MIN_AQUARIUM_TEMP+18
required_temperature_max = MIN_AQUARIUM_TEMP+26
fish_traits = list(
diff --git a/code/modules/fishing/fishing_rod.dm b/code/modules/fishing/fishing_rod.dm
index b748a5215b6..6ee02d6d9de 100644
--- a/code/modules/fishing/fishing_rod.dm
+++ b/code/modules/fishing/fishing_rod.dm
@@ -277,7 +277,7 @@
if(istype(bait, /obj/item/food/bait))
var/obj/item/food/bait/real_bait = bait
bait_state = real_bait.rod_overlay_icon_state
- if(istype(bait, /obj/item/stock_parts/cell/lead))
+ if(istype(bait, /obj/item/stock_parts/power_store/cell/lead))
bait_state = "battery_overlay"
. += bait_state
diff --git a/code/modules/food_and_drinks/machinery/microwave.dm b/code/modules/food_and_drinks/machinery/microwave.dm
index 0cb98677234..b3233386f97 100644
--- a/code/modules/food_and_drinks/machinery/microwave.dm
+++ b/code/modules/food_and_drinks/machinery/microwave.dm
@@ -53,9 +53,9 @@
/// If we use a cell instead of powernet
var/cell_powered = FALSE
/// The cell we charge with
- var/obj/item/stock_parts/cell/cell
+ var/obj/item/stock_parts/power_store/cell
/// The cell we're charging
- var/obj/item/stock_parts/cell/vampire_cell
+ var/obj/item/stock_parts/power_store/vampire_cell
/// Capable of vampire charging PDAs
var/vampire_charging_capable = FALSE
/// Charge contents of microwave instead of cook
@@ -123,7 +123,7 @@
if(cell_powered)
if(!isnull(cell))
context[SCREENTIP_CONTEXT_CTRL_LMB] = "Remove cell"
- else if(held_item && istype(held_item, /obj/item/stock_parts/cell))
+ else if(held_item && istype(held_item, /obj/item/stock_parts/power_store/cell))
context[SCREENTIP_CONTEXT_CTRL_LMB] = "Insert cell"
if(held_item?.tool_behaviour == TOOL_WRENCH)
@@ -385,7 +385,7 @@
return TRUE
return ..()
- if(istype(item, /obj/item/stock_parts/cell) && cell_powered)
+ if(istype(item, /obj/item/stock_parts/power_store/cell) && cell_powered)
var/swapped = FALSE
if(!isnull(cell))
cell.forceMove(drop_location())
@@ -903,12 +903,12 @@
/obj/machinery/microwave/engineering/Initialize(mapload)
. = ..()
if(mapload)
- cell = new /obj/item/stock_parts/cell/upgraded/plus
+ cell = new /obj/item/stock_parts/power_store/cell/upgraded/plus
update_appearance()
/obj/machinery/microwave/engineering/cell_included/Initialize(mapload)
. = ..()
- cell = new /obj/item/stock_parts/cell/upgraded/plus
+ cell = new /obj/item/stock_parts/power_store/cell/upgraded/plus
update_appearance()
#undef MICROWAVE_NORMAL
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm
index 67d1ca54c00..cc27a6f078b 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm
@@ -113,7 +113,7 @@
/obj/item/food/flatdough = 1,
/datum/reagent/consumable/milk = 1,
/datum/reagent/consumable/cherryjelly = 5,
- /obj/item/stock_parts/cell/super =1,
+ /obj/item/stock_parts/power_store/cell/super =1,
/obj/item/melee/sabre = 1
)
result = /obj/item/food/powercrepe
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pie.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pie.dm
index c0c99bbe652..a215ecdd750 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pie.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pie.dm
@@ -241,7 +241,7 @@
/datum/crafting_recipe/food/bacid_pie
reqs = list(
/obj/item/food/pie/plain = 1,
- /obj/item/stock_parts/cell = 2,
+ /obj/item/stock_parts/power_store/cell = 2,
)
result = /obj/item/food/pie/bacid_pie
category = CAT_PIE
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm
index fd7ec330163..f67071a86f5 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm
@@ -104,7 +104,7 @@
/datum/crafting_recipe/food/energypizza
reqs = list(
/obj/item/food/flatdough = 1,
- /obj/item/stock_parts/cell = 2,
+ /obj/item/stock_parts/power_store/cell = 2,
)
result = /obj/item/food/pizza/energy/raw
category = CAT_PIZZA
diff --git a/code/modules/hydroponics/plant_genes.dm b/code/modules/hydroponics/plant_genes.dm
index b273cfb6d58..c5861140e4e 100644
--- a/code/modules/hydroponics/plant_genes.dm
+++ b/code/modules/hydroponics/plant_genes.dm
@@ -330,7 +330,7 @@
to_chat(eater, span_notice("You feel energized as you bite into [our_plant]."))
var/batteries_recharged = FALSE
var/obj/item/seeds/our_seed = our_plant.get_plant_seed()
- for(var/obj/item/stock_parts/cell/found_cell in eater.get_all_contents())
+ for(var/obj/item/stock_parts/power_store/found_cell in eater.get_all_contents())
var/newcharge = min(our_seed.potency * 0.01 * found_cell.maxcharge, found_cell.maxcharge)
if(found_cell.charge < newcharge)
found_cell.charge = newcharge
@@ -586,7 +586,7 @@
return
to_chat(user, span_notice("You add some cable to [our_plant] and slide it inside the battery encasing."))
- var/obj/item/stock_parts/cell/potato/pocell = new /obj/item/stock_parts/cell/potato(user.loc)
+ var/obj/item/stock_parts/power_store/cell/potato/pocell = new /obj/item/stock_parts/power_store/cell/potato(user.loc)
pocell.icon = our_plant.icon // Just in case the plant icons get spread out in different files eventually, this trait won't cause error sprites (also yay downstreams)
pocell.icon_state = our_plant.icon_state
pocell.maxcharge = our_seed.potency * 0.02 * STANDARD_CELL_CHARGE
diff --git a/code/modules/mob/living/basic/bots/_bots.dm b/code/modules/mob/living/basic/bots/_bots.dm
index 85cfdccf35f..22ab4532269 100644
--- a/code/modules/mob/living/basic/bots/_bots.dm
+++ b/code/modules/mob/living/basic/bots/_bots.dm
@@ -517,8 +517,8 @@ GLOBAL_LIST_INIT(command_strings, list(
item_to_drop = drop_item
item_to_drop.forceMove(dropzone)
- if(istype(item_to_drop, /obj/item/stock_parts/cell))
- var/obj/item/stock_parts/cell/dropped_cell = item_to_drop
+ if(istype(item_to_drop, /obj/item/stock_parts/power_store/cell))
+ var/obj/item/stock_parts/power_store/cell/dropped_cell = item_to_drop
dropped_cell.charge = 0
dropped_cell.update_appearance()
return
diff --git a/code/modules/mob/living/basic/festivus_pole.dm b/code/modules/mob/living/basic/festivus_pole.dm
index 838674c0811..1c1a88dd31f 100644
--- a/code/modules/mob/living/basic/festivus_pole.dm
+++ b/code/modules/mob/living/basic/festivus_pole.dm
@@ -68,8 +68,8 @@
return
visible_message(span_warning("[src] crackles with static electricity!"))
for(var/atom/affected in range(2, get_turf(src)))
- if(istype(affected, /obj/item/stock_parts/cell))
- var/obj/item/stock_parts/cell/cell = affected
+ if(istype(affected, /obj/item/stock_parts/power_store/cell))
+ var/obj/item/stock_parts/power_store/cell/cell = affected
cell.give(FESTIVUS_RECHARGE_VALUE)
cell.update_appearance()
if(istype(affected, /mob/living/silicon/robot))
@@ -112,7 +112,7 @@
var/obj/machinery/power/apc/apc_target = dinner
if(!apc_target.cell)
return FALSE
- var/obj/item/stock_parts/cell/apc_cell = apc_target.cell
+ var/obj/item/stock_parts/power_store/cell/apc_cell = apc_target.cell
if(apc_cell.charge == apc_cell.maxcharge) //if its full charge we no longer feed it
return FALSE
diff --git a/code/modules/mob/living/silicon/robot/robot_defense.dm b/code/modules/mob/living/silicon/robot/robot_defense.dm
index 70e7d8b34ab..2346c36ba5c 100644
--- a/code/modules/mob/living/silicon/robot/robot_defense.dm
+++ b/code/modules/mob/living/silicon/robot/robot_defense.dm
@@ -22,7 +22,7 @@ GLOBAL_LIST_INIT(blacklisted_borg_hats, typecacheof(list( //Hats that don't real
to_chat(user, span_warning("The wires seem fine, there's no need to fix them."))
return
- if(istype(W, /obj/item/stock_parts/cell) && opened) // trying to put a cell inside
+ if(istype(W, /obj/item/stock_parts/power_store/cell) && opened) // trying to put a cell inside
if(wiresexposed)
to_chat(user, span_warning("Close the cover first!"))
else if(cell)
diff --git a/code/modules/mob/living/silicon/robot/robot_defines.dm b/code/modules/mob/living/silicon/robot/robot_defines.dm
index 0701584476c..48995a1582e 100644
--- a/code/modules/mob/living/silicon/robot/robot_defines.dm
+++ b/code/modules/mob/living/silicon/robot/robot_defines.dm
@@ -40,7 +40,7 @@
///Used for deconstruction to remember what the borg was constructed out of.
var/obj/item/robot_suit/robot_suit = null
///If this is a path, this gets created as an object in Initialize.
- var/obj/item/stock_parts/cell/cell = /obj/item/stock_parts/cell/high
+ var/obj/item/stock_parts/power_store/cell = /obj/item/stock_parts/power_store/cell/high
///If the lamp isn't broken.
var/lamp_functional = TRUE
@@ -202,7 +202,7 @@
Your cyborg LMG will slowly produce ammunition from your power supply, and your operative pinpointer will find and locate fellow nuclear operatives. \
Help the operatives secure the disk at all costs!"
set_model = /obj/item/robot_model/syndicate
- cell = /obj/item/stock_parts/cell/hyper
+ cell = /obj/item/stock_parts/power_store/cell/hyper
radio = /obj/item/radio/borg/syndicate
/mob/living/silicon/robot/model/syndicate/Initialize(mapload)
diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm
index c7507b677dc..48d83da80a9 100644
--- a/code/modules/mob/living/simple_animal/bot/bot.dm
+++ b/code/modules/mob/living/simple_animal/bot/bot.dm
@@ -555,8 +555,8 @@
item_to_drop = drop_item
item_to_drop.forceMove(dropzone)
- if(istype(item_to_drop, /obj/item/stock_parts/cell))
- var/obj/item/stock_parts/cell/dropped_cell = item_to_drop
+ if(istype(item_to_drop, /obj/item/stock_parts/power_store/cell))
+ var/obj/item/stock_parts/power_store/cell/dropped_cell = item_to_drop
dropped_cell.charge = 0
dropped_cell.update_appearance()
diff --git a/code/modules/mob/living/simple_animal/bot/mulebot.dm b/code/modules/mob/living/simple_animal/bot/mulebot.dm
index 7ce0e89cd2b..39db78fdffb 100644
--- a/code/modules/mob/living/simple_animal/bot/mulebot.dm
+++ b/code/modules/mob/living/simple_animal/bot/mulebot.dm
@@ -52,7 +52,7 @@
var/auto_pickup = TRUE /// true if auto-pickup at beacon
var/report_delivery = TRUE /// true if bot will announce an arrival to a location.
- var/obj/item/stock_parts/cell/cell /// Internal Powercell
+ var/obj/item/stock_parts/power_store/cell /// Internal Powercell
var/cell_move_power_usage = 1///How much power we use when we move.
var/num_steps = 0 ///The amount of steps we should take until we rest for a time.
@@ -78,7 +78,7 @@
access_card.add_access(cargo_trim.access + cargo_trim.wildcard_access)
prev_access = access_card.access.Copy()
- cell = new /obj/item/stock_parts/cell/upgraded(src, 2000)
+ cell = new /obj/item/stock_parts/power_store/cell/upgraded(src, 2000)
AddElement(/datum/element/ridable, /datum/component/riding/creature/mulebot)
diag_hud_set_mulebotcell()
@@ -181,7 +181,7 @@
return ITEM_INTERACT_SUCCESS
/mob/living/simple_animal/bot/mulebot/attackby(obj/item/I, mob/living/user, params)
- if(istype(I, /obj/item/stock_parts/cell) && bot_cover_flags & BOT_COVER_MAINTS_OPEN)
+ if(istype(I, /obj/item/stock_parts/power_store/cell) && bot_cover_flags & BOT_COVER_MAINTS_OPEN)
if(cell)
to_chat(user, span_warning("[src] already has a power cell!"))
return TRUE
diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm
index 04c637e4052..7448f6d34bc 100644
--- a/code/modules/mob/living/simple_animal/bot/secbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/secbot.dm
@@ -121,7 +121,7 @@
/mob/living/simple_animal/bot/secbot/beepsky/explode()
var/atom/Tsec = drop_location()
- new /obj/item/stock_parts/cell/potato(Tsec)
+ new /obj/item/stock_parts/power_store/cell/potato(Tsec)
var/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass/drinking_oil = new(Tsec)
drinking_oil.reagents.add_reagent(/datum/reagent/consumable/ethanol/whiskey, 15)
return ..()
diff --git a/code/modules/mod/mod_control.dm b/code/modules/mod/mod_control.dm
index c386f7f51c6..734cc6ba251 100644
--- a/code/modules/mod/mod_control.dm
+++ b/code/modules/mod/mod_control.dm
@@ -358,7 +358,7 @@
return NONE
/obj/item/mod/control/get_cell()
- var/obj/item/stock_parts/cell/cell = get_charge_source()
+ var/obj/item/stock_parts/power_store/cell = get_charge_source()
if(!istype(cell))
return null
return cell
diff --git a/code/modules/mod/mod_core.dm b/code/modules/mod/mod_core.dm
index e62be77fe55..70f95297b94 100644
--- a/code/modules/mod/mod_core.dm
+++ b/code/modules/mod/mod_core.dm
@@ -85,7 +85,7 @@
Which one you have in your suit is unclear, but either way, \
it's been repurposed to be an internal power source for a Modular Outerwear Device."
/// Installed cell.
- var/obj/item/stock_parts/cell/cell
+ var/obj/item/stock_parts/power_store/cell
/obj/item/mod/core/standard/Destroy()
QDEL_NULL(cell)
@@ -114,15 +114,15 @@
return cell
/obj/item/mod/core/standard/charge_amount()
- var/obj/item/stock_parts/cell/charge_source = charge_source()
+ var/obj/item/stock_parts/power_store/charge_source = charge_source()
return charge_source?.charge || 0
/obj/item/mod/core/standard/max_charge_amount(amount)
- var/obj/item/stock_parts/cell/charge_source = charge_source()
+ var/obj/item/stock_parts/power_store/charge_source = charge_source()
return charge_source?.maxcharge || 1
/obj/item/mod/core/standard/add_charge(amount)
- var/obj/item/stock_parts/cell/charge_source = charge_source()
+ var/obj/item/stock_parts/power_store/charge_source = charge_source()
if(isnull(charge_source))
return FALSE
. = charge_source.give(amount)
@@ -131,7 +131,7 @@
return .
/obj/item/mod/core/standard/subtract_charge(amount)
- var/obj/item/stock_parts/cell/charge_source = charge_source()
+ var/obj/item/stock_parts/power_store/charge_source = charge_source()
if(isnull(charge_source))
return FALSE
. = charge_source.use(amount, TRUE)
@@ -209,7 +209,7 @@
/obj/item/mod/core/standard/proc/on_attackby(datum/source, obj/item/attacking_item, mob/user)
SIGNAL_HANDLER
- if(istype(attacking_item, /obj/item/stock_parts/cell))
+ if(istype(attacking_item, /obj/item/stock_parts/power_store/cell))
if(!mod.open)
mod.balloon_alert(user, "open the cover first!")
playsound(mod, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE)
@@ -239,7 +239,7 @@
/obj/item/mod/core/standard/proc/on_borg_charge(datum/source, datum/callback/charge_cell, seconds_per_tick)
SIGNAL_HANDLER
- var/obj/item/stock_parts/cell/target_cell = charge_source()
+ var/obj/item/stock_parts/power_store/target_cell = charge_source()
if(isnull(target_cell))
return
diff --git a/code/modules/mod/mod_link.dm b/code/modules/mod/mod_link.dm
index 40a0fb94f17..5733d48f45f 100644
--- a/code/modules/mod/mod_link.dm
+++ b/code/modules/mod/mod_link.dm
@@ -140,7 +140,7 @@
icon_state = "modlink"
actions_types = list(/datum/action/item_action/call_link)
/// The installed power cell.
- var/obj/item/stock_parts/cell/cell
+ var/obj/item/stock_parts/power_store/cell
/// The MODlink datum we operate.
var/datum/mod_link/mod_link
/// Initial frequency of the MODlink.
@@ -203,7 +203,7 @@
/obj/item/clothing/neck/link_scryer/attackby(obj/item/attacked_by, mob/user, params)
. = ..()
- if(cell || !istype(attacked_by, /obj/item/stock_parts/cell))
+ if(cell || !istype(attacked_by, /obj/item/stock_parts/power_store/cell))
return
if(!user.transferItemToLoc(attacked_by, src))
return
@@ -311,7 +311,7 @@
/obj/item/clothing/neck/link_scryer/loaded/Initialize(mapload)
. = ..()
- cell = new /obj/item/stock_parts/cell/high(src)
+ cell = new /obj/item/stock_parts/power_store/cell/high(src)
/obj/item/clothing/neck/link_scryer/loaded/charlie
starting_frequency = MODLINK_FREQ_CHARLIE
diff --git a/code/modules/mod/mod_types.dm b/code/modules/mod/mod_types.dm
index 539237fa3e8..d6465960beb 100644
--- a/code/modules/mod/mod_types.dm
+++ b/code/modules/mod/mod_types.dm
@@ -5,7 +5,7 @@
/// The MOD core we apply to the suit.
var/applied_core = /obj/item/mod/core/standard
/// The cell we apply to the core. Only applies to standard core suits.
- var/applied_cell = /obj/item/stock_parts/cell/high
+ var/applied_cell = /obj/item/stock_parts/power_store/cell/high
/// List of modules we spawn with.
var/list/applied_modules = list()
/// Modules that we pin when the suit is installed for the first time, for convenience, can be applied or theme inbuilt modules.
@@ -82,7 +82,7 @@
/obj/item/mod/control/pre_equipped/advanced
theme = /datum/mod_theme/advanced
- applied_cell = /obj/item/stock_parts/cell/super
+ applied_cell = /obj/item/stock_parts/power_store/cell/super
applied_modules = list(
/obj/item/mod/module/storage/large_capacity,
/obj/item/mod/module/welding,
@@ -139,7 +139,7 @@
/obj/item/mod/control/pre_equipped/rescue
theme = /datum/mod_theme/rescue
- applied_cell = /obj/item/stock_parts/cell/super
+ applied_cell = /obj/item/stock_parts/power_store/cell/super
applied_modules = list(
/obj/item/mod/module/storage/large_capacity,
/obj/item/mod/module/flashlight,
@@ -149,7 +149,7 @@
/obj/item/mod/control/pre_equipped/research
theme = /datum/mod_theme/research
- applied_cell = /obj/item/stock_parts/cell/super
+ applied_cell = /obj/item/stock_parts/power_store/cell/super
applied_modules = list(
/obj/item/mod/module/storage/large_capacity,
/obj/item/mod/module/welding,
@@ -174,7 +174,7 @@
/obj/item/mod/control/pre_equipped/safeguard
theme = /datum/mod_theme/safeguard
- applied_cell = /obj/item/stock_parts/cell/super
+ applied_cell = /obj/item/stock_parts/power_store/cell/super
applied_modules = list(
/obj/item/mod/module/storage/large_capacity,
/obj/item/mod/module/magnetic_harness,
@@ -192,7 +192,7 @@
/obj/item/mod/control/pre_equipped/magnate
theme = /datum/mod_theme/magnate
- applied_cell = /obj/item/stock_parts/cell/hyper
+ applied_cell = /obj/item/stock_parts/power_store/cell/hyper
applied_modules = list(
/obj/item/mod/module/storage/large_capacity,
/obj/item/mod/module/hat_stabilizer,
@@ -218,7 +218,7 @@
/obj/item/mod/control/pre_equipped/traitor
theme = /datum/mod_theme/syndicate
starting_frequency = MODLINK_FREQ_SYNDICATE
- applied_cell = /obj/item/stock_parts/cell/super
+ applied_cell = /obj/item/stock_parts/power_store/cell/super
applied_modules = list(
/obj/item/mod/module/storage/syndicate,
/obj/item/mod/module/shock_absorber,
@@ -239,7 +239,7 @@
/obj/item/mod/control/pre_equipped/traitor_elite
theme = /datum/mod_theme/elite
starting_frequency = MODLINK_FREQ_SYNDICATE
- applied_cell = /obj/item/stock_parts/cell/bluespace
+ applied_cell = /obj/item/stock_parts/power_store/cell/bluespace
applied_modules = list(
/obj/item/mod/module/storage/syndicate,
/obj/item/mod/module/shock_absorber,
@@ -261,7 +261,7 @@
/obj/item/mod/control/pre_equipped/nuclear
theme = /datum/mod_theme/syndicate
starting_frequency = MODLINK_FREQ_SYNDICATE
- applied_cell = /obj/item/stock_parts/cell/hyper
+ applied_cell = /obj/item/stock_parts/power_store/cell/hyper
req_access = list(ACCESS_SYNDICATE)
applied_modules = list(
/obj/item/mod/module/storage/syndicate,
@@ -298,7 +298,7 @@
/obj/item/mod/control/pre_equipped/elite
theme = /datum/mod_theme/elite
starting_frequency = MODLINK_FREQ_SYNDICATE
- applied_cell = /obj/item/stock_parts/cell/bluespace
+ applied_cell = /obj/item/stock_parts/power_store/cell/bluespace
req_access = list(ACCESS_SYNDICATE)
applied_modules = list(
/obj/item/mod/module/storage/syndicate,
@@ -341,7 +341,7 @@
/obj/item/mod/control/pre_equipped/infiltrator
theme = /datum/mod_theme/infiltrator
starting_frequency = MODLINK_FREQ_SYNDICATE
- applied_cell = /obj/item/stock_parts/cell/super
+ applied_cell = /obj/item/stock_parts/power_store/cell/super
applied_modules = list(
/obj/item/mod/module/emp_shield,
/obj/item/mod/module/magnetic_harness,
@@ -355,7 +355,7 @@
/obj/item/mod/control/pre_equipped/interdyne
theme = /datum/mod_theme/interdyne
starting_frequency = MODLINK_FREQ_SYNDICATE
- applied_cell = /obj/item/stock_parts/cell/super
+ applied_cell = /obj/item/stock_parts/power_store/cell/super
applied_modules = list(
/obj/item/mod/module/organ_thrower,
/obj/item/mod/module/defibrillator/combat,
@@ -383,7 +383,7 @@
/obj/item/mod/control/pre_equipped/ninja
theme = /datum/mod_theme/ninja
starting_frequency = null
- applied_cell = /obj/item/stock_parts/cell/ninja
+ applied_cell = /obj/item/stock_parts/power_store/cell/ninja
applied_modules = list(
/obj/item/mod/module/storage,
/obj/item/mod/module/noslip,
@@ -422,7 +422,7 @@
/obj/item/mod/control/pre_equipped/glitch
theme = /datum/mod_theme/glitch
starting_frequency = null
- applied_cell = /obj/item/stock_parts/cell/bluespace
+ applied_cell = /obj/item/stock_parts/power_store/cell/bluespace
applied_modules = list(
/obj/item/mod/module/storage,
/obj/item/mod/module/magnetic_harness,
@@ -439,7 +439,7 @@
/obj/item/mod/control/pre_equipped/responsory
theme = /datum/mod_theme/responsory
starting_frequency = MODLINK_FREQ_CENTCOM
- applied_cell = /obj/item/stock_parts/cell/hyper
+ applied_cell = /obj/item/stock_parts/power_store/cell/hyper
req_access = list(ACCESS_CENT_GENERAL)
applied_modules = list(
/obj/item/mod/module/storage/large_capacity,
@@ -504,7 +504,7 @@
/obj/item/mod/control/pre_equipped/responsory/inquisitory/syndie
starting_frequency = MODLINK_FREQ_SYNDICATE
req_access = null
- applied_cell = /obj/item/stock_parts/cell/super
+ applied_cell = /obj/item/stock_parts/power_store/cell/super
theme = /datum/mod_theme/responsory/traitor
applied_modules = list(
/obj/item/mod/module/storage/syndicate,
@@ -539,7 +539,7 @@
/obj/item/mod/control/pre_equipped/apocryphal
theme = /datum/mod_theme/apocryphal
starting_frequency = MODLINK_FREQ_CENTCOM
- applied_cell = /obj/item/stock_parts/cell/bluespace
+ applied_cell = /obj/item/stock_parts/power_store/cell/bluespace
req_access = list(ACCESS_CENT_SPECOPS)
applied_modules = list(
/obj/item/mod/module/storage/bluespace,
diff --git a/code/modules/modular_computers/computers/item/computer.dm b/code/modules/modular_computers/computers/item/computer.dm
index 04c29d6c37b..1ece8577d3c 100644
--- a/code/modules/modular_computers/computers/item/computer.dm
+++ b/code/modules/modular_computers/computers/item/computer.dm
@@ -19,7 +19,7 @@
///The disk in this PDA. If set, this will be inserted on Initialize.
var/obj/item/computer_disk/inserted_disk
///The power cell the computer uses to run on.
- var/obj/item/stock_parts/cell/internal_cell = /obj/item/stock_parts/cell
+ var/obj/item/stock_parts/power_store/internal_cell = /obj/item/stock_parts/power_store/cell
///A pAI currently loaded into the modular computer.
var/obj/item/pai_card/inserted_pai
///Does the console update the crew manifest when the ID is removed?
@@ -75,9 +75,9 @@
var/comp_light_color = COLOR_WHITE
///Power usage when the computer is open (screen is active) and can be interacted with.
- var/base_active_power_usage = 125
+ var/base_active_power_usage = 2 WATTS
///Power usage when the computer is idle and screen is off.
- var/base_idle_power_usage = 5
+ var/base_idle_power_usage = 1 WATTS
// Modular computers can run on various devices. Each DEVICE (Laptop, Console & Tablet)
// must have it's own DMI file. Icon states must be called exactly the same in all files, but may look differently
@@ -831,7 +831,7 @@
if(istype(tool, /obj/item/pai_card))
return pai_act(user, tool)
- if(istype(tool, /obj/item/stock_parts/cell))
+ if(istype(tool, /obj/item/stock_parts/power_store/cell))
return cell_act(user, tool)
if(istype(tool, /obj/item/photo))
@@ -871,7 +871,7 @@
update_appearance(UPDATE_ICON)
return ITEM_INTERACT_SUCCESS
-/obj/item/modular_computer/proc/cell_act(mob/user, obj/item/stock_parts/cell/new_cell)
+/obj/item/modular_computer/proc/cell_act(mob/user, obj/item/stock_parts/power_store/cell/new_cell)
if(ismachinery(physical))
return ITEM_INTERACT_BLOCKING
if(internal_cell)
diff --git a/code/modules/modular_computers/computers/item/processor.dm b/code/modules/modular_computers/computers/item/processor.dm
index 3a8f58576c9..ad5d36a87cd 100644
--- a/code/modules/modular_computers/computers/item/processor.dm
+++ b/code/modules/modular_computers/computers/item/processor.dm
@@ -8,7 +8,7 @@
icon_state_unpowered = null
icon_state_menu = null
hardware_flag = NONE
- internal_cell = /obj/item/stock_parts/cell/crap
+ internal_cell = /obj/item/stock_parts/power_store/cell/crap
///The modular computer MACHINE that hosts us.
var/obj/machinery/modular_computer/machinery_computer
diff --git a/code/modules/modular_computers/computers/machinery/modular_computer.dm b/code/modules/modular_computers/computers/machinery/modular_computer.dm
index e629e67fab4..48cbc57d745 100644
--- a/code/modules/modular_computers/computers/machinery/modular_computer.dm
+++ b/code/modules/modular_computers/computers/machinery/modular_computer.dm
@@ -137,7 +137,7 @@
///Try to recharge our internal cell if it isn't fully charged.
/obj/machinery/modular_computer/process(seconds_per_tick)
- var/obj/item/stock_parts/cell/cell = get_cell()
+ var/obj/item/stock_parts/power_store/cell = get_cell()
if(isnull(cell) || cell.percent() >= 100)
return
charge_cell(idle_power_usage * seconds_per_tick, cell)
diff --git a/code/modules/power/apc/apc_attack.dm b/code/modules/power/apc/apc_attack.dm
index 50f10c47e33..2752ae3c2bf 100644
--- a/code/modules/power/apc/apc_attack.dm
+++ b/code/modules/power/apc/apc_attack.dm
@@ -29,7 +29,7 @@
return
var/charge_limit = ETHEREAL_CHARGE_DANGEROUS - APC_POWER_GAIN
var/obj/item/organ/internal/stomach/ethereal/stomach = maybe_stomach
- var/obj/item/stock_parts/cell/stomach_cell = stomach.cell
+ var/obj/item/stock_parts/power_store/stomach_cell = stomach.cell
if(!((stomach?.drain_time < world.time) && LAZYACCESS(modifiers, RIGHT_CLICK)))
return
if(ethereal.combat_mode)
diff --git a/code/modules/power/apc/apc_contextual_tips.dm b/code/modules/power/apc/apc_contextual_tips.dm
index 4fe6458e4eb..ad109cd397a 100644
--- a/code/modules/power/apc/apc_contextual_tips.dm
+++ b/code/modules/power/apc/apc_contextual_tips.dm
@@ -43,8 +43,8 @@
if (opened == APC_COVER_OPENED && !has_electronics)
context[SCREENTIP_CONTEXT_LMB] = "Disassemble the APC"
- else if(istype(held_item, /obj/item/stock_parts/cell) && opened == APC_COVER_OPENED)
- context[SCREENTIP_CONTEXT_LMB] = "Insert Cell"
+ else if(istype(held_item, /obj/item/stock_parts/power_store/battery) && opened == APC_COVER_OPENED)
+ context[SCREENTIP_CONTEXT_LMB] = "Insert Battery"
else if(istype(held_item, /obj/item/stack/cable_coil) && opened == APC_COVER_OPENED)
context[SCREENTIP_CONTEXT_LMB] = "Create wire terminal"
@@ -56,7 +56,7 @@
if (!has_electronics)
context[SCREENTIP_CONTEXT_LMB] = "Insert an APC board"
else if(!cell)
- context[SCREENTIP_CONTEXT_LMB] = "Insert a cell"
+ context[SCREENTIP_CONTEXT_LMB] = "Insert a battery"
else if(istype(held_item, /obj/item/wallframe/apc))
context[SCREENTIP_CONTEXT_LMB] = "Replace damaged frame"
diff --git a/code/modules/power/apc/apc_main.dm b/code/modules/power/apc/apc_main.dm
index 69732c69b97..329f77ab718 100644
--- a/code/modules/power/apc/apc_main.dm
+++ b/code/modules/power/apc/apc_main.dm
@@ -30,11 +30,11 @@
///Mapper helper to tie an apc to another area
var/areastring = null
///Reference to our internal cell
- var/obj/item/stock_parts/cell/cell
+ var/obj/item/stock_parts/power_store/cell
///Initial cell charge %
var/start_charge = 90
///Type of cell we start with
- var/cell_type = /obj/item/stock_parts/cell/upgraded //Base cell has 2500 capacity. Enter the path of a different cell you want to use. cell determines charge rates, max capacity, ect. These can also be changed with other APC vars, but isn't recommended to minimize the risk of accidental usage of dirty editted APCs
+ var/cell_type = /obj/item/stock_parts/power_store/battery/upgraded //Base cell has 2500 capacity. Enter the path of a different cell you want to use. cell determines charge rates, max capacity, ect. These can also be changed with other APC vars, but isn't recommended to minimize the risk of accidental usage of dirty editted APCs
///State of the cover (closed, opened, removed)
var/opened = APC_COVER_CLOSED
///Is the APC shorted and not working?
@@ -689,12 +689,12 @@
///Used for cell_5k apc helper, which installs 5k cell into apc.
/obj/machinery/power/apc/proc/install_cell_5k()
- cell_type = /obj/item/stock_parts/cell/upgraded/plus
+ cell_type = /obj/item/stock_parts/power_store/battery/upgraded
cell = new cell_type(src)
/// Used for cell_10k apc helper, which installs 10k cell into apc.
/obj/machinery/power/apc/proc/install_cell_10k()
- cell_type = /obj/item/stock_parts/cell/high
+ cell_type = /obj/item/stock_parts/power_store/battery/high
cell = new cell_type(src)
/// Used for unlocked apc helper, which unlocks the apc.
diff --git a/code/modules/power/apc/apc_tool_act.dm b/code/modules/power/apc/apc_tool_act.dm
index a82ce2f8f0d..2072ab14561 100644
--- a/code/modules/power/apc/apc_tool_act.dm
+++ b/code/modules/power/apc/apc_tool_act.dm
@@ -11,7 +11,7 @@
togglelock(user)
return ITEM_INTERACT_SUCCESS
- if(istype(tool, /obj/item/stock_parts/cell))
+ if(istype(tool, /obj/item/stock_parts/power_store))
. = cell_act(user, tool)
else if(istype(tool, /obj/item/stack/cable_coil))
. = cable_act(user, tool, LAZYACCESS(modifiers, RIGHT_CLICK))
@@ -52,7 +52,7 @@
return ITEM_INTERACT_SUCCESS
/// Called when we interact with the APC with a cell, attempts to insert it
-/obj/machinery/power/apc/proc/cell_act(mob/living/user, obj/item/stock_parts/cell/new_cell)
+/obj/machinery/power/apc/proc/cell_act(mob/living/user, obj/item/stock_parts/power_store/new_cell)
if(!opened)
return NONE
@@ -184,7 +184,7 @@
return ITEM_INTERACT_BLOCKING
if(!pseudocircuit.adapt_circuit(user, circuit_cost = 0.5 * STANDARD_CELL_CHARGE))
return ITEM_INTERACT_BLOCKING
- var/obj/item/stock_parts/cell/crap/empty/bad_cell = new(src)
+ var/obj/item/stock_parts/power_store/battery/crap/empty/bad_cell = new(src)
bad_cell.forceMove(src)
cell = bad_cell
user.visible_message(
@@ -424,7 +424,7 @@
if(machine_stat & MAINT)
balloon_alert(user, "no board for a cell!")
return FALSE
- var/obj/item/stock_parts/cell/crap/empty/C = new(src)
+ var/obj/item/stock_parts/power_store/battery/crap/empty/C = new(src)
C.forceMove(src)
cell = C
balloon_alert(user, "power cell installed")
diff --git a/code/modules/power/battery.dm b/code/modules/power/battery.dm
new file mode 100644
index 00000000000..8a6be8d85aa
--- /dev/null
+++ b/code/modules/power/battery.dm
@@ -0,0 +1,79 @@
+/obj/item/stock_parts/power_store/battery
+ name = "megacell"
+ desc = "A series of rechargeable electrochemical cells wired together to hold significantly more power than a standard power cell."
+ icon = 'icons/obj/machines/cell_charger.dmi'
+ icon_state = "cellbig"
+ cell_size_prefix = "cellbig"
+ inhand_icon_state = "cell"
+ lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi'
+ w_class = WEIGHT_CLASS_NORMAL
+ force = 10
+ throwforce = 5
+ throw_speed = 2
+ throw_range = 2
+ custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*12, /datum/material/glass=SMALL_MATERIAL_AMOUNT*2)
+ grind_results = list(/datum/reagent/lithium = 60, /datum/reagent/iron = 10, /datum/reagent/silicon = 10)
+ rating_base = STANDARD_BATTERY_CHARGE
+ maxcharge = STANDARD_BATTERY_CHARGE
+ chargerate = STANDARD_BATTERY_RATE
+
+/obj/item/stock_parts/power_store/battery/empty
+ empty = TRUE
+
+/obj/item/stock_parts/power_store/battery/upgraded
+ name = "upgraded megacell"
+ desc = "A battery with a slightly higher capacity than normal!"
+ maxcharge = STANDARD_BATTERY_CHARGE * 2.5
+ custom_materials = list(/datum/material/glass=SMALL_MATERIAL_AMOUNT*2.5)
+ chargerate = STANDARD_BATTERY_RATE * 0.5
+
+/obj/item/stock_parts/power_store/battery/high
+ name = "high-capacity megacell"
+ icon_state = "hcellbig"
+ maxcharge = STANDARD_BATTERY_CHARGE * 10
+ custom_materials = list(/datum/material/glass=SMALL_MATERIAL_AMOUNT * 3)
+ chargerate = STANDARD_BATTERY_RATE * 0.75
+
+/obj/item/stock_parts/power_store/battery/high/empty
+ empty = TRUE
+
+/obj/item/stock_parts/power_store/battery/super
+ name = "super-capacity megacell"
+ icon_state = "scellbig"
+ maxcharge = STANDARD_BATTERY_CHARGE * 20
+ custom_materials = list(/datum/material/glass=SMALL_MATERIAL_AMOUNT * 4)
+ chargerate = STANDARD_BATTERY_RATE
+
+/obj/item/stock_parts/power_store/battery/super/empty
+ empty = TRUE
+
+/obj/item/stock_parts/power_store/battery/hyper
+ name = "hyper-capacity megacell"
+ icon_state = "hpcellbig"
+ maxcharge = STANDARD_BATTERY_CHARGE * 30
+ custom_materials = list(/datum/material/glass=SMALL_MATERIAL_AMOUNT * 5)
+ chargerate = STANDARD_BATTERY_RATE * 1.5
+
+/obj/item/stock_parts/power_store/battery/hyper/empty
+ empty = TRUE
+
+/obj/item/stock_parts/power_store/battery/bluespace
+ name = "bluespace megacell"
+ desc = "A rechargeable transdimensional megacell."
+ icon_state = "bscellbig"
+ maxcharge = STANDARD_BATTERY_CHARGE * 40
+ custom_materials = list(/datum/material/glass=SMALL_MATERIAL_AMOUNT*6)
+ chargerate = STANDARD_BATTERY_RATE * 2
+
+/obj/item/stock_parts/power_store/battery/bluespace/empty
+ empty = TRUE
+
+/obj/item/stock_parts/power_store/battery/crap
+ name = "\improper Nanotrasen brand rechargeable AA megacell"
+ desc = "You can't top the plasma top." //TOTALLY TRADEMARK INFRINGEMENT
+ maxcharge = STANDARD_BATTERY_CHARGE * 0.5
+ custom_materials = list(/datum/material/glass=SMALL_MATERIAL_AMOUNT*1)
+
+/obj/item/stock_parts/power_store/battery/crap/empty
+ empty = TRUE
diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm
index 74352134f59..fbb36703cc5 100644
--- a/code/modules/power/cell.dm
+++ b/code/modules/power/cell.dm
@@ -1,13 +1,10 @@
-#define CELL_DRAIN_TIME 35
-#define CELL_POWER_GAIN (0.06 * STANDARD_CELL_CHARGE)
-#define CELL_POWER_DRAIN (0.75 * STANDARD_CELL_CHARGE)
/**
* # Power cell
*
- * Batteries.
+ * Power cells, used primarily for handheld and portable things. Holds a reasonable amount of power.
*/
-/obj/item/stock_parts/cell
+/obj/item/stock_parts/power_store/cell
name = "power cell"
desc = "A rechargeable electrochemical power cell."
icon = 'icons/obj/machines/cell_charger.dmi'
@@ -22,307 +19,26 @@
w_class = WEIGHT_CLASS_SMALL
custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*7, /datum/material/glass=SMALL_MATERIAL_AMOUNT*0.5)
grind_results = list(/datum/reagent/lithium = 15, /datum/reagent/iron = 5, /datum/reagent/silicon = 5)
- ///Current charge in cell units
- var/charge = 0
- ///Maximum charge in cell units
- var/maxcharge = STANDARD_CELL_CHARGE
- ///If the cell has been booby-trapped by injecting it with plasma. Chance on use() to explode.
- var/rigged = FALSE
- ///If the power cell was damaged by an explosion, chance for it to become corrupted and function the same as rigged.
- var/corrupted = FALSE
- ///How much power is given per second in a recharger.
- var/chargerate = STANDARD_CELL_RATE * 0.05
- ///If true, the cell will state it's maximum charge in it's description
- var/ratingdesc = TRUE
- ///If it's a grown that acts as a battery, add a wire overlay to it.
- var/grown_battery = FALSE
- ///What charge lige sprite to use, null if no light
- var/charge_light_type = "standard"
- ///What connector sprite to use when in a cell charger, null if no connectors
- var/connector_type = "standard"
- ///Does the cell start without any charge?
- var/empty = FALSE
-
-/obj/item/stock_parts/cell/get_cell()
- return src
-
-/obj/item/stock_parts/cell/Initialize(mapload, override_maxcharge)
- . = ..()
- create_reagents(5, INJECTABLE | DRAINABLE)
- if (override_maxcharge)
- maxcharge = override_maxcharge
- rating = max(round(maxcharge / (STANDARD_CELL_CHARGE * 10), 1), 1)
- if(!charge)
- charge = maxcharge
- if(empty)
- charge = 0
- if(ratingdesc)
- desc += " This one has a rating of [display_energy(maxcharge)][prob(10) ? ", and you should not swallow it" : ""]." //joke works better if it's not on every cell
- update_appearance()
-
- RegisterSignal(src, COMSIG_ITEM_MAGICALLY_CHARGED, PROC_REF(on_magic_charge))
- var/static/list/loc_connections = list(
- COMSIG_ITEM_MAGICALLY_CHARGED = PROC_REF(on_magic_charge),
- )
- AddElement(/datum/element/connect_loc, loc_connections)
-
-/**
- * Signal proc for [COMSIG_ITEM_MAGICALLY_CHARGED]
- *
- * If we, or the item we're located in, is subject to the charge spell, gain some charge back
- */
-/obj/item/stock_parts/cell/proc/on_magic_charge(datum/source, datum/action/cooldown/spell/charge/spell, mob/living/caster)
- SIGNAL_HANDLER
-
- // This shouldn't be running if we're not being held by a mob,
- // or if we're not within an object being held by a mob, but just in case...
- if(!ismovable(loc))
- return
-
- . = COMPONENT_ITEM_CHARGED
-
- if(prob(80))
- maxcharge -= STANDARD_CELL_CHARGE * 0.2
-
- if(maxcharge <= 1) // Div by 0 protection
- maxcharge = 1
- . |= COMPONENT_ITEM_BURNT_OUT
-
- charge = maxcharge
- update_appearance()
-
- // Guns need to process their chamber when we've been charged
- if(isgun(loc))
- var/obj/item/gun/gun_loc = loc
- gun_loc.process_chamber()
-
- // The thing we're in might have overlays or icon states for whether the cell is charged
- if(!ismob(loc))
- loc.update_appearance()
-
- return .
-
-/obj/item/stock_parts/cell/create_reagents(max_vol, flags)
- . = ..()
- RegisterSignals(reagents, list(COMSIG_REAGENTS_NEW_REAGENT, COMSIG_REAGENTS_ADD_REAGENT, COMSIG_REAGENTS_DEL_REAGENT, COMSIG_REAGENTS_REM_REAGENT), PROC_REF(on_reagent_change))
- RegisterSignal(reagents, COMSIG_QDELETING, PROC_REF(on_reagents_del))
-
-/// Handles properly detaching signal hooks.
-/obj/item/stock_parts/cell/proc/on_reagents_del(datum/reagents/reagents)
- SIGNAL_HANDLER
- UnregisterSignal(reagents, list(COMSIG_REAGENTS_NEW_REAGENT, COMSIG_REAGENTS_ADD_REAGENT, COMSIG_REAGENTS_DEL_REAGENT, COMSIG_REAGENTS_REM_REAGENT, COMSIG_QDELETING))
- return NONE
-
-/obj/item/stock_parts/cell/update_overlays()
- . = ..()
- if(grown_battery)
- . += mutable_appearance('icons/obj/machines/cell_charger.dmi', "grown_wires")
- if((charge < 0.01) || !charge_light_type)
- return
- . += mutable_appearance('icons/obj/machines/cell_charger.dmi', "cell-[charge_light_type]-o[(percent() >= 99.5) ? 2 : 1]")
-
-/obj/item/stock_parts/cell/vv_edit_var(vname, vval)
- if(vname == NAMEOF(src, charge))
- charge = clamp(vval, 0, maxcharge)
- return TRUE
- if(vname == NAMEOF(src, maxcharge))
- if(charge > vval)
- charge = vval
- if(vname == NAMEOF(src, corrupted) && vval && !corrupted)
- corrupt(TRUE)
- return TRUE
- return ..()
-
-
-/**
- * Returns the percentage of the cell's charge.
- */
-/obj/item/stock_parts/cell/proc/percent() // return % charge of cell
- return 100 * charge / maxcharge
-
-/**
- * Returns the maximum charge of the cell.
- */
-/obj/item/stock_parts/cell/proc/max_charge()
- return maxcharge
-
-/**
- * Returns the current charge of the cell.
- */
-/obj/item/stock_parts/cell/proc/charge()
- return charge
-
-/**
- * Returns the amount of charge used on the cell.
- */
-/obj/item/stock_parts/cell/proc/used_charge()
- return maxcharge - charge
-
-/// Use power from the cell.
-/// Args:
-/// - used: Amount of power in joules to use.
-/// - force: If true, uses the remaining power from the cell if there isn't enough power to supply the demand.
-/// Returns: The power used from the cell in joules.
-/obj/item/stock_parts/cell/use(used, force = FALSE)
- var/power_used = min(used, charge)
- if(rigged && power_used > 0)
- explode()
- return 0 // The cell decided to explode so we won't be able to use it.
- if(!force && charge < used)
- return 0
- charge -= power_used
- if(!istype(loc, /obj/machinery/power/apc))
- SSblackbox.record_feedback("tally", "cell_used", 1, type)
- return power_used
-
-/// Recharge the cell.
-/// Args:
-/// - amount: The amount of energy to give to the cell in joules.
-/// Returns: The power given to the cell in joules.
-/obj/item/stock_parts/cell/proc/give(amount)
- var/power_used = min(maxcharge-charge,amount)
- charge += power_used
- if(rigged && amount > 0)
- explode()
- return power_used
-
-/**
- * Changes the charge of the cell.
- * Args:
- * - amount: The energy to give to the cell (can be negative).
- * Returns: The energy that was given to the cell (can be negative).
- */
-/obj/item/stock_parts/cell/proc/change(amount)
- var/energy_used = clamp(amount, -charge, maxcharge - charge)
- charge += energy_used
- if(rigged && energy_used)
- explode()
- return energy_used
-
-/obj/item/stock_parts/cell/examine(mob/user)
- . = ..()
- if(rigged)
- . += span_danger("This power cell seems to be faulty!")
- else
- . += "The charge meter reads [CEILING(percent(), 0.1)]%." //so it doesn't say 0% charge when the overlay indicates it still has charge
-
-/obj/item/stock_parts/cell/suicide_act(mob/living/user)
- user.visible_message(span_suicide("[user] is licking the electrodes of [src]! It looks like [user.p_theyre()] trying to commit suicide!"))
- return FIRELOSS
-
-/obj/item/stock_parts/cell/proc/on_reagent_change(datum/reagents/holder, ...)
- SIGNAL_HANDLER
- rigged = (corrupted || holder.has_reagent(/datum/reagent/toxin/plasma, 5)) ? TRUE : FALSE //has_reagent returns the reagent datum
- return NONE
-
-
-/obj/item/stock_parts/cell/proc/explode()
- if(!charge)
- return
- var/range_devastation = -1
- var/range_heavy = round(sqrt(charge / (3.6 * STANDARD_CELL_CHARGE)))
- var/range_light = round(sqrt(charge / (0.9 * STANDARD_CELL_CHARGE)))
- var/range_flash = range_light
- if(!range_light)
- rigged = FALSE
- corrupt()
- return
-
- message_admins("[ADMIN_LOOKUPFLW(usr)] has triggered a rigged/corrupted power cell explosion at [AREACOORD(loc)].")
- usr?.log_message("triggered a rigged/corrupted power cell explosion", LOG_GAME)
- usr?.log_message("triggered a rigged/corrupted power cell explosion", LOG_VICTIM, log_globally = FALSE)
-
- explosion(src, devastation_range = range_devastation, heavy_impact_range = range_heavy, light_impact_range = range_light, flash_range = range_flash)
- qdel(src)
-
-/obj/item/stock_parts/cell/proc/corrupt(force)
- charge /= 2
- maxcharge = max(maxcharge/2, chargerate)
- if (force || prob(10))
- rigged = TRUE //broken batterys are dangerous
- corrupted = TRUE
-
-/obj/item/stock_parts/cell/emp_act(severity)
- . = ..()
- if(. & EMP_PROTECT_SELF)
- return
- use(STANDARD_CELL_CHARGE / severity, force = TRUE)
-
-/obj/item/stock_parts/cell/ex_act(severity, target)
- . = ..()
- if(QDELETED(src))
- return FALSE
-
- switch(severity)
- if(EXPLODE_HEAVY)
- if(prob(50))
- corrupt()
- if(EXPLODE_LIGHT)
- if(prob(25))
- corrupt()
-
- return TRUE
-
-/obj/item/stock_parts/cell/attack_self(mob/user)
- if(ishuman(user))
- var/mob/living/carbon/human/H = user
- var/obj/item/organ/internal/stomach/maybe_stomach = H.get_organ_slot(ORGAN_SLOT_STOMACH)
-
- if(istype(maybe_stomach, /obj/item/organ/internal/stomach/ethereal))
-
- var/charge_limit = ETHEREAL_CHARGE_DANGEROUS - CELL_POWER_GAIN
- var/obj/item/organ/internal/stomach/ethereal/stomach = maybe_stomach
- var/obj/item/stock_parts/cell/stomach_cell = stomach.cell
- if((stomach.drain_time > world.time) || !stomach)
- return
- if(charge < CELL_POWER_DRAIN)
- to_chat(H, span_warning("[src] doesn't have enough power!"))
- return
- if(stomach_cell.charge() > charge_limit)
- to_chat(H, span_warning("Your charge is full!"))
- return
- to_chat(H, span_notice("You begin clumsily channeling power from [src] into your body."))
- stomach.drain_time = world.time + CELL_DRAIN_TIME
- while(do_after(user, CELL_DRAIN_TIME, target = src))
- if((charge < CELL_POWER_DRAIN) || (stomach_cell.charge() > charge_limit))
- return
- if(istype(stomach))
- to_chat(H, span_notice("You receive some charge from [src], wasting some in the process."))
- stomach.adjust_charge(CELL_POWER_GAIN)
- charge -= CELL_POWER_DRAIN //you waste way more than you receive, so that ethereals cant just steal one cell and forget about hunger
- else
- to_chat(H, span_warning("You can't receive charge from [src]!"))
- return
-
-
-/obj/item/stock_parts/cell/blob_act(obj/structure/blob/B)
- SSexplosions.high_mov_atom += src
-
-/obj/item/stock_parts/cell/proc/get_electrocute_damage()
- return ELECTROCUTE_DAMAGE(charge / max(0.001 * STANDARD_CELL_CHARGE, 1)) // Wouldn't want it to consider more energy than whatever is actually in the cell if for some strange reason someone set the STANDARD_CELL_CHARGE to below 1kJ.
-
-/obj/item/stock_parts/cell/get_part_rating()
- return maxcharge * 10 + charge
/* Cell variants*/
-/obj/item/stock_parts/cell/empty
+/obj/item/stock_parts/power_store/cell/empty
empty = TRUE
-/obj/item/stock_parts/cell/crap
- name = "\improper Nanotrasen brand rechargeable AA battery"
+/obj/item/stock_parts/power_store/cell/crap
+ name = "\improper Nanotrasen brand rechargeable AA cell"
desc = "You can't top the plasma top." //TOTALLY TRADEMARK INFRINGEMENT
icon_state = "aa_cell"
maxcharge = STANDARD_CELL_CHARGE * 0.5
custom_materials = list(/datum/material/glass=SMALL_MATERIAL_AMOUNT*0.4)
-/obj/item/stock_parts/cell/crap/Initialize(mapload)
+/obj/item/stock_parts/power_store/cell/crap/Initialize(mapload)
AddElement(/datum/element/update_icon_blocker)
return ..()
-/obj/item/stock_parts/cell/crap/empty
+/obj/item/stock_parts/power_store/cell/crap/empty
empty = TRUE
-/obj/item/stock_parts/cell/upgraded
+/obj/item/stock_parts/power_store/cell/upgraded
name = "upgraded power cell"
desc = "A power cell with a slightly higher capacity than normal!"
icon_state = "9v_cell"
@@ -330,82 +46,82 @@
custom_materials = list(/datum/material/glass=SMALL_MATERIAL_AMOUNT*0.5)
chargerate = STANDARD_CELL_RATE * 0.5
-/obj/item/stock_parts/cell/upgraded/Initialize(mapload)
+/obj/item/stock_parts/power_store/cell/upgraded/Initialize(mapload)
AddElement(/datum/element/update_icon_blocker)
return ..()
-/obj/item/stock_parts/cell/upgraded/plus
+/obj/item/stock_parts/power_store/cell/upgraded/plus
name = "upgraded power cell+"
desc = "A power cell with an even higher capacity than the base model!"
maxcharge = STANDARD_CELL_CHARGE * 5
-/obj/item/stock_parts/cell/secborg
- name = "security borg rechargeable D battery"
+/obj/item/stock_parts/power_store/cell/secborg
+ name = "security borg rechargeable D cell"
maxcharge = STANDARD_CELL_CHARGE * 0.6
custom_materials = list(/datum/material/glass=SMALL_MATERIAL_AMOUNT*0.4)
-/obj/item/stock_parts/cell/secborg/empty
+/obj/item/stock_parts/power_store/cell/secborg/empty
empty = TRUE
-/obj/item/stock_parts/cell/mini_egun
+/obj/item/stock_parts/power_store/cell/mini_egun
name = "miniature energy gun power cell"
maxcharge = STANDARD_CELL_CHARGE * 0.6
-/obj/item/stock_parts/cell/hos_gun
+/obj/item/stock_parts/power_store/cell/hos_gun
name = "X-01 multiphase energy gun power cell"
maxcharge = STANDARD_CELL_CHARGE * 1.2
-/obj/item/stock_parts/cell/pulse //200 pulse shots
+/obj/item/stock_parts/power_store/cell/pulse //200 pulse shots
name = "pulse rifle power cell"
maxcharge = STANDARD_CELL_CHARGE * 40
chargerate = STANDARD_CELL_RATE * 0.75
-/obj/item/stock_parts/cell/pulse/carbine //25 pulse shots
+/obj/item/stock_parts/power_store/cell/pulse/carbine //25 pulse shots
name = "pulse carbine power cell"
maxcharge = STANDARD_CELL_CHARGE * 5
-/obj/item/stock_parts/cell/pulse/pistol //10 pulse shots
+/obj/item/stock_parts/power_store/cell/pulse/pistol //10 pulse shots
name = "pulse pistol power cell"
maxcharge = STANDARD_CELL_CHARGE * 2
-/obj/item/stock_parts/cell/ninja
+/obj/item/stock_parts/power_store/cell/ninja
name = "black power cell"
icon_state = "bscell"
maxcharge = STANDARD_CELL_CHARGE * 10
custom_materials = list(/datum/material/glass=SMALL_MATERIAL_AMOUNT*0.6)
chargerate = STANDARD_CELL_RATE
-/obj/item/stock_parts/cell/high
+/obj/item/stock_parts/power_store/cell/high
name = "high-capacity power cell"
icon_state = "hcell"
maxcharge = STANDARD_CELL_CHARGE * 10
custom_materials = list(/datum/material/glass=SMALL_MATERIAL_AMOUNT*0.6)
chargerate = STANDARD_CELL_RATE * 0.75
-/obj/item/stock_parts/cell/high/empty
+/obj/item/stock_parts/power_store/cell/high/empty
empty = TRUE
-/obj/item/stock_parts/cell/super
+/obj/item/stock_parts/power_store/cell/super
name = "super-capacity power cell"
icon_state = "scell"
maxcharge = STANDARD_CELL_CHARGE * 20
custom_materials = list(/datum/material/glass=SMALL_MATERIAL_AMOUNT * 3)
chargerate = STANDARD_CELL_RATE
-/obj/item/stock_parts/cell/super/empty
+/obj/item/stock_parts/power_store/cell/super/empty
empty = TRUE
-/obj/item/stock_parts/cell/hyper
+/obj/item/stock_parts/power_store/cell/hyper
name = "hyper-capacity power cell"
icon_state = "hpcell"
maxcharge = STANDARD_CELL_CHARGE * 30
custom_materials = list(/datum/material/glass=SMALL_MATERIAL_AMOUNT * 4)
chargerate = STANDARD_CELL_RATE * 1.5
-/obj/item/stock_parts/cell/hyper/empty
+/obj/item/stock_parts/power_store/cell/hyper/empty
empty = TRUE
-/obj/item/stock_parts/cell/bluespace
+/obj/item/stock_parts/power_store/cell/bluespace
name = "bluespace power cell"
desc = "A rechargeable transdimensional power cell."
icon_state = "bscell"
@@ -413,10 +129,10 @@
custom_materials = list(/datum/material/glass=SMALL_MATERIAL_AMOUNT*6)
chargerate = STANDARD_CELL_RATE * 2
-/obj/item/stock_parts/cell/bluespace/empty
+/obj/item/stock_parts/power_store/cell/bluespace/empty
empty = TRUE
-/obj/item/stock_parts/cell/infinite
+/obj/item/stock_parts/power_store/cell/infinite
name = "infinite-capacity power cell"
icon_state = "icell"
maxcharge = INFINITY //little disappointing if you examine it and it's not huge
@@ -424,10 +140,10 @@
chargerate = INFINITY
ratingdesc = FALSE
-/obj/item/stock_parts/cell/infinite/use(used, force = FALSE)
+/obj/item/stock_parts/power_store/cell/infinite/use(used, force = FALSE)
return TRUE
-/obj/item/stock_parts/cell/infinite/abductor
+/obj/item/stock_parts/power_store/cell/infinite/abductor
name = "void core"
desc = "An alien power cell that produces energy seemingly out of nowhere."
icon = 'icons/obj/antags/abductor.dmi'
@@ -435,11 +151,11 @@
maxcharge = STANDARD_CELL_CHARGE * 50
ratingdesc = FALSE
-/obj/item/stock_parts/cell/infinite/abductor/Initialize(mapload)
+/obj/item/stock_parts/power_store/cell/infinite/abductor/Initialize(mapload)
AddElement(/datum/element/update_icon_blocker)
return ..()
-/obj/item/stock_parts/cell/potato
+/obj/item/stock_parts/power_store/cell/potato
name = "potato battery"
desc = "A rechargeable starch based power cell."
icon = 'icons/obj/service/hydroponics/harvest.dmi'
@@ -451,26 +167,26 @@
grown_battery = TRUE //it has the overlays for wires
custom_premium_price = PAYCHECK_CREW
-/obj/item/stock_parts/cell/potato/Initialize(mapload, override_maxcharge)
+/obj/item/stock_parts/power_store/cell/potato/Initialize(mapload, override_maxcharge)
charge = maxcharge * 0.3
. = ..()
-/obj/item/stock_parts/cell/emproof
+/obj/item/stock_parts/power_store/cell/emproof
name = "\improper EMP-proof cell"
desc = "An EMP-proof cell."
maxcharge = STANDARD_CELL_CHARGE * 0.5
-/obj/item/stock_parts/cell/emproof/Initialize(mapload)
+/obj/item/stock_parts/power_store/cell/emproof/Initialize(mapload)
AddElement(/datum/element/empprotection, EMP_PROTECT_SELF)
return ..()
-/obj/item/stock_parts/cell/emproof/empty
+/obj/item/stock_parts/power_store/cell/emproof/empty
empty = TRUE
-/obj/item/stock_parts/cell/emproof/corrupt()
+/obj/item/stock_parts/power_store/cell/emproof/corrupt()
return
-/obj/item/stock_parts/cell/emproof/slime
+/obj/item/stock_parts/power_store/cell/emproof/slime
name = "EMP-proof slime core"
desc = "A yellow slime core infused with plasma. Its organic nature makes it immune to EMPs."
icon = 'icons/mob/simple/slimes.dmi'
@@ -480,21 +196,21 @@
charge_light_type = null
connector_type = "slimecore"
-/obj/item/stock_parts/cell/emergency_light
+/obj/item/stock_parts/power_store/cell/emergency_light
name = "miniature power cell"
desc = "A tiny power cell with a very low power capacity. Used in light fixtures to power them in the event of an outage."
maxcharge = STANDARD_CELL_CHARGE * 0.12 //Emergency lights use 0.2 W per tick, meaning ~10 minutes of emergency power from a cell
custom_materials = list(/datum/material/glass = SMALL_MATERIAL_AMOUNT*0.2)
w_class = WEIGHT_CLASS_TINY
-/obj/item/stock_parts/cell/emergency_light/Initialize(mapload)
+/obj/item/stock_parts/power_store/cell/emergency_light/Initialize(mapload)
. = ..()
var/area/area = get_area(src)
if(area)
if(!area.lightswitch || !area.light_power)
charge = 0 //For naturally depowered areas, we start with no power
-/obj/item/stock_parts/cell/crystal_cell
+/obj/item/stock_parts/power_store/cell/crystal_cell
name = "crystal power cell"
desc = "A very high power cell made from crystallized plasma"
icon_state = "crystal_cell"
@@ -505,10 +221,10 @@
custom_materials = null
grind_results = null
-/obj/item/stock_parts/cell/inducer_supply
+/obj/item/stock_parts/power_store/cell/inducer_supply
maxcharge = STANDARD_CELL_CHARGE * 5
-/obj/item/stock_parts/cell/ethereal
+/obj/item/stock_parts/power_store/cell/ethereal
name = "ahelp it"
desc = "you sohuldn't see this"
maxcharge = ETHEREAL_CHARGE_DANGEROUS
@@ -519,10 +235,6 @@
custom_materials = null
grind_results = null
-/obj/item/stock_parts/cell/ethereal/examine(mob/user)
+/obj/item/stock_parts/power_store/cell/ethereal/examine(mob/user)
. = ..()
CRASH("[src.type] got examined by [user]")
-
-#undef CELL_DRAIN_TIME
-#undef CELL_POWER_GAIN
-#undef CELL_POWER_DRAIN
diff --git a/code/modules/power/lighting/light.dm b/code/modules/power/lighting/light.dm
index 9d3eb222fb8..3781944ad00 100644
--- a/code/modules/power/lighting/light.dm
+++ b/code/modules/power/lighting/light.dm
@@ -37,7 +37,7 @@
///Count of number of times switched on/off, this is used to calculate the probability the light burns out
var/switchcount = 0
///Cell reference
- var/obj/item/stock_parts/cell/cell
+ var/obj/item/stock_parts/power_store/cell
/// If TRUE, then cell is null, but one is pretending to exist.
/// This is to defer emergency cell creation unless necessary, as it is very expensive.
var/has_mock_cell = TRUE
@@ -321,7 +321,7 @@
/obj/machinery/light/get_cell()
if (has_mock_cell)
- cell = new /obj/item/stock_parts/cell/emergency_light(src)
+ cell = new /obj/item/stock_parts/power_store/cell/emergency_light(src)
has_mock_cell = FALSE
return cell
@@ -421,7 +421,7 @@
new /obj/item/stack/cable_coil(loc, 1, "red")
transfer_fingerprints_to(new_light)
- var/obj/item/stock_parts/cell/real_cell = get_cell()
+ var/obj/item/stock_parts/power_store/real_cell = get_cell()
if(!QDELETED(real_cell))
new_light.cell = real_cell
real_cell.forceMove(new_light)
@@ -482,8 +482,8 @@
/obj/machinery/light/proc/use_emergency_power(power_usage_amount = LIGHT_EMERGENCY_POWER_USE)
if(!has_emergency_power(power_usage_amount))
return FALSE
- var/obj/item/stock_parts/cell/real_cell = get_cell()
- if(real_cell.charge > 2.5 * /obj/item/stock_parts/cell/emergency_light::maxcharge) //it's meant to handle 120 W, ya doofus
+ var/obj/item/stock_parts/power_store/real_cell = get_cell()
+ if(real_cell.charge > 2.5 * /obj/item/stock_parts/power_store/cell/emergency_light::maxcharge) //it's meant to handle 120 W, ya doofus
visible_message(span_warning("[src] short-circuits from too powerful of a power cell!"))
burn_out()
return FALSE
diff --git a/code/modules/power/lighting/light_construct.dm b/code/modules/power/lighting/light_construct.dm
index 8b79c33d69b..2bca5e3b3f1 100644
--- a/code/modules/power/lighting/light_construct.dm
+++ b/code/modules/power/lighting/light_construct.dm
@@ -17,7 +17,7 @@
///Reference for light object
var/obj/machinery/light/new_light = null
///Reference for the internal cell
- var/obj/item/stock_parts/cell/cell
+ var/obj/item/stock_parts/power_store/cell
///Can we support a cell?
var/cell_connectors = TRUE
@@ -71,14 +71,14 @@
if(!cell)
return
to_chat(user, span_notice("You telekinetically remove [cell]."))
- var/obj/item/stock_parts/cell/cell_reference = cell
+ var/obj/item/stock_parts/power_store/cell_reference = cell
cell = null
cell_reference.forceMove(drop_location())
return cell_reference.attack_tk(user)
/obj/structure/light_construct/attackby(obj/item/tool, mob/user, params)
add_fingerprint(user)
- if(istype(tool, /obj/item/stock_parts/cell))
+ if(istype(tool, /obj/item/stock_parts/power_store/cell))
if(!cell_connectors)
to_chat(user, span_warning("This [name] can't support a power cell!"))
return
diff --git a/code/modules/power/power.dm b/code/modules/power/power.dm
index ab4dfba49db..5cfeab92f06 100644
--- a/code/modules/power/power.dm
+++ b/code/modules/power/power.dm
@@ -249,7 +249,7 @@
* - channel: The power channel to use.
* Returns: The amount of energy the cell received.
*/
-/obj/machinery/proc/charge_cell(amount, obj/item/stock_parts/cell/cell, grid_only = FALSE, channel = AREA_USAGE_EQUIP)
+/obj/machinery/proc/charge_cell(amount, obj/item/stock_parts/power_store/cell, grid_only = FALSE, channel = AREA_USAGE_EQUIP)
var/demand = use_energy(min(amount, cell.used_charge()), channel = channel, ignore_apc = grid_only)
var/power_given = cell.give(demand)
return power_given
@@ -449,11 +449,11 @@
power_source = Cable.powernet
var/datum/powernet/PN
- var/obj/item/stock_parts/cell/cell
+ var/obj/item/stock_parts/power_store/cell
if (istype(power_source, /datum/powernet))
PN = power_source
- else if (istype(power_source, /obj/item/stock_parts/cell))
+ else if (istype(power_source, /obj/item/stock_parts/power_store))
cell = power_source
else if (istype(power_source, /obj/machinery/power/apc))
var/obj/machinery/power/apc/apc = power_source
@@ -492,7 +492,7 @@
return FALSE
var/datum/powernet/PN = powernet_info["powernet"]
- var/obj/item/stock_parts/cell/cell = powernet_info["cell"]
+ var/obj/item/stock_parts/power_store/cell = powernet_info["cell"]
var/PN_damage = 0
var/cell_damage = 0
@@ -517,7 +517,7 @@
source_area.apc?.terminal?.use_energy(drained_energy)
else if (istype(power_source, /datum/powernet))
PN.delayedload += (min(drained_energy, max(PN.newavail - PN.delayedload, 0)))
- else if (istype(power_source, /obj/item/stock_parts/cell))
+ else if (istype(power_source, /obj/item/stock_parts/power_store))
cell.use(drained_energy)
return drained_energy
diff --git a/code/modules/power/power_store.dm b/code/modules/power/power_store.dm
new file mode 100644
index 00000000000..688dc70908f
--- /dev/null
+++ b/code/modules/power/power_store.dm
@@ -0,0 +1,326 @@
+#define CELL_DRAIN_TIME 35
+#define CELL_POWER_GAIN (0.06 * STANDARD_CELL_CHARGE)
+#define CELL_POWER_DRAIN (0.75 * STANDARD_CELL_CHARGE)
+
+/**
+ * # Power store abstract type
+ *
+ * Abstract type for a stock part that holds power.
+ */
+/obj/item/stock_parts/power_store
+ name = "power store abstract"
+ /// The size icon overlay prefix.
+ var/cell_size_prefix = "cell"
+ ///Current charge in cell units
+ var/charge = 0
+ /// Standard cell charge used for rating
+ var/rating_base = STANDARD_CELL_CHARGE
+ ///Maximum charge in cell units
+ var/maxcharge = STANDARD_CELL_CHARGE
+ ///If the cell has been booby-trapped by injecting it with plasma. Chance on use() to explode.
+ var/rigged = FALSE
+ ///If the power cell was damaged by an explosion, chance for it to become corrupted and function the same as rigged.
+ var/corrupted = FALSE
+ ///How much power is given per second in a recharger.
+ var/chargerate = STANDARD_CELL_RATE * 0.05
+ ///If true, the cell will state it's maximum charge in it's description
+ var/ratingdesc = TRUE
+ ///If it's a grown that acts as a battery, add a wire overlay to it.
+ var/grown_battery = FALSE
+ ///What charge lige sprite to use, null if no light
+ var/charge_light_type = "standard"
+ ///What connector sprite to use when in a cell charger, null if no connectors
+ var/connector_type = "standard"
+ ///Does the cell start without any charge?
+ var/empty = FALSE
+
+/obj/item/stock_parts/power_store/get_cell()
+ return src
+
+/obj/item/stock_parts/power_store/Initialize(mapload, override_maxcharge)
+ . = ..()
+ create_reagents(5, INJECTABLE | DRAINABLE)
+ if (override_maxcharge)
+ maxcharge = override_maxcharge
+ rating = max(round(maxcharge / (rating_base * 10), 1), 1)
+ if(!charge)
+ charge = maxcharge
+ if(empty)
+ charge = 0
+ if(ratingdesc)
+ desc += " This one has a rating of [display_energy(maxcharge)][prob(10) ? ", and you should not swallow it" : ""]." //joke works better if it's not on every cell
+ update_appearance()
+
+ RegisterSignal(src, COMSIG_ITEM_MAGICALLY_CHARGED, PROC_REF(on_magic_charge))
+ var/static/list/loc_connections = list(
+ COMSIG_ITEM_MAGICALLY_CHARGED = PROC_REF(on_magic_charge),
+ )
+ AddElement(/datum/element/connect_loc, loc_connections)
+
+/**
+ * Signal proc for [COMSIG_ITEM_MAGICALLY_CHARGED]
+ *
+ * If we, or the item we're located in, is subject to the charge spell, gain some charge back
+ */
+/obj/item/stock_parts/power_store/proc/on_magic_charge(datum/source, datum/action/cooldown/spell/charge/spell, mob/living/caster)
+ SIGNAL_HANDLER
+
+ // This shouldn't be running if we're not being held by a mob,
+ // or if we're not within an object being held by a mob, but just in case...
+ if(!ismovable(loc))
+ return
+
+ . = COMPONENT_ITEM_CHARGED
+
+ if(prob(80))
+ maxcharge -= rating_base * 0.2
+
+ if(maxcharge <= 1) // Div by 0 protection
+ maxcharge = 1
+ . |= COMPONENT_ITEM_BURNT_OUT
+
+ charge = maxcharge
+ update_appearance()
+
+ // Guns need to process their chamber when we've been charged
+ if(isgun(loc))
+ var/obj/item/gun/gun_loc = loc
+ gun_loc.process_chamber()
+
+ // The thing we're in might have overlays or icon states for whether the cell is charged
+ if(!ismob(loc))
+ loc.update_appearance()
+
+ return .
+
+/obj/item/stock_parts/power_store/create_reagents(max_vol, flags)
+ . = ..()
+ RegisterSignals(reagents, list(COMSIG_REAGENTS_NEW_REAGENT, COMSIG_REAGENTS_ADD_REAGENT, COMSIG_REAGENTS_DEL_REAGENT, COMSIG_REAGENTS_REM_REAGENT), PROC_REF(on_reagent_change))
+ RegisterSignal(reagents, COMSIG_QDELETING, PROC_REF(on_reagents_del))
+
+/// Handles properly detaching signal hooks.
+/obj/item/stock_parts/power_store/proc/on_reagents_del(datum/reagents/reagents)
+ SIGNAL_HANDLER
+ UnregisterSignal(reagents, list(COMSIG_REAGENTS_NEW_REAGENT, COMSIG_REAGENTS_ADD_REAGENT, COMSIG_REAGENTS_DEL_REAGENT, COMSIG_REAGENTS_REM_REAGENT, COMSIG_QDELETING))
+ return NONE
+
+/obj/item/stock_parts/power_store/update_overlays()
+ . = ..()
+ if(grown_battery)
+ . += mutable_appearance('icons/obj/machines/cell_charger.dmi', "grown_wires")
+ if((charge < 0.01) || !charge_light_type)
+ return
+ . += mutable_appearance('icons/obj/machines/cell_charger.dmi', "[cell_size_prefix]-[charge_light_type]-o[(percent() >= 99.5) ? 2 : 1]")
+
+/obj/item/stock_parts/power_store/vv_edit_var(vname, vval)
+ if(vname == NAMEOF(src, charge))
+ charge = clamp(vval, 0, maxcharge)
+ return TRUE
+ if(vname == NAMEOF(src, maxcharge))
+ if(charge > vval)
+ charge = vval
+ if(vname == NAMEOF(src, corrupted) && vval && !corrupted)
+ corrupt(TRUE)
+ return TRUE
+ return ..()
+
+
+/**
+ * Returns the percentage of the cell's charge.
+ */
+/obj/item/stock_parts/power_store/proc/percent() // return % charge of cell
+ return 100 * charge / maxcharge
+
+/**
+ * Returns the maximum charge of the cell.
+ */
+/obj/item/stock_parts/power_store/proc/max_charge()
+ return maxcharge
+
+/**
+ * Returns the current charge of the cell.
+ */
+/obj/item/stock_parts/power_store/proc/charge()
+ return charge
+
+/**
+ * Returns the amount of charge used on the cell.
+ */
+/obj/item/stock_parts/power_store/proc/used_charge()
+ return maxcharge - charge
+
+/// Use power from the cell.
+/// Args:
+/// - used: Amount of power in joules to use.
+/// - force: If true, uses the remaining power from the cell if there isn't enough power to supply the demand.
+/// Returns: The power used from the cell in joules.
+/obj/item/stock_parts/power_store/use(used, force = FALSE)
+ var/power_used = min(used, charge)
+ if(rigged && power_used > 0)
+ explode()
+ return 0 // The cell decided to explode so we won't be able to use it.
+ if(!force && charge < used)
+ return 0
+ charge -= power_used
+ if(!istype(loc, /obj/machinery/power/apc))
+ SSblackbox.record_feedback("tally", "cell_used", 1, type)
+ return power_used
+
+/// Recharge the cell.
+/// Args:
+/// - amount: The amount of energy to give to the cell in joules.
+/// Returns: The power given to the cell in joules.
+/obj/item/stock_parts/power_store/proc/give(amount)
+ var/power_used = min(maxcharge-charge,amount)
+ charge += power_used
+ if(rigged && amount > 0)
+ explode()
+ return power_used
+
+/**
+ * Changes the charge of the cell.
+ * Args:
+ * - amount: The energy to give to the cell (can be negative).
+ * Returns: The energy that was given to the cell (can be negative).
+ */
+/obj/item/stock_parts/power_store/proc/change(amount)
+ var/energy_used = clamp(amount, -charge, maxcharge - charge)
+ charge += energy_used
+ if(rigged && energy_used)
+ explode()
+ return energy_used
+
+/obj/item/stock_parts/power_store/examine(mob/user)
+ . = ..()
+ if(rigged)
+ . += span_danger("This [name] seems to be faulty!")
+ else
+ . += "The charge meter reads [CEILING(percent(), 0.1)]%." //so it doesn't say 0% charge when the overlay indicates it still has charge
+
+/obj/item/stock_parts/power_store/proc/on_reagent_change(datum/reagents/holder, ...)
+ SIGNAL_HANDLER
+ rigged = (corrupted || holder.has_reagent(/datum/reagent/toxin/plasma, 5)) ? TRUE : FALSE //has_reagent returns the reagent datum
+ return NONE
+
+
+/obj/item/stock_parts/power_store/proc/explode()
+ if(!charge)
+ return
+ var/range_devastation = -1
+ var/range_heavy = round(sqrt(charge / (3.6 * rating_base)))
+ var/range_light = round(sqrt(charge / (0.9 * rating_base)))
+ var/range_flash = range_light
+ if(!range_light)
+ rigged = FALSE
+ corrupt()
+ return
+
+ message_admins("[ADMIN_LOOKUPFLW(usr)] has triggered a rigged/corrupted power cell explosion at [AREACOORD(loc)].")
+ usr?.log_message("triggered a rigged/corrupted power cell explosion", LOG_GAME)
+ usr?.log_message("triggered a rigged/corrupted power cell explosion", LOG_VICTIM, log_globally = FALSE)
+
+ explosion(src, devastation_range = range_devastation, heavy_impact_range = range_heavy, light_impact_range = range_light, flash_range = range_flash)
+ qdel(src)
+
+/obj/item/stock_parts/power_store/proc/corrupt(force)
+ charge /= 2
+ maxcharge = max(maxcharge/2, chargerate)
+ if (force || prob(10))
+ rigged = TRUE //broken batterys are dangerous
+ corrupted = TRUE
+
+/obj/item/stock_parts/power_store/emp_act(severity)
+ . = ..()
+ if(. & EMP_PROTECT_SELF)
+ return
+ use(STANDARD_CELL_CHARGE / severity, force = TRUE)
+
+/obj/item/stock_parts/power_store/ex_act(severity, target)
+ . = ..()
+ if(QDELETED(src))
+ return FALSE
+
+ switch(severity)
+ if(EXPLODE_HEAVY)
+ if(prob(50))
+ corrupt()
+ if(EXPLODE_LIGHT)
+ if(prob(25))
+ corrupt()
+
+ return TRUE
+
+/obj/item/stock_parts/power_store/suicide_act(mob/living/user)
+ user.visible_message(span_suicide("[user] is licking the electrodes of [src]! It looks like [user.p_theyre()] trying to commit suicide!"))
+ do_sparks(2, TRUE, user)
+ var/eating_success = do_after(user, 5 SECONDS, src)
+ if(QDELETED(user))
+ return SHAME
+ if(!eating_success || QDELETED(src) || charge == 0)
+ user.visible_message(span_suicide("[user] chickens out!"))
+ return SHAME
+ playsound(user, 'sound/effects/sparks1.ogg', charge / maxcharge)
+ var/damage = charge / (1 KILO JOULES)
+ user.electrocute_act(damage, src, 1, SHOCK_IGNORE_IMMUNITY|SHOCK_DELAY_STUN|SHOCK_NOGLOVES)
+ charge = 0
+ update_appearance()
+ if(user.stat != DEAD)
+ to_chat(user, span_suicide("There's not enough charge in [src] to kill you!"))
+ return SHAME
+ addtimer(CALLBACK(src, PROC_REF(gib_user), user, charge), 3 SECONDS)
+ return MANUAL_SUICIDE
+
+/obj/item/stock_parts/power_store/proc/gib_user(mob/living/user, discharged_energy)
+ if(QDELETED(user))
+ return
+ if(discharged_energy < STANDARD_BATTERY_CHARGE)
+ return
+ user.dropItemToGround(src)
+ user.dust(just_ash = TRUE)
+ playsound(src, 'sound/magic/lightningshock.ogg', 50, TRUE, 10)
+ tesla_zap(source = src, zap_range = 10, power = discharged_energy)
+
+/obj/item/stock_parts/power_store/attack_self(mob/user)
+ if(ishuman(user))
+ var/mob/living/carbon/human/H = user
+ var/obj/item/organ/internal/stomach/maybe_stomach = H.get_organ_slot(ORGAN_SLOT_STOMACH)
+
+ if(istype(maybe_stomach, /obj/item/organ/internal/stomach/ethereal))
+
+ var/charge_limit = ETHEREAL_CHARGE_DANGEROUS - CELL_POWER_GAIN
+ var/obj/item/organ/internal/stomach/ethereal/stomach = maybe_stomach
+ var/obj/item/stock_parts/power_store/stomach_cell = stomach.cell
+ if((stomach.drain_time > world.time) || !stomach)
+ return
+ if(charge < CELL_POWER_DRAIN)
+ to_chat(H, span_warning("[src] doesn't have enough power!"))
+ return
+ if(stomach_cell.charge() > charge_limit)
+ to_chat(H, span_warning("Your charge is full!"))
+ return
+ to_chat(H, span_notice("You begin clumsily channeling power from [src] into your body."))
+ stomach.drain_time = world.time + CELL_DRAIN_TIME
+ while(do_after(user, CELL_DRAIN_TIME, target = src))
+ if((charge < CELL_POWER_DRAIN) || (stomach_cell.charge() > charge_limit))
+ return
+ if(istype(stomach))
+ to_chat(H, span_notice("You receive some charge from [src], wasting some in the process."))
+ stomach.adjust_charge(CELL_POWER_GAIN)
+ charge -= CELL_POWER_DRAIN //you waste way more than you receive, so that ethereals cant just steal one cell and forget about hunger
+ else
+ to_chat(H, span_warning("You can't receive charge from [src]!"))
+ return
+
+
+/obj/item/stock_parts/power_store/blob_act(obj/structure/blob/B)
+ SSexplosions.high_mov_atom += src
+
+/obj/item/stock_parts/power_store/proc/get_electrocute_damage()
+ return ELECTROCUTE_DAMAGE(charge / max(0.001 * STANDARD_CELL_CHARGE, 1)) // Wouldn't want it to consider more energy than whatever is actually in the cell if for some strange reason someone set the STANDARD_CELL_CHARGE to below 1kJ.
+
+/obj/item/stock_parts/power_store/get_part_rating()
+ return maxcharge * 10 + charge
+
+#undef CELL_DRAIN_TIME
+#undef CELL_POWER_GAIN
+#undef CELL_POWER_DRAIN
diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm
index 0cad7bdcef5..935601b834b 100644
--- a/code/modules/power/smes.dm
+++ b/code/modules/power/smes.dm
@@ -23,7 +23,7 @@
can_change_cable_layer = TRUE
/// The charge capacity.
- var/capacity = 50 * STANDARD_CELL_CHARGE // The board defaults with 5 high capacity power cells.
+ var/capacity = 50 * STANDARD_BATTERY_CHARGE // The board defaults with 5 high capacity batteries.
/// The current charge.
var/charge = 0
@@ -71,7 +71,7 @@
power_coefficient += capacitor.tier
input_level_max = initial(input_level_max) * power_coefficient
output_level_max = initial(output_level_max) * power_coefficient
- for(var/obj/item/stock_parts/cell/power_cell in component_parts)
+ for(var/obj/item/stock_parts/power_store/power_cell in component_parts)
max_charge += power_cell.maxcharge
new_charge += power_cell.charge
capacity = max_charge
@@ -203,7 +203,7 @@
return ..()
/obj/machinery/power/smes/on_deconstruction(disassembled)
- for(var/obj/item/stock_parts/cell/cell in component_parts)
+ for(var/obj/item/stock_parts/power_store/cell in component_parts)
cell.charge = (charge / capacity) * cell.maxcharge
/obj/machinery/power/smes/Destroy()
@@ -431,7 +431,7 @@
outputting = output_attempt
output_level = rand(0, output_level_max)
input_level = rand(0, input_level_max)
- charge -= STANDARD_CELL_CHARGE/severity
+ charge -= STANDARD_BATTERY_CHARGE/severity
if (charge < 0)
charge = 0
update_appearance()
@@ -442,19 +442,19 @@
name = "super capacity power storage unit"
desc = "A super-capacity superconducting magnetic energy storage (SMES) unit. Relatively rare, and typically installed in long-range outposts where minimal maintenance is expected."
circuit = /obj/item/circuitboard/machine/smes/super
- capacity = 100 * STANDARD_CELL_CHARGE
+ capacity = 100 * STANDARD_BATTERY_CHARGE
/obj/machinery/power/smes/super/full
- charge = 100 * STANDARD_CELL_CHARGE
+ charge = 100 * STANDARD_BATTERY_CHARGE
/obj/machinery/power/smes/full
- charge = 50 * STANDARD_CELL_CHARGE
+ charge = 50 * STANDARD_BATTERY_CHARGE
/obj/machinery/power/smes/ship
- charge = 20 * STANDARD_CELL_CHARGE
+ charge = 20 * STANDARD_BATTERY_CHARGE
/obj/machinery/power/smes/engineering
- charge = 50 * STANDARD_CELL_CHARGE // Engineering starts with some charge for singulo //sorry little one, singulo as engine is gone
+ charge = 50 * STANDARD_BATTERY_CHARGE // Engineering starts with some charge for singulo //sorry little one, singulo as engine is gone
output_level = 90 KILO WATTS
/obj/machinery/power/smes/magical
diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm
index b977441e9ae..3571e0858c8 100644
--- a/code/modules/projectiles/guns/energy.dm
+++ b/code/modules/projectiles/guns/energy.dm
@@ -5,8 +5,8 @@
icon = 'icons/obj/weapons/guns/energy.dmi'
/// What type of power cell this uses
- var/obj/item/stock_parts/cell/cell
- var/cell_type = /obj/item/stock_parts/cell
+ var/obj/item/stock_parts/power_store/cell
+ var/cell_type = /obj/item/stock_parts/power_store/cell
///if the weapon has custom icons for individual ammo types it can switch between. ie disabler beams, taser, laser/lethals, ect.
var/modifystate = FALSE
var/list/ammo_type = list(/obj/item/ammo_casing/energy)
diff --git a/code/modules/projectiles/guns/energy/energy_gun.dm b/code/modules/projectiles/guns/energy/energy_gun.dm
index 78e75d1f306..3ce3338bf87 100644
--- a/code/modules/projectiles/guns/energy/energy_gun.dm
+++ b/code/modules/projectiles/guns/energy/energy_gun.dm
@@ -34,7 +34,7 @@
icon_state = "mini"
inhand_icon_state = "gun"
w_class = WEIGHT_CLASS_SMALL
- cell_type = /obj/item/stock_parts/cell/mini_egun
+ cell_type = /obj/item/stock_parts/power_store/cell/mini_egun
ammo_x_offset = 2
charge_sections = 3
single_shot_type_overlay = FALSE
@@ -75,7 +75,7 @@
/obj/item/gun/energy/e_gun/hos
name = "\improper X-01 MultiPhase Energy Gun"
desc = "This is an expensive, modern recreation of an antique laser gun. This gun has several unique firemodes, but lacks the ability to recharge over time."
- cell_type = /obj/item/stock_parts/cell/hos_gun
+ cell_type = /obj/item/stock_parts/power_store/cell/hos_gun
icon_state = "hoslaser"
w_class = WEIGHT_CLASS_NORMAL
force = 10
diff --git a/code/modules/projectiles/guns/energy/laser_gatling.dm b/code/modules/projectiles/guns/energy/laser_gatling.dm
index 0f5e7d3deac..e4375bd4832 100644
--- a/code/modules/projectiles/guns/energy/laser_gatling.dm
+++ b/code/modules/projectiles/guns/energy/laser_gatling.dm
@@ -13,7 +13,7 @@
w_class = WEIGHT_CLASS_HUGE
var/obj/item/gun/energy/minigun/gun
- var/obj/item/stock_parts/cell/minigun/battery
+ var/obj/item/stock_parts/power_store/cell/minigun/battery
var/armed = FALSE //whether the gun is attached, FALSE is attached, TRUE is the gun is wielded.
var/overheat = 0
var/overheat_max = 40
@@ -102,7 +102,7 @@
custom_materials = null
weapon_weight = WEAPON_HEAVY
ammo_type = list(/obj/item/ammo_casing/energy/laser/minigun)
- cell_type = /obj/item/stock_parts/cell/crap
+ cell_type = /obj/item/stock_parts/power_store/cell/crap
item_flags = NEEDS_PERMIT | SLOWS_WHILE_IN_HAND
can_charge = FALSE
var/obj/item/minigunpack/ammo_pack
@@ -148,7 +148,7 @@
return FALSE
return ..()
-/obj/item/stock_parts/cell/minigun
+/obj/item/stock_parts/power_store/cell/minigun
name = "gatling gun fusion core"
desc = "Where did these come from?"
maxcharge = 500 * STANDARD_CELL_CHARGE
diff --git a/code/modules/projectiles/guns/energy/pulse.dm b/code/modules/projectiles/guns/energy/pulse.dm
index a589594d796..0635de8037a 100644
--- a/code/modules/projectiles/guns/energy/pulse.dm
+++ b/code/modules/projectiles/guns/energy/pulse.dm
@@ -10,7 +10,7 @@
obj_flags = CONDUCTS_ELECTRICITY
slot_flags = ITEM_SLOT_BACK
ammo_type = list(/obj/item/ammo_casing/energy/laser/pulse, /obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser)
- cell_type = /obj/item/stock_parts/cell/pulse
+ cell_type = /obj/item/stock_parts/power_store/cell/pulse
/obj/item/gun/energy/pulse/Initialize(mapload)
. = ..()
@@ -44,7 +44,7 @@
icon_state = "pulse_carbine"
worn_icon_state = "gun"
inhand_icon_state = null
- cell_type = /obj/item/stock_parts/cell/pulse/carbine
+ cell_type = /obj/item/stock_parts/power_store/cell/pulse/carbine
/obj/item/gun/energy/pulse/carbine/add_seclight_point()
AddComponent(/datum/component/seclite_attachable, \
@@ -63,7 +63,7 @@
name = "pulse destroyer"
desc = "A heavy-duty energy rifle built for pure destruction."
worn_icon_state = "pulse"
- cell_type = /obj/item/stock_parts/cell/infinite
+ cell_type = /obj/item/stock_parts/power_store/cell/infinite
ammo_type = list(/obj/item/ammo_casing/energy/laser/pulse)
/obj/item/gun/energy/pulse/destroyer/attack_self(mob/living/user)
@@ -77,7 +77,7 @@
icon_state = "pulse_pistol"
worn_icon_state = "gun"
inhand_icon_state = "gun"
- cell_type = /obj/item/stock_parts/cell/pulse/pistol
+ cell_type = /obj/item/stock_parts/power_store/cell/pulse/pistol
/obj/item/gun/energy/pulse/pistol/loyalpin
pin = /obj/item/firing_pin/implant/mindshield
@@ -87,4 +87,4 @@
desc = "A compact pulse core in a classic handgun frame for Nanotrasen officers. It's not the size of the gun, it's the size of the hole it puts through people."
icon_state = "m1911"
inhand_icon_state = "gun"
- cell_type = /obj/item/stock_parts/cell/infinite
+ cell_type = /obj/item/stock_parts/power_store/cell/infinite
diff --git a/code/modules/projectiles/guns/energy/recharge.dm b/code/modules/projectiles/guns/energy/recharge.dm
index 1b9409478cd..0aa14b48c32 100644
--- a/code/modules/projectiles/guns/energy/recharge.dm
+++ b/code/modules/projectiles/guns/energy/recharge.dm
@@ -4,7 +4,7 @@
base_icon_state = "kineticgun"
desc = "A self recharging gun. Holds one shot at a time."
automatic_charge_overlays = FALSE
- cell_type = /obj/item/stock_parts/cell/emproof
+ cell_type = /obj/item/stock_parts/power_store/cell/emproof
/// If set to something, instead of an overlay, sets the icon_state directly.
var/no_charge_state
/// Does it hold charge when not put away?
diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm
index a342b0e85f4..653cffcbeec 100644
--- a/code/modules/projectiles/guns/energy/special.dm
+++ b/code/modules/projectiles/guns/energy/special.dm
@@ -52,7 +52,7 @@
inhand_icon_state = "c20r"
w_class = WEIGHT_CLASS_BULKY
ammo_type = list(/obj/item/ammo_casing/energy/meteor)
- cell_type = /obj/item/stock_parts/cell/potato
+ cell_type = /obj/item/stock_parts/power_store/cell/potato
clumsy_check = 0 //Admin spawn only, might as well let clowns use it.
selfcharge = 1
automatic_charge_overlays = FALSE
@@ -297,7 +297,7 @@
desc = "An LMG that fires 3D-printed flechettes. They are slowly resupplied using the cyborg's internal power source."
icon_state = "l6_cyborg"
icon = 'icons/obj/weapons/guns/ballistic.dmi'
- cell_type = /obj/item/stock_parts/cell/secborg
+ cell_type = /obj/item/stock_parts/power_store/cell/secborg
ammo_type = list(/obj/item/ammo_casing/energy/c3dbullet)
can_charge = FALSE
use_cyborg_cell = TRUE
@@ -314,7 +314,7 @@
desc = "A gun that changes temperatures. Comes with a collapsible stock."
w_class = WEIGHT_CLASS_NORMAL
ammo_type = list(/obj/item/ammo_casing/energy/temp, /obj/item/ammo_casing/energy/temp/hot)
- cell_type = /obj/item/stock_parts/cell/high
+ cell_type = /obj/item/stock_parts/power_store/cell/high
pin = null
/obj/item/gun/energy/temperature/security
diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
index 68c4c2abff0..cbd6449269c 100644
--- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
@@ -11,13 +11,13 @@
processing_flags = NONE
/// The cell used to dispense reagents
- var/obj/item/stock_parts/cell/cell
- /// Efficiency used when converting cell power to reagents. Units (volume) per joule.
- var/powerefficiency = 1e-4
+ var/obj/item/stock_parts/power_store/cell
+ /// Efficiency used when converting cell power to reagents. Joule per volume.
+ var/power_cost = 0.1 KILO WATTS
/// The current amount this machine is dispensing
var/amount = 30
/// The rate at which this machine recharges the power cell.
- var/recharge_amount = 1.25 KILO WATTS
+ var/recharge_amount = 0.3 KILO WATTS
/// The temperature reagents are dispensed into the beaker
var/dispensed_temperature = DEFAULT_REAGENT_TEMPERATURE
/// If the UI has the pH meter shown
@@ -124,7 +124,7 @@
if(in_range(user, src) || isobserver(user))
. += "The status display reads:\n\
Recharge rate: [display_power(recharge_amount, convert = FALSE)].\n\
- Energy cost: [siunit(INVERSE(powerefficiency), "J/u", 3)]."
+ Energy cost: [siunit(power_cost, "J/u", 3)]."
. += span_notice("Use RMB to eject a stored beaker.")
/obj/machinery/chem_dispenser/on_set_is_operational(old_value)
@@ -278,7 +278,7 @@
var/datum/reagents/holder = beaker.reagents
var/to_dispense = max(0, min(amount, holder.maximum_volume - holder.total_volume))
- if(!cell.use(to_dispense / powerefficiency))
+ if(!cell.use(to_dispense * power_cost))
say("Not enough energy to complete operation!")
return
holder.add_reagent(reagent, to_dispense, reagtemp = dispensed_temperature, added_purity = base_reagent_purity)
@@ -321,7 +321,7 @@
var/to_dispense = max(0, min(dispense_amount, holder.maximum_volume - holder.total_volume))
if(!to_dispense)
continue
- if(!cell.use(to_dispense / powerefficiency))
+ if(!cell.use(to_dispense * power_cost))
say("Not enough energy to complete operation!")
return
holder.add_reagent(reagent, to_dispense, reagtemp = dispensed_temperature, added_purity = base_reagent_purity)
@@ -412,7 +412,7 @@
if(. & EMP_PROTECT_SELF)
return
var/list/datum/reagents/R = list()
- var/total = min(rand(7,15), FLOOR(cell.charge*powerefficiency, 1))
+ var/total = min(rand(7,15), FLOOR(cell.charge*INVERSE(power_cost), 1))
var/datum/reagents/Q = new(total*10)
if(beaker?.reagents)
R += beaker.reagents
@@ -422,7 +422,7 @@
chem_splash(get_turf(src), null, 3, R)
if(beaker?.reagents)
beaker.reagents.remove_all()
- cell.use(total/powerefficiency)
+ cell.use(total * power_cost)
cell.emp_act(severity)
work_animation()
visible_message(span_danger("[src] malfunctions, spraying chemicals everywhere!"))
@@ -430,12 +430,12 @@
/obj/machinery/chem_dispenser/RefreshParts()
. = ..()
recharge_amount = initial(recharge_amount)
- var/newpowereff = INVERSE(1.5e4)
+ var/new_power_cost = initial(power_cost)
var/parts_rating = 0
- for(var/obj/item/stock_parts/cell/stock_cell in component_parts)
+ for(var/obj/item/stock_parts/power_store/stock_cell in component_parts)
cell = stock_cell
for(var/datum/stock_part/matter_bin/matter_bin in component_parts)
- newpowereff += matter_bin.tier / 6e4
+ new_power_cost -= (matter_bin.tier * 0.25 KILO WATTS)
parts_rating += matter_bin.tier
for(var/datum/stock_part/capacitor/capacitor in component_parts)
recharge_amount *= capacitor.tier
@@ -446,7 +446,7 @@
else
dispensable_reagents -= upgrade_reagents
parts_rating += servo.tier
- powerefficiency = round(newpowereff, 1e-5)
+ power_cost = max(new_power_cost, 0.1 KILO WATTS)
/obj/machinery/chem_dispenser/proc/replace_beaker(mob/living/user, obj/item/reagent_containers/new_beaker)
if(!user)
diff --git a/code/modules/reagents/chemistry/recipes/slime_extracts.dm b/code/modules/reagents/chemistry/recipes/slime_extracts.dm
index 6407ff0fb8b..a60432c0784 100644
--- a/code/modules/reagents/chemistry/recipes/slime_extracts.dm
+++ b/code/modules/reagents/chemistry/recipes/slime_extracts.dm
@@ -262,7 +262,7 @@
required_container = /obj/item/slime_extract/yellow
/datum/chemical_reaction/slime/slimecell/on_reaction(datum/reagents/holder, created_volume)
- new /obj/item/stock_parts/cell/emproof/slime(get_turf(holder.my_atom))
+ new /obj/item/stock_parts/power_store/cell/emproof/slime(get_turf(holder.my_atom))
..()
/datum/chemical_reaction/slime/slimeglow
diff --git a/code/modules/reagents/reagent_containers/misc.dm b/code/modules/reagents/reagent_containers/misc.dm
index f7152204f9e..d2dc2adfb5f 100644
--- a/code/modules/reagents/reagent_containers/misc.dm
+++ b/code/modules/reagents/reagent_containers/misc.dm
@@ -8,13 +8,13 @@
reagent_flags = OPENCONTAINER
fill_icon_state = "maunafilling"
fill_icon_thresholds = list(25)
- var/obj/item/stock_parts/cell/cell
+ var/obj/item/stock_parts/power_store/cell
var/open = FALSE
var/on = FALSE
/obj/item/reagent_containers/cup/maunamug/Initialize(mapload, vol)
. = ..()
- cell = new /obj/item/stock_parts/cell(src)
+ cell = new /obj/item/stock_parts/power_store/cell(src)
/obj/item/reagent_containers/cup/maunamug/get_cell()
return cell
@@ -75,7 +75,7 @@
/obj/item/reagent_containers/cup/maunamug/attackby(obj/item/I, mob/user, params)
add_fingerprint(user)
- if(!istype(I, /obj/item/stock_parts/cell))
+ if(!istype(I, /obj/item/stock_parts/power_store/cell))
return ..()
if(!open)
to_chat(user, span_warning("The battery case must be open to insert a power cell!"))
diff --git a/code/modules/religion/religion_sects.dm b/code/modules/religion/religion_sects.dm
index a8f23225a8b..0789cb2ac20 100644
--- a/code/modules/religion/religion_sects.dm
+++ b/code/modules/religion/religion_sects.dm
@@ -146,7 +146,7 @@
do not heal organic limbs. You can now sacrifice cells, with favor depending on their charge."
tgui_icon = "robot"
alignment = ALIGNMENT_NEUT
- desired_items = list(/obj/item/stock_parts/cell = "with battery charge")
+ desired_items = list(/obj/item/stock_parts/power_store = "with battery charge")
rites_list = list(/datum/religion_rites/synthconversion, /datum/religion_rites/machine_blessing)
altar_icon_state = "convertaltar-blue"
max_favor = 2500
@@ -196,7 +196,7 @@
blessed.add_mood_event("blessing", /datum/mood_event/blessing)
return TRUE
-/datum/religion_sect/mechanical/on_sacrifice(obj/item/stock_parts/cell/power_cell, mob/living/chap)
+/datum/religion_sect/mechanical/on_sacrifice(obj/item/stock_parts/power_store/cell/power_cell, mob/living/chap)
if(!istype(power_cell))
return
diff --git a/code/modules/research/designs/autolathe/engineering_designs.dm b/code/modules/research/designs/autolathe/engineering_designs.dm
index 6d1bfed8ea1..dc87b747959 100644
--- a/code/modules/research/designs/autolathe/engineering_designs.dm
+++ b/code/modules/research/designs/autolathe/engineering_designs.dm
@@ -76,7 +76,7 @@
id = "miniature_power_cell"
build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE
materials = list(/datum/material/glass =SMALL_MATERIAL_AMOUNT*0.2)
- build_path = /obj/item/stock_parts/cell/emergency_light
+ build_path = /obj/item/stock_parts/power_store/cell/emergency_light
category = list(
RND_CATEGORY_INITIAL,
RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_LIGHTING,
diff --git a/code/modules/research/designs/power_designs.dm b/code/modules/research/designs/power_designs.dm
index 700f99a6435..deb2256ff10 100644
--- a/code/modules/research/designs/power_designs.dm
+++ b/code/modules/research/designs/power_designs.dm
@@ -4,12 +4,12 @@
/datum/design/basic_cell
name = "Basic Power Cell"
- desc = "A basic power cell that holds 1 MJ of energy."
+ desc = "A basic power cell that holds 10 KW of energy."
id = "basic_cell"
build_type = PROTOLATHE | AWAY_LATHE | AUTOLATHE |MECHFAB
materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 7, /datum/material/glass =SMALL_MATERIAL_AMOUNT * 0.5)
construction_time = 10 SECONDS
- build_path = /obj/item/stock_parts/cell/empty
+ build_path = /obj/item/stock_parts/power_store/cell/empty
category = list(
RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_1
)
@@ -17,12 +17,12 @@
/datum/design/high_cell
name = "High-Capacity Power Cell"
- desc = "A power cell that holds 10 MJ of energy."
+ desc = "A power cell that holds 100 KW of energy."
id = "high_cell"
build_type = PROTOLATHE | AWAY_LATHE | AUTOLATHE | MECHFAB
materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 7, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 0.6)
construction_time = 10 SECONDS
- build_path = /obj/item/stock_parts/cell/high/empty
+ build_path = /obj/item/stock_parts/power_store/cell/high/empty
category = list(
RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_1
)
@@ -30,12 +30,12 @@
/datum/design/super_cell
name = "Super-Capacity Power Cell"
- desc = "A power cell that holds 20 MJ of energy."
+ desc = "A power cell that holds 200 KW of energy."
id = "super_cell"
build_type = PROTOLATHE | AWAY_LATHE | MECHFAB
materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 7, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 0.7)
construction_time = 10 SECONDS
- build_path = /obj/item/stock_parts/cell/super/empty
+ build_path = /obj/item/stock_parts/power_store/cell/super/empty
category = list(
RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_2
)
@@ -43,12 +43,12 @@
/datum/design/hyper_cell
name = "Hyper-Capacity Power Cell"
- desc = "A power cell that holds 30 MJ of energy."
+ desc = "A power cell that holds 300 KW of energy."
id = "hyper_cell"
build_type = PROTOLATHE | AWAY_LATHE | MECHFAB
materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 7, /datum/material/gold = SMALL_MATERIAL_AMOUNT * 1.5, /datum/material/silver = SMALL_MATERIAL_AMOUNT * 1.5, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 0.8)
construction_time = 10 SECONDS
- build_path = /obj/item/stock_parts/cell/hyper/empty
+ build_path = /obj/item/stock_parts/power_store/cell/hyper/empty
category = list(
RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_3
)
@@ -56,17 +56,83 @@
/datum/design/bluespace_cell
name = "Bluespace Power Cell"
- desc = "A power cell that holds 40 MJ of energy."
+ desc = "A power cell that holds 400 KW of energy."
id = "bluespace_cell"
build_type = PROTOLATHE | AWAY_LATHE | MECHFAB
materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 8, /datum/material/gold = SMALL_MATERIAL_AMOUNT * 1.2, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 1.6, /datum/material/diamond = SMALL_MATERIAL_AMOUNT * 1.6, /datum/material/titanium =SMALL_MATERIAL_AMOUNT * 3, /datum/material/bluespace =SMALL_MATERIAL_AMOUNT)
construction_time = 10 SECONDS
- build_path = /obj/item/stock_parts/cell/bluespace/empty
+ build_path = /obj/item/stock_parts/power_store/cell/bluespace/empty
category = list(
RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_4
)
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING
+/datum/design/basic_battery
+ name = "Basic Megacell"
+ desc = "A basic megacell that holds 1 MJ of energy."
+ id = "basic_battery"
+ build_type = PROTOLATHE | AWAY_LATHE | AUTOLATHE |MECHFAB
+ materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 12, /datum/material/glass =SMALL_MATERIAL_AMOUNT * 2)
+ construction_time = 10 SECONDS
+ build_path = /obj/item/stock_parts/power_store/battery/empty
+ category = list(
+ RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_1
+ )
+ departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING
+
+/datum/design/high_battery
+ name = "High-Capacity Megacell"
+ desc = "A megacell that holds 10 MJ of energy."
+ id = "high_battery"
+ build_type = PROTOLATHE | AWAY_LATHE | AUTOLATHE | MECHFAB
+ materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 12, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 3)
+ construction_time = 10 SECONDS
+ build_path = /obj/item/stock_parts/power_store/battery/high/empty
+ category = list(
+ RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_2
+ )
+ departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING
+
+/datum/design/super_battery
+ name = "Super-Capacity Megacell"
+ desc = "A megacell that holds 20 MJ of energy."
+ id = "super_battery"
+ build_type = PROTOLATHE | AWAY_LATHE | MECHFAB
+ materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 12, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 4)
+ construction_time = 10 SECONDS
+ build_path = /obj/item/stock_parts/power_store/battery/super/empty
+ category = list(
+ RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_3
+ )
+ departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING
+
+/datum/design/hyper_battery
+ name = "Hyper-Capacity Megacell"
+ desc = "A megacell that holds 30 MJ of energy."
+ id = "hyper_battery"
+ build_type = PROTOLATHE | AWAY_LATHE | MECHFAB
+ materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 12, /datum/material/gold = SMALL_MATERIAL_AMOUNT * 1.5, /datum/material/silver = SMALL_MATERIAL_AMOUNT * 1.5, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 5)
+ construction_time = 10 SECONDS
+ build_path = /obj/item/stock_parts/power_store/battery/hyper/empty
+ category = list(
+ RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_3
+ )
+ departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING
+
+/datum/design/bluespace_battery
+ name = "Bluespace Megacell"
+ desc = "A megacell that holds 40 MJ of energy."
+ id = "bluespace_battery"
+ build_type = PROTOLATHE | AWAY_LATHE | MECHFAB
+ materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 12, /datum/material/gold = SMALL_MATERIAL_AMOUNT * 1.2, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 6, /datum/material/diamond = SMALL_MATERIAL_AMOUNT * 1.6, /datum/material/titanium =SMALL_MATERIAL_AMOUNT * 3, /datum/material/bluespace =SMALL_MATERIAL_AMOUNT)
+ construction_time = 10 SECONDS
+ build_path = /obj/item/stock_parts/power_store/battery/bluespace/empty
+ category = list(
+ RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_4
+ )
+ departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING
+
+
/datum/design/inducer
name = "Inducer"
desc = "The NT-75 Electromagnetic Power Inducer can wirelessly induce electric charge in an object, allowing you to recharge power cells without having to remove them."
diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm
index 89c69b7334e..affe82275ab 100644
--- a/code/modules/research/experimentor.dm
+++ b/code/modules/research/experimentor.dm
@@ -60,7 +60,7 @@
/obj/machinery/rnd/experimentor/proc/generate_valid_items_and_item_reactions()
var/static/list/banned_typecache = typecacheof(list(
- /obj/item/stock_parts/cell/infinite,
+ /obj/item/stock_parts/power_store/cell/infinite,
/obj/item/grenade/chem_grenade/tuberculosis
))
diff --git a/code/modules/research/stock_parts.dm b/code/modules/research/stock_parts.dm
index 3c7b48cef51..46bd8746663 100644
--- a/code/modules/research/stock_parts.dm
+++ b/code/modules/research/stock_parts.dm
@@ -95,8 +95,8 @@ If you create T5+ please take a pass at mech_fabricator.dm. The parts being good
/obj/item/storage/part_replacer/bluespace/proc/on_part_entered(datum/source, obj/item/inserted_component)
SIGNAL_HANDLER
- if(istype(inserted_component, /obj/item/stock_parts/cell))
- var/obj/item/stock_parts/cell/inserted_cell = inserted_component
+ if(istype(inserted_component, /obj/item/stock_parts/power_store))
+ var/obj/item/stock_parts/power_store/inserted_cell = inserted_component
if(inserted_cell.rigged || inserted_cell.corrupted)
message_admins("[ADMIN_LOOKUPFLW(usr)] has inserted rigged/corrupted [inserted_cell] into [src].")
usr.log_message("has inserted rigged/corrupted [inserted_cell] into [src].", LOG_GAME)
@@ -144,7 +144,7 @@ If you create T5+ please take a pass at mech_fabricator.dm. The parts being good
new /obj/item/stock_parts/servo(src)
new /obj/item/stock_parts/micro_laser(src)
new /obj/item/stock_parts/matter_bin(src)
- new /obj/item/stock_parts/cell/high(src)
+ new /obj/item/stock_parts/power_store/cell/high(src)
/obj/item/storage/part_replacer/bluespace/tier2
@@ -155,7 +155,7 @@ If you create T5+ please take a pass at mech_fabricator.dm. The parts being good
new /obj/item/stock_parts/servo/nano(src)
new /obj/item/stock_parts/micro_laser/high(src)
new /obj/item/stock_parts/matter_bin/adv(src)
- new /obj/item/stock_parts/cell/super(src)
+ new /obj/item/stock_parts/power_store/cell/super(src)
/obj/item/storage/part_replacer/bluespace/tier3
@@ -166,7 +166,7 @@ If you create T5+ please take a pass at mech_fabricator.dm. The parts being good
new /obj/item/stock_parts/servo/pico(src)
new /obj/item/stock_parts/micro_laser/ultra(src)
new /obj/item/stock_parts/matter_bin/super(src)
- new /obj/item/stock_parts/cell/hyper(src)
+ new /obj/item/stock_parts/power_store/cell/hyper(src)
/obj/item/storage/part_replacer/bluespace/tier4
@@ -177,7 +177,7 @@ If you create T5+ please take a pass at mech_fabricator.dm. The parts being good
new /obj/item/stock_parts/servo/femto(src)
new /obj/item/stock_parts/micro_laser/quadultra(src)
new /obj/item/stock_parts/matter_bin/bluespace(src)
- new /obj/item/stock_parts/cell/bluespace(src)
+ new /obj/item/stock_parts/power_store/cell/bluespace(src)
/obj/item/storage/part_replacer/cargo //used in a cargo crate
diff --git a/code/modules/research/techweb/nodes/engi_nodes.dm b/code/modules/research/techweb/nodes/engi_nodes.dm
index 182f689c372..02d20fef5fc 100644
--- a/code/modules/research/techweb/nodes/engi_nodes.dm
+++ b/code/modules/research/techweb/nodes/engi_nodes.dm
@@ -6,12 +6,14 @@
description = "Foundational components that form the backbone of station operations, encompassing a range of essential equipment necessary for day-to-day functionality."
design_ids = list(
"micro_servo",
+ "basic_battery",
"basic_capacitor",
+ "basic_cell",
"basic_matter_bin",
"basic_micro_laser",
"basic_scanning",
+ "high_battery",
"high_cell",
- "basic_cell",
"miniature_power_cell",
"condenser",
"igniter",
@@ -36,6 +38,7 @@
"nano_servo",
"adv_matter_bin",
"adv_scanning",
+ "super_battery",
"super_cell",
)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_2_POINTS)
@@ -51,6 +54,7 @@
"pico_servo",
"super_matter_bin",
"phasic_scanning",
+ "hyper_battery",
"hyper_cell",
)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_3_POINTS)
@@ -69,6 +73,7 @@
"femto_servo",
"bluespace_matter_bin",
"triphasic_scanning",
+ "bluespace_battery",
"bluespace_cell",
)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_4_POINTS)
diff --git a/code/modules/research/xenobiology/crossbreeding/_misc.dm b/code/modules/research/xenobiology/crossbreeding/_misc.dm
index 75fabc77cf1..b07299813d6 100644
--- a/code/modules/research/xenobiology/crossbreeding/_misc.dm
+++ b/code/modules/research/xenobiology/crossbreeding/_misc.dm
@@ -80,7 +80,7 @@ Slimecrossing Items
new /obj/effect/timestop(get_turf(target), 2, 50, list(user))
//Hypercharged slime cell - Charged Yellow
-/obj/item/stock_parts/cell/high/slime_hypercharged
+/obj/item/stock_parts/power_store/cell/high/slime_hypercharged
name = "hypercharged slime core"
desc = "A charged yellow slime extract, infused with plasma. It almost hurts to touch."
icon = 'icons/mob/simple/slimes.dmi'
diff --git a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm
index 658d0734f4e..832d266723d 100644
--- a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm
+++ b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm
@@ -589,11 +589,11 @@
return ..()
cooldown = max_cooldown
var/list/batteries = list()
- for(var/obj/item/stock_parts/cell/C in owner.get_all_contents())
+ for(var/obj/item/stock_parts/power_store/C in owner.get_all_contents())
if(C.charge < C.maxcharge)
batteries += C
if(batteries.len)
- var/obj/item/stock_parts/cell/ToCharge = pick(batteries)
+ var/obj/item/stock_parts/power_store/ToCharge = pick(batteries)
ToCharge.charge += min(ToCharge.maxcharge - ToCharge.charge, ToCharge.maxcharge/10) //10% of the cell, or to maximum.
return ..()
diff --git a/code/modules/research/xenobiology/crossbreeding/charged.dm b/code/modules/research/xenobiology/crossbreeding/charged.dm
index 76c4d3eaa14..ca026ae9f33 100644
--- a/code/modules/research/xenobiology/crossbreeding/charged.dm
+++ b/code/modules/research/xenobiology/crossbreeding/charged.dm
@@ -81,7 +81,7 @@ Charged extracts:
effect_desc = "Creates a hypercharged slime cell battery, which has high capacity but takes longer to recharge."
/obj/item/slimecross/charged/yellow/do_effect(mob/user)
- new /obj/item/stock_parts/cell/high/slime_hypercharged(get_turf(user))
+ new /obj/item/stock_parts/power_store/cell/high/slime_hypercharged(get_turf(user))
user.visible_message(span_notice("[src] sparks violently, and swells with electric power!"))
..()
diff --git a/code/modules/research/xenobiology/crossbreeding/industrial.dm b/code/modules/research/xenobiology/crossbreeding/industrial.dm
index da878b77b5a..9d5ed59fcec 100644
--- a/code/modules/research/xenobiology/crossbreeding/industrial.dm
+++ b/code/modules/research/xenobiology/crossbreeding/industrial.dm
@@ -85,10 +85,10 @@ Industrial extracts:
colour = SLIME_TYPE_YELLOW
effect_desc = "Produces high capacity power cells, which are not fully charged on creation."
plasmarequired = 5
- itempath = /obj/item/stock_parts/cell/high
+ itempath = /obj/item/stock_parts/power_store/cell/high
/obj/item/slimecross/industrial/yellow/do_after_spawn(obj/item/spawned)
- var/obj/item/stock_parts/cell/high/C = spawned
+ var/obj/item/stock_parts/power_store/cell/high/C = spawned
if(istype(C))
C.charge = rand(0,C.maxcharge/2)
diff --git a/code/modules/research/xenobiology/crossbreeding/regenerative.dm b/code/modules/research/xenobiology/crossbreeding/regenerative.dm
index e46290bef28..82beed78e43 100644
--- a/code/modules/research/xenobiology/crossbreeding/regenerative.dm
+++ b/code/modules/research/xenobiology/crossbreeding/regenerative.dm
@@ -82,11 +82,11 @@ Regenerative extracts:
/obj/item/slimecross/regenerative/yellow/core_effect(mob/living/target, mob/user)
var/list/batteries = list()
- for(var/obj/item/stock_parts/cell/C in target.get_all_contents())
+ for(var/obj/item/stock_parts/power_store/C in target.get_all_contents())
if(C.charge < C.maxcharge)
batteries += C
if(batteries.len)
- var/obj/item/stock_parts/cell/ToCharge = pick(batteries)
+ var/obj/item/stock_parts/power_store/ToCharge = pick(batteries)
ToCharge.charge = ToCharge.maxcharge
to_chat(target, span_notice("You feel a strange electrical pulse, and one of your electrical items was recharged."))
diff --git a/code/modules/surgery/bodyparts/robot_bodyparts.dm b/code/modules/surgery/bodyparts/robot_bodyparts.dm
index 5c6bd527d1b..314f3396f0a 100644
--- a/code/modules/surgery/bodyparts/robot_bodyparts.dm
+++ b/code/modules/surgery/bodyparts/robot_bodyparts.dm
@@ -215,7 +215,7 @@
wing_types = list(/obj/item/organ/external/wings/functional/robotic)
var/wired = FALSE
- var/obj/item/stock_parts/cell/cell = null
+ var/obj/item/stock_parts/power_store/cell = null
/obj/item/bodypart/chest/robot/emp_effect(severity, protection)
. = ..()
@@ -291,7 +291,7 @@
), AUGMENTATION_TRAIT)
/obj/item/bodypart/chest/robot/attackby(obj/item/weapon, mob/user, params)
- if(istype(weapon, /obj/item/stock_parts/cell))
+ if(istype(weapon, /obj/item/stock_parts/power_store/cell))
if(cell)
to_chat(user, span_warning("You have already inserted a cell!"))
return
diff --git a/code/modules/surgery/organs/internal/stomach/stomach_ethereal.dm b/code/modules/surgery/organs/internal/stomach/stomach_ethereal.dm
index 2675f46d13d..887df31e3ff 100644
--- a/code/modules/surgery/organs/internal/stomach/stomach_ethereal.dm
+++ b/code/modules/surgery/organs/internal/stomach/stomach_ethereal.dm
@@ -4,13 +4,13 @@
desc = "A crystal-like organ that stores the electric charge of ethereals."
organ_traits = list(TRAIT_NOHUNGER) // We have our own hunger mechanic.
/// Where the energy of the stomach is stored.
- var/obj/item/stock_parts/cell/cell
+ var/obj/item/stock_parts/power_store/cell
///used to keep ethereals from spam draining power sources
var/drain_time = 0
/obj/item/organ/internal/stomach/ethereal/Initialize(mapload)
. = ..()
- cell = new /obj/item/stock_parts/cell/ethereal(null)
+ cell = new /obj/item/stock_parts/power_store/cell/ethereal(null)
/obj/item/organ/internal/stomach/ethereal/Destroy()
QDEL_NULL(cell)
diff --git a/code/modules/vehicles/mecha/_mecha.dm b/code/modules/vehicles/mecha/_mecha.dm
index 1155e6293d2..f36beee83cd 100644
--- a/code/modules/vehicles/mecha/_mecha.dm
+++ b/code/modules/vehicles/mecha/_mecha.dm
@@ -46,7 +46,7 @@
///if we cant use our equipment(such as due to EMP)
var/equipment_disabled = FALSE
/// Keeps track of the mech's cell
- var/obj/item/stock_parts/cell/cell
+ var/obj/item/stock_parts/power_store/cell
/// Keeps track of the mech's scanning module
var/obj/item/stock_parts/scanning_module/scanmod
/// Keeps track of the mech's capacitor
@@ -305,7 +305,7 @@
///Add parts on mech spawning. Skipped in manual construction.
/obj/vehicle/sealed/mecha/proc/populate_parts()
- cell = new /obj/item/stock_parts/cell/high(src)
+ cell = new /obj/item/stock_parts/power_store/cell/high(src)
scanmod = new /obj/item/stock_parts/scanning_module(src)
capacitor = new /obj/item/stock_parts/capacitor(src)
servo = new /obj/item/stock_parts/servo(src)
@@ -313,7 +313,7 @@
/obj/vehicle/sealed/mecha/CheckParts(list/parts_list)
. = ..()
- cell = locate(/obj/item/stock_parts/cell) in contents
+ cell = locate(/obj/item/stock_parts/power_store) in contents
diag_hud_set_mechcell()
scanmod = locate(/obj/item/stock_parts/scanning_module) in contents
capacitor = locate(/obj/item/stock_parts/capacitor) in contents
diff --git a/code/modules/vehicles/mecha/combat/gygax.dm b/code/modules/vehicles/mecha/combat/gygax.dm
index 0284f10d23d..0acb746c52d 100644
--- a/code/modules/vehicles/mecha/combat/gygax.dm
+++ b/code/modules/vehicles/mecha/combat/gygax.dm
@@ -78,7 +78,7 @@
max_ammo()
/obj/vehicle/sealed/mecha/gygax/dark/loaded/populate_parts()
- cell = new /obj/item/stock_parts/cell/bluespace(src)
+ cell = new /obj/item/stock_parts/power_store/cell/bluespace(src)
scanmod = new /obj/item/stock_parts/scanning_module/triphasic(src)
capacitor = new /obj/item/stock_parts/capacitor/quadratic(src)
servo = new /obj/item/stock_parts/servo/femto(src)
diff --git a/code/modules/vehicles/mecha/combat/honker.dm b/code/modules/vehicles/mecha/combat/honker.dm
index a7c9f018d28..83934244638 100644
--- a/code/modules/vehicles/mecha/combat/honker.dm
+++ b/code/modules/vehicles/mecha/combat/honker.dm
@@ -75,7 +75,7 @@
acid = 100
/obj/vehicle/sealed/mecha/honker/dark/loaded/populate_parts()
- cell = new /obj/item/stock_parts/cell/hyper(src)
+ cell = new /obj/item/stock_parts/power_store/cell/hyper(src)
scanmod = new /obj/item/stock_parts/scanning_module/phasic(src)
capacitor = new /obj/item/stock_parts/capacitor/super(src)
servo = new /obj/item/stock_parts/servo/pico(src)
diff --git a/code/modules/vehicles/mecha/combat/marauder.dm b/code/modules/vehicles/mecha/combat/marauder.dm
index 3cc73214fca..48e2d60cbd6 100644
--- a/code/modules/vehicles/mecha/combat/marauder.dm
+++ b/code/modules/vehicles/mecha/combat/marauder.dm
@@ -48,7 +48,7 @@
)
/obj/vehicle/sealed/mecha/marauder/loaded/populate_parts()
- cell = new /obj/item/stock_parts/cell/bluespace(src)
+ cell = new /obj/item/stock_parts/power_store/cell/bluespace(src)
scanmod = new /obj/item/stock_parts/scanning_module/triphasic(src)
capacitor = new /obj/item/stock_parts/capacitor/quadratic(src)
servo = new /obj/item/stock_parts/servo/femto(src)
@@ -169,7 +169,7 @@
max_ammo()
/obj/vehicle/sealed/mecha/marauder/mauler/loaded/populate_parts()
- cell = new /obj/item/stock_parts/cell/bluespace(src)
+ cell = new /obj/item/stock_parts/power_store/cell/bluespace(src)
scanmod = new /obj/item/stock_parts/scanning_module/triphasic(src)
capacitor = new /obj/item/stock_parts/capacitor/quadratic(src)
servo = new /obj/item/stock_parts/servo/femto(src)
diff --git a/code/modules/vehicles/mecha/combat/reticence.dm b/code/modules/vehicles/mecha/combat/reticence.dm
index 5dcc5f34e91..0860fbc407f 100644
--- a/code/modules/vehicles/mecha/combat/reticence.dm
+++ b/code/modules/vehicles/mecha/combat/reticence.dm
@@ -42,7 +42,7 @@
)
/obj/vehicle/sealed/mecha/reticence/loaded/populate_parts()
- cell = new /obj/item/stock_parts/cell/bluespace(src)
+ cell = new /obj/item/stock_parts/power_store/cell/bluespace(src)
scanmod = new /obj/item/stock_parts/scanning_module/phasic(src)
capacitor = new /obj/item/stock_parts/capacitor/super(src)
servo = new /obj/item/stock_parts/servo/pico(src)
diff --git a/code/modules/vehicles/mecha/mecha_construction_paths.dm b/code/modules/vehicles/mecha/mecha_construction_paths.dm
index e77b1eebacf..f4b1a679596 100644
--- a/code/modules/vehicles/mecha/mecha_construction_paths.dm
+++ b/code/modules/vehicles/mecha/mecha_construction_paths.dm
@@ -209,7 +209,7 @@
"backward_message" = "removed servo"
),
list(
- "key" = /obj/item/stock_parts/cell,
+ "key" = /obj/item/stock_parts/power_store/cell,
"action" = ITEM_MOVE_INSIDE,
"back_key" = TOOL_SCREWDRIVER,
"desc" = "Servo is secured, and the power cell can be added.",
@@ -542,7 +542,7 @@
"desc" = "HONK!!!!!!"
),
list(
- "key" = /obj/item/stock_parts/cell,
+ "key" = /obj/item/stock_parts/power_store/cell,
"action" = ITEM_MOVE_INSIDE,
"desc" = "Laughter cell can be added!",
"forward_message" = "added laughter"
@@ -715,7 +715,7 @@
"backward_message" = "disconnected bluespace crystal"
),
list(
- "key" = /obj/item/stock_parts/cell,
+ "key" = /obj/item/stock_parts/power_store/cell,
"action" = ITEM_MOVE_INSIDE,
"back_key" = TOOL_SCREWDRIVER,
"desc" = "The bluespace crystal is engaged, and the power cell can be added.",
diff --git a/code/modules/vehicles/mecha/mecha_defense.dm b/code/modules/vehicles/mecha/mecha_defense.dm
index 426efaf1e6f..912993d1ee6 100644
--- a/code/modules/vehicles/mecha/mecha_defense.dm
+++ b/code/modules/vehicles/mecha/mecha_defense.dm
@@ -261,7 +261,7 @@
balloon_alert(user, "open the panel first!")
return
- if(istype(weapon, /obj/item/stock_parts/cell))
+ if(istype(weapon, /obj/item/stock_parts/power_store/cell))
if(!cell)
if(!user.transferItemToLoc(weapon, src, silent = FALSE))
return
diff --git a/code/modules/vehicles/mecha/working/ripley.dm b/code/modules/vehicles/mecha/working/ripley.dm
index be9dc0d69c3..754a6b820d7 100644
--- a/code/modules/vehicles/mecha/working/ripley.dm
+++ b/code/modules/vehicles/mecha/working/ripley.dm
@@ -281,7 +281,7 @@ GLOBAL_DATUM(cargo_ripley, /obj/vehicle/sealed/mecha/ripley/cargo)
return ..()
/obj/vehicle/sealed/mecha/ripley/cargo/populate_parts()
- cell = new /obj/item/stock_parts/cell/high(src)
+ cell = new /obj/item/stock_parts/power_store/cell/high(src)
//No scanmod for Big Bess
capacitor = new /obj/item/stock_parts/capacitor(src)
servo = new /obj/item/stock_parts/servo(src)
diff --git a/code/modules/vehicles/motorized_wheelchair.dm b/code/modules/vehicles/motorized_wheelchair.dm
index 8dbdfd93e8f..cecf6b815e2 100644
--- a/code/modules/vehicles/motorized_wheelchair.dm
+++ b/code/modules/vehicles/motorized_wheelchair.dm
@@ -20,7 +20,7 @@
/datum/stock_part/capacitor,
)
///power cell we draw power from
- var/obj/item/stock_parts/cell/power_cell
+ var/obj/item/stock_parts/power_store/power_cell
///stock parts for this chair
var/list/component_parts = list()
@@ -34,7 +34,7 @@
component_parts += GLOB.stock_part_datums[/datum/stock_part/capacitor]
component_parts += GLOB.stock_part_datums[/datum/stock_part/servo]
component_parts += GLOB.stock_part_datums[/datum/stock_part/servo]
- power_cell = new /obj/item/stock_parts/cell(src)
+ power_cell = new /obj/item/stock_parts/power_store/cell(src)
/obj/vehicle/ridden/wheelchair/motorized/make_ridable()
AddElement(/datum/element/ridable, /datum/component/riding/vehicle/wheelchair/motorized)
@@ -45,7 +45,7 @@
component_parts = list()
for(var/obj/item/stock_parts/part in parts_list)
- if(istype(part, /obj/item/stock_parts/cell)) // power cell, physically moves into the wheelchair
+ if(istype(part, /obj/item/stock_parts/power_store/cell)) // power cell, physically moves into the wheelchair
power_cell = part
part.forceMove(src)
continue
@@ -109,7 +109,7 @@
if(!panel_open)
return ..()
- if(istype(attacking_item, /obj/item/stock_parts/cell))
+ if(istype(attacking_item, /obj/item/stock_parts/power_store/cell))
if(power_cell)
to_chat(user, span_warning("There is a power cell already installed."))
else
@@ -232,4 +232,4 @@
component_parts += GLOB.stock_part_datums[/datum/stock_part/capacitor]
component_parts += GLOB.stock_part_datums[/datum/stock_part/servo/tier2]
component_parts += GLOB.stock_part_datums[/datum/stock_part/servo]
- power_cell = new /obj/item/stock_parts/cell/upgraded/plus(src)
+ power_cell = new /obj/item/stock_parts/power_store/cell/upgraded/plus(src)
diff --git a/code/modules/vending/assist.dm b/code/modules/vending/assist.dm
index a043a365046..c1cffea115f 100644
--- a/code/modules/vending/assist.dm
+++ b/code/modules/vending/assist.dm
@@ -20,7 +20,8 @@
/obj/item/assembly/health = 2,
/obj/item/assembly/timer = 2,
/obj/item/assembly/voice = 2,
- /obj/item/stock_parts/cell/high = 1,
+ /obj/item/stock_parts/power_store/cell/high = 1,
+ /obj/item/stock_parts/power_store/battery/high = 1,
/obj/item/market_uplink/blackmarket = 1,
)
premium = list(
diff --git a/code/modules/vending/engineering.dm b/code/modules/vending/engineering.dm
index 801a44e0f20..48da7e27b12 100644
--- a/code/modules/vending/engineering.dm
+++ b/code/modules/vending/engineering.dm
@@ -20,7 +20,8 @@
/obj/item/multitool = 12,
/obj/item/wrench = 12,
/obj/item/t_scanner = 12,
- /obj/item/stock_parts/cell = 8,
+ /obj/item/stock_parts/power_store/cell = 8,
+ /obj/item/stock_parts/power_store/battery = 8,
/obj/item/weldingtool = 8,
/obj/item/clothing/head/utility/welding = 8,
/obj/item/light/tube = 10,
diff --git a/code/modules/vending/engivend.dm b/code/modules/vending/engivend.dm
index ce7e1bf12bd..1522d0047b0 100644
--- a/code/modules/vending/engivend.dm
+++ b/code/modules/vending/engivend.dm
@@ -11,7 +11,8 @@
/obj/item/multitool = 4,
/obj/item/grenade/chem_grenade/smart_metal_foam = 10,
/obj/item/geiger_counter = 5,
- /obj/item/stock_parts/cell/high = 10,
+ /obj/item/stock_parts/power_store/cell/high = 10,
+ /obj/item/stock_parts/power_store/battery/high = 10,
/obj/item/electronics/airlock = 10,
/obj/item/electronics/apc = 10,
/obj/item/electronics/airalarm = 10,
@@ -19,7 +20,7 @@
/obj/item/electronics/firelock = 10,
)
contraband = list(
- /obj/item/stock_parts/cell/potato = 3,
+ /obj/item/stock_parts/power_store/cell/potato = 3,
)
premium = list(
/obj/item/storage/belt/utility = 3,
diff --git a/code/modules/vending/robotics.dm b/code/modules/vending/robotics.dm
index 30bf8543d50..8796e8d7561 100644
--- a/code/modules/vending/robotics.dm
+++ b/code/modules/vending/robotics.dm
@@ -12,7 +12,7 @@
/obj/item/clothing/under/rank/rnd/roboticist = 4,
/obj/item/stack/cable_coil = 4,
/obj/item/assembly/flash/handheld = 4,
- /obj/item/stock_parts/cell/high = 12,
+ /obj/item/stock_parts/power_store/cell/high = 12,
/obj/item/assembly/prox_sensor = 3,
/obj/item/assembly/signaler = 3,
/obj/item/healthanalyzer = 3,
diff --git a/code/modules/wiremod/components/abstract/module.dm b/code/modules/wiremod/components/abstract/module.dm
index ad544354298..4dd144b4c80 100644
--- a/code/modules/wiremod/components/abstract/module.dm
+++ b/code/modules/wiremod/components/abstract/module.dm
@@ -190,7 +190,7 @@
))
return ..()
-/obj/item/circuit_component/module/proc/handle_set_cell(datum/source, obj/item/stock_parts/cell/cell)
+/obj/item/circuit_component/module/proc/handle_set_cell(datum/source, obj/item/stock_parts/power_store/cell/cell)
SIGNAL_HANDLER
internal_circuit.set_cell(cell)
diff --git a/code/modules/wiremod/components/atom/remotecam.dm b/code/modules/wiremod/components/atom/remotecam.dm
index 3d5afa2381c..d5a8506c5cf 100644
--- a/code/modules/wiremod/components/atom/remotecam.dm
+++ b/code/modules/wiremod/components/atom/remotecam.dm
@@ -262,7 +262,7 @@
if (current_camera_emp)
close_camera()
return
- var/obj/item/stock_parts/cell/cell = parent.get_cell()
+ var/obj/item/stock_parts/power_store/cell = parent.get_cell()
//If cell doesn't exist, or we ran out of power
if(!cell?.use(current_camera_range > 0 ? REMOTECAM_ENERGY_USAGE_FAR : REMOTECAM_ENERGY_USAGE_NEAR))
close_camera()
@@ -393,7 +393,7 @@
if(!bci.owner || bci.owner.is_blind() || bci.owner.stat >= UNCONSCIOUS)
close_camera()
return
- var/obj/item/stock_parts/cell/cell = parent.get_cell()
+ var/obj/item/stock_parts/power_store/cell = parent.get_cell()
//If cell doesn't exist, or we ran out of power
if(!cell?.use(current_camera_range > 0 ? REMOTECAM_ENERGY_USAGE_FAR : REMOTECAM_ENERGY_USAGE_NEAR))
close_camera()
@@ -422,7 +422,7 @@
if(shell_parent.loc.atom_storage)
close_camera()
return
- var/obj/item/stock_parts/cell/cell = parent.get_cell()
+ var/obj/item/stock_parts/power_store/cell = parent.get_cell()
//If cell doesn't exist, or we ran out of power
if(!cell?.use(REMOTECAM_ENERGY_USAGE_NEAR))
close_camera()
diff --git a/code/modules/wiremod/core/component.dm b/code/modules/wiremod/core/component.dm
index 7f7bddaa572..ff0e64cd9a4 100644
--- a/code/modules/wiremod/core/component.dm
+++ b/code/modules/wiremod/core/component.dm
@@ -268,7 +268,7 @@
var/flags = SEND_SIGNAL(parent, COMSIG_CIRCUIT_PRE_POWER_USAGE, energy_usage_per_input)
if(!(flags & COMPONENT_OVERRIDE_POWER_USAGE))
- var/obj/item/stock_parts/cell/cell = parent.get_cell()
+ var/obj/item/stock_parts/power_store/cell = parent.get_cell()
if(!cell?.use(energy_usage_per_input))
return FALSE
diff --git a/code/modules/wiremod/core/integrated_circuit.dm b/code/modules/wiremod/core/integrated_circuit.dm
index 5a825b81482..f24c5dac667 100644
--- a/code/modules/wiremod/core/integrated_circuit.dm
+++ b/code/modules/wiremod/core/integrated_circuit.dm
@@ -24,7 +24,7 @@ GLOBAL_LIST_EMPTY_TYPED(integrated_circuits, /obj/item/integrated_circuit)
var/label_max_length = 24
/// The power of the integrated circuit
- var/obj/item/stock_parts/cell/cell
+ var/obj/item/stock_parts/power_store/cell
/// The shell that this circuitboard is attached to. Used by components.
var/atom/movable/shell
@@ -98,7 +98,7 @@ GLOBAL_LIST_EMPTY_TYPED(integrated_circuits, /obj/item/integrated_circuit)
/obj/item/integrated_circuit/loaded/Initialize(mapload)
. = ..()
- set_cell(new /obj/item/stock_parts/cell/high(src))
+ set_cell(new /obj/item/stock_parts/power_store/cell/high(src))
/obj/item/integrated_circuit/Destroy()
for(var/obj/item/circuit_component/to_delete in attached_components)
@@ -132,7 +132,7 @@ GLOBAL_LIST_EMPTY_TYPED(integrated_circuits, /obj/item/integrated_circuit)
* Arguments:
* * cell_to_set - The new cell of the circuit. Can be null.
**/
-/obj/item/integrated_circuit/proc/set_cell(obj/item/stock_parts/cell_to_set)
+/obj/item/integrated_circuit/proc/set_cell(obj/item/stock_parts/power_store/cell_to_set)
SEND_SIGNAL(src, COMSIG_CIRCUIT_SET_CELL, cell_to_set)
cell = cell_to_set
@@ -152,7 +152,7 @@ GLOBAL_LIST_EMPTY_TYPED(integrated_circuits, /obj/item/integrated_circuit)
add_component_manually(I, user)
return
- if(istype(I, /obj/item/stock_parts/cell))
+ if(istype(I, /obj/item/stock_parts/power_store/cell))
if(cell)
balloon_alert(user, "there already is a cell inside!")
return
diff --git a/code/modules/wiremod/shell/brain_computer_interface.dm b/code/modules/wiremod/shell/brain_computer_interface.dm
index 3cd9a3d6bc0..67a3a41a488 100644
--- a/code/modules/wiremod/shell/brain_computer_interface.dm
+++ b/code/modules/wiremod/shell/brain_computer_interface.dm
@@ -256,7 +256,7 @@
return ..()
/datum/action/innate/bci_charge_action/Trigger(trigger_flags)
- var/obj/item/stock_parts/cell/cell = circuit_component.parent.cell
+ var/obj/item/stock_parts/power_store/cell/cell = circuit_component.parent.cell
if (isnull(cell))
to_chat(owner, span_boldwarning("[circuit_component.parent] has no power cell."))
@@ -269,7 +269,7 @@
/datum/action/innate/bci_charge_action/update_button_status(atom/movable/screen/movable/action_button/button, force = FALSE)
. = ..()
- var/obj/item/stock_parts/cell/cell = circuit_component.parent.cell
+ var/obj/item/stock_parts/power_store/cell/cell = circuit_component.parent.cell
button.maptext = cell ? MAPTEXT("[cell.percent()]%") : ""
/obj/machinery/bci_implanter
diff --git a/code/modules/wiremod/shell/gun.dm b/code/modules/wiremod/shell/gun.dm
index 8e9a3d987fd..7115c3b548b 100644
--- a/code/modules/wiremod/shell/gun.dm
+++ b/code/modules/wiremod/shell/gun.dm
@@ -9,7 +9,7 @@
icon = 'icons/obj/science/circuits.dmi'
icon_state = "setup_gun"
ammo_type = list(/obj/item/ammo_casing/energy/wiremod_gun)
- cell_type = /obj/item/stock_parts/cell/emproof/wiremod_gun
+ cell_type = /obj/item/stock_parts/power_store/cell/emproof/wiremod_gun
item_flags = NONE
light_system = OVERLAY_LIGHT_DIRECTIONAL
light_on = FALSE
@@ -29,7 +29,7 @@
damage = 0
range = 7
-/obj/item/stock_parts/cell/emproof/wiremod_gun
+/obj/item/stock_parts/power_store/cell/emproof/wiremod_gun
maxcharge = 0.1 * STANDARD_CELL_CHARGE
/obj/item/gun/energy/wiremod_gun/Initialize(mapload)
diff --git a/icons/obj/machines/cell_charger.dmi b/icons/obj/machines/cell_charger.dmi
index 0c9ca53544286bb1d40e6be608b5cbbf22623c56..1082130dadb1eabeca165acdaf90746a59a6d000 100644
GIT binary patch
literal 4554
zcmZu#cUTkKx1G?WTzXOQVxsgCL3&RJy#@#bDT)XpMIh2qBvBDiKsusS0R^N=uc0U+
zAc7!WdI`OS776g;eeZq0``*2O%sG2z*8b+4J!{rp-#jxl(Pd`jWds0#Szk}foH9>S
zjuv`4%ECXABpoZB97rZ`Cxj^+r&2f+O~Ui{qn;OpDz
zX2mR>?{2=LL#WprsDjLz>mh~F7K`~1T0HvQu&Gra^6WTBt1LztFj
zrHr7u=G{_RMR<3toI#dNy{e_iY#T-imK%1(n$18jK`6-G6T*jxm)nJQ-dlB*Z?vFA
zt7=}m(j~fWoHsX{`l6$~2iv}0dF{om4_}VtR^;kS>ip?i6DBQgyNx-S!;vL{dGXwJ
zi!Fl4K`&wTYluD_^4zwt0->XOW^X-&+VA|#uxGw$oia;>q5
zWRL?yO|LDH$+V%G6FC>>rcg)YpLX-io9RgCpP@kowWcb@0|hnMBDCJ>VC2HXt3$+B
z+htx$qe=TYn*mnUAv`tX(Y~K&Ft`-m`b_M3Ra*KtxKL9#f}U0&l!^l(0=dK$%Z30k
z=z~G_N+Tk8?=rJ_lvYG5)$hpe+O3am92Z0`UHWw|VXUo$RmBvIW&sp^UBISwpLhAz
zcW$sWv;R3#%fh;T3Mazve1sDc4%w~)7sO(2GDl
zWx@fgWa|<1wsL5nw>zF&tw}8qvzkM>zt|(vGC{Nf(SJ!b1HLxUfp8u=AgKUq%rC*|
zfjtVqBsKXd>dZdCCgownvkwjgBV2+^Oys|1vSwBL=P7b9I5LhbhHwIy4nAu~gEn(3
zW0$UH!gi|w!2LYI0?EL+fF%FAyH*b4KM8bvDoSEv61p|~j=z3kif1DXJw0i#{Igc~
zQb7iXx|!T1SwGer#Va(x$mM;Am(HUSj;;
zUtAYgW8|h7-3M7qdUcI1wEbj0>?J6K-r>)Sh6oE^P*NH-Bi7qdztFC4X!t(zCpJ~C
z(15)b(_Tq7j%2!en9*Aqe6;pziFA1C+sV4S|E3BrxFIjzh0e~a(S1qY|I7qbfATW3
z8q)K~XQ6qbL66Y=>2bGOTM?_C)r1=yMCSPlS61)48js_`=$7k$EK79wG>@?WDWt0S
zt@6){@WJLrn33RK}{!Q6YjS+ke$q-oW8(N<9gRq
zGax|WdE`5n6Dom(-|MRPNnZB;9a9!YQ#?^W-)k)on~^WxgVOKrFUOz$s0d=H*{->(
z@nDYj>$Sp%A)cOB(BR(ahG>W{y0RZ;EEfWjHa1T>i&6Nyu)({M9)lL*wbB5LO?=dMWDn_)nw$`qqTC?}xDyAxI
zvPGVipn@Eujr2Q<5-*Z>T}u}gZdHcacR5{IK6z{Oo_i}&QeAU6oNs2CQ`qF)?sS9y
zaa$WIDwds5?;ibCx)Zg()P_;-9~v~rIsn5U5A3xs7vVzLC;*B&QACQOPQOJ8WEnI(
z3OUJjI&;QL-zS*mWy&&UTUE-uB_N%7_NxbNAOs5%ak!6KDyaZ)=^VWL(+%I~uKJMn
zf(#Tx?kNRlcRL^t$5?7tB_6-va8|aOisASV#a@6-P0Us7P0r+rcb8e_|WWaU0mW8rNo$7~v8;^1YeiSk?
zzL5`r>^fG4-e0^ErGx(>rpK^Xg5VH_{Sq~K9u5MkV?1d;^|<;(i#qP!6DNXPk~8Dp
z2gh+?_nZy#`SB3}w!I6PwyGJ+JPVbRTF=3(YV)zhdF6cz#Hsr~Q8ePS?CP{Rp%
zL5ft4=9#|LEgb9hnUcO(79mr^-N)NB^@v$$G~otVDR+O^v-xI!>V024VW(G41)po%
zcL$G^kjRjjf~!dNU4;Im6ztmRghxG0(7(aGZeqj6)5fyAA^FJYE3%o#uFqo)CPPe+
zCN13dinxy54kLhrFd(`y?tteA=!(n~EG!1L`e|+4U@Mq_VgSREn$P_4Y?$XYbT4pa
zEIL_Iy18#USUN=SJ=Mup`jJF?4Ojbwa~2e(@~OBaMmc>;Hz%XF0ZfJ
zY=L{t`1Q9tl{3Rm8TJ05JJ!b$8_@i6?uQWUqxU%EhPv$RN=Iof
z1^x>uxng6#-`d~u(OE#jrG*x#`-JFSWHb@{MA8AyaZg}ZDVZ9V*Ef-oOnUV~7if{0
zo>a&nT7x=Dg8Nl4dZCrwXSd3?IBs0rBso@7jq#Z;AJq1o$M)`$hwb`RwhmVIuVTrI
zG5R1)VQebULYK%31rc9)S*VLcDAO%YR1xwz1%tY4zHqXcBimFp*X
zNOv^$o@veF6LaVcfE;`glr@!o6U1
zYt?~y84?Nksjn~gaHvA1jp(J;;FuCy9=JUpX%A9Tx4TbBRa1_8#s|-4RFst!7#bed
zg^G)dUqI6?sANW5vR`wDzhLbM<|Ov$7=k#f%0GxhI>H_C&q#9`El$&ixKNQmMYZ4Edj_X&pVcwhAbFWXkDXy`B&Pmc0g5tM?}}@!sywL9i^6d^Lp2TatipsKI*lX+degbF73+6
zvay6)E5E(_A(so$U7m;3nQr6u4W8!K<<}@Dal$g0{~S`cPc{)vtxpuDI5KNu@zU~o
zE5645?0+M?nnTDoi{1UAw^1+qSua&eP;3dI_l&7+11dL^?mD&lj7_*^iQh+>XM=b*
z3U?0B&NH1|MGlWYx!HRql8+7dg{nL|XKl+|x1k?tq6hID(c$?e*9fwEH~pQ!v16!|
z3h+TREroV*bjBnDEm8eq7|eA^orEwpuw~i*S~Pgx}6_faUYXPV2_btK=z*
z8Hytm_lPaxaxY(A#iLd*c~soVVtr`
z>VsnYeU}f5Ig7#wgn6fqCWf4V5F4hEiHYdXi!o+|bus5@OOEWIyJjvw7psgtvGPpWcJ0T+(m?b`0>
z!WspU2TH-sevd7Q)iT0)QPt<5SvKQJ979E7+S6@GW;N-ZkeYYi58i9ze_uu?7Hc8B
zVlI)q-NkD1Z065AX?5@*=#`D~%#cYqXW>Fsx6-KZ)Dge9NKbj^g^O^^%;tpz-{iSE
zdyg0!1){s)jNgub*XdDPM*TSj!+8Eta=LEmRA16K3cAzV$X|8eC%LBsZ2wTkZNkFc
zKQO&9edkmiU7@rXzGSngd$IXvhFjd!@NoFI4&=?f?JBm=Z%gEY8fw7X$LG662$x{<
z$*;0g+Z#7{h?-=sd3ThA%w2L|rUAZpLyWIDl!4Y)xjW&0*0pgtc|!$5iUZ88eA2mS
zRm{hTJRQ1GVttZ!o2XlL-TfgGRntS!W_Ty%nb^%D((47n;^M8n?Vq9J#p-yTIkU+AHwfDP{W=z4F)}K8cb?_>!$M;`XB3{vjT;^8x000
zCen9Ugi^tUR4?Qyne8fZbCzPoVmBMf*SIm2q&RM=480FxS;5c(S{-|0fq~1samol-
z?T@J|>22;GY*(O?#?#W^2JRe-G`iCT6V%)5WYi_3rz>N)
zV3a&!!@MC|HYwNI?U27PA-OhD{B~yJh9L9#*{Fztl
zZZcCAg!ufBHn^E7UqY3Ni@FJK2$$TN3UPe?LISVK47oqqaW*MegK2EFfh+mDo|v%S
ztl`nt0|35kHJ?s3NpLs#+<=qYWS(}p=lr95?il<1;T^$INzug|r8&X^SpNy*A*MoL
zdU~+;P=e!DCC=HDI0<-ert)N1C7fgX@{b14*EZ2ALEL=&U&iE_xBvhE
literal 3629
zcma)9cTm&Yw*G~110q3eH%JR!6cD9Xr6XMeNEbvD5Tq9Yks5*&rHP>QB1jWyMmjZ6B=n@Ud%X#7g9x^fgW2fo
zxA>*J7n1e+&&0P|ggCbHd(i?fJ!6x6X>ctguVBvPPS9nE#zCQ^e)fy!_1jv}ez$Yd
zN~HszaE0&r33;^s;~uT=g*-jB6|5CPQ_d}1z!i%+q!z*Lub=KCH-wiY>e@2j-VH4q
z1X*roCP*4J>fX{$xqd$Hg%WD*?Zwv+-3Si~%o3_E#VKC#iYPo`KP?gz`JptZr0P-Q
zWSJLYW_@R9NWNugeQ0$Muhubql+C>}G}CZI_bWbPcB0WcrZ$F#9L8dQPhMF^JqpG-
zYt>SKM-T{58Vf=`x(|r(^8rbJa`VczS)>fyRAm@zteRYdqVfP(mwb@wo?%)NuS~^h
zpi0k2L3^sXRxxni=KbfOg`0X-I1a)Uwf4}cET#EgbY0oX)x%N(+M{V?`}__Xr^F2>
z-RgH}b_u!7g5$(*4`#kY99iu6v@^RoqP`b@BrV-xIh{Px?u8xbHo=`+<13_FB_d|N
z#>dd~V+OLvJ~F1#rf+#G^W0t|$W>a>`_s|5HI2pFc8sUPpvk%@Td4;w;{!h_gW@Jt
z%H8|V@rPSv{t1FtR>^L9$KKr=s=1$5(gni>XCv;W`ZGdc1!bt>-L^q&@xW@gk4vV5
zW9qz8lLwCtc9=1GFA1d%TLR>|KOSiP`RapE|y
zWl%$GtUaqJr^Bh~A8&*kPAt!QUa8C#sR#88l#H2|JNoAq%{Di`-OviTNvZN%A5Qae
zB*X^%Fl~RZf?us@a*}-LiqwesHNyDSgWFUjVVH23=71q~!tqlUe6mnf~$wXr*PSGyUWa
z^lYc&ZxXhG7f4xFX1A%a;KIUFk(<~=ufhJUQT78dSR4XV_K+cnxq8Qr;e*ofxI5q0
zY!#)9ecP_lwfy+y@A2uLQ>p{WSTT}M;G)vdy|IaNN#Kay1Y;Ao$+(P8-|mJq
z?CEXu38f6!(b}*Vi*hPPS3pJm=gNNiSyoxG%Ho1^st~p9P(S+!GcgzQEm=lw^hvn+
z=2u78I$GtmwSafUQvei}X6f4{sqXUSy5A@C>P*|WowE<>v52kk?@?BrwV*|On`p>t
zqj>c%m~*7VcCw7)FYT(h;#d%^ln6900SmmXKp1G9n&
z0X;An_>KXz6=eZl=)c{pCeXd22I&xLlD@=`s|9W!uG1InfrZHl;8)r}W;N+sx8
z6I^T)F3MLkG1n?H#-nm=rK*13YsAddf~#4jkJuQtwSg8={jDp(tKX@HAVBC?c@bzx
zX~O5LOii%9_;qn*2pqt>HkEgM#3+oZqpF`ogTfqfx?fp2aU*DkBl3Kys^Ff1NKihM
z*OX=}YN_M0YD-kmYf!7=KRC41UJ(TkjwghXTh{NmzZ{D7A7t}k
zgXCf&@Fb7s)z-M?cSY7~18HZUTef&pvtg}8Y+D1)3hOHG2StxifuE^Lj0bETq!yR7
zL)loZOHx*adxqV0FL37dUwxUW6JhZI-X?Z)5DjvQj#r}}2Z-a>YecU#kvm!$+%nCl
z4wXk>HY;xilbf{}VzCUMLbdNc`u0o**;G&f`AtyljN?h+-mwz;4>i)=*}u_e_qbV<
z#+q)qBM(*5Tsw2kCxY;rKH4U}@2IZK?`vCpvyXgBnJJl-=w{G;FEhHFBne)f>n?7d
z+m>|NT2=B?;M3pq_A;}jV&gcj#xqiWbs_m2L6*k
zoU+bnX|bP54|_S8B8ZGDi0kI{VXM>+E|e#id)M%r@!i|xQ)cHl5-9ewE9=fTN10sA
zko~*U@?`zFyBClOn1q@lTVLV*!S7n!_A)8^(Dc0wPNnTqS1xP+@3`eTmAi=86mD7j
zrgW{tFy|Xtr-s;kvp*PzL^an;(QqafWm;w4>;5PV9fE_XM(#B@aIplDLA{Nj9t$}F
zo-MK|TZ`Hfw6y&?HubP1NTOqd4Me(3_*U8)j|S=m%%J+noD;kAt4{uFh
zz1&ies|OSljLgF<#nvVJo%bcrh*Rv9?d$e
zn{>JQ^D>#`NsiaaW%arNA@{vw$3>_;i8^p==`?w5zYtOhwTEacF1^!E6A@IENABAT
zW*#RHSJ0ri@#Csq^Vk#*Mg6i3@4N{5q@5B8v(Z%$ePZs^TPkl7$;Y9;q!KJC&ztQPf*W;
zRWo#sTYG6rswU*zKv}dzzkJp#Ypb}En2uAj5gYs9ER;Hnrxu0bZl2kVV=xot!Fp1n
z7S_F-=O8RjeS*Yk&&>DcAQo%K9a%y_FNr$%rf6>oBSd*=`pZOjqzDzgG-2-c9()td
z(0ru@{@|r77{)rIAqvpm!jWB35Y7foHQL*HE3Fs^uO(cV@p1PiQ%(ZV;r*Jf1LEZR
z-+Jf2oNZBJRtN}x-sjTZQF7kxKNQj*71$7@yqnFnH}ku@LP9p}j1l?6gRGEGW^hZFewUyqUJ!nvScH=zPlXjm%ffALUUUnTnFgtvRpG
zi=JdDr$h1g%-dG=Yi|fyS4De(hkAYiR~77=Yig&lXEqhan2x^qQP_}LrETf~{Lrh7??d$haC5_7{987(pc68(
z9|`cZJ`w}3gy|-a)|+_%6Fi6XVc5a3^ky)q^;Sp5_2QMVd$9IWPe?aIae!C{;qoZT
zq@Tk35py?chP9sT=Dm&71bTI<*0zlDsASmjYm-^YABi)IQEj+D5}hkL6*koA!ua6%
zc@qCHv+mmdt`D@tfTedygU!JGQG~APho_&?MrTYHpDc2ZS5fIQ{n@?JB~9K_@8gO4
zkIKKEh+h18KHZ%dbt3XC@rs4mCSg2Lq;}xAXey@&Og*7F$at;Wm~Ll(I#Up*^s_AZ*m
zXye(l^nU@D4a>RFB5Qu*h!rSn*Ao=-IFNXXPvqS>X1~X}vHun9uu(l%>;_wWmdj(h
nC0LjSQTg&8>fukbb0@}5#(1>IeY^Vj{|6ZBo9Wf*-beil+eh^v
diff --git a/tgstation.dme b/tgstation.dme
index ce40a5948a3..f8e2a62d097 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -5333,6 +5333,7 @@
#include "code\modules\plumbing\plumbers\teleporter.dm"
#include "code\modules\plumbing\plumbers\vatgrower.dm"
#include "code\modules\point\point.dm"
+#include "code\modules\power\battery.dm"
#include "code\modules\power\cable.dm"
#include "code\modules\power\cell.dm"
#include "code\modules\power\energy_accumulator.dm"
@@ -5343,6 +5344,7 @@
#include "code\modules\power\pipecleaners.dm"
#include "code\modules\power\port_gen.dm"
#include "code\modules\power\power.dm"
+#include "code\modules\power\power_store.dm"
#include "code\modules\power\powernet.dm"
#include "code\modules\power\rtg.dm"
#include "code\modules\power\smes.dm"
diff --git a/tools/UpdatePaths/Scripts/74651_apc_to_apc_helpers.txt b/tools/UpdatePaths/Scripts/74651_apc_to_apc_helpers.txt
index 34c4c581f52..bfedeb2406c 100644
--- a/tools/UpdatePaths/Scripts/74651_apc_to_apc_helpers.txt
+++ b/tools/UpdatePaths/Scripts/74651_apc_to_apc_helpers.txt
@@ -35,4 +35,4 @@
/obj/machinery/power/apc/@SUBTYPES{cell_type = /obj/item/stock_parts/cell/upgraded/plus} : @OLD{@OLD;cell_type=@SKIP}, /obj/effect/mapping_helpers/apc/cell_5k
/obj/machinery/power/apc/@SUBTYPES{cell_type = /obj/item/stock_parts/cell/high} : @OLD{@OLD;cell_type=@SKIP}, /obj/effect/mapping_helpers/apc/cell_10k
/obj/machinery/power/apc/@SUBTYPES{start_charge = 100} : @OLD{@OLD;start_charge=@SKIP}, /obj/effect/mapping_helpers/apc/full_charge
-/obj/machinery/power/apc/@SUBTYPES{start_charge = 0} : @OLD{@OLD;start_charge=@SKIP}, /obj/effect/mapping_helpers/apc/no_charge
\ No newline at end of file
+/obj/machinery/power/apc/@SUBTYPES{start_charge = 0} : @OLD{@OLD;start_charge=@SKIP}, /obj/effect/mapping_helpers/apc/no_charge
diff --git a/tools/UpdatePaths/Scripts/84079_cell_updates.txt b/tools/UpdatePaths/Scripts/84079_cell_updates.txt
new file mode 100644
index 00000000000..ac792704f1b
--- /dev/null
+++ b/tools/UpdatePaths/Scripts/84079_cell_updates.txt
@@ -0,0 +1,2 @@
+/obj/item/stock_parts/cell : /obj/item/stock_parts/power_store/cell{@OLD}
+/obj/item/stock_parts/cell/@SUBTYPES : /obj/item/stock_parts/power_store/cell/@SUBTYPES{@OLD}
diff --git a/tools/ci/check_grep.sh b/tools/ci/check_grep.sh
index 8436073fe97..c78e8fecf7c 100644
--- a/tools/ci/check_grep.sh
+++ b/tools/ci/check_grep.sh
@@ -287,7 +287,7 @@ if [ "$pcre2_support" -eq 1 ]; then
st=1
fi
part "datum stockpart sanity"
- if $grep -P 'for\b.*/obj/item/stock_parts/(?!cell)(?![\w_]+ in )' $code_files; then
+ if $grep -P 'for\b.*/obj/item/stock_parts/(?!power_store)(?![\w_]+ in )' $code_files; then
echo
echo -e "${RED}ERROR: Should be using datum/stock_part instead"
st=1