diff --git a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm index 2c7a240d679..ad27c03ab9a 100644 --- a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm @@ -755,7 +755,7 @@ /turf/open/floor/iron/small, /area/ruin/space/has_grav/listeningstation) "NO" = ( -/obj/machinery/power/smes/full, +/obj/machinery/power/smes/super/full, /obj/effect/turf_decal/stripes/line{ dir = 10 }, diff --git a/_maps/RandomRuins/SpaceRuins/waystation.dmm b/_maps/RandomRuins/SpaceRuins/waystation.dmm index 245473c8fae..e5262d32425 100644 --- a/_maps/RandomRuins/SpaceRuins/waystation.dmm +++ b/_maps/RandomRuins/SpaceRuins/waystation.dmm @@ -357,7 +357,7 @@ /area/ruin/space/has_grav/waystation/cargobay) "gE" = ( /obj/structure/sign/poster/contraband/missing_gloves/directional/north, -/obj/machinery/power/smes/full, +/obj/machinery/power/smes/super/full, /obj/structure/cable, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -464,7 +464,7 @@ /area/ruin/space) "iT" = ( /obj/machinery/light/dim/directional/north, -/obj/machinery/power/smes/full, +/obj/machinery/power/smes/super/full, /obj/structure/cable, /turf/open/floor/plating, /area/ruin/space/has_grav/waystation/power) diff --git a/_maps/map_files/Birdshot/birdshot.dmm b/_maps/map_files/Birdshot/birdshot.dmm index 6820177f3a0..083c0731c69 100644 --- a/_maps/map_files/Birdshot/birdshot.dmm +++ b/_maps/map_files/Birdshot/birdshot.dmm @@ -24949,7 +24949,7 @@ /area/station/ai_monitored/security/armory) "jBA" = ( /obj/structure/cable, -/obj/machinery/power/smes/full, +/obj/machinery/power/smes/super/full, /obj/machinery/camera/directional/north{ c_tag = "AI Chamber - SMES"; network = list("aicore") @@ -27014,7 +27014,7 @@ /area/station/hallway/primary/central/fore) "kiQ" = ( /obj/structure/cable, -/obj/machinery/power/smes/full, +/obj/machinery/power/smes/super/full, /obj/machinery/status_display/ai/directional/north, /turf/open/floor/iron/smooth, /area/station/ai_monitored/turret_protected/aisat/equipment) diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 52f721f2377..ae7ee09bff3 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -62781,7 +62781,7 @@ /turf/open/floor/iron, /area/station/science/breakroom) "pKa" = ( -/obj/machinery/power/smes/full, +/obj/machinery/power/smes/super/full, /obj/structure/sign/warning/electric_shock/directional/north, /obj/machinery/camera/directional/north{ c_tag = "AI Chamber - Fore"; diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index f50a64f900e..24a50b251ef 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -16563,7 +16563,7 @@ /turf/open/floor/iron/smooth, /area/mine/laborcamp/security) "eYH" = ( -/obj/machinery/power/smes/full, +/obj/machinery/power/smes/super/full, /obj/structure/cable, /turf/open/floor/circuit, /area/station/ai_monitored/turret_protected/ai) diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 4037c53da16..afcd6438739 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -55870,7 +55870,7 @@ /turf/open/floor/carpet, /area/station/service/chapel/funeral) "tVC" = ( -/obj/machinery/power/smes/full, +/obj/machinery/power/smes/super/full, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/flasher/directional/north{ diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm index a524709c2a5..11fdfaa697c 100644 --- a/_maps/map_files/Mining/Lavaland.dmm +++ b/_maps/map_files/Mining/Lavaland.dmm @@ -2832,7 +2832,7 @@ /area/mine/laborcamp/production) "ps" = ( /obj/structure/cable, -/obj/machinery/power/smes/full, +/obj/machinery/power/smes/super/full, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/mine/maintenance/service) @@ -3145,6 +3145,17 @@ }, /turf/open/floor/iron/smooth, /area/mine/laborcamp) +"rr" = ( +/obj/structure/cable, +/obj/machinery/door/airlock/external{ + name = "Mining External Airlock" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "lavaland_services_north" + }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance/departmental, +/turf/open/floor/plating, +/area/mine/maintenance/service) "rv" = ( /obj/effect/turf_decal/trimline/brown/filled/line, /turf/open/floor/iron/dark/smooth_edge{ @@ -3418,7 +3429,7 @@ name = "Mining Station Maintenance" }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance/departmental, /turf/open/floor/plating, /area/mine/maintenance/service) "ti" = ( @@ -3671,7 +3682,7 @@ name = "Mining Station Maintenance" }, /obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance/departmental, /turf/open/floor/plating, /area/mine/maintenance/service) "vd" = ( @@ -4110,7 +4121,7 @@ name = "Mining Station Maintenance" }, /obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/all/engineering/tcoms, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance/departmental, /turf/open/floor/plating, /area/mine/maintenance/service/comms) "xJ" = ( @@ -4966,7 +4977,7 @@ /turf/open/floor/plating/lavaland_atmos, /area/lavaland/surface/outdoors) "Ee" = ( -/obj/machinery/power/smes/full, +/obj/machinery/power/smes/super/full, /obj/structure/cable, /turf/open/floor/plating, /area/mine/maintenance/labor) @@ -7125,6 +7136,17 @@ /obj/structure/closet/toolcloset, /turf/open/floor/plating, /area/mine/maintenance/service) +"Rx" = ( +/obj/machinery/door/airlock/external{ + name = "Mining External Airlock" + }, +/obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "lavaland_services_north" + }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance/departmental, +/turf/open/floor/plating, +/area/mine/maintenance/service) "RB" = ( /obj/structure/railing/corner{ dir = 1 @@ -7480,7 +7502,7 @@ /obj/machinery/door/airlock/maintenance{ name = "Mining Station Maintenance" }, -/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance/departmental, /turf/open/floor/plating, /area/mine/maintenance/service) "TW" = ( @@ -7983,6 +8005,15 @@ /obj/effect/mapping_helpers/airlock/access/any/supply/mining_station, /turf/open/floor/plating, /area/mine/storage) +"Xb" = ( +/obj/structure/lattice/catwalk/mining, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/item/toy/plush/shark{ + desc = "A plushie depicting a somewhat cartoonish shark. The tag calls it a 'hákarl', noting that it was made by an obscure furniture manufacturer in old Scandinavia. This one seems to have some cable wiring sticking out of its mouth." + }, +/turf/open/lava/smooth/lava_land_surface, +/area/lavaland/surface/outdoors) "Xd" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -29779,7 +29810,7 @@ Xw aj aj aj -cU +Xb aj aj aj @@ -38998,7 +39029,7 @@ pU Dx cm FL -cm +Rx Ao Ao aW @@ -39255,7 +39286,7 @@ pU aD cV fi -cV +rr Jh cr JS diff --git a/_maps/map_files/NSVBlueshift/Blueshift.dmm b/_maps/map_files/NSVBlueshift/Blueshift.dmm index 1ecfe6134ac..517fe016c15 100644 --- a/_maps/map_files/NSVBlueshift/Blueshift.dmm +++ b/_maps/map_files/NSVBlueshift/Blueshift.dmm @@ -93967,8 +93967,8 @@ /turf/open/floor/iron/dark, /area/station/service/chapel) "rXc" = ( -/obj/machinery/power/smes/full, /obj/structure/cable, +/obj/machinery/power/smes/super/full, /turf/open/floor/circuit, /area/station/ai_monitored/turret_protected/ai) "rXe" = ( diff --git a/_maps/map_files/NorthStar/north_star.dmm b/_maps/map_files/NorthStar/north_star.dmm index 390b175e707..0517c465636 100644 --- a/_maps/map_files/NorthStar/north_star.dmm +++ b/_maps/map_files/NorthStar/north_star.dmm @@ -12178,7 +12178,7 @@ /obj/machinery/camera/motion/directional/north{ c_tag = "Minisat North" }, -/obj/machinery/power/smes/full, +/obj/machinery/power/smes/super/full, /obj/structure/cable, /turf/open/floor/circuit, /area/station/ai_monitored/turret_protected/aisat/service) @@ -61876,7 +61876,7 @@ /turf/open/floor/iron/white, /area/station/science/lobby) "pUB" = ( -/obj/machinery/power/smes/full, +/obj/machinery/power/smes/super/full, /obj/structure/cable, /turf/open/floor/circuit, /area/station/ai_monitored/turret_protected/aisat/service) @@ -79775,7 +79775,7 @@ /area/station/maintenance/solars/starboard/fore) "uDR" = ( /obj/machinery/firealarm/directional/west, -/obj/machinery/power/smes/full, +/obj/machinery/power/smes/super/full, /obj/structure/cable, /turf/open/floor/circuit, /area/station/ai_monitored/turret_protected/aisat_interior) diff --git a/_maps/map_files/Ouroboros/Ouroboros.dmm b/_maps/map_files/Ouroboros/Ouroboros.dmm index 15ccb667860..553469026ea 100644 --- a/_maps/map_files/Ouroboros/Ouroboros.dmm +++ b/_maps/map_files/Ouroboros/Ouroboros.dmm @@ -338,7 +338,7 @@ /area/station/science/ordnance/testlab) "aft" = ( /obj/structure/cable, -/obj/machinery/power/smes/full, +/obj/machinery/power/smes/super/full, /turf/open/floor/circuit, /area/station/ai_monitored/turret_protected/ai) "afy" = ( diff --git a/_maps/map_files/VoidRaptor/VoidRaptor.dmm b/_maps/map_files/VoidRaptor/VoidRaptor.dmm index 870c0dddc3e..52f192749be 100644 --- a/_maps/map_files/VoidRaptor/VoidRaptor.dmm +++ b/_maps/map_files/VoidRaptor/VoidRaptor.dmm @@ -7594,8 +7594,8 @@ /obj/structure/sign/nanotrasen{ pixel_y = -32 }, -/obj/machinery/power/smes/full, /obj/structure/cable, +/obj/machinery/power/smes/super/full, /turf/open/floor/vault, /area/station/ai_monitored/turret_protected/ai) "cog" = ( diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index 1fecd715209..b1a79c85fdd 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -22957,7 +22957,7 @@ /turf/open/floor/iron/dark, /area/station/command/bridge) "hhf" = ( -/obj/machinery/power/smes/full, +/obj/machinery/power/smes/super/full, /obj/structure/cable, /turf/open/floor/circuit, /area/station/ai_monitored/turret_protected/ai) diff --git a/_maps/shuttles/infiltrator_advanced.dmm b/_maps/shuttles/infiltrator_advanced.dmm index 1f048327921..c9123066874 100644 --- a/_maps/shuttles/infiltrator_advanced.dmm +++ b/_maps/shuttles/infiltrator_advanced.dmm @@ -1935,7 +1935,7 @@ /turf/open/floor/mineral/plastitanium, /area/shuttle/syndicate/armory) "tP" = ( -/obj/machinery/power/smes/full, +/obj/machinery/power/smes/super/full, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, /obj/structure/sign/warning/electric_shock/directional/north, diff --git a/_maps/shuttles/ruin_pirate_cutter.dmm b/_maps/shuttles/ruin_pirate_cutter.dmm index 018e60f2762..2777f06ce8c 100644 --- a/_maps/shuttles/ruin_pirate_cutter.dmm +++ b/_maps/shuttles/ruin_pirate_cutter.dmm @@ -753,7 +753,7 @@ }, /area/shuttle/ruin/caravan/pirate) "We" = ( -/obj/machinery/power/smes/full, +/obj/machinery/power/smes/super/full, /obj/effect/turf_decal/stripes/line{ dir = 5 }, diff --git a/_maps/shuttles/ruin_syndicate_dropship.dmm b/_maps/shuttles/ruin_syndicate_dropship.dmm index 449c21eb56a..dc3e7b68a7b 100644 --- a/_maps/shuttles/ruin_syndicate_dropship.dmm +++ b/_maps/shuttles/ruin_syndicate_dropship.dmm @@ -376,7 +376,7 @@ /turf/open/floor/pod/dark, /area/shuttle/ruin/caravan/syndicate3) "Oe" = ( -/obj/machinery/power/smes/full, +/obj/machinery/power/smes/super/full, /obj/effect/turf_decal/stripes/line{ dir = 5 }, diff --git a/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm index 2b7086c3b53..ac38fee5387 100644 --- a/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm +++ b/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm @@ -349,6 +349,9 @@ greyscale_colors = CIRCUIT_COLOR_ENGINEERING 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) + /obj/item/circuitboard/machine/thermomachine name = "Thermomachine" greyscale_colors = CIRCUIT_COLOR_ENGINEERING diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm index 2aa5247451d..bf866f234e3 100644 --- a/code/modules/power/smes.dm +++ b/code/modules/power/smes.dm @@ -438,6 +438,16 @@ update_appearance() log_smes() +// Variant of SMES that starts with super power cells for higher longevity +/obj/machinery/power/smes/super + 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 + +/obj/machinery/power/smes/super/full + charge = 100 * STANDARD_CELL_CHARGE + /obj/machinery/power/smes/full charge = 50 * STANDARD_CELL_CHARGE