From aed44072d30f003ee221d48a986844fb99fbada7 Mon Sep 17 00:00:00 2001 From: CHOMPStation2StaffMirrorBot <94713762+CHOMPStation2StaffMirrorBot@users.noreply.github.com> Date: Fri, 24 Oct 2025 14:51:06 -0700 Subject: [PATCH] [MIRROR] smes linting (#11829) Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com> Co-authored-by: Will <7099514+Willburd@users.noreply.github.com> Co-authored-by: Cameron Lennox Co-authored-by: ShadowLarkens --- code/modules/power/smes_prefabs.dm | 141 +++++++++++++++++- .../aerostat/aerostat_science_outpost.dmm | 14 +- maps/gateway_vr/snowfield.dmm | 8 +- maps/groundbase/gb-z1.dmm | 55 +++---- maps/groundbase/gb-z2.dmm | 5 +- maps/groundbase/gb-z3.dmm | 4 +- .../westwilds/westwilds template.dmm | 18 +-- maps/groundbase/westwilds/westwilds1.dmm | 18 +-- maps/groundbase/westwilds/westwilds2.dmm | 18 +-- maps/offmap_vr/om_ships/aro.dmm | 4 +- maps/offmap_vr/om_ships/aro2.dmm | 14 +- maps/offmap_vr/om_ships/aro3.dmm | 14 +- maps/offmap_vr/om_ships/cruiser.dmm | 13 +- maps/offmap_vr/om_ships/lunaship.dmm | 16 +- maps/offmap_vr/om_ships/screebarge.dmm | 4 +- maps/offmap_vr/om_ships/shelter_6.dmm | 11 +- maps/offmap_vr/om_ships/vespa.dmm | 4 +- maps/stellar_delight/stellar_delight1.dmm | 35 ++--- maps/stellar_delight/stellar_delight2.dmm | 26 ++-- maps/stellar_delight/stellar_delight3.dmm | 21 +-- .../admin_use_vr/event_autonomous_drone.dmm | 4 +- .../pois_vr/debris_field/mining_drones.dmm | 6 +- .../debris_field/ship_tourist_overrun.dmm | 4 +- .../pois_vr/debris_field/tinycarrier.dmm | 6 +- maps/submaps/shelters/shelter_tesla.dmm | 12 +- maps/tether/tether-01-surface1.dmm | 20 +-- maps/tether/tether-02-surface2.dmm | 22 +-- maps/tether/tether-03-surface3.dmm | 9 +- maps/tether/tether-05-station1.dmm | 47 +++--- maps/tether/tether-06-mining.dmm | 5 +- maps/tether/tether-07-solars.dmm | 14 +- maps/virgo_minitest/virgo_minitest-1.dmm | 26 ++-- modular_chomp/maps/common/sc_belt_miner.dmm | 4 +- .../maps/common_submaps/gateway/darkrps.dmm | 6 +- .../maps/common_submaps/gateway/snowfield.dmm | 58 +++---- .../kara/northern_star/northern_star_mine.dmm | 74 +++------ .../maps/overmap/om_ships/cruiser.dmm | 13 +- .../maps/overmap/om_ships/shelter_6.dmm | 5 +- .../maps/relic_base/relicbase-11.dmm | 18 +-- modular_chomp/maps/relic_base/relicbase-2.dmm | 6 +- modular_chomp/maps/relic_base/relicbase-3.dmm | 46 +++--- modular_chomp/maps/relic_base/relicbase-4.dmm | 31 +--- modular_chomp/maps/relic_base/relicbase-6.dmm | 16 +- .../maps/soluna_nexus/soluna_nexus-1.dmm | 26 +--- .../maps/soluna_nexus/soluna_nexus-3.dmm | 100 +++++-------- .../maps/soluna_nexus/soluna_nexus-6.dmm | 52 +++---- .../maps/southern_cross/southern_cross-1.dmm | 6 +- .../maps/southern_cross/southern_cross-2.dmm | 21 +-- .../maps/southern_cross/southern_cross-3.dmm | 38 ++--- .../maps/southern_cross/southern_cross-4.dmm | 35 ++--- .../maps/southern_cross/southern_cross-5.dmm | 82 ++++------ .../maps/southern_cross/southern_cross-6.dmm | 16 +- .../maps/southern_cross/southern_cross-7.dmm | 69 ++++----- .../maps/submaps/shelters/CultShip-28x17.dmm | 2 +- .../surface_submaps/wilderness/Chapel.dmm | 7 +- .../maps/virgo_minitest/virgo_minitest-1.dmm | 25 +--- tools/maplint/lints/smes_sanity.yml | 18 +++ 57 files changed, 577 insertions(+), 815 deletions(-) create mode 100644 tools/maplint/lints/smes_sanity.yml diff --git a/code/modules/power/smes_prefabs.dm b/code/modules/power/smes_prefabs.dm index 532d77450b..62e6bb6bc7 100644 --- a/code/modules/power/smes_prefabs.dm +++ b/code/modules/power/smes_prefabs.dm @@ -1,18 +1,61 @@ -// Defaults to maximum charge, no change to input or output levels +/// Defaults to maximum charge, no change to input or output levels by default /obj/machinery/power/smes/buildable/max_charge/apply_mapped_settings() // Set charge charge = capacity -// Defaults to 100% input and output settings, starts with maximum charge +/// Defaults to 100% input and output settings, starts with maximum charge by default /obj/machinery/power/smes/buildable/engine_default/apply_mapped_settings() // Set charge charge = capacity - // Set output to max + // Set input and output to max inputting(TRUE) outputting(TRUE) input_level = input_level_max output_level = output_level_max +/// Standard charge, but with 100% output by default +/obj/machinery/power/smes/buildable/max_output/apply_mapped_settings() + outputting(TRUE) + output_level = output_level_max + +/// Standard charge, but with 100% input by default +/obj/machinery/power/smes/buildable/max_input/apply_mapped_settings() + inputting(TRUE) + input_level = input_level_max + +/// Standard charge, no output by default +/obj/machinery/power/smes/buildable/disable_output/apply_mapped_settings() + outputting(FALSE) + output_level = 0 + +/// Max charge, but with 100% input by default +/obj/machinery/power/smes/buildable/max_charge_max_input/apply_mapped_settings() + // Set charge + charge = capacity + // Set input to max + inputting(TRUE) + input_level = input_level_max + +/// Max charge, but with 100% output by default +/obj/machinery/power/smes/buildable/max_charge_max_output/apply_mapped_settings() + // Set charge + charge = capacity + // Set input to max + outputting(TRUE) + output_level = output_level_max + +//CHOMPedit start - Upstream these post-haste +/// Max input, max output, default starting charge +/obj/machinery/power/smes/buildable/max_input_max_output/apply_mapped_settings() + // Set input to max + inputting(TRUE) + input_level = input_level_max + // Set input to max + outputting(TRUE) + output_level = output_level_max + +// CHOMPEdit End + // Poi prop /obj/machinery/power/smes/buildable/alien_royal name = "Alien Royal Capacitor" @@ -20,3 +63,95 @@ icon = 'icons/obj/alien_smes.dmi' input_level = 950000 output_level = 950000 + + +//////////////////////////////////////////////////////////////////////////////////// +// Hybrids +//////////////////////////////////////////////////////////////////////////////////// +/obj/machinery/power/smes/buildable/hybrid/max_charge/apply_mapped_settings() + // Set charge + charge = capacity + +/obj/machinery/power/smes/buildable/hybrid/engine_default/apply_mapped_settings() + // Set charge + charge = capacity + // Set input and output to max + inputting(TRUE) + outputting(TRUE) + input_level = input_level_max + output_level = output_level_max + +/obj/machinery/power/smes/buildable/hybrid/max_output/apply_mapped_settings() + outputting(TRUE) + output_level = output_level_max + +/obj/machinery/power/smes/buildable/hybrid/max_input/apply_mapped_settings() + inputting(TRUE) + input_level = input_level_max + +/obj/machinery/power/smes/buildable/hybrid/high_recharge_rate/apply_mapped_settings() + recharge_rate = 10000 + + +//////////////////////////////////////////////////////////////////////////////////// +// Preconfigured specials +//////////////////////////////////////////////////////////////////////////////////// +/obj/machinery/power/smes/buildable/outpost_substation/max_charge/apply_mapped_settings() + // Set charge + charge = capacity + +/obj/machinery/power/smes/buildable/outpost_substation/max_charge_max_input/apply_mapped_settings() + // Set charge + charge = capacity + // Set input to max + inputting(TRUE) + input_level = input_level_max + +/obj/machinery/power/smes/batteryrack/mapped/input_and_output_on/apply_mapped_settings() + inputting(TRUE) + outputting(TRUE) + mode = 3 + + +//CHOMPedit start - Upstream these post-haste +//////////////////////////////////////////////////////////////////////////////////// +// Shuttles and poi +//////////////////////////////////////////////////////////////////////////////////// +/obj/machinery/power/smes/buildable/power_shuttle/max_charge/apply_mapped_settings() + // Set charge + charge = capacity + +/obj/machinery/power/smes/buildable/power_shuttle/max_charge_max_input/apply_mapped_settings() + // Set charge + charge = capacity + // Set input to max + inputting(TRUE) + input_level = input_level_max + +/obj/machinery/power/smes/buildable/power_shuttle/max_charge_max_input_base_output/apply_mapped_settings() + // Set charge + charge = capacity + // Set input to max + inputting(TRUE) + input_level = input_level_max + // Standard level output + outputting(TRUE) + + +/obj/machinery/power/smes/buildable/point_of_interest/max_charge/apply_mapped_settings() + // Set charge + charge = capacity + +/obj/machinery/power/smes/buildable/point_of_interest/max_charge_max_input/apply_mapped_settings() + // Set charge + charge = capacity + // Set input to max + inputting(TRUE) + input_level = input_level_max + +/obj/machinery/power/smes/buildable/point_of_interest/max_input/apply_mapped_settings() + // Set input to max + inputting(TRUE) + input_level = input_level_max + +// CHOMPEdit End diff --git a/maps/expedition_vr/aerostat/aerostat_science_outpost.dmm b/maps/expedition_vr/aerostat/aerostat_science_outpost.dmm index 8472a1be34..7c51135482 100644 --- a/maps/expedition_vr/aerostat/aerostat_science_outpost.dmm +++ b/maps/expedition_vr/aerostat/aerostat_science_outpost.dmm @@ -1469,12 +1469,7 @@ /area/offmap/aerostat/solars) "dK" = ( /obj/structure/cable, -/obj/machinery/power/smes/buildable{ - charge = 2e+006; - input_attempt = 1; - input_level = 100000; - output_level = 200000 - }, +/obj/machinery/power/smes/buildable/engine_default, /turf/simulated/floor/bluegrid, /area/offmap/aerostat/inside/powercontrol) "dL" = ( @@ -1493,12 +1488,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/smes/buildable{ - charge = 2e+006; - input_attempt = 1; - input_level = 100000; - output_level = 200000 - }, +/obj/machinery/power/smes/buildable/engine_default, /turf/simulated/floor/bluegrid, /area/offmap/aerostat/inside/powercontrol) "dN" = ( diff --git a/maps/gateway_vr/snowfield.dmm b/maps/gateway_vr/snowfield.dmm index a2f68bfa41..1820516a53 100644 --- a/maps/gateway_vr/snowfield.dmm +++ b/maps/gateway_vr/snowfield.dmm @@ -98,13 +98,7 @@ /turf/simulated/floor/plating, /area/awaymission/snowfield/base) "ao" = ( -/obj/machinery/power/smes/buildable{ - charge = 2.5e+006; - input_attempt = 1; - input_level = 250000; - inputting = 1; - output_level = 250000 - }, +/obj/machinery/power/smes/buildable/engine_default, /obj/structure/cable{ icon_state = "0-2" }, diff --git a/maps/groundbase/gb-z1.dmm b/maps/groundbase/gb-z1.dmm index fb3aeb4b71..e8d2ee6418 100644 --- a/maps/groundbase/gb-z1.dmm +++ b/maps/groundbase/gb-z1.dmm @@ -7109,19 +7109,18 @@ /turf/simulated/floor/tiled, /area/groundbase/cargo/mining) "pu" = ( -/obj/machinery/power/smes/buildable{ +/obj/machinery/power/smes/buildable/engine_default{ RCon_tag = "Power - Main"; - charge = 2e+007; - cur_coils = 4; - input_attempt = 1; - input_level = 500000; - name = "Main"; - output_level = 1e+006 + name = "Main" }, /obj/structure/cable, /obj/machinery/light{ dir = 8 }, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, /turf/simulated/floor, /area/groundbase/engineering/storage) "pv" = ( @@ -8276,9 +8275,8 @@ /obj/structure/cable/yellow{ icon_state = "0-8" }, -/obj/machinery/power/smes/buildable{ - RCon_tag = "Substation - Engineering"; - output_attempt = 0 +/obj/machinery/power/smes/buildable/disable_output{ + RCon_tag = "Substation - Engineering" }, /turf/simulated/floor, /area/groundbase/engineering/storage) @@ -10229,9 +10227,8 @@ /obj/structure/cable/yellow{ icon_state = "0-8" }, -/obj/machinery/power/smes/buildable{ - RCon_tag = "Substation - AI/Telecomms"; - output_attempt = 0 +/obj/machinery/power/smes/buildable/disable_output{ + RCon_tag = "Substation - AI/Telecomms" }, /obj/machinery/light/small{ dir = 1 @@ -12713,9 +12710,8 @@ /obj/structure/cable/yellow{ icon_state = "0-8" }, -/obj/machinery/power/smes/buildable{ - RCon_tag = "Substation - Civilian"; - output_attempt = 0 +/obj/machinery/power/smes/buildable/disable_output{ + RCon_tag = "Substation - Civilian" }, /obj/machinery/light/small, /turf/simulated/floor, @@ -13249,9 +13245,8 @@ /obj/structure/cable/yellow{ icon_state = "0-8" }, -/obj/machinery/power/smes/buildable{ - RCon_tag = "Substation - Cargo"; - output_attempt = 0 +/obj/machinery/power/smes/buildable/disable_output{ + RCon_tag = "Substation - Cargo" }, /obj/machinery/light/small{ dir = 1 @@ -13841,12 +13836,7 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, -/obj/machinery/power/smes/buildable{ - charge = 5e+006; - input_attempt = 1; - input_level = 200000; - output_level = 200000 - }, +/obj/machinery/power/smes/buildable/engine_default, /turf/simulated/floor/tiled/techfloor/grid, /area/groundbase/command/ai/chamber) "Fb" = ( @@ -14412,9 +14402,8 @@ /turf/simulated/floor/tiled, /area/groundbase/engineering/engine) "Gr" = ( -/obj/machinery/power/smes/buildable{ - RCon_tag = "Substation - Medical"; - output_attempt = 0 +/obj/machinery/power/smes/buildable/disable_output{ + RCon_tag = "Substation - Medical" }, /obj/structure/cable/yellow{ icon_state = "0-4" @@ -19503,9 +19492,8 @@ icon_state = "0-2" }, /obj/structure/cable/yellow, -/obj/machinery/power/smes/buildable{ - RCon_tag = "Substation - Science"; - output_attempt = 0 +/obj/machinery/power/smes/buildable/disable_output{ + RCon_tag = "Substation - Science" }, /obj/machinery/light/small{ dir = 8 @@ -20337,9 +20325,8 @@ icon_state = "0-2" }, /obj/structure/cable/yellow, -/obj/machinery/power/smes/buildable{ - RCon_tag = "Substation - Security"; - output_attempt = 0 +/obj/machinery/power/smes/buildable/disable_output{ + RCon_tag = "Substation - Security" }, /obj/machinery/light/small{ dir = 4 diff --git a/maps/groundbase/gb-z2.dmm b/maps/groundbase/gb-z2.dmm index f65e436030..bc6ab3f3d6 100644 --- a/maps/groundbase/gb-z2.dmm +++ b/maps/groundbase/gb-z2.dmm @@ -14362,9 +14362,8 @@ /obj/structure/cable/yellow{ icon_state = "0-2" }, -/obj/machinery/power/smes/buildable{ - RCon_tag = "Substation - Command"; - output_attempt = 0 +/obj/machinery/power/smes/buildable/disable_output{ + RCon_tag = "Substation - Command" }, /turf/simulated/floor, /area/maintenance/groundbase/substation/command) diff --git a/maps/groundbase/gb-z3.dmm b/maps/groundbase/gb-z3.dmm index 8f4dafc6eb..6be99fa5cd 100644 --- a/maps/groundbase/gb-z3.dmm +++ b/maps/groundbase/gb-z3.dmm @@ -2642,9 +2642,7 @@ }, /area/groundbase/medical/patio) "Pf" = ( -/obj/machinery/power/smes/buildable{ - charge = 500000 - }, +/obj/machinery/power/smes/buildable/max_charge, /obj/structure/cable/cyan{ icon_state = "0-4" }, diff --git a/maps/groundbase/westwilds/westwilds template.dmm b/maps/groundbase/westwilds/westwilds template.dmm index 0173f1fc33..2370bff427 100644 --- a/maps/groundbase/westwilds/westwilds template.dmm +++ b/maps/groundbase/westwilds/westwilds template.dmm @@ -1149,9 +1149,8 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/smes/buildable{ - RCon_tag = "Substation - Science Outpost"; - output_attempt = 0 +/obj/machinery/power/smes/buildable/disable_output{ + RCon_tag = "Substation - Science Outpost" }, /turf/simulated/floor, /area/groundbase/science/outpost/substation) @@ -1646,9 +1645,7 @@ /area/groundbase/science/outpost/toxins_mixing) "oP" = ( /obj/structure/cable, -/obj/machinery/power/smes/buildable{ - charge = 500000 - }, +/obj/machinery/power/smes/buildable/max_charge, /turf/simulated/floor/tiled/techfloor, /area/shuttle/axolotl_engineering) "oX" = ( @@ -3407,10 +3404,11 @@ /obj/structure/cable/heavyduty{ icon_state = "0-2" }, -/obj/machinery/power/smes/buildable{ - RCon_tag = "Power - Solar Array"; - cur_coils = 3; - output_attempt = 0 +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/machinery/power/smes/buildable/disable_output{ + RCon_tag = "Power - Solar Array" }, /turf/simulated/floor, /area/groundbase/engineering/solarshed) diff --git a/maps/groundbase/westwilds/westwilds1.dmm b/maps/groundbase/westwilds/westwilds1.dmm index 7e8b5507a4..1f0a1b12a5 100644 --- a/maps/groundbase/westwilds/westwilds1.dmm +++ b/maps/groundbase/westwilds/westwilds1.dmm @@ -1691,9 +1691,7 @@ /area/shuttle/axolotl_q1) "or" = ( /obj/structure/cable, -/obj/machinery/power/smes/buildable{ - charge = 500000 - }, +/obj/machinery/power/smes/buildable/max_charge, /turf/simulated/floor/tiled/techfloor, /area/shuttle/axolotl_engineering) "os" = ( @@ -3643,9 +3641,8 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/smes/buildable{ - RCon_tag = "Substation - Science Outpost"; - output_attempt = 0 +/obj/machinery/power/smes/buildable/disable_output{ + RCon_tag = "Substation - Science Outpost" }, /turf/simulated/floor, /area/groundbase/science/outpost/substation) @@ -5642,11 +5639,12 @@ /obj/structure/cable/heavyduty{ icon_state = "0-2" }, -/obj/machinery/power/smes/buildable{ - RCon_tag = "Power - Solar Array"; - cur_coils = 3; - output_attempt = 0 +/obj/machinery/power/smes/buildable/disable_output{ + RCon_tag = "Power - Solar Array" }, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, /turf/simulated/floor, /area/groundbase/engineering/solarshed) "TV" = ( diff --git a/maps/groundbase/westwilds/westwilds2.dmm b/maps/groundbase/westwilds/westwilds2.dmm index 1d4e051684..2937cfd5c0 100644 --- a/maps/groundbase/westwilds/westwilds2.dmm +++ b/maps/groundbase/westwilds/westwilds2.dmm @@ -1380,9 +1380,8 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/smes/buildable{ - RCon_tag = "Substation - Science Outpost"; - output_attempt = 0 +/obj/machinery/power/smes/buildable/disable_output{ + RCon_tag = "Substation - Science Outpost" }, /turf/simulated/floor, /area/groundbase/science/outpost/substation) @@ -3584,11 +3583,12 @@ /obj/structure/cable/heavyduty{ icon_state = "0-2" }, -/obj/machinery/power/smes/buildable{ - RCon_tag = "Power - Solar Array"; - cur_coils = 3; - output_attempt = 0 +/obj/machinery/power/smes/buildable/disable_output{ + RCon_tag = "Power - Solar Array" }, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, /turf/simulated/floor, /area/groundbase/engineering/solarshed) "Bg" = ( @@ -5283,9 +5283,7 @@ /area/groundbase/science/outpost/toxing_gasworks) "Pw" = ( /obj/structure/cable, -/obj/machinery/power/smes/buildable{ - charge = 500000 - }, +/obj/machinery/power/smes/buildable/max_charge, /turf/simulated/floor/tiled/techfloor, /area/shuttle/axolotl_engineering) "Pz" = ( diff --git a/maps/offmap_vr/om_ships/aro.dmm b/maps/offmap_vr/om_ships/aro.dmm index a098de90be..1ed0080eef 100644 --- a/maps/offmap_vr/om_ships/aro.dmm +++ b/maps/offmap_vr/om_ships/aro.dmm @@ -2829,9 +2829,7 @@ /turf/simulated/shuttle/floor/alienplating/blue, /area/ship/aro/engineering) "gG" = ( -/obj/machinery/power/smes/buildable/hybrid{ - output_level = 250000 - }, +/obj/machinery/power/smes/buildable/hybrid/max_charge, /obj/structure/cable/cyan{ icon_state = "0-8" }, diff --git a/maps/offmap_vr/om_ships/aro2.dmm b/maps/offmap_vr/om_ships/aro2.dmm index 7414f114e8..8eed067047 100644 --- a/maps/offmap_vr/om_ships/aro2.dmm +++ b/maps/offmap_vr/om_ships/aro2.dmm @@ -1621,12 +1621,7 @@ /obj/structure/cable/cyan{ icon_state = "0-4" }, -/obj/machinery/power/smes/buildable/hybrid{ - input_attempt = 1; - input_level = 250000; - input_level_max = 250000; - output_level = 190000 - }, +/obj/machinery/power/smes/buildable/hybrid/engine_default, /turf/simulated/floor/plating/eris/under, /area/aro2/powerarea) "pX" = ( @@ -3606,12 +3601,7 @@ /turf/simulated/floor/plating/eris/under, /area/aro2/boatdeck) "MU" = ( -/obj/machinery/power/smes/buildable/hybrid{ - input_attempt = 1; - input_level = 250000; - input_level_max = 250000; - output_level = 190000 - }, +/obj/machinery/power/smes/buildable/hybrid/engine_default, /obj/structure/cable/cyan{ icon_state = "0-4" }, diff --git a/maps/offmap_vr/om_ships/aro3.dmm b/maps/offmap_vr/om_ships/aro3.dmm index 6c1271a006..c9c99ece61 100644 --- a/maps/offmap_vr/om_ships/aro3.dmm +++ b/maps/offmap_vr/om_ships/aro3.dmm @@ -3644,12 +3644,7 @@ /turf/simulated/floor/tiled/milspec, /area/aro3/power) "wW" = ( -/obj/machinery/power/smes/buildable/hybrid{ - input_attempt = 1; - input_level = 250000; - input_level_max = 250000; - output_level = 190000 - }, +/obj/machinery/power/smes/buildable/hybrid/engine_default, /obj/structure/cable/cyan{ icon_state = "0-4" }, @@ -6680,12 +6675,7 @@ /obj/structure/cable/cyan{ icon_state = "0-4" }, -/obj/machinery/power/smes/buildable/hybrid{ - input_attempt = 1; - input_level = 250000; - input_level_max = 250000; - output_level = 190000 - }, +/obj/machinery/power/smes/buildable/hybrid/engine_default, /turf/simulated/floor/plating/eris/under, /area/aro3/power) "RL" = ( diff --git a/maps/offmap_vr/om_ships/cruiser.dmm b/maps/offmap_vr/om_ships/cruiser.dmm index 02750e3c6d..b2ce39a37c 100644 --- a/maps/offmap_vr/om_ships/cruiser.dmm +++ b/maps/offmap_vr/om_ships/cruiser.dmm @@ -2915,15 +2915,12 @@ /turf/simulated/floor/tiled/white, /area/mothership/chemistry) "gh" = ( -/obj/machinery/power/smes/buildable{ - capacity = 2e+007; - charge = 2e+007; - cur_coils = 4; - input_attempt = 1; - input_level = 1e+006; - output_level = 1e+006 - }, /obj/structure/cable/cyan, +/obj/machinery/power/smes/buildable/max_charge_max_input, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, /turf/simulated/floor/tiled/techfloor/grid, /area/mothership/vault) "gj" = ( diff --git a/maps/offmap_vr/om_ships/lunaship.dmm b/maps/offmap_vr/om_ships/lunaship.dmm index 685d734d6f..15bc505f50 100644 --- a/maps/offmap_vr/om_ships/lunaship.dmm +++ b/maps/offmap_vr/om_ships/lunaship.dmm @@ -2486,12 +2486,8 @@ /obj/effect/floor_decal/industrial/warning{ dir = 9 }, -/obj/machinery/power/smes/buildable/hybrid{ - desc = "A high-capacity superconducting magnetic energy storage (SMES) unit, linked to an advanced looking generator.."; - input_attempt = 1; - input_level = 250000; - input_level_max = 250000; - output_level = 190000 +/obj/machinery/power/smes/buildable/hybrid/engine_default{ + desc = "A high-capacity superconducting magnetic energy storage (SMES) unit, linked to an advanced looking generator.." }, /obj/structure/cable/cyan{ icon_state = "0-8" @@ -3555,12 +3551,8 @@ /obj/structure/cable/cyan{ icon_state = "0-8" }, -/obj/machinery/power/smes/buildable/hybrid{ - desc = "A high-capacity superconducting magnetic energy storage (SMES) unit, linked to an advanced looking generator.."; - input_attempt = 1; - input_level = 250000; - input_level_max = 250000; - output_level = 190000 +/obj/machinery/power/smes/buildable/hybrid/engine_default{ + desc = "A high-capacity superconducting magnetic energy storage (SMES) unit, linked to an advanced looking generator.." }, /turf/simulated/floor/tiled/eris/white/gray_platform, /area/lunaship/engineering) diff --git a/maps/offmap_vr/om_ships/screebarge.dmm b/maps/offmap_vr/om_ships/screebarge.dmm index fde34c8f7e..e4b18d7465 100644 --- a/maps/offmap_vr/om_ships/screebarge.dmm +++ b/maps/offmap_vr/om_ships/screebarge.dmm @@ -162,9 +162,7 @@ /turf/simulated/floor/reinforced, /area/shuttle/screebarge/fore) "av" = ( -/obj/machinery/power/smes/buildable{ - charge = 5e+006 - }, +/obj/machinery/power/smes/buildable/max_charge, /obj/structure/cable/cyan, /turf/simulated/floor/reinforced, /area/shuttle/screebarge/fore) diff --git a/maps/offmap_vr/om_ships/shelter_6.dmm b/maps/offmap_vr/om_ships/shelter_6.dmm index c343448eec..cf160f83f9 100644 --- a/maps/offmap_vr/om_ships/shelter_6.dmm +++ b/maps/offmap_vr/om_ships/shelter_6.dmm @@ -1057,15 +1057,14 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/tabiranth) "bl" = ( -/obj/machinery/power/smes/buildable/hybrid{ - cur_coils = 4; - input_level = 500000; - output_level = 500000; - recharge_rate = 40000 - }, /obj/structure/cable/cyan{ icon_state = "0-4" }, +/obj/machinery/power/smes/buildable/hybrid/max_charge, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, /turf/simulated/floor/tiled/techmaint, /area/shuttle/tabiranth) "bm" = ( diff --git a/maps/offmap_vr/om_ships/vespa.dmm b/maps/offmap_vr/om_ships/vespa.dmm index 28b17adead..f327cfd6c2 100644 --- a/maps/offmap_vr/om_ships/vespa.dmm +++ b/maps/offmap_vr/om_ships/vespa.dmm @@ -8085,9 +8085,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/expe/engineeringpower) "pt" = ( -/obj/machinery/power/smes/buildable/hybrid{ - recharge_rate = 10000 - }, +/obj/machinery/power/smes/buildable/hybrid/high_recharge_rate, /obj/structure/cable{ icon_state = "0-8" }, diff --git a/maps/stellar_delight/stellar_delight1.dmm b/maps/stellar_delight/stellar_delight1.dmm index 5bbbab70ca..4b313c10e1 100644 --- a/maps/stellar_delight/stellar_delight1.dmm +++ b/maps/stellar_delight/stellar_delight1.dmm @@ -3092,9 +3092,8 @@ color = "#42038a"; icon_state = "0-2" }, -/obj/machinery/power/smes/buildable{ - RCon_tag = "Substation - Exploration"; - output_attempt = 0 +/obj/machinery/power/smes/buildable/disable_output{ + RCon_tag = "Substation - Exploration" }, /turf/simulated/floor, /area/maintenance/stellardelight/substation/exploration) @@ -3683,9 +3682,8 @@ icon_state = "0-2" }, /obj/structure/cable/pink, -/obj/machinery/power/smes/buildable{ - RCon_tag = "Substation - Security"; - output_attempt = 0 +/obj/machinery/power/smes/buildable/disable_output{ + RCon_tag = "Substation - Security" }, /turf/simulated/floor, /area/maintenance/stellardelight/substation/security) @@ -15595,9 +15593,8 @@ /obj/structure/cable/green{ color = "#42038a" }, -/obj/machinery/power/smes/buildable{ - RCon_tag = "Substation - Research"; - output_attempt = 0 +/obj/machinery/power/smes/buildable/disable_output{ + RCon_tag = "Substation - Research" }, /turf/simulated/floor, /area/maintenance/stellardelight/substation/research) @@ -19166,9 +19163,8 @@ /obj/structure/cable/yellow{ icon_state = "0-2" }, -/obj/machinery/power/smes/buildable{ - RCon_tag = "Substation - Cargo"; - output_attempt = 0 +/obj/machinery/power/smes/buildable/disable_output{ + RCon_tag = "Substation - Cargo" }, /turf/simulated/floor, /area/maintenance/stellardelight/substation/cargo) @@ -19929,9 +19925,8 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/smes/buildable{ - RCon_tag = "Substation - Civilian"; - output_attempt = 0 +/obj/machinery/power/smes/buildable/disable_output{ + RCon_tag = "Substation - Civilian" }, /turf/simulated/floor, /area/maintenance/stellardelight/substation/civilian) @@ -20032,9 +20027,8 @@ icon_state = "0-2" }, /obj/structure/cable/orange, -/obj/machinery/power/smes/buildable{ - RCon_tag = "Substation - Atmospherics"; - output_attempt = 0 +/obj/machinery/power/smes/buildable/disable_output{ + RCon_tag = "Substation - Atmospherics" }, /turf/simulated/floor, /area/maintenance/stellardelight/substation/atmospherics) @@ -21639,9 +21633,8 @@ /obj/structure/cable/white{ icon_state = "0-2" }, -/obj/machinery/power/smes/buildable{ - RCon_tag = "Substation - Medical"; - output_attempt = 0 +/obj/machinery/power/smes/buildable/disable_output{ + RCon_tag = "Substation - Medical" }, /turf/simulated/floor, /area/maintenance/stellardelight/substation/medical) diff --git a/maps/stellar_delight/stellar_delight2.dmm b/maps/stellar_delight/stellar_delight2.dmm index 7243a7a48f..75427ec975 100644 --- a/maps/stellar_delight/stellar_delight2.dmm +++ b/maps/stellar_delight/stellar_delight2.dmm @@ -1053,13 +1053,9 @@ /turf/simulated/floor/carpet/sblucarpet, /area/stellardelight/deck2/briefingroom) "cc" = ( -/obj/machinery/power/smes/buildable{ +/obj/machinery/power/smes/buildable/engine_default{ RCon_tag = "Engine - Core"; - charge = 2e+006; - input_attempt = 1; - input_level = 200000; - name = "Engine"; - output_level = 250000 + name = "Engine" }, /obj/structure/cable/cyan{ icon_state = "0-8" @@ -4112,15 +4108,14 @@ /area/crew_quarters/kitchen) "iG" = ( /obj/structure/cable, -/obj/machinery/power/smes/buildable{ +/obj/machinery/power/smes/buildable/engine_default{ RCon_tag = "Power - Main"; - charge = 2e+007; - cur_coils = 4; - input_attempt = 1; - input_level = 500000; - name = "Main"; - output_level = 1e+006 + name = "Main" }, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, /turf/simulated/floor/plating, /area/engineering/storage) "iH" = ( @@ -21111,9 +21106,8 @@ /turf/simulated/floor/tiled, /area/stellardelight/deck2/starboard) "UB" = ( -/obj/machinery/power/smes/buildable{ - RCon_tag = "Substation - Engineering"; - output_attempt = 0 +/obj/machinery/power/smes/buildable/disable_output{ + RCon_tag = "Substation - Engineering" }, /obj/structure/cable/orange{ icon_state = "0-2" diff --git a/maps/stellar_delight/stellar_delight3.dmm b/maps/stellar_delight/stellar_delight3.dmm index 6d1bfbc208..3403ca9b92 100644 --- a/maps/stellar_delight/stellar_delight3.dmm +++ b/maps/stellar_delight/stellar_delight3.dmm @@ -1991,12 +1991,7 @@ /turf/simulated/open, /area/stellardelight/deck2/fore) "gQ" = ( -/obj/machinery/power/smes/buildable{ - charge = 5e+006; - input_attempt = 1; - input_level = 200000; - output_level = 200000 - }, +/obj/machinery/power/smes/buildable/engine_default, /obj/structure/window/reinforced{ dir = 1 }, @@ -8971,9 +8966,8 @@ icon_state = "0-2" }, /obj/structure/cable/blue, -/obj/machinery/power/smes/buildable{ - RCon_tag = "Substation - Command"; - output_attempt = 0 +/obj/machinery/power/smes/buildable/disable_output{ + RCon_tag = "Substation - Command" }, /turf/simulated/floor, /area/maintenance/stellardelight/substation/command) @@ -12925,9 +12919,8 @@ /obj/structure/cable/blue{ icon_state = "0-2" }, -/obj/machinery/power/smes/buildable{ - RCon_tag = "Substation - AI/Telecomms"; - output_attempt = 0 +/obj/machinery/power/smes/buildable/disable_output{ + RCon_tag = "Substation - AI/Telecomms" }, /turf/simulated/floor, /area/ai_cyborg_station) @@ -13469,9 +13462,7 @@ /turf/simulated/open, /area/stellardelight/deck2/port) "Wn" = ( -/obj/machinery/power/smes/buildable{ - charge = 500000 - }, +/obj/machinery/power/smes/buildable/max_charge, /obj/effect/floor_decal/fancy_shuttle{ fancy_shuttle_tag = "sdboat" }, diff --git a/maps/submaps/admin_use_vr/event_autonomous_drone.dmm b/maps/submaps/admin_use_vr/event_autonomous_drone.dmm index 3ee51dc338..495f85d621 100644 --- a/maps/submaps/admin_use_vr/event_autonomous_drone.dmm +++ b/maps/submaps/admin_use_vr/event_autonomous_drone.dmm @@ -341,9 +341,7 @@ /turf/simulated/shuttle/plating, /area/submap/event_autonomous_drone/command) "QR" = ( -/obj/machinery/power/smes/buildable{ - charge = 500000 - }, +/obj/machinery/power/smes/buildable/max_charge, /obj/structure/cable/green{ icon_state = "0-4" }, diff --git a/maps/submaps/pois_vr/debris_field/mining_drones.dmm b/maps/submaps/pois_vr/debris_field/mining_drones.dmm index c6ffcda525..7c07ce2a45 100644 --- a/maps/submaps/pois_vr/debris_field/mining_drones.dmm +++ b/maps/submaps/pois_vr/debris_field/mining_drones.dmm @@ -20,11 +20,7 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/smes/batteryrack/mapped{ - input_attempt = 1; - mode = 3; - output_attempt = 1 - }, +/obj/machinery/power/smes/batteryrack/mapped/input_and_output_on, /turf/simulated/floor/tiled/airless, /area/submap/debrisfield/mining_outpost) "f" = ( diff --git a/maps/submaps/pois_vr/debris_field/ship_tourist_overrun.dmm b/maps/submaps/pois_vr/debris_field/ship_tourist_overrun.dmm index 8ba20d1e8d..bd4ea4cc7d 100644 --- a/maps/submaps/pois_vr/debris_field/ship_tourist_overrun.dmm +++ b/maps/submaps/pois_vr/debris_field/ship_tourist_overrun.dmm @@ -1597,9 +1597,7 @@ /turf/simulated/floor/wood/broken, /area/submap/debrisfield/luxury_boat/crew) "Xr" = ( -/obj/machinery/power/smes/buildable{ - charge = 500000 - }, +/obj/machinery/power/smes/buildable/max_charge, /obj/structure/cable/green{ icon_state = "0-4" }, diff --git a/maps/submaps/pois_vr/debris_field/tinycarrier.dmm b/maps/submaps/pois_vr/debris_field/tinycarrier.dmm index 7bbcb2f777..aa9fdc29fd 100644 --- a/maps/submaps/pois_vr/debris_field/tinycarrier.dmm +++ b/maps/submaps/pois_vr/debris_field/tinycarrier.dmm @@ -774,11 +774,7 @@ /turf/simulated/floor/tiled/steel, /area/submap/debrisfield/tinyshuttle/engine) "bu" = ( -/obj/machinery/power/smes/buildable/outpost_substation{ - charge = 3e+006; - input_attempt = 1; - input_level = 200000 - }, +/obj/machinery/power/smes/buildable/outpost_substation/max_charge_max_input, /obj/structure/cable/green{ icon_state = "0-2" }, diff --git a/maps/submaps/shelters/shelter_tesla.dmm b/maps/submaps/shelters/shelter_tesla.dmm index 2176320ab0..4795f47c28 100644 --- a/maps/submaps/shelters/shelter_tesla.dmm +++ b/maps/submaps/shelters/shelter_tesla.dmm @@ -374,17 +374,17 @@ /turf/simulated/floor, /area/survivalpod) "Vk" = ( -/obj/machinery/power/smes/buildable{ +/obj/machinery/power/smes/buildable/max_charge_max_input{ RCon_tag = "Power - Capsule"; - cur_coils = 4; - input_attempt = 1; - input_level = 500000; - name = "JUICE COLLECTION"; - output_level = 1e+006 + name = "JUICE COLLECTION" }, /obj/structure/cable{ icon_state = "0-8" }, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, /turf/simulated/floor, /area/survivalpod) "VE" = ( diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm index bac27a770a..90d66b054b 100644 --- a/maps/tether/tether-01-surface1.dmm +++ b/maps/tether/tether-01-surface1.dmm @@ -20285,9 +20285,8 @@ /obj/structure/cable/cyan{ icon_state = "0-4" }, -/obj/machinery/power/smes/buildable{ - RCon_tag = "Substation - Atmospherics"; - charge = 2e+006 +/obj/machinery/power/smes/buildable/max_charge{ + RCon_tag = "Substation - Atmospherics" }, /turf/simulated/floor/plating, /area/maintenance/substation/surface_atmos) @@ -29385,9 +29384,8 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/smes/buildable{ - RCon_tag = "Substation - Surface Services"; - output_attempt = 0 +/obj/machinery/power/smes/buildable/disable_output{ + RCon_tag = "Substation - Surface Services" }, /turf/simulated/floor, /area/maintenance/substation/surfaceservicesubstation) @@ -29576,9 +29574,8 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/smes/buildable{ - RCon_tag = "Substation - Medical"; - output_attempt = 0 +/obj/machinery/power/smes/buildable/disable_output{ + RCon_tag = "Substation - Medical" }, /turf/simulated/floor, /area/maintenance/substation/SurfMedsubstation) @@ -36642,9 +36639,8 @@ /turf/simulated/floor/tiled, /area/rnd/hallway) "sBl" = ( -/obj/machinery/power/smes/buildable{ - RCon_tag = "Substation - Civ West"; - output_attempt = 0 +/obj/machinery/power/smes/buildable/disable_output{ + RCon_tag = "Substation - Civ West" }, /obj/structure/cable/green{ icon_state = "0-2" diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm index 10649c1c45..7511d81c02 100644 --- a/maps/tether/tether-02-surface2.dmm +++ b/maps/tether/tether-02-surface2.dmm @@ -9371,9 +9371,8 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/smes/buildable{ - RCon_tag = "Substation - Security"; - output_attempt = 0 +/obj/machinery/power/smes/buildable/disable_output{ + RCon_tag = "Substation - Security" }, /turf/simulated/floor, /area/maintenance/substation/medsec) @@ -16923,9 +16922,8 @@ icon_state = "0-2" }, /obj/structure/cable, -/obj/machinery/power/smes/buildable{ - RCon_tag = "Substation - Command"; - output_attempt = 0 +/obj/machinery/power/smes/buildable/disable_output{ + RCon_tag = "Substation - Command" }, /turf/simulated/floor/plating, /area/maintenance/substation/command) @@ -20406,9 +20404,8 @@ /turf/simulated/floor/tiled, /area/rnd/rdoffice) "aKU" = ( -/obj/machinery/power/smes/buildable{ - RCon_tag = "Substation - Research"; - output_attempt = 0 +/obj/machinery/power/smes/buildable/disable_output{ + RCon_tag = "Substation - Research" }, /obj/structure/cable/green, /obj/structure/cable/green{ @@ -33453,12 +33450,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ai_cyborg_station) "rRj" = ( -/obj/machinery/power/smes/buildable{ - charge = 5e+006; - input_attempt = 1; - input_level = 200000; - output_level = 200000 - }, +/obj/machinery/power/smes/buildable/engine_default, /obj/structure/window/reinforced{ dir = 1 }, diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index bc3d5c46e3..2ac3a98770 100644 --- a/maps/tether/tether-03-surface3.dmm +++ b/maps/tether/tether-03-surface3.dmm @@ -12160,9 +12160,8 @@ /obj/structure/cable/orange{ icon_state = "0-2" }, -/obj/machinery/power/smes/buildable{ - RCon_tag = "Substation - Surface Civilian"; - output_attempt = 0 +/obj/machinery/power/smes/buildable/disable_output{ + RCon_tag = "Substation - Surface Civilian" }, /obj/machinery/camera/network/engineering{ dir = 4 @@ -39514,9 +39513,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/smes/buildable{ - charge = 500000 - }, +/obj/machinery/power/smes/buildable/max_charge, /turf/simulated/floor/tiled, /area/shuttle/tourbus/general) "gLg" = ( diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm index cb7bed5401..c21d704581 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -165,12 +165,8 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) "aas" = ( -/obj/machinery/power/smes/buildable{ - RCon_tag = "Engine - Core"; - charge = 2e+006; - input_attempt = 1; - input_level = 200000; - output_level = 250000 +/obj/machinery/power/smes/buildable/engine_default{ + RCon_tag = "Engine - Core" }, /obj/structure/cable/cyan{ icon_state = "0-2" @@ -307,17 +303,16 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) "aaG" = ( -/obj/machinery/power/smes/buildable{ - RCon_tag = "Power - Main"; - charge = 2e+007; - cur_coils = 4; - input_attempt = 1; - input_level = 500000; - output_level = 1e+006 +/obj/machinery/power/smes/buildable/engine_default{ + RCon_tag = "Power - Main" }, /obj/structure/cable{ icon_state = "0-4" }, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, /turf/simulated/floor, /area/engineering/engine_smes) "aaH" = ( @@ -1437,9 +1432,8 @@ /turf/simulated/floor/tiled, /area/hallway/station/atrium) "acO" = ( -/obj/machinery/power/smes/buildable{ - RCon_tag = "Substation - Engineering"; - output_attempt = 0 +/obj/machinery/power/smes/buildable/disable_output{ + RCon_tag = "Substation - Engineering" }, /obj/structure/cable/green{ icon_state = "0-4" @@ -10943,9 +10937,8 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/engi_wash) "aES" = ( -/obj/machinery/power/smes/buildable{ - RCon_tag = "Substation - Cargo"; - output_attempt = 0 +/obj/machinery/power/smes/buildable/disable_output{ + RCon_tag = "Substation - Cargo" }, /obj/structure/cable/green{ icon_state = "0-4" @@ -14222,9 +14215,8 @@ /turf/simulated/floor/tiled, /area/engineering/gravity_lobby) "bJG" = ( -/obj/machinery/power/smes/buildable{ - RCon_tag = "Substation - Asteroid civilian"; - output_attempt = 0 +/obj/machinery/power/smes/buildable/disable_output{ + RCon_tag = "Substation - Asteroid civilian" }, /obj/structure/cable{ icon_state = "0-2" @@ -17449,9 +17441,8 @@ }, /area/shuttle/excursion/cargo) "fca" = ( -/obj/machinery/power/smes/buildable{ - RCon_tag = "Substation - Exploration"; - output_attempt = 0 +/obj/machinery/power/smes/buildable/disable_output{ + RCon_tag = "Substation - Exploration" }, /obj/structure/cable{ icon_state = "0-2" @@ -23365,10 +23356,8 @@ /turf/simulated/floor/tiled/monotile, /area/tether/exploration) "kRF" = ( -/obj/machinery/power/smes/buildable{ - RCon_tag = "Substation - Telecomms"; - charge = 100000; - output_level = 1000 +/obj/machinery/power/smes/buildable/max_charge_max_output{ + RCon_tag = "Substation - Telecomms" }, /obj/structure/cable/green{ icon_state = "0-2" diff --git a/maps/tether/tether-06-mining.dmm b/maps/tether/tether-06-mining.dmm index 1a0f3c7abc..360cac2875 100644 --- a/maps/tether/tether-06-mining.dmm +++ b/maps/tether/tether-06-mining.dmm @@ -677,9 +677,8 @@ /turf/simulated/floor/plating, /area/outpost/mining_main/maintenance) "bD" = ( -/obj/machinery/power/smes/buildable{ - RCon_tag = "Substation - Mining Outpost"; - output_attempt = 0 +/obj/machinery/power/smes/buildable/disable_output{ + RCon_tag = "Substation - Mining Outpost" }, /obj/structure/cable{ icon_state = "0-8" diff --git a/maps/tether/tether-07-solars.dmm b/maps/tether/tether-07-solars.dmm index b643535132..d1ff44dec9 100644 --- a/maps/tether/tether-07-solars.dmm +++ b/maps/tether/tether-07-solars.dmm @@ -316,12 +316,13 @@ /turf/simulated/floor/virgo3b, /area/tether/outpost/solars_outside/lower) "aO" = ( -/obj/machinery/power/smes/buildable{ - RCon_tag = "Power - Solar Array"; - cur_coils = 3; - output_attempt = 0 +/obj/machinery/power/smes/buildable/disable_output{ + RCon_tag = "Power - Solar Array" }, /obj/structure/cable/heavyduty, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, /turf/simulated/floor/virgo3b_indoors, /area/tether/outpost/solars_shed) "aP" = ( @@ -2367,9 +2368,8 @@ /turf/simulated/floor, /area/maintenance/substation/outpost) "ff" = ( -/obj/machinery/power/smes/buildable{ - RCon_tag = "Substation - Science Outpost"; - output_attempt = 0 +/obj/machinery/power/smes/buildable/disable_output{ + RCon_tag = "Substation - Science Outpost" }, /obj/structure/cable/green, /obj/structure/cable/green{ diff --git a/maps/virgo_minitest/virgo_minitest-1.dmm b/maps/virgo_minitest/virgo_minitest-1.dmm index dcf393899a..636765570a 100644 --- a/maps/virgo_minitest/virgo_minitest-1.dmm +++ b/maps/virgo_minitest/virgo_minitest-1.dmm @@ -721,10 +721,7 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/smes/buildable{ - charge = 1.5e+007; - cur_coils = 3 - }, +/obj/machinery/power/smes/buildable/max_charge, /turf/simulated/floor/plating, /area/engineering/engine_smes) "bC" = ( @@ -5343,12 +5340,8 @@ /turf/simulated/floor, /area/engineering/workshop) "Bo" = ( -/obj/machinery/power/smes/buildable{ - RCon_tag = "Engine - Core"; - charge = 2e+006; - input_attempt = 1; - input_level = 200000; - output_level = 250000 +/obj/machinery/power/smes/buildable/engine_default{ + RCon_tag = "Engine - Core" }, /obj/structure/cable/cyan{ icon_state = "0-2" @@ -6524,14 +6517,13 @@ /turf/space, /area/space) "PH" = ( -/obj/machinery/power/smes/buildable{ - RCon_tag = "Power - Main"; - charge = 2e+007; - cur_coils = 4; - input_attempt = 1; - input_level = 500000; - output_level = 1e+006 +/obj/machinery/power/smes/buildable/engine_default{ + RCon_tag = "Power - Main" }, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, /obj/structure/cable{ icon_state = "0-4" }, diff --git a/modular_chomp/maps/common/sc_belt_miner.dmm b/modular_chomp/maps/common/sc_belt_miner.dmm index 97bc66a7c9..5ca0930114 100644 --- a/modular_chomp/maps/common/sc_belt_miner.dmm +++ b/modular_chomp/maps/common/sc_belt_miner.dmm @@ -586,9 +586,7 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/smes/buildable{ - input_level_max = 350000; - output_level_max = 300000; +/obj/machinery/power/smes/buildable/max_input_max_output{ RCon_tag = "Belt_Mining_Outpost" }, /turf/simulated/floor/plating, diff --git a/modular_chomp/maps/common_submaps/gateway/darkrps.dmm b/modular_chomp/maps/common_submaps/gateway/darkrps.dmm index 25b6b1c273..3f4bc39be4 100644 --- a/modular_chomp/maps/common_submaps/gateway/darkrps.dmm +++ b/modular_chomp/maps/common_submaps/gateway/darkrps.dmm @@ -13158,11 +13158,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/smes/buildable{ - input_attempt = 1; - inputting = 1; - outputting = 1 - }, +/obj/machinery/power/smes/buildable/max_input_max_output, /turf/simulated/floor/outdoors/sidewalk/slab{ movement_cost = 0; temperature = 293.15 diff --git a/modular_chomp/maps/common_submaps/gateway/snowfield.dmm b/modular_chomp/maps/common_submaps/gateway/snowfield.dmm index aef2b43e41..aa233e4ca9 100644 --- a/modular_chomp/maps/common_submaps/gateway/snowfield.dmm +++ b/modular_chomp/maps/common_submaps/gateway/snowfield.dmm @@ -3540,13 +3540,11 @@ /turf/simulated/floor/cult, /area/awaymission/snowfield/command/gateway) "dtS" = ( -/obj/machinery/power/smes/buildable{ - charge = null; - cur_coils = 4; - input_attempt = 1; - input_level = 1000000; - output_level = 750000 - }, +/obj/machinery/power/smes/buildable/max_input, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -4301,13 +4299,10 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/smes/buildable{ - charge = null; - cur_coils = 3; - input_attempt = 1; - input_level = 500000; - output_level = 350000 - }, +/obj/machinery/power/smes/buildable/max_input, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, /turf/simulated/floor, /area/awaymission/snowfield/solarshack) "dVK" = ( @@ -9760,13 +9755,11 @@ /turf/simulated/floor/cult, /area/awaymission/snowfield/command/gateway) "iQR" = ( -/obj/machinery/power/smes/buildable{ - charge = null; - cur_coils = 4; - input_attempt = 1; - input_level = 1000000; - output_level = 750000 - }, +/obj/machinery/power/smes/buildable/max_input, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, /obj/structure/cable/yellow{ icon_state = "0-2" }, @@ -19207,13 +19200,11 @@ /obj/structure/cable/yellow{ icon_state = "0-2" }, -/obj/machinery/power/smes/buildable{ - charge = null; - cur_coils = 4; - input_attempt = 1; - input_level = 1000000; - output_level = 750000 - }, +/obj/machinery/power/smes/buildable/max_input, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, /turf/simulated/floor, /area/awaymission/snowfield/hallway/frontgate_substation) "rlj" = ( @@ -23649,13 +23640,10 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/smes/buildable{ - charge = null; - cur_coils = 3; - input_attempt = 1; - input_level = 500000; - output_level = 350000 - }, +/obj/machinery/power/smes/buildable/max_input, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, /turf/simulated/floor/tiled/dark, /area/awaymission/snowfield/solarshack) "vGX" = ( diff --git a/modular_chomp/maps/common_submaps/overmap/planets/kara/northern_star/northern_star_mine.dmm b/modular_chomp/maps/common_submaps/overmap/planets/kara/northern_star/northern_star_mine.dmm index 8699901240..8125e4583d 100644 --- a/modular_chomp/maps/common_submaps/overmap/planets/kara/northern_star/northern_star_mine.dmm +++ b/modular_chomp/maps/common_submaps/overmap/planets/kara/northern_star/northern_star_mine.dmm @@ -10161,12 +10161,8 @@ /area/outpost/research/isolation_c) "uI" = ( /obj/structure/cable/blue, -/obj/machinery/power/smes/buildable/outpost_substation{ - RCon_tag = "Outpost - Research"; - charge = 500000; - input_attempt = 1; - input_level = 150000; - output_level = 150000 +/obj/machinery/power/smes/buildable/outpost_substation/max_charge_max_input{ + RCon_tag = "Outpost - Research" }, /turf/simulated/floor/plating, /area/outpost/research/power) @@ -11556,12 +11552,8 @@ /obj/structure/cable/blue{ icon_state = "0-8" }, -/obj/machinery/power/smes/buildable/outpost_substation{ - RCon_tag = "Outpost - Mining"; - charge = 500000; - input_attempt = 1; - input_level = 150000; - output_level = 150000 +/obj/machinery/power/smes/buildable/outpost_substation/max_charge_max_input{ + RCon_tag = "Outpost - Mining" }, /turf/simulated/floor/plating, /area/outpost/mining_main/maintenance) @@ -13031,12 +13023,8 @@ /turf/simulated/floor/plating, /area/outpost/engineering/mining/power) "AZ" = ( -/obj/machinery/power/smes/buildable/outpost_substation{ - RCon_tag = "Outpost - Mining Engineering"; - charge = 500000; - input_attempt = 1; - input_level = 150000; - output_level = 150000 +/obj/machinery/power/smes/buildable/outpost_substation/max_charge_max_input{ + RCon_tag = "Outpost - Mining Engineering" }, /obj/structure/cable/blue{ icon_state = "0-8" @@ -16241,12 +16229,8 @@ /turf/simulated/floor/tiled/white, /area/outpost/medical/power) "HH" = ( -/obj/machinery/power/smes/buildable/outpost_substation{ - RCon_tag = "Outpost - Medical"; - charge = 500000; - input_attempt = 1; - input_level = 150000; - output_level = 150000 +/obj/machinery/power/smes/buildable/outpost_substation/max_charge_max_input{ + RCon_tag = "Outpost - Medical" }, /obj/structure/cable/green{ icon_state = "0-2" @@ -17331,16 +17315,12 @@ /turf/simulated/floor/plating, /area/outpost/engineering/mining/power) "JH" = ( -/obj/machinery/power/smes/buildable{ - RCon_tag = "Outpost - Main Power Unit 1"; - charge = 1.5e+007; - cur_coils = 3; - input_attempt = 1; - input_level = 750000; - input_level_max = 750000; - output_level = 750000; - output_level_max = 750000 +/obj/machinery/power/smes/buildable/engine_default{ + RCon_tag = "Outpost - Main Power Unit 1" }, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, /obj/structure/cable/yellow{ icon_state = "0-4" }, @@ -17356,16 +17336,12 @@ /turf/simulated/floor/plating, /area/outpost/engineering/mining/power) "JJ" = ( -/obj/machinery/power/smes/buildable{ - RCon_tag = "Outpost - Main Power Unit 2"; - charge = 1.5e+007; - cur_coils = 3; - input_attempt = 1; - input_level = 750000; - input_level_max = 750000; - output_level = 750000; - output_level_max = 750000 +/obj/machinery/power/smes/buildable/engine_default{ + RCon_tag = "Outpost - Main Power Unit 2" }, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, /obj/structure/cable/yellow{ icon_state = "0-8" }, @@ -19508,16 +19484,12 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/smes/buildable{ - RCon_tag = "Outpost - Main"; - charge = 1.5e+007; - cur_coils = 3; - input_attempt = 1; - input_level = 750000; - input_level_max = 750000; - output_level = 750000; - output_level_max = 750000 +/obj/machinery/power/smes/buildable/engine_default{ + RCon_tag = "Outpost - Main" }, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, /turf/simulated/floor, /area/outpost/engineering/solars) "OQ" = ( diff --git a/modular_chomp/maps/overmap/om_ships/cruiser.dmm b/modular_chomp/maps/overmap/om_ships/cruiser.dmm index ff42d37614..574ef32a81 100644 --- a/modular_chomp/maps/overmap/om_ships/cruiser.dmm +++ b/modular_chomp/maps/overmap/om_ships/cruiser.dmm @@ -2914,14 +2914,11 @@ /turf/simulated/floor/tiled/white, /area/mothership/chemistry) "gh" = ( -/obj/machinery/power/smes/buildable{ - capacity = 2e+007; - charge = 2e+007; - cur_coils = 4; - input_attempt = 1; - input_level = 1e+006; - output_level = 1e+006 - }, +/obj/machinery/power/smes/buildable/max_charge_max_input, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, /obj/structure/cable/cyan, /turf/simulated/floor/tiled/techfloor/grid, /area/mothership/vault) diff --git a/modular_chomp/maps/overmap/om_ships/shelter_6.dmm b/modular_chomp/maps/overmap/om_ships/shelter_6.dmm index afa5c2bf8d..232ee86004 100644 --- a/modular_chomp/maps/overmap/om_ships/shelter_6.dmm +++ b/modular_chomp/maps/overmap/om_ships/shelter_6.dmm @@ -1063,10 +1063,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/tabiranth) "bl" = ( -/obj/machinery/power/smes/buildable/hybrid{ - input_level = 200000; - output_level = 200000 - }, +/obj/machinery/power/smes/buildable/hybrid/engine_default, /obj/structure/cable/cyan{ icon_state = "0-4" }, diff --git a/modular_chomp/maps/relic_base/relicbase-11.dmm b/modular_chomp/maps/relic_base/relicbase-11.dmm index dddeb7cf94..32869eb526 100644 --- a/modular_chomp/maps/relic_base/relicbase-11.dmm +++ b/modular_chomp/maps/relic_base/relicbase-11.dmm @@ -1307,12 +1307,8 @@ /turf/simulated/floor/plating, /area/expoutpost/hangarthree) "eY" = ( -/obj/machinery/power/smes/buildable{ - RCon_tag = "Expedition Outpost - Starboard Solars"; - charge = 2.5e+006; - input_attempt = 1; - input_level = 150000; - output_level = 100000 +/obj/machinery/power/smes/buildable/max_charge_max_input{ + RCon_tag = "Expedition Outpost - Starboard Solars" }, /obj/structure/cable{ icon_state = "0-2" @@ -3415,7 +3411,7 @@ /obj/structure/window/reinforced/survival_pod{ dir = 4 }, -/obj/machinery/power/smes/buildable/power_shuttle, +/obj/machinery/power/smes/buildable/power_shuttle/max_charge_max_input_base_output, /obj/structure/cable/green, /turf/simulated/shuttle/plating, /area/shuttle/echidna) @@ -7744,12 +7740,8 @@ /turf/simulated/wall/r_wall, /area/expoutpost/prep) "Fa" = ( -/obj/machinery/power/smes/buildable{ - RCon_tag = "Expedition Outpost - Port Solars"; - charge = 2.5e+006; - input_attempt = 1; - input_level = 150000; - output_level = 100000 +/obj/machinery/power/smes/buildable/max_charge_max_input{ + RCon_tag = "Expedition Outpost - Port Solars" }, /obj/structure/cable{ icon_state = "0-2" diff --git a/modular_chomp/maps/relic_base/relicbase-2.dmm b/modular_chomp/maps/relic_base/relicbase-2.dmm index 8a83b07cc4..c8044ed4ee 100644 --- a/modular_chomp/maps/relic_base/relicbase-2.dmm +++ b/modular_chomp/maps/relic_base/relicbase-2.dmm @@ -7241,10 +7241,8 @@ /turf/simulated/floor/plating, /area/maintenance/firstdeck/aft/simulated_caves) "ikR" = ( -/obj/machinery/power/smes/buildable{ - RCon_tag = "Substation - Atmospherics"; - charge = 2e+006; - input_attempt = 1 +/obj/machinery/power/smes/buildable/max_charge_max_input{ + RCon_tag = "Substation - Atmospherics" }, /obj/structure/cable{ icon_state = "0-2" diff --git a/modular_chomp/maps/relic_base/relicbase-3.dmm b/modular_chomp/maps/relic_base/relicbase-3.dmm index 78354eba18..013a377881 100644 --- a/modular_chomp/maps/relic_base/relicbase-3.dmm +++ b/modular_chomp/maps/relic_base/relicbase-3.dmm @@ -23591,12 +23591,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/machinery/power/smes/buildable/power_shuttle{ - charge = 4e+006; - input_attempt = 1; - inputting = 1; - outputting = 1 - }, +/obj/machinery/power/smes/buildable/power_shuttle/max_charge_max_input_base_output, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -38279,14 +38274,13 @@ /turf/simulated/floor/tiled, /area/janitor) "qLB" = ( -/obj/machinery/power/smes/buildable{ - RCon_tag = "Engine - Main"; - charge = 2e+007; - cur_coils = 4; - input_attempt = 1; - input_level = 750000; - output_level = 750000 +/obj/machinery/power/smes/buildable/max_charge_max_input{ + RCon_tag = "Engine - Main" }, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, /obj/structure/cable{ icon_state = "0-4" }, @@ -40976,14 +40970,13 @@ /obj/structure/extinguisher_cabinet{ pixel_y = -32 }, -/obj/machinery/power/smes/buildable{ - RCon_tag = "Engine - Input"; - charge = 2e+007; - cur_coils = 4; - input_attempt = 1; - input_level = 750000; - output_level = 100 +/obj/machinery/power/smes/buildable/engine_default{ + RCon_tag = "Engine - Input" }, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, /obj/structure/cable/cyan{ icon_state = "0-8" }, @@ -55166,14 +55159,13 @@ /turf/simulated/floor/plating, /area/engineering/external_lights) "xBC" = ( -/obj/machinery/power/smes/buildable{ - RCon_tag = "Outpost Lighting SMES"; - charge = 2e+007; - cur_coils = 4; - input_attempt = 1; - input_level = 750000; - output_level = 500000 +/obj/machinery/power/smes/buildable/max_charge_max_input{ + RCon_tag = "Outpost Lighting SMES" }, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, /obj/machinery/light/small{ dir = 4 }, diff --git a/modular_chomp/maps/relic_base/relicbase-4.dmm b/modular_chomp/maps/relic_base/relicbase-4.dmm index e73c305c5c..85dbd1dc3e 100644 --- a/modular_chomp/maps/relic_base/relicbase-4.dmm +++ b/modular_chomp/maps/relic_base/relicbase-4.dmm @@ -14141,12 +14141,7 @@ /area/surface/outpost/main/dorms/dorm_1/upstairs) "mVG" = ( /obj/structure/cable/cyan, -/obj/machinery/power/smes/buildable{ - charge = 5e+006; - input_attempt = 1; - input_level = 200000; - output_level = 200000 - }, +/obj/machinery/power/smes/buildable/engine_default, /obj/machinery/flasher{ id = "AI"; pixel_y = -24 @@ -18709,13 +18704,8 @@ /turf/simulated/floor/carpet/geo, /area/surface/outpost/main/bar) "qxu" = ( -/obj/machinery/power/smes/buildable{ - RCon_tag = "Telecommunications Satellite"; - charge = 6e+006; - input_attempt = 1; - input_level = 250000; - inputting = 1; - output_level = 250000 +/obj/machinery/power/smes/buildable/engine_default{ + RCon_tag = "Telecommunications Satellite" }, /obj/structure/cable/cyan, /turf/simulated/floor/plating, @@ -18821,12 +18811,7 @@ dir = 1; opacity = 1 }, -/obj/machinery/power/smes/buildable/power_shuttle{ - charge = 4e+006; - input_attempt = 1; - inputting = 1; - outputting = 1 - }, +/obj/machinery/power/smes/buildable/power_shuttle/max_charge_max_input_base_output, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -23903,12 +23888,8 @@ /turf/simulated/floor/tiled/dark, /area/security/main) "uRR" = ( -/obj/machinery/power/smes/buildable{ - RCon_tag = "Outpost Solars"; - charge = 2.5e+006; - input_attempt = 1; - input_level = 150000; - output_level = 100000 +/obj/machinery/power/smes/buildable/max_charge_max_input{ + RCon_tag = "Outpost Solars" }, /obj/structure/cable{ icon_state = "0-4" diff --git a/modular_chomp/maps/relic_base/relicbase-6.dmm b/modular_chomp/maps/relic_base/relicbase-6.dmm index 7f46d96fdb..9ce117c1fb 100644 --- a/modular_chomp/maps/relic_base/relicbase-6.dmm +++ b/modular_chomp/maps/relic_base/relicbase-6.dmm @@ -1500,12 +1500,8 @@ /turf/simulated/floor/plating, /area/surface/outpost/mining_main/crew_area) "pg" = ( -/obj/machinery/power/smes/buildable/outpost_substation{ - RCon_tag = "Outpost - Xenoarch"; - charge = 500000; - input_attempt = 1; - input_level = 150000; - output_level = 150000 +/obj/machinery/power/smes/buildable/outpost_substation/max_charge_max_input{ + RCon_tag = "Outpost - Xenoarch" }, /obj/structure/cable/green{ icon_state = "0-4" @@ -4056,12 +4052,8 @@ /turf/simulated/floor/tiled/white, /area/surface/outpost/research/xenoarcheology/anomaly) "Tf" = ( -/obj/machinery/power/smes/buildable/outpost_substation{ - RCon_tag = "Outpost - Mining"; - charge = 500000; - input_attempt = 1; - input_level = 150000; - output_level = 150000 +/obj/machinery/power/smes/buildable/outpost_substation/max_charge_max_input{ + RCon_tag = "Outpost - Mining" }, /obj/structure/cable/green{ icon_state = "0-4" diff --git a/modular_chomp/maps/soluna_nexus/soluna_nexus-1.dmm b/modular_chomp/maps/soluna_nexus/soluna_nexus-1.dmm index 59cb87e071..42027b3b65 100644 --- a/modular_chomp/maps/soluna_nexus/soluna_nexus-1.dmm +++ b/modular_chomp/maps/soluna_nexus/soluna_nexus-1.dmm @@ -10620,11 +10620,7 @@ /turf/simulated/floor/plating, /area/maintenance/Deck1_Star_Corridor) "bAl" = ( -/obj/machinery/power/smes/buildable/power_shuttle{ - charge = 2e+006; - input_attempt = 1; - inputting = 1 - }, +/obj/machinery/power/smes/buildable/power_shuttle/max_charge_max_input_base_output, /obj/structure/cable/green, /turf/simulated/floor/tiled/milspec, /area/shuttle/echidna) @@ -14815,12 +14811,7 @@ dir = 1; opacity = 1 }, -/obj/machinery/power/smes/buildable/power_shuttle{ - charge = 4e+006; - input_attempt = 1; - inputting = 1; - outputting = 1 - }, +/obj/machinery/power/smes/buildable/power_shuttle/max_charge_max_input_base_output, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -59709,13 +59700,8 @@ /area/quartermaster/Deck1_Stairwell) "sAy" = ( /obj/effect/floor_decal/industrial/hatch/yellow, -/obj/machinery/power/smes/buildable{ - RCon_tag = "Substation - Tcoms"; - charge = 6e+006; - input_attempt = 1; - input_level = 250000; - inputting = 1; - output_level = 250000 +/obj/machinery/power/smes/buildable/engine_default{ + RCon_tag = "Substation - Tcoms" }, /obj/structure/cable/green{ icon_state = "0-4" @@ -74406,9 +74392,7 @@ /area/hallway/For_Locker_Room) "xRj" = ( /obj/effect/floor_decal/industrial/warning/cee, -/obj/machinery/power/smes/buildable/point_of_interest{ - input_attempt = 1 - }, +/obj/machinery/power/smes/buildable/point_of_interest/max_input, /obj/structure/cable/green{ icon_state = "0-8" }, diff --git a/modular_chomp/maps/soluna_nexus/soluna_nexus-3.dmm b/modular_chomp/maps/soluna_nexus/soluna_nexus-3.dmm index a995917e0a..091d6b3db3 100644 --- a/modular_chomp/maps/soluna_nexus/soluna_nexus-3.dmm +++ b/modular_chomp/maps/soluna_nexus/soluna_nexus-3.dmm @@ -3050,11 +3050,8 @@ /turf/simulated/floor/plating, /area/engineering/Engine1_Chamber) "ahv" = ( -/obj/machinery/power/smes/buildable{ - RCon_tag = "Solar - AftPort"; - input_attempt = 1; - input_level = 150000; - output_level = 100000 +/obj/machinery/power/smes/buildable/max_charge_max_input{ + RCon_tag = "Solar - AftPort" }, /obj/structure/cable, /obj/structure/sign/warning/high_voltage{ @@ -9198,14 +9195,13 @@ /turf/simulated/floor/plating, /area/maintenance/Deck3_Bridge_ForStarCorridor1) "czb" = ( -/obj/machinery/power/smes/buildable{ - RCon_tag = "Engine - Primary Core"; - charge = 2e+006; - input_attempt = 1; - input_level = 100000; - output_level = 200000; - cur_coils = 4 +/obj/machinery/power/smes/buildable/engine_default{ + RCon_tag = "Engine - Primary Core" }, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, /obj/effect/engine_setup/smes, /obj/structure/cable/cyan{ icon_state = "0-4" @@ -19243,13 +19239,11 @@ /turf/simulated/floor/plating, /area/engineering/Engine2_Waste_Handling) "fHB" = ( -/obj/machinery/power/smes/buildable{ - RCon_tag = "Solar - ForStar"; - input_attempt = 1; - input_level = 150000; - output_level = 100000; - cur_coils = 2 +/obj/machinery/power/smes/buildable/max_charge_max_input{ + RCon_tag = "Solar - ForStar" }, +/obj/item/smes_coil, +/obj/item/smes_coil, /obj/structure/sign/warning/high_voltage{ pixel_y = 32 }, @@ -26235,12 +26229,7 @@ /obj/structure/cable/white{ icon_state = "0-4" }, -/obj/machinery/power/smes/buildable{ - charge = 5e+006; - input_attempt = 1; - input_level = 200000; - output_level = 200000 - }, +/obj/machinery/power/smes/buildable/engine_default, /turf/simulated/floor/plating, /area/bridge/AI_Core_Chamber) "iho" = ( @@ -29587,14 +29576,13 @@ /turf/simulated/floor/plating, /area/maintenance/Deck3_Dorms_AftPortChamber1) "jqU" = ( -/obj/machinery/power/smes/buildable{ - RCon_tag = "Engine - Primary Main"; - charge = 2e+007; - cur_coils = 4; - input_attempt = 1; - input_level = 750000; - output_level = 750000 +/obj/machinery/power/smes/buildable/engine_default{ + RCon_tag = "Engine - Primary Main" }, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, /obj/effect/engine_setup/smes/main, /obj/structure/cable{ icon_state = "0-2" @@ -38192,13 +38180,11 @@ /turf/simulated/floor/airless, /area/engineering/Solar_Array_ForStar) "mhS" = ( -/obj/machinery/power/smes/buildable{ - RCon_tag = "Solar - AftStar"; - input_attempt = 1; - input_level = 150000; - output_level = 100000; - cur_coils = 2 +/obj/machinery/power/smes/buildable/engine_default{ + RCon_tag = "Solar - AftStar" }, +/obj/item/smes_coil, +/obj/item/smes_coil, /obj/structure/cable, /obj/structure/sign/warning/high_voltage{ pixel_y = -32 @@ -60572,11 +60558,8 @@ /turf/simulated/floor/plating, /area/engineering/Atmospherics_Chamber) "tJr" = ( -/obj/machinery/power/smes/buildable{ - RCon_tag = "Solar - ForPort"; - input_attempt = 1; - input_level = 150000; - output_level = 100000 +/obj/machinery/power/smes/buildable/engine_default{ + RCon_tag = "Solar - ForPort" }, /obj/structure/sign/warning/high_voltage{ pixel_y = 32 @@ -64353,10 +64336,8 @@ /turf/simulated/floor/plating, /area/engineering/Engine2_Waste_Handling) "uVo" = ( -/obj/machinery/power/smes/buildable{ - RCon_tag = "Substation - Atmospherics"; - charge = 2e+006; - input_attempt = 1 +/obj/machinery/power/smes/buildable/max_charge_max_input{ + RCon_tag = "Substation - Atmospherics" }, /obj/effect/floor_decal/industrial/hatch/yellow, /obj/structure/cable/green{ @@ -66996,15 +66977,13 @@ /turf/simulated/floor/carpet/gaycarpet, /area/crew_quarters/sleep/Dormitory_05) "vJY" = ( -/obj/machinery/power/smes/buildable{ - RCon_tag = "Engine - Secondary Core"; - charge = 2e+006; - input_attempt = 1; - input_level = 100000; - output_level = 200000; - output_attempt = 0; - cur_coils = 4 +/obj/machinery/power/smes/buildable/max_charge_max_input{ + RCon_tag = "Engine - Secondary Core" }, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, /obj/structure/cable/cyan{ icon_state = "0-4" }, @@ -69996,14 +69975,13 @@ /turf/simulated/floor/plating, /area/engineering/Construction_Area) "wLB" = ( -/obj/machinery/power/smes/buildable{ - RCon_tag = "Engine - Secondary Main"; - charge = 2e+007; - cur_coils = 4; - input_attempt = 1; - input_level = 750000; - output_level = 750000 +/obj/machinery/power/smes/buildable/max_charge_max_input{ + RCon_tag = "Engine - Secondary Main" }, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, /obj/structure/cable{ icon_state = "0-2" }, diff --git a/modular_chomp/maps/soluna_nexus/soluna_nexus-6.dmm b/modular_chomp/maps/soluna_nexus/soluna_nexus-6.dmm index bf17d02fec..773d7770d4 100644 --- a/modular_chomp/maps/soluna_nexus/soluna_nexus-6.dmm +++ b/modular_chomp/maps/soluna_nexus/soluna_nexus-6.dmm @@ -749,9 +749,8 @@ /turf/simulated/floor, /area/expoutpost/starfuelstorage) "aHw" = ( -/obj/machinery/power/smes/buildable{ +/obj/machinery/power/smes/buildable/max_input{ RCon_tag = "Reactor Secondary - Aegis"; - input_attempt = 1; name = "Reactor SMES - Secondary" }, /obj/structure/cable/green{ @@ -1893,13 +1892,16 @@ /turf/simulated/floor, /area/expoutpost/starfuelstorage) "bKJ" = ( -/obj/machinery/power/smes/buildable{ +/obj/machinery/power/smes/buildable/max_charge_max_input{ RCon_tag = "Reactor Input - Aegis"; - charge = 2e+006; - cur_coils = 6; - input_attempt = 1; name = "Reactor SMES - Input" }, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, /obj/structure/cable/cyan{ icon_state = "0-4" }, @@ -8172,9 +8174,7 @@ /area/expoutpost/staginghangar) "hsz" = ( /obj/structure/closet/walllocker/emerglocker/south, -/obj/machinery/power/smes/buildable/point_of_interest{ - input_attempt = 1 - }, +/obj/machinery/power/smes/buildable/point_of_interest/max_input, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -10645,9 +10645,7 @@ /turf/simulated/floor/tiled/dark, /area/expoutpost/lowersternhallway) "jBv" = ( -/obj/machinery/power/smes/buildable/point_of_interest{ - input_attempt = 1 - }, +/obj/machinery/power/smes/buildable/point_of_interest/max_input, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -13523,8 +13521,7 @@ /turf/simulated/floor/tiled/dark, /area/expoutpost/staginghangar) "lZt" = ( -/obj/machinery/power/smes/buildable{ - input_attempt = 1; +/obj/machinery/power/smes/buildable/engine_default{ name = "AI Core SMES" }, /obj/effect/floor_decal/industrial/outline/yellow, @@ -15558,15 +15555,14 @@ /turf/simulated/floor/tiled/white, /area/expoutpost/medbaylobby) "nFb" = ( -/obj/machinery/power/smes/buildable{ +/obj/machinery/power/smes/buildable/max_charge_max_input{ RCon_tag = "Reactor Primary - Aegis"; - charge = 2e+006; - cur_coils = 4; - input_attempt = 1; - input_level = 750000; - name = "Reactor SMES - Main"; - output_level = 750000 + name = "Reactor SMES - Main" }, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, /obj/structure/cable/green, /obj/effect/floor_decal/industrial/outline/yellow, /obj/effect/engine_setup/smes, @@ -20971,8 +20967,7 @@ /turf/simulated/floor/tiled, /area/expoutpost/hangarfive) "sky" = ( -/obj/machinery/power/smes/buildable{ - input_attempt = 1; +/obj/machinery/power/smes/buildable/engine_default{ name = "Telecomms SMES" }, /obj/effect/floor_decal/industrial/outline/yellow, @@ -28443,15 +28438,12 @@ /turf/simulated/floor, /area/expoutpost/restrooms) "yjG" = ( -/obj/machinery/power/smes/buildable{ +/obj/machinery/power/smes/buildable/max_charge_max_input{ RCon_tag = "Auxiliary Reactor - Aegis"; - charge = 2e+006; - cur_coils = 2; - input_attempt = 1; - input_level = 500000; - name = "Auxiliary Reactor SMES"; - output_level = 350000 + name = "Auxiliary Reactor SMES" }, +/obj/item/smes_coil, +/obj/item/smes_coil, /obj/effect/engine_setup/smes, /obj/structure/cable/green{ icon_state = "0-8" diff --git a/modular_chomp/maps/southern_cross/southern_cross-1.dmm b/modular_chomp/maps/southern_cross/southern_cross-1.dmm index ecb4bc5575..ffa92ce012 100644 --- a/modular_chomp/maps/southern_cross/southern_cross-1.dmm +++ b/modular_chomp/maps/southern_cross/southern_cross-1.dmm @@ -3333,11 +3333,7 @@ /obj/structure/sign/warning/radioactive{ pixel_y = 32 }, -/obj/machinery/power/smes/buildable{ - charge = 5e+006; - input_attempt = 1; - input_level = 200000; - output_level = 200000; +/obj/machinery/power/smes/buildable/max_charge_max_input{ RCon_tag = "Gravity Generator" }, /obj/structure/cable/cyan{ diff --git a/modular_chomp/maps/southern_cross/southern_cross-2.dmm b/modular_chomp/maps/southern_cross/southern_cross-2.dmm index a689324d5a..46f7d8915e 100644 --- a/modular_chomp/maps/southern_cross/southern_cross-2.dmm +++ b/modular_chomp/maps/southern_cross/southern_cross-2.dmm @@ -12708,13 +12708,13 @@ /obj/structure/cable/yellow{ icon_state = "0-8" }, -/obj/machinery/power/smes/buildable{ - RCon_tag = "Auxiliary - Main"; - charge = 2.4e+007; - cur_coils = 4; - input_level = 500000; - output_level = 500000 +/obj/machinery/power/smes/buildable/max_charge_max_output{ + RCon_tag = "Auxiliary - Main" }, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, /turf/simulated/floor/plating, /area/engineering/auxiliary_engineering) "dWD" = ( @@ -18426,13 +18426,8 @@ /turf/simulated/floor/tiled, /area/medical/morgue) "iHD" = ( -/obj/machinery/power/smes/buildable{ - RCon_tag = "Telecommunications Satellite"; - charge = 6e+006; - input_attempt = 1; - input_level = 250000; - inputting = 1; - output_level = 250000 +/obj/machinery/power/smes/buildable/engine_default{ + RCon_tag = "Telecommunications Satellite" }, /obj/structure/cable/cyan, /turf/simulated/floor/plating, diff --git a/modular_chomp/maps/southern_cross/southern_cross-3.dmm b/modular_chomp/maps/southern_cross/southern_cross-3.dmm index 55c2c15f15..9161a9ba81 100644 --- a/modular_chomp/maps/southern_cross/southern_cross-3.dmm +++ b/modular_chomp/maps/southern_cross/southern_cross-3.dmm @@ -781,10 +781,8 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/smes/buildable{ - RCon_tag = "Substation - Atmospherics"; - charge = 2e+006; - input_attempt = 1 +/obj/machinery/power/smes/buildable/max_charge_max_input{ + RCon_tag = "Substation - Atmospherics" }, /obj/structure/cable/cyan{ icon_state = "0-8" @@ -9792,14 +9790,13 @@ /area/engineering/engine_room) "aEI" = ( /obj/structure/cable, -/obj/machinery/power/smes/buildable{ - RCon_tag = "Engine - Main"; - charge = 2e+007; - cur_coils = 4; - input_attempt = 1; - input_level = 750000; - output_level = 750000 +/obj/machinery/power/smes/buildable/engine_default{ + RCon_tag = "Engine - Main" }, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, /obj/effect/engine_setup/smes/main, /turf/simulated/floor/plating, /area/engineering/engine_smes) @@ -18547,12 +18544,8 @@ /obj/structure/cable/cyan{ icon_state = "0-4" }, -/obj/machinery/power/smes/buildable{ - RCon_tag = "Engine - Core"; - charge = 2e+006; - input_attempt = 1; - input_level = 100000; - output_level = 200000 +/obj/machinery/power/smes/buildable/engine_default{ + RCon_tag = "Engine - Core" }, /obj/effect/engine_setup/smes, /turf/simulated/floor/plating, @@ -47433,12 +47426,13 @@ /turf/simulated/floor/plating, /area/engineering/drone_fabrication) "fJb" = ( -/obj/machinery/power/smes/buildable{ - RCon_tag = "Engine - ShieldGen"; - cur_coils = 4; - input_level = 750000; - output_level = 750000 +/obj/machinery/power/smes/buildable/engine_default{ + RCon_tag = "Engine - ShieldGen" }, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, /obj/structure/cable/orange{ icon_state = "0-4" }, diff --git a/modular_chomp/maps/southern_cross/southern_cross-4.dmm b/modular_chomp/maps/southern_cross/southern_cross-4.dmm index b5be602ff1..525dcce9c3 100644 --- a/modular_chomp/maps/southern_cross/southern_cross-4.dmm +++ b/modular_chomp/maps/southern_cross/southern_cross-4.dmm @@ -374,12 +374,7 @@ /area/ai) "ajC" = ( /obj/structure/cable/cyan, -/obj/machinery/power/smes/buildable{ - charge = 5e+006; - input_attempt = 1; - input_level = 200000; - output_level = 200000 - }, +/obj/machinery/power/smes/buildable/engine_default, /obj/machinery/flasher{ id = "AI"; pixel_y = -24 @@ -2752,11 +2747,8 @@ /area/maintenance/solars/foreportsolar) "cpE" = ( /obj/structure/cable, -/obj/machinery/power/smes/buildable{ - RCon_tag = "Solar - Fore Port"; - input_attempt = 1; - input_level = 150000; - output_level = 100000 +/obj/machinery/power/smes/buildable/max_charge_max_input{ + RCon_tag = "Solar - Fore Port" }, /turf/simulated/floor/plating, /area/maintenance/solars/foreportsolar) @@ -2900,11 +2892,8 @@ /area/maintenance/thirddeck/forestarboard) "cxs" = ( /obj/structure/cable, -/obj/machinery/power/smes/buildable{ - RCon_tag = "Solar - Fore Starboard"; - input_attempt = 1; - input_level = 150000; - output_level = 100000 +/obj/machinery/power/smes/buildable/max_charge_max_input{ + RCon_tag = "Solar - Fore Starboard" }, /turf/simulated/floor/plating, /area/maintenance/solars/forestarboardsolar) @@ -15699,11 +15688,8 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/smes/buildable{ - RCon_tag = "Solar - Aft Port"; - input_attempt = 1; - input_level = 150000; - output_level = 100000 +/obj/machinery/power/smes/buildable/max_charge_max_input{ + RCon_tag = "Solar - Aft Port" }, /turf/simulated/floor/plating, /area/maintenance/solars/aftportsolar) @@ -16162,11 +16148,8 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/smes/buildable{ - RCon_tag = "Solar - Aft Starboard"; - input_attempt = 1; - input_level = 150000; - output_level = 100000 +/obj/machinery/power/smes/buildable/engine_default{ + RCon_tag = "Solar - Aft Starboard" }, /turf/simulated/floor/plating, /area/maintenance/solars/aftstarboardsolar) diff --git a/modular_chomp/maps/southern_cross/southern_cross-5.dmm b/modular_chomp/maps/southern_cross/southern_cross-5.dmm index 30da1bfde3..17c3884287 100644 --- a/modular_chomp/maps/southern_cross/southern_cross-5.dmm +++ b/modular_chomp/maps/southern_cross/southern_cross-5.dmm @@ -1786,14 +1786,13 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/smes/buildable{ - RCon_tag = "Outpost Parallel - Main 2"; - charge = 2e+007; - cur_coils = 4; - input_attempt = 1; - input_level = 750000; - output_level = 100 +/obj/machinery/power/smes/buildable/engine_default{ + RCon_tag = "Outpost Parallel - Main 2" }, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, /turf/simulated/floor/plating, /area/surface/outpost/engineering/reactor_smes) "dF" = ( @@ -3770,12 +3769,8 @@ /area/surface/outpost/civilian/smes) "hy" = ( /obj/structure/cable/blue, -/obj/machinery/power/smes/buildable/outpost_substation{ - RCon_tag = "Outpost - Shuttle Landing"; - charge = 5e+006; - input_attempt = 1; - input_level = 150000; - output_level = 150000 +/obj/machinery/power/smes/buildable/outpost_substation/max_charge_max_input{ + RCon_tag = "Outpost - Shuttle Landing" }, /turf/simulated/floor/plating, /area/surface/outpost/main/gen_room) @@ -6137,14 +6132,13 @@ /obj/structure/cable/cyan{ icon_state = "0-8" }, -/obj/machinery/power/smes/buildable{ - RCon_tag = "Outpost Parallel - Main 1"; - charge = 2e+007; - cur_coils = 4; - input_attempt = 1; - input_level = 750000; - output_level = 750000 +/obj/machinery/power/smes/buildable/max_charge_max_input{ + RCon_tag = "Outpost Parallel - Main 1" }, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, /obj/structure/cable, /obj/item/radio/intercom{ name = "Station Intercom (General)"; @@ -7190,12 +7184,8 @@ /turf/simulated/floor/tiled, /area/surface/outpost/main/corridor/left_lower) "nR" = ( -/obj/machinery/power/smes/buildable/outpost_substation{ - RCon_tag = "Outpost - Engineering Outpost"; - charge = 5e+006; - input_attempt = 1; - input_level = 150000; - output_level = 150000 +/obj/machinery/power/smes/buildable/outpost_substation/max_charge_max_input{ + RCon_tag = "Outpost - Engineering Outpost" }, /obj/structure/cable/blue, /turf/simulated/floor/plating, @@ -8996,12 +8986,8 @@ /obj/structure/cable/blue{ icon_state = "0-2" }, -/obj/machinery/power/smes/buildable/outpost_substation{ - RCon_tag = "Outpost - Civilian"; - charge = 500000; - input_attempt = 1; - input_level = 150000; - output_level = 150000 +/obj/machinery/power/smes/buildable/outpost_substation/max_charge_max_input{ + RCon_tag = "Outpost - Civilian" }, /turf/simulated/floor/plating, /area/surface/outpost/civilian/smes) @@ -16550,12 +16536,8 @@ /obj/structure/cable/blue{ icon_state = "0-4" }, -/obj/machinery/power/smes/buildable/outpost_substation{ - RCon_tag = "Outpost - Left Wing"; - charge = 5e+006; - input_attempt = 1; - input_level = 150000; - output_level = 150000 +/obj/machinery/power/smes/buildable/outpost_substation/max_charge_max_input{ + RCon_tag = "Outpost - Left Wing" }, /turf/simulated/floor/plating, /area/surface/outpost/main/gen_room/smes_left) @@ -17640,12 +17622,8 @@ /obj/structure/cable/blue{ icon_state = "0-4" }, -/obj/machinery/power/smes/buildable/outpost_substation{ - RCon_tag = "Outpost - Mining"; - charge = 5e+006; - input_attempt = 1; - input_level = 150000; - output_level = 150000 +/obj/machinery/power/smes/buildable/outpost_substation/max_charge_max_input{ + RCon_tag = "Outpost - Mining" }, /turf/simulated/floor/plating, /area/surface/outpost/engineering/atmos_room) @@ -24086,12 +24064,8 @@ /area/surface/outpost/main/airlock/landing_north) "UL" = ( /obj/structure/cable/blue, -/obj/machinery/power/smes/buildable/outpost_substation{ - RCon_tag = "Outpost - Security"; - charge = 5e+006; - input_attempt = 1; - input_level = 150000; - output_level = 150000 +/obj/machinery/power/smes/buildable/outpost_substation/max_charge_max_input{ + RCon_tag = "Outpost - Security" }, /turf/simulated/floor/plating, /area/surface/outpost/security/smes) @@ -26237,12 +26211,8 @@ /obj/structure/cable/blue{ icon_state = "0-4" }, -/obj/machinery/power/smes/buildable/outpost_substation{ - RCon_tag = "Outpost - Right Wing"; - charge = 5e+006; - input_attempt = 1; - input_level = 150000; - output_level = 150000 +/obj/machinery/power/smes/buildable/outpost_substation/max_charge_max_input{ + RCon_tag = "Outpost - Right Wing" }, /turf/simulated/floor/plating, /area/surface/outpost/main/gen_room/smes_right) diff --git a/modular_chomp/maps/southern_cross/southern_cross-6.dmm b/modular_chomp/maps/southern_cross/southern_cross-6.dmm index 3ba59b9da1..64a0328533 100644 --- a/modular_chomp/maps/southern_cross/southern_cross-6.dmm +++ b/modular_chomp/maps/southern_cross/southern_cross-6.dmm @@ -2848,12 +2848,8 @@ /turf/simulated/floor/reinforced, /area/surface/outpost/research/xenoarcheology/isolation_c) "fV" = ( -/obj/machinery/power/smes/buildable/outpost_substation{ - RCon_tag = "Outpost - Chemical Refinery"; - charge = 500000; - input_attempt = 1; - input_level = 150000; - output_level = 150000 +/obj/machinery/power/smes/buildable/outpost_substation/max_charge_max_input{ + RCon_tag = "Outpost - Chemical Refinery" }, /obj/structure/cable/blue{ icon_state = "0-4" @@ -4743,12 +4739,8 @@ /turf/simulated/floor/plating, /area/surface/outpost/engineering/refinery/smes) "kd" = ( -/obj/machinery/power/smes/buildable/outpost_substation{ - RCon_tag = "Outpost - Xenoarch"; - charge = 500000; - input_attempt = 1; - input_level = 150000; - output_level = 150000 +/obj/machinery/power/smes/buildable/outpost_substation/max_charge_max_input{ + RCon_tag = "Outpost - Xenoarch" }, /obj/structure/cable/blue{ icon_state = "0-2" diff --git a/modular_chomp/maps/southern_cross/southern_cross-7.dmm b/modular_chomp/maps/southern_cross/southern_cross-7.dmm index 844007a3d3..af85d41170 100644 --- a/modular_chomp/maps/southern_cross/southern_cross-7.dmm +++ b/modular_chomp/maps/southern_cross/southern_cross-7.dmm @@ -1218,9 +1218,8 @@ /turf/simulated/wall/rshull, /area/shuttle/echidna) "aHw" = ( -/obj/machinery/power/smes/buildable{ +/obj/machinery/power/smes/buildable/max_input{ RCon_tag = "Reactor Secondary - Aegis"; - input_attempt = 1; name = "Reactor SMES - Secondary" }, /obj/structure/cable/green{ @@ -2348,13 +2347,16 @@ /turf/simulated/floor/tiled/yellow, /area/shuttle/baby_mammoth) "bKJ" = ( -/obj/machinery/power/smes/buildable{ +/obj/machinery/power/smes/buildable/max_charge_max_input{ RCon_tag = "Reactor Input - Aegis"; - charge = 2e+006; - cur_coils = 6; - input_attempt = 1; name = "Reactor SMES - Input" }, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, /obj/structure/cable/cyan{ icon_state = "0-4" }, @@ -2664,12 +2666,7 @@ dir = 1; opacity = 1 }, -/obj/machinery/power/smes/buildable/power_shuttle{ - charge = 4e+006; - input_attempt = 1; - inputting = 1; - outputting = 1 - }, +/obj/machinery/power/smes/buildable/power_shuttle/max_charge_max_input_base_output, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -9018,9 +9015,7 @@ /area/expoutpost/staginghangar) "hsz" = ( /obj/structure/closet/walllocker/emerglocker/south, -/obj/machinery/power/smes/buildable/point_of_interest{ - input_attempt = 1 - }, +/obj/machinery/power/smes/buildable/point_of_interest/max_input, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -12626,9 +12621,7 @@ /turf/simulated/floor/tiled/dark, /area/expoutpost/staginghangar) "kwr" = ( -/obj/machinery/power/smes/buildable/point_of_interest{ - input_attempt = 1 - }, +/obj/machinery/power/smes/buildable/point_of_interest/max_input, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -14632,8 +14625,7 @@ /turf/simulated/floor/tiled/dark, /area/expoutpost/staginghangar) "lZt" = ( -/obj/machinery/power/smes/buildable{ - input_attempt = 1; +/obj/machinery/power/smes/buildable/engine_default{ name = "AI Core SMES" }, /obj/effect/floor_decal/industrial/outline/yellow, @@ -14851,11 +14843,7 @@ /turf/simulated/floor/tiled/dark, /area/expoutpost/uppersternhallway) "mgQ" = ( -/obj/machinery/power/smes/buildable/power_shuttle{ - charge = 2e+006; - input_attempt = 1; - inputting = 1 - }, +/obj/machinery/power/smes/buildable/power_shuttle/max_charge_max_input_base_output, /obj/structure/cable/green, /turf/simulated/floor/tiled/milspec, /area/shuttle/echidna) @@ -16244,9 +16232,7 @@ /area/expoutpost/miningfoyer) "nlv" = ( /obj/effect/floor_decal/industrial/warning/cee, -/obj/machinery/power/smes/buildable/point_of_interest{ - input_attempt = 1 - }, +/obj/machinery/power/smes/buildable/point_of_interest/max_input, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -16879,15 +16865,14 @@ /turf/simulated/floor/tiled/white, /area/expoutpost/medbaylobby) "nFb" = ( -/obj/machinery/power/smes/buildable{ +/obj/machinery/power/smes/buildable/engine_default{ RCon_tag = "Reactor Primary - Aegis"; - charge = 2e+006; - cur_coils = 4; - input_attempt = 1; - input_level = 750000; - name = "Reactor SMES - Main"; - output_level = 750000 + name = "Reactor SMES - Main" }, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, /obj/structure/cable/green, /obj/effect/floor_decal/industrial/outline/yellow, /obj/effect/engine_setup/smes, @@ -22582,8 +22567,7 @@ /turf/simulated/floor/tiled, /area/expoutpost/hangarfive) "sky" = ( -/obj/machinery/power/smes/buildable{ - input_attempt = 1; +/obj/machinery/power/smes/buildable/engine_default{ name = "Telecomms SMES" }, /obj/effect/floor_decal/industrial/outline/yellow, @@ -30296,15 +30280,12 @@ /turf/simulated/floor, /area/expoutpost/restrooms) "yjG" = ( -/obj/machinery/power/smes/buildable{ +/obj/machinery/power/smes/buildable/max_charge_max_input{ RCon_tag = "Auxiliary Reactor - Aegis"; - charge = 2e+006; - cur_coils = 2; - input_attempt = 1; - input_level = 500000; - name = "Auxiliary Reactor SMES"; - output_level = 350000 + name = "Auxiliary Reactor SMES" }, +/obj/item/smes_coil, +/obj/item/smes_coil, /obj/effect/engine_setup/smes, /obj/structure/cable/green{ icon_state = "0-8" diff --git a/modular_chomp/maps/submaps/shelters/CultShip-28x17.dmm b/modular_chomp/maps/submaps/shelters/CultShip-28x17.dmm index a645267752..d3b571758f 100644 --- a/modular_chomp/maps/submaps/shelters/CultShip-28x17.dmm +++ b/modular_chomp/maps/submaps/shelters/CultShip-28x17.dmm @@ -685,7 +685,7 @@ /obj/effect/floor_decal/techfloor{ dir = 6 }, -/obj/machinery/power/smes/buildable/power_shuttle, +/obj/machinery/power/smes/buildable/power_shuttle/max_charge_max_input_base_output, /obj/structure/cable/green, /turf/simulated/floor/cult, /area/survivalpod/superpose/CultShip) diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/Chapel.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/Chapel.dmm index 72d4219302..4bd0793f0d 100644 --- a/modular_chomp/maps/submaps/surface_submaps/wilderness/Chapel.dmm +++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/Chapel.dmm @@ -613,12 +613,7 @@ /obj/effect/floor_decal/industrial/warning/dust{ dir = 5 }, -/obj/machinery/power/smes/buildable{ - charge = 2e+006; - input_attempt = 1; - input_level = 250000; - input_level_max = 250000 - }, +/obj/machinery/power/smes/buildable/max_charge_max_input, /obj/structure/cable/cyan{ icon_state = "0-2" }, diff --git a/modular_chomp/maps/virgo_minitest/virgo_minitest-1.dmm b/modular_chomp/maps/virgo_minitest/virgo_minitest-1.dmm index 565b6969ba..71073c58b4 100644 --- a/modular_chomp/maps/virgo_minitest/virgo_minitest-1.dmm +++ b/modular_chomp/maps/virgo_minitest/virgo_minitest-1.dmm @@ -721,10 +721,10 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/smes/buildable{ - charge = 1.5e+007; - cur_coils = 3 - }, +/obj/machinery/power/smes/buildable/max_charge, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, /turf/simulated/floor/plating, /area/engineering/engine_smes) "bC" = ( @@ -4982,12 +4982,8 @@ /turf/simulated/floor, /area/engineering/workshop) "Bo" = ( -/obj/machinery/power/smes/buildable{ - RCon_tag = "Engine - Core"; - charge = 2e+006; - input_attempt = 1; - input_level = 200000; - output_level = 250000 +/obj/machinery/power/smes/buildable/engine_default{ + RCon_tag = "Engine - Core" }, /obj/structure/cable/cyan{ icon_state = "0-2" @@ -6160,13 +6156,8 @@ /turf/space, /area/space) "PH" = ( -/obj/machinery/power/smes/buildable{ - RCon_tag = "Power - Main"; - charge = 2e+007; - cur_coils = 4; - input_attempt = 1; - input_level = 500000; - output_level = 1e+006 +/obj/machinery/power/smes/buildable/engine_default{ + RCon_tag = "Power - Main" }, /obj/structure/cable{ icon_state = "0-4" diff --git a/tools/maplint/lints/smes_sanity.yml b/tools/maplint/lints/smes_sanity.yml new file mode 100644 index 0000000000..d12d1e773e --- /dev/null +++ b/tools/maplint/lints/smes_sanity.yml @@ -0,0 +1,18 @@ +help: "Smes variables are not to be map edited. Use appropriate subtypes." +/obj/machinery/power/smes: + banned_variables: + - capacity + - charge + - input_attempt + - inputting + - input_level + - input_level_max + - input_available + - output_attempt + - outputting + - output_level + - output_level_max + - output_used + - last_output_attempt + - last_input_attempt + - last_charge