diff --git a/code/modules/power/smes_construction.dm b/code/modules/power/smes_construction.dm index a70a4cb91c4..f84084f8bfe 100644 --- a/code/modules/power/smes_construction.dm +++ b/code/modules/power/smes_construction.dm @@ -73,6 +73,11 @@ output_level = 500000 charge =1.5e+7 +// For the substation SMES around the Horizon. +/obj/machinery/power/smes/buildable/substation + input_level = 150000 + output_level = 140000 + // The Horizon's shuttles want something with decent capacity to sustain themselves and enough transmission to meet their energy needs. /obj/machinery/power/smes/buildable/horizon_shuttle/Initialize() . = ..() diff --git a/html/changelogs/llywelwyn-higher_smes_defaults.yml b/html/changelogs/llywelwyn-higher_smes_defaults.yml new file mode 100644 index 00000000000..6207a62406a --- /dev/null +++ b/html/changelogs/llywelwyn-higher_smes_defaults.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Llywelwyn + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - tweak: "Changes SMES input/output defaults to 150kW, up from 50kW. Should make RCON less tedious, whilst still leaving room for optimisation round-by-round." diff --git a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm index 03e4f7a6dec..8e1cfae46b3 100644 --- a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm +++ b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm @@ -367,7 +367,7 @@ }, /area/engineering/atmos/propulsion) "arn" = ( -/obj/machinery/power/smes/buildable{ +/obj/machinery/power/smes/buildable/substation{ RCon_tag = "Substation - Service" }, /obj/structure/cable, @@ -3418,7 +3418,7 @@ /turf/simulated/floor/plating, /area/shuttle/mining) "cyS" = ( -/obj/machinery/power/smes/buildable{ +/obj/machinery/power/smes/buildable/substation{ RCon_tag = "Substation - Hangar" }, /obj/structure/cable, @@ -5635,7 +5635,7 @@ /turf/simulated/floor/tiled/dark, /area/engineering/atmos) "ejL" = ( -/obj/machinery/power/smes/buildable{ +/obj/machinery/power/smes/buildable/substation{ RCon_tag = "Substation - Engineering Lower Deck" }, /obj/structure/cable/green, @@ -11028,7 +11028,7 @@ /turf/simulated/floor/tiled/white, /area/shuttle/intrepid/crew_compartment) "hXX" = ( -/obj/machinery/power/smes/buildable{ +/obj/machinery/power/smes/buildable/substation{ RCon_tag = "Substation - Xenoarchaeology" }, /obj/structure/cable{ @@ -11878,7 +11878,7 @@ /turf/simulated/floor/tiled/dark/full, /area/security/checkpoint) "iJR" = ( -/obj/machinery/power/smes/buildable{ +/obj/machinery/power/smes/buildable/substation{ RCon_tag = "Substation - Operations" }, /obj/structure/cable/green{ @@ -20576,7 +20576,7 @@ /turf/simulated/floor/tiled, /area/hangar/canary) "pkG" = ( -/obj/machinery/power/smes/buildable{ +/obj/machinery/power/smes/buildable/substation{ RCon_tag = "Substation - Security" }, /obj/structure/cable, diff --git a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm index 818ff80acb6..3793b9b4959 100644 --- a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm +++ b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm @@ -7030,7 +7030,7 @@ /turf/simulated/floor/tiled/dark, /area/engineering/engine_waste) "dwb" = ( -/obj/machinery/power/smes/buildable{ +/obj/machinery/power/smes/buildable/substation{ RCon_tag = "Substation - Starboard Wing" }, /obj/structure/cable/green{ @@ -9935,7 +9935,7 @@ /turf/simulated/floor/plating, /area/maintenance/wing/port) "eYp" = ( -/obj/machinery/power/smes/buildable{ +/obj/machinery/power/smes/buildable/substation{ RCon_tag = "Substation - Port Wing" }, /obj/structure/cable/green{ @@ -11641,7 +11641,7 @@ /turf/simulated/floor/tiled, /area/horizon/security/hallway) "fLU" = ( -/obj/machinery/power/smes/buildable{ +/obj/machinery/power/smes/buildable/substation{ RCon_tag = "Substation - Research" }, /obj/structure/cable{ @@ -26703,7 +26703,7 @@ /turf/simulated/floor/tiled, /area/hallway/primary/central_one) "mVR" = ( -/obj/machinery/power/smes/buildable{ +/obj/machinery/power/smes/buildable/substation{ RCon_tag = "Substation - Medical" }, /obj/structure/cable{ @@ -37019,7 +37019,7 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/kitchen) "sbO" = ( -/obj/machinery/power/smes/buildable{ +/obj/machinery/power/smes/buildable/substation{ RCon_tag = "Substation - Engineering Main" }, /obj/structure/cable, diff --git a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm index 2542fc930a2..fc8da769fc9 100644 --- a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm +++ b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm @@ -7300,7 +7300,7 @@ dir = 9 }, /obj/machinery/light, -/obj/machinery/power/smes/buildable{ +/obj/machinery/power/smes/buildable/substation{ RCon_tag = "Substation - Deck 3 Telecommunications"; charge = 5e+006; input_attempt = 1; @@ -11076,7 +11076,7 @@ /turf/simulated/floor/carpet/rubber, /area/tcommsat/entrance) "jbg" = ( -/obj/machinery/power/smes/buildable{ +/obj/machinery/power/smes/buildable/substation{ RCon_tag = "Substation - Deck 3 Civilian" }, /obj/structure/cable{ @@ -17121,7 +17121,7 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard) "nJT" = ( -/obj/machinery/power/smes/buildable{ +/obj/machinery/power/smes/buildable/substation{ RCon_tag = "Shield Substation"; charge = 1e+007; cur_coils = 6; @@ -19223,7 +19223,7 @@ /turf/simulated/floor/tiled/white, /area/horizon/crew_quarters/fitness/changing) "pxf" = ( -/obj/machinery/power/smes/buildable{ +/obj/machinery/power/smes/buildable/substation{ RCon_tag = "Substation - Deck 3 Command" }, /obj/structure/cable,