diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index e88e6c686c2a..dadc62ca7d4d 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -629,13 +629,6 @@ }, /turf/open/floor/plating, /area/crew_quarters/heads/hos) -"abs" = ( -/obj/structure/cable{ - icon_state = "0-2" - }, -/obj/machinery/power/tracker, -/turf/open/floor/plasteel/airless/solarpanel, -/area/solar/port/fore) "abt" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -954,13 +947,6 @@ /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, /turf/open/floor/carpet, /area/crew_quarters/heads/hos) -"abX" = ( -/obj/structure/cable{ - icon_state = "0-2" - }, -/obj/machinery/power/tracker, -/turf/open/floor/plasteel/airless/solarpanel, -/area/solar/starboard/fore) "abY" = ( /obj/structure/grille, /turf/open/space, @@ -1476,16 +1462,6 @@ /obj/structure/table/reinforced, /turf/open/floor/plasteel, /area/ai_monitored/security/armory) -"acV" = ( -/obj/structure/cable{ - icon_state = "0-2" - }, -/obj/machinery/power/solar{ - id = "auxsolareast"; - name = "Port Auxiliary Solar Array" - }, -/turf/open/floor/plasteel/airless/solarpanel, -/area/solar/port/fore) "acW" = ( /obj/structure/cable, /obj/structure/lattice/catwalk, @@ -1712,16 +1688,6 @@ }, /turf/open/floor/carpet, /area/crew_quarters/heads/hos) -"ads" = ( -/obj/structure/cable{ - icon_state = "0-2" - }, -/obj/machinery/power/solar{ - id = "auxsolareast"; - name = "Port Auxiliary Solar Array" - }, -/turf/open/floor/plasteel/airless/solarpanel, -/area/solar/starboard/fore) "adt" = ( /obj/structure/cable, /obj/structure/lattice/catwalk, @@ -2058,14 +2024,6 @@ /obj/structure/lattice/catwalk, /turf/open/space, /area/solar/starboard/fore) -"adZ" = ( -/obj/structure/cable, -/obj/machinery/power/solar{ - id = "auxsolareast"; - name = "Port Auxiliary Solar Array" - }, -/turf/open/floor/plasteel/airless/solarpanel, -/area/solar/port/fore) "aea" = ( /obj/machinery/portable_atmospherics/canister/nitrous_oxide, /obj/machinery/atmospherics/components/unary/portables_connector/visible, @@ -2373,14 +2331,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /turf/open/space/basic, /area/space/nearstation) -"aeG" = ( -/obj/structure/cable, -/obj/machinery/power/solar{ - id = "auxsolareast"; - name = "Port Auxiliary Solar Array" - }, -/turf/open/floor/plasteel/airless/solarpanel, -/area/solar/starboard/fore) "aeH" = ( /obj/machinery/atmospherics/pipe/manifold/general/visible{ dir = 8 @@ -47372,26 +47322,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plasteel/white, /area/science/nanite) -"cca" = ( -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/machinery/power/solar{ - id = "portsolar"; - name = "Port Solar Array" - }, -/turf/open/floor/plasteel/airless/solarpanel, -/area/solar/port/aft) -"ccb" = ( -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/machinery/power/solar{ - id = "portsolar"; - name = "Port Solar Array" - }, -/turf/open/floor/plasteel/airless/solarpanel, -/area/solar/port/aft) "ccc" = ( /obj/structure/cable{ icon_state = "2-8" @@ -48263,13 +48193,6 @@ /obj/structure/lattice/catwalk, /turf/open/space, /area/solar/port/aft) -"chJ" = ( -/obj/machinery/power/tracker, -/obj/structure/cable{ - icon_state = "0-4" - }, -/turf/open/floor/plasteel/airless/solarpanel, -/area/solar/port/aft) "chK" = ( /obj/structure/cable{ icon_state = "0-8" @@ -49090,6 +49013,14 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"cmp" = ( +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/power/tracker, +/obj/structure/lattice/catwalk, +/turf/open/floor/plasteel/airless/solarpanel, +/area/solar/starboard/fore) "cmq" = ( /obj/effect/landmark/xeno_spawn, /turf/open/floor/plating{ @@ -49703,11 +49634,6 @@ "ctv" = ( /turf/closed/wall/r_wall, /area/space/nearstation) -"ctB" = ( -/obj/structure/cable, -/obj/machinery/power/tracker, -/turf/open/floor/plasteel/airless/solarpanel, -/area/solar/starboard/aft) "ctR" = ( /obj/structure/sign/warning/radiation/rad_area, /turf/closed/wall, @@ -50564,24 +50490,6 @@ }, /turf/open/floor/plasteel/dark, /area/engine/engineering) -"cMQ" = ( -/obj/structure/cable{ - icon_state = "0-2" - }, -/obj/machinery/power/solar{ - id = "starboardsolar"; - name = "Starboard Solar Array" - }, -/turf/open/floor/plasteel/airless/solarpanel, -/area/solar/starboard/aft) -"cNa" = ( -/obj/structure/cable, -/obj/machinery/power/solar{ - id = "starboardsolar"; - name = "Starboard Solar Array" - }, -/turf/open/floor/plasteel/airless/solarpanel, -/area/solar/starboard/aft) "cNh" = ( /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -51807,6 +51715,10 @@ dir = 4 }, /area/escapepodbay) +"eZX" = ( +/obj/structure/lattice/catwalk, +/turf/open/space/basic, +/area/solar/port/aft) "faA" = ( /obj/structure/cable/yellow{ icon_state = "0-4" @@ -52260,6 +52172,11 @@ }, /turf/open/floor/plasteel, /area/engine/atmos) +"fZJ" = ( +/obj/structure/cable, +/obj/effect/spawner/structure/solars/solar_96, +/turf/open/floor/plasteel/solarpanel, +/area/solar/starboard/aft) "gaW" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -53009,6 +52926,14 @@ }, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) +"hNq" = ( +/obj/machinery/power/tracker, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/structure/lattice/catwalk, +/turf/open/space/basic, +/area/solar/port/aft) "hNI" = ( /obj/effect/spawner/structure/window/reinforced/shutter, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ @@ -53801,6 +53726,13 @@ }, /turf/open/floor/plasteel/white, /area/medical/virology) +"jFV" = ( +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/effect/spawner/structure/solars/solar_96, +/turf/open/floor/plasteel/solarpanel, +/area/solar/port/aft) "jHx" = ( /obj/machinery/door/airlock/external{ name = "External Access"; @@ -54471,6 +54403,12 @@ }, /turf/open/floor/plasteel, /area/tcommsat/entrance) +"los" = ( +/obj/structure/cable, +/obj/structure/cable, +/obj/effect/spawner/structure/solars/solar_96, +/turf/open/floor/plasteel/solarpanel, +/area/solar/port/fore) "lou" = ( /obj/structure/cable{ icon_state = "1-4" @@ -57399,6 +57337,12 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/fore) +"swh" = ( +/obj/structure/cable, +/obj/machinery/power/tracker, +/obj/structure/lattice/catwalk, +/turf/open/floor/plasteel/airless/solarpanel, +/area/solar/starboard/aft) "szl" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -57511,6 +57455,13 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /turf/open/floor/plasteel, /area/ai_monitored/storage/eva) +"sHU" = ( +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/effect/spawner/structure/solars/solar_96, +/turf/open/floor/plasteel/solarpanel, +/area/solar/port/fore) "sIE" = ( /obj/machinery/announcement_system, /obj/effect/turf_decal/tile/yellow, @@ -58525,6 +58476,14 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/plating, /area/maintenance/port) +"uRq" = ( +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/power/tracker, +/obj/structure/lattice/catwalk, +/turf/open/space/basic, +/area/solar/port/fore) "uRs" = ( /obj/machinery/light/small, /obj/structure/closet/crate/hydroponics, @@ -58823,6 +58782,13 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/exit) +"vFi" = ( +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/effect/spawner/structure/solars/solar_96, +/turf/open/floor/plasteel/solarpanel, +/area/solar/port/aft) "vFw" = ( /obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/dark, @@ -58871,6 +58837,11 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel, /area/engine/atmos) +"vOD" = ( +/obj/structure/cable, +/obj/effect/spawner/structure/solars/solar_96, +/turf/open/floor/plasteel/solarpanel, +/area/solar/port/fore) "vPm" = ( /obj/structure/lattice, /obj/structure/disposalpipe/segment{ @@ -59006,6 +58977,13 @@ }, /turf/open/floor/plating, /area/quartermaster/sorting) +"wfJ" = ( +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/effect/spawner/structure/solars/solar_96, +/turf/open/floor/plasteel/solarpanel, +/area/solar/starboard/fore) "wfU" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 4 @@ -59269,6 +59247,11 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /turf/open/floor/plasteel, /area/security/main) +"wCF" = ( +/obj/structure/cable, +/obj/effect/spawner/structure/solars/solar_96, +/turf/open/floor/plasteel/solarpanel, +/area/solar/starboard/fore) "wDq" = ( /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" @@ -59481,6 +59464,13 @@ }, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) +"xnl" = ( +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/effect/spawner/structure/solars/solar_96, +/turf/open/floor/plasteel/solarpanel, +/area/solar/starboard/aft) "xnF" = ( /obj/structure/grille, /turf/open/floor/plating/airless, @@ -75920,7 +75910,7 @@ aaa aaa aaS aaf -chJ +hNq aaf aaS aaa @@ -76334,17 +76324,17 @@ aaa aaa abY aaa -acV +sHU adv -adZ +vOD aaa -acV +sHU adv -adZ +vOD aaa -acV +sHU adv -adZ +vOD aaa aaS aaf @@ -76591,17 +76581,17 @@ aaa aaa abY aaf -acV +sHU adu -adZ +vOD aaa -acV +sHU adu -adZ +vOD aaa -acV +sHU adu -adZ +vOD aaf aaf aaa @@ -76685,19 +76675,19 @@ aaa aaa aaS aaf -cca -cca -cca -cca -cca +vFi +vFi +vFi +vFi +vFi aaa chK aaa -cca -cca -cca -cca -cca +vFi +vFi +vFi +vFi +vFi aaf aaS aaa @@ -76848,17 +76838,17 @@ aaa aaa abY aaa -acV +sHU adu -adZ +vOD aaf -acV +sHU adu -adZ +vOD aaf -acV +sHU adu -adZ +vOD aaa aaf aaa @@ -76948,7 +76938,7 @@ ccX ccX ccX cgz -chL +eZX ciP cjH cjH @@ -77105,17 +77095,17 @@ aaa aaa aaf aaf -acV +sHU adu -adZ +vOD aaa -acV +sHU adu -adZ +vOD aaa -acV +sHU adu -adZ +vOD aaf aaf aaf @@ -77199,19 +77189,19 @@ aaa aaf aaS aaf -ccb -ccb -ccb -ccb -ccb +jFV +jFV +jFV +jFV +jFV aaa -chL +eZX aaa -ccb -ccb -ccb -ccb -ccb +jFV +jFV +jFV +jFV +jFV aaf aaS aaa @@ -77362,17 +77352,17 @@ aaS aaS aaf aaa -acV +sHU adu -adZ +vOD aaa -acV +sHU adu -adZ +vOD aaa -acV +sHU adu -adZ +vOD aaa aaf aaa @@ -77713,19 +77703,19 @@ aaa aaf aaS aaf -cca -cca -cca -cca -cca +vFi +vFi +vFi +vFi +vFi aaa chL aaa -cca -cca -cca -cca -cca +vFi +vFi +vFi +vFi +vFi aaf aaS aaa @@ -77873,7 +77863,7 @@ aaa aaa aaS aaf -abs +uRq abZ abZ acW @@ -78227,19 +78217,19 @@ aaa aaf aaS acy -ccb -ccb -ccb -ccb -ccb +jFV +jFV +jFV +jFV +jFV aaa chL aaa -ccb -ccb -ccb -ccb -ccb +jFV +jFV +jFV +jFV +jFV aaf aaS aaa @@ -78390,17 +78380,17 @@ aba aaS aaf aaa -acV +sHU adz -adZ +los aaa -acV +sHU adz -adZ +vOD aaa -acV +sHU adz -adZ +vOD aaa aaf aaa @@ -78647,17 +78637,17 @@ aaa aaa aaf aaf -acV +sHU adz -adZ +los aaa -acV +sHU adz -adZ +vOD aaa -acV +sHU adz -adZ +vOD aaf aaf aaa @@ -78741,19 +78731,19 @@ aaa aaf aaS aaf -cca -cca -cca -cca -cca +vFi +vFi +vFi +vFi +vFi aaa chL aaa -cca -cca -cca -cca -cca +vFi +vFi +vFi +vFi +vFi aaf aaS aaa @@ -78904,17 +78894,17 @@ aaa aaa aaS aaa -acV +sHU adz -adZ +los aaf -acV +sHU adz -adZ +vOD aaf -acV +sHU adz -adZ +vOD aaa aaf aaf @@ -79161,17 +79151,17 @@ aaa aaa aaS aaf -acV +sHU adz -adZ +los aaa -acV +sHU adz -adZ +vOD aaa -acV +sHU adz -adZ +vOD aaf aaf aaa @@ -79255,19 +79245,19 @@ aoV aaa aaS aaf -ccb -ccb -ccb -ccb -ccb +jFV +jFV +jFV +jFV +jFV aaa chL aaa -ccb -ccb -ccb -ccb -ccb +jFV +jFV +jFV +jFV +jFV aaf aaS aaa @@ -79418,17 +79408,17 @@ aaa aaa aaS aaa -acV +sHU adA -adZ +los aaa -acV +sHU adA -adZ +vOD aaa -acV +sHU adA -adZ +vOD aaa aaS aaa @@ -101263,17 +101253,17 @@ aaa aaa aaS aaa -ads +wfJ adS -aeG +wCF aaa -ads +wfJ adS -aeG +wCF aaa -ads +wfJ adS -aeG +wCF aaa aaS aaf @@ -101520,17 +101510,17 @@ aaa aaa aaS aaf -ads +wfJ adT -aeG +wCF aaa -ads +wfJ adT -aeG +wCF aaa -ads +wfJ adT -aeG +wCF aaf aaf aaa @@ -101777,17 +101767,17 @@ aaa aaa aaS aaa -ads +wfJ adT -aeG +wCF aaf -ads +wfJ adT -aeG +wCF aaf -ads +wfJ adT -aeG +wCF aaa aaf aaa @@ -102034,17 +102024,17 @@ aaa aaa aaf aaf -ads +wfJ adT -aeG +wCF aaa -ads +wfJ adT -aeG +wCF aaa -ads +wfJ adT -aeG +wCF aaf aaf aaf @@ -102291,17 +102281,17 @@ aaS aaS aaf aaa -ads +wfJ adT -aeG +wCF aaa -ads +wfJ adT -aeG +wCF aaa -ads +wfJ adT -aeG +wCF aaa aaf aaa @@ -102802,7 +102792,7 @@ aaa aaa aaS aaf -abX +cmp acx acx adt @@ -103319,17 +103309,17 @@ aba aaS acy aaa -ads +wfJ adW -aeG +wCF aaa -ads +wfJ adW -aeG +wCF aaa -ads +wfJ adW -aeG +wCF aaa aaf aaa @@ -103576,17 +103566,17 @@ aaa aaa aaf aaf -ads +wfJ adW -aeG +wCF aaa -ads +wfJ adW -aeG +wCF aaa -ads +wfJ adW -aeG +wCF aaf aaf aaf @@ -103833,17 +103823,17 @@ aaa aaa aaS aaa -ads +wfJ adW -aeG +wCF aaf -ads +wfJ adW -aeG +wCF aaf -ads +wfJ adW -aeG +wCF aaa aaf aaa @@ -104090,17 +104080,17 @@ aaa aaa aaS aaf -ads +wfJ adW -aeG +wCF aaa -ads +wfJ adW -aeG +wCF aaa -ads +wfJ adW -aeG +wCF aaf aaf aaa @@ -104347,17 +104337,17 @@ aaa aaa aaS aaa -ads +wfJ adY -aeG +wCF aaa -ads +wfJ adY -aeG +wCF aaa -ads +wfJ adY -aeG +wCF aaa aaS aaf @@ -110113,17 +110103,17 @@ aaa aaa aaS aaa -cMQ +xnl crB -cNa +fZJ aaa -cMQ +xnl crB -cNa +fZJ aaa -cMQ +xnl crB -cNa +fZJ aaa aaS aaa @@ -110370,17 +110360,17 @@ aaa aaa aba aaf -cMQ +xnl crC -cNa +fZJ aaa -cMQ +xnl crC -cNa +fZJ aaa -cMQ +xnl crC -cNa +fZJ aaf aaS aaa @@ -110627,17 +110617,17 @@ aaa aaa aaf aaa -cMQ +xnl crC -cNa +fZJ aaf -cMQ +xnl crC -cNa +fZJ aaf -cMQ +xnl crC -cNa +fZJ aaa aaS aaa @@ -110884,17 +110874,17 @@ aaf aaf aaf aaf -cMQ +xnl crC -cNa +fZJ aaa -cMQ +xnl crC -cNa +fZJ aaa -cMQ +xnl crC -cNa +fZJ aaf aaf aaa @@ -111141,17 +111131,17 @@ aaa aaa aaf aaa -cMQ +xnl crC -cNa +fZJ aaa -cMQ +xnl crC -cNa +fZJ aaa -cMQ +xnl crC -cNa +fZJ aaa aaf aaS @@ -111668,7 +111658,7 @@ crk tyu cpi cpi -ctB +swh aaf aaS aaa @@ -112169,17 +112159,17 @@ aaa aaa aaf aaa -cMQ +xnl crE -cNa +fZJ aaa -cMQ +xnl crE -cNa +fZJ aaa -cMQ +xnl crE -cNa +fZJ aaa aaf aaS @@ -112426,17 +112416,17 @@ aaf aaf aaf aaf -cMQ +xnl crE -cNa +fZJ aaa -cMQ +xnl crE -cNa +fZJ aaa -cMQ +xnl crE -cNa +fZJ aaf aaf aaa @@ -112683,17 +112673,17 @@ aaa aaa aaf aaa -cMQ +xnl crE -cNa +fZJ aaf -cMQ +xnl crE -cNa +fZJ aaf -cMQ +xnl crE -cNa +fZJ aaa aaS aaa @@ -112940,17 +112930,17 @@ aaf aaf aaf aaf -cMQ +xnl crE -cNa +fZJ aaa -cMQ +xnl crE -cNa +fZJ aaa -cMQ +xnl crE -cNa +fZJ aaf aaS aaa @@ -113197,17 +113187,17 @@ aaa aaa aba aaa -cMQ +xnl crG -cNa +fZJ aaa -cMQ +xnl crG -cNa +fZJ aaa -cMQ +xnl crG -cNa +fZJ aaa aaS aaa diff --git a/code/game/objects/effects/spawners/structure.dm b/code/game/objects/effects/spawners/structure.dm index dd24034b7443..df00fdc564ca 100644 --- a/code/game/objects/effects/spawners/structure.dm +++ b/code/game/objects/effects/spawners/structure.dm @@ -383,3 +383,18 @@ again. name = "reinforced plasma shutter window spawner" icon_state = "shprwindow_spawner" spawn_list = list(/obj/machinery/door/firedoor/window, /obj/structure/grille, /obj/structure/window/plasma/reinforced/fulltile) + +// Solars + +/obj/effect/spawner/structure/solars/solar_96 // Spawn rate calibrated to miss on average 7-10 solars per shift + name = "solar spawner 96%" + icon = 'icons/obj/structures_spawners.dmi' + icon_state = "solar_spawner" + spawn_list = list(/obj/machinery/power/solar) + +/obj/effect/spawner/structure/solars/solar_96/Initialize() + if (prob(3)) // I know mathmatically it is supphosed to be 4 but when set to 4 I got inconsistent results. 3 puts you at 7-10 consistently. Weird snowflake behavior of prob() - Hopek + qdel(src) + return + . = ..() + diff --git a/icons/obj/structures_spawners.dmi b/icons/obj/structures_spawners.dmi index 3e02f8fa1954..9862a5f61436 100644 Binary files a/icons/obj/structures_spawners.dmi and b/icons/obj/structures_spawners.dmi differ