diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 279698ffe5..c9763a151d 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -2318,12 +2318,6 @@ "agN" = ( /turf/closed/wall, /area/space) -"agQ" = ( -/obj/item/hilbertshotel/ghostdojo{ - pixel_y = 16 - }, -/turf/open/floor/carpet, -/area/hallway/primary/port) "agR" = ( /obj/machinery/airalarm{ dir = 4; @@ -9113,6 +9107,19 @@ }, /turf/open/floor/plasteel, /area/security/prison) +"aDt" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/machinery/requests_console{ + department = "Atmospherics"; + departmentType = 4; + name = "Atmos RC"; + pixel_x = 30 + }, +/obj/machinery/vending/wardrobe/atmos_wardrobe, +/turf/open/floor/plasteel/dark/corner, +/area/engineering/atmos) "aDu" = ( /turf/closed/wall, /area/hallway/primary/fore) @@ -9899,6 +9906,12 @@ }, /turf/open/floor/plating, /area/maintenance/fore) +"aGD" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/engineering/atmos) "aGE" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -19436,15 +19449,6 @@ dir = 1 }, /area/hallway/primary/starboard) -"byQ" = ( -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel/dark/corner, -/area/hallway/primary/starboard) "bzi" = ( /obj/structure/lattice, /obj/structure/grille, @@ -21208,22 +21212,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel, /area/hallway/primary/starboard) -"bHo" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 - }, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 24 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/turf/open/floor/plasteel/dark/corner, -/area/hallway/primary/starboard) "bHr" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ @@ -24676,17 +24664,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall, /area/maintenance/disposal/incinerator) -"bZD" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Incinerator Access"; - req_access_txt = "12" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/plating, -/area/maintenance/disposal/incinerator) "bZE" = ( /turf/closed/wall, /area/maintenance/disposal/incinerator) @@ -25293,41 +25270,6 @@ }, /turf/closed/wall, /area/maintenance/disposal/incinerator) -"caY" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel, -/area/maintenance/disposal/incinerator) -"caZ" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk, -/obj/structure/sign/warning/deathsposal{ - pixel_y = 32 - }, -/obj/machinery/camera{ - c_tag = "Atmospherics - Incinerator"; - name = "atmospherics camera" - }, -/turf/open/floor/plasteel, -/area/maintenance/disposal/incinerator) -"cba" = ( -/obj/machinery/power/smes{ - capacity = 9e+006; - charge = 10000 - }, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/turf/open/floor/plasteel, -/area/maintenance/disposal/incinerator) "cbp" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 @@ -25911,18 +25853,6 @@ }, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) -"ccK" = ( -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/machinery/power/terminal{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ - dir = 6 - }, -/turf/open/floor/plasteel, -/area/maintenance/disposal/incinerator) "ccU" = ( /obj/structure/table/wood/poker, /obj/item/toy/cards/deck{ @@ -44738,22 +44668,6 @@ /obj/structure/closet/emcloset, /turf/open/floor/plasteel/dark, /area/hallway/primary/central) -"cVp" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/machinery/requests_console{ - department = "Atmospherics"; - departmentType = 4; - name = "Atmos RC"; - pixel_x = 30 - }, -/obj/machinery/vending/wardrobe/atmos_wardrobe, -/turf/open/floor/plasteel/dark/corner, -/area/engineering/atmos) "cVx" = ( /obj/docking_port/stationary{ dir = 8; @@ -44828,22 +44742,22 @@ }, /turf/open/floor/plasteel/dark, /area/ai_monitored/aisat/exterior) +"cWa" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/dark/visible, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) "cWc" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 10 }, /turf/open/floor/carpet, /area/service/theater) -"cWn" = ( -/obj/machinery/door/airlock/atmos/glass{ - name = "Atmospherics Monitoring"; - req_access_txt = "24" - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel, -/area/engineering/atmos) "cWA" = ( /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, @@ -45129,6 +45043,18 @@ }, /turf/open/floor/plating, /area/engineering/atmos) +"dak" = ( +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/power/terminal{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/dark/visible{ + dir = 6 + }, +/turf/open/floor/plating, +/area/maintenance/disposal/incinerator) "dal" = ( /obj/machinery/status_display/evac{ pixel_y = 32 @@ -47827,26 +47753,6 @@ /obj/machinery/holopad/secure, /turf/open/floor/plasteel/dark, /area/ai_monitored/aisat/exterior) -"dtk" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/machinery/button/door{ - id = "atmos"; - name = "Atmospherics Lockdown"; - pixel_x = 26; - pixel_y = -26; - req_access_txt = "24" - }, -/turf/open/floor/plasteel, -/area/engineering/atmos) "dtl" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/yellow{ @@ -48425,6 +48331,19 @@ icon_state = "platingdmg3" }, /area/maintenance/starboard/aft) +"dAr" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 4 + }, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = 24 + }, +/turf/open/floor/plasteel/dark/corner, +/area/hallway/primary/starboard) "dAw" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -49378,17 +49297,6 @@ }, /turf/open/floor/plating, /area/maintenance/port) -"dRb" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/machinery/door/airlock/atmos/glass{ - name = "Atmospherics Monitoring"; - req_access_txt = "24" - }, -/turf/open/floor/plasteel, -/area/engineering/atmos) "dRx" = ( /obj/structure/closet/crate{ icon_state = "crateopen" @@ -49852,6 +49760,16 @@ }, /turf/open/floor/plasteel, /area/construction/storage_wing) +"eeL" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/camera{ + c_tag = "Atmospherics - Entrance" + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) "efp" = ( /obj/structure/chair/office/dark, /turf/open/floor/wood, @@ -50275,13 +50193,6 @@ }, /turf/open/floor/plasteel/dark, /area/engineering/main) -"erz" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel, -/area/engineering/atmos) "erD" = ( /obj/machinery/reagentgrinder, /obj/structure/table/glass, @@ -51003,6 +50914,12 @@ }, /turf/open/floor/plasteel, /area/cargo/storage) +"eJY" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) "eKo" = ( /obj/structure/window/reinforced{ dir = 8 @@ -51959,6 +51876,19 @@ }, /turf/open/floor/plasteel/dark, /area/commons/dorms) +"fjC" = ( +/obj/structure/chair/office/dark{ + dir = 4 + }, +/obj/effect/landmark/start/atmospheric_technician, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) "fkj" = ( /obj/item/folder/blue, /obj/structure/table/glass, @@ -51982,6 +51912,16 @@ }, /turf/open/floor/wood, /area/service/theater) +"fky" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) "fkF" = ( /obj/structure/window/reinforced, /obj/machinery/door/window/eastright{ @@ -52083,14 +52023,6 @@ /obj/structure/loot_pile/maint, /turf/open/floor/plating, /area/maintenance/port/aft) -"fpg" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/pipedispenser/disposal, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel, -/area/engineering/atmos) "fpr" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -52573,14 +52505,6 @@ }, /turf/open/floor/plasteel/white, /area/science/circuit) -"fFR" = ( -/obj/structure/closet/crate, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/camera{ - c_tag = "Atmospherics - Entrance" - }, -/turf/open/floor/plasteel, -/area/engineering/atmos) "fFY" = ( /obj/structure/cable, /obj/structure/lattice/catwalk, @@ -52820,23 +52744,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/command/heads_quarters/ce) -"fNf" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/machinery/light/small, -/turf/open/floor/plasteel, -/area/engineering/atmos) -"fNh" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel, -/area/engineering/atmos) "fNk" = ( /obj/machinery/vending/wardrobe/hydro_wardrobe, /turf/open/floor/plasteel, @@ -52859,6 +52766,21 @@ }, /turf/open/floor/plasteel/dark, /area/ai_monitored/aisat/exterior) +"fNX" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk, +/obj/structure/sign/warning/deathsposal{ + pixel_y = 32 + }, +/obj/machinery/camera{ + c_tag = "Atmospherics - Incinerator"; + name = "atmospherics camera" + }, +/turf/open/floor/plating, +/area/maintenance/disposal/incinerator) "fOe" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -53182,24 +53104,6 @@ }, /turf/open/floor/plasteel/dark, /area/service/chapel/office) -"gaV" = ( -/obj/machinery/firealarm{ - pixel_y = 24 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/pipedispenser, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/camera{ - c_tag = "Atmospherics - Entrance"; - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/engineering/atmos) "gbt" = ( /obj/structure/cable{ icon_state = "4-8" @@ -53761,15 +53665,6 @@ }, /turf/open/floor/plating, /area/security/prison/upper) -"grX" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 6 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel, -/area/engineering/atmos) "gsp" = ( /turf/open/floor/carpet, /area/commons/dorms) @@ -53864,6 +53759,10 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/cargo/sorting) +"gul" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall, +/area/engineering/atmos) "guM" = ( /obj/structure/window/reinforced{ dir = 1; @@ -54328,16 +54227,6 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/plasteel, /area/commons/dorms) -"gGc" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/effect/landmark/event_spawn, -/turf/open/floor/plasteel, -/area/engineering/atmos) "gGH" = ( /obj/structure/cable/yellow{ icon_state = "2-4" @@ -54540,6 +54429,17 @@ /obj/item/reagent_containers/food/drinks/flask/gold, /turf/open/floor/carpet, /area/command/heads_quarters/captain/private) +"gPr" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/door/airlock/atmos{ + name = "Turbine Access"; + req_access_txt = "32" + }, +/turf/open/floor/plating, +/area/maintenance/disposal/incinerator) "gPs" = ( /obj/structure/cable/white{ icon_state = "4-8" @@ -54928,13 +54828,6 @@ }, /turf/open/floor/engine, /area/engineering/main) -"hdJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 10 - }, -/obj/machinery/suit_storage_unit/atmos, -/turf/open/floor/plasteel, -/area/engineering/atmos) "hdR" = ( /obj/structure/chair/stool{ pixel_y = 8 @@ -56654,6 +56547,12 @@ }, /turf/open/floor/plating, /area/engineering/main) +"hYl" = ( +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) "hYq" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 @@ -56948,12 +56847,6 @@ /obj/effect/spawner/structure/window/plasma/reinforced, /turf/open/floor/plating, /area/engineering/main) -"iix" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/engineering/atmos) "iiE" = ( /obj/machinery/firealarm{ dir = 8; @@ -57019,6 +56912,13 @@ }, /turf/open/floor/wood, /area/service/library) +"ijT" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/machinery/suit_storage_unit/atmos, +/turf/open/floor/plasteel/dark/corner, +/area/engineering/atmos) "ijW" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -57195,6 +57095,22 @@ }, /turf/open/floor/engine, /area/engineering/main) +"ipF" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/machinery/button/door{ + id = "atmos"; + name = "Atmospherics Lockdown"; + pixel_x = 26; + req_access_txt = "24" + }, +/turf/open/floor/plasteel/dark/corner, +/area/engineering/atmos) "ipG" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/carbon_output{ dir = 8 @@ -57492,14 +57408,6 @@ }, /turf/open/floor/plating, /area/service/chapel/main) -"ixJ" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/yellow/visible, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4 - }, -/turf/open/floor/plating, -/area/engineering/atmos) "ixL" = ( /turf/closed/wall, /area/cargo/miningoffice) @@ -58313,6 +58221,13 @@ }, /turf/open/floor/plasteel, /area/cargo/office) +"iVM" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) "iWB" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -60735,6 +60650,18 @@ }, /turf/open/floor/plasteel, /area/service/bar) +"krs" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/door/airlock/atmos/glass{ + name = "Atmospherics Monitoring"; + req_access_txt = "24" + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/plasteel, +/area/engineering/atmos) "krD" = ( /turf/closed/wall, /area/science/circuit) @@ -60822,12 +60749,6 @@ }, /turf/open/floor/engine/co2, /area/engineering/atmos) -"ktV" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 - }, -/turf/closed/wall, -/area/engineering/atmos) "kuk" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/tile/yellow{ @@ -60954,6 +60875,20 @@ /obj/structure/closet/secure_closet/engineering_welding, /turf/open/floor/plasteel, /area/engineering/main) +"kwT" = ( +/obj/machinery/door/airlock/atmos/glass{ + name = "Atmospherics Monitoring"; + req_access_txt = "24" + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/turf/open/floor/plasteel, +/area/engineering/atmos) "kxk" = ( /obj/structure/table/reinforced, /obj/machinery/cell_charger, @@ -62010,15 +61945,6 @@ /obj/machinery/vending/snack/random, /turf/open/floor/plasteel/dark, /area/command/bridge) -"kWW" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/closed/wall, -/area/engineering/atmos) "kXd" = ( /obj/machinery/power/terminal, /obj/structure/cable, @@ -62352,6 +62278,16 @@ /obj/structure/grille, /turf/closed/wall/r_wall, /area/engineering/atmos) +"leV" = ( +/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ + dir = 1 + }, +/obj/machinery/door/airlock/atmos/glass{ + name = "Atmospherics Monitoring"; + req_access_txt = "24" + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) "lgF" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -63166,16 +63102,6 @@ }, /turf/open/floor/plasteel, /area/commons/locker) -"lFH" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/machinery/suit_storage_unit/atmos, -/turf/open/floor/plasteel, -/area/engineering/atmos) "lFQ" = ( /obj/structure/chair/office/dark{ dir = 4 @@ -63670,15 +63596,6 @@ }, /turf/open/floor/plasteel, /area/engineering/atmos) -"lUs" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 4 - }, -/turf/closed/wall, -/area/engineering/atmos) "lUv" = ( /obj/structure/noticeboard{ dir = 1; @@ -63813,15 +63730,6 @@ }, /turf/open/floor/plasteel, /area/commons/fitness/recreation) -"lXt" = ( -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 5 - }, -/turf/open/floor/plasteel, -/area/engineering/atmos) "lYc" = ( /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment, @@ -65476,6 +65384,21 @@ }, /turf/open/floor/plasteel, /area/cargo/qm) +"mSc" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) "mSd" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -65493,13 +65416,6 @@ luminosity = 2 }, /area/ai_monitored/command/nuke_storage) -"mSB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/turf/open/floor/plasteel, -/area/engineering/atmos) "mSL" = ( /obj/structure/cable, /obj/machinery/power/solar{ @@ -65803,6 +65719,18 @@ /obj/machinery/atmospherics/components/binary/pump, /turf/closed/wall/r_wall, /area/engineering/atmos) +"nfb" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/dark/corner, +/area/engineering/atmos) "nfs" = ( /obj/structure/mirror{ pixel_x = 28 @@ -66461,6 +66389,14 @@ }, /turf/open/floor/plasteel/white, /area/science/xenobiology) +"nBS" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/engineering/atmos) "nBX" = ( /obj/structure/table/wood, /obj/item/paper_bin{ @@ -66647,6 +66583,16 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /turf/open/floor/plasteel, /area/engineering/atmos) +"nJT" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) "nKi" = ( /obj/machinery/conveyor{ dir = 1; @@ -66926,6 +66872,18 @@ }, /turf/open/floor/plasteel, /area/service/hydroponics/garden) +"nSl" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 5 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/plasteel/dark/corner, +/area/hallway/primary/starboard) "nSn" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -67323,28 +67281,6 @@ dir = 1 }, /area/command/gateway) -"oay" = ( -/obj/machinery/power/apc/highcap/ten_k{ - areastring = "/area/engineering/atmos"; - dir = 1; - name = "Atmospherics APC"; - pixel_y = 23 - }, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/obj/machinery/light_switch{ - pixel_x = -26 - }, -/obj/machinery/pipedispenser/disposal/transit_tube, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/engineering/atmos) "oaA" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -67793,13 +67729,6 @@ /obj/machinery/recharge_station, /turf/open/floor/plasteel/freezer, /area/commons/toilet/restrooms) -"olw" = ( -/obj/machinery/door/airlock/atmos/glass{ - name = "Atmospherics Monitoring"; - req_access_txt = "24" - }, -/turf/open/floor/plasteel, -/area/engineering/atmos) "olW" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -68309,13 +68238,6 @@ }, /turf/open/floor/plasteel, /area/service/bar) -"oBF" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel, -/area/engineering/atmos) "oBW" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -68472,6 +68394,24 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, /area/security/prison/cells) +"oGQ" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 10 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/machinery/suit_storage_unit/atmos, +/turf/open/floor/plasteel/dark/corner, +/area/engineering/atmos) +"oHI" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/machinery/pipedispenser/disposal/transit_tube, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel, +/area/engineering/atmos) "oHW" = ( /obj/machinery/portable_atmospherics/canister/air, /obj/effect/turf_decal/bot, @@ -69014,16 +68954,24 @@ }, /turf/open/floor/plasteel, /area/commons/dorms) -"oWF" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/closed/wall, -/area/engineering/atmos) "oWR" = ( /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/port) +"oXc" = ( +/obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/tile/green{ + dir = 1 + }, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/obj/structure/dresser, +/turf/open/floor/plasteel, +/area/security/prison/upper) "oXj" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -69058,6 +69006,17 @@ }, /turf/open/floor/plating, /area/construction/storage_wing) +"oXz" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) "oYR" = ( /obj/structure/table, /obj/item/assembly/igniter{ @@ -70219,20 +70178,6 @@ }, /turf/open/floor/engine/vacuum, /area/engineering/atmos) -"pAw" = ( -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, -/obj/structure/dresser, -/turf/open/floor/plasteel, -/area/security/prison/upper) "pAA" = ( /obj/item/flashlight/lamp, /obj/machinery/newscaster{ @@ -70355,6 +70300,15 @@ }, /turf/open/floor/plasteel, /area/engineering/break_room) +"pDg" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 6 + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) "pDn" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ @@ -71137,6 +71091,12 @@ }, /turf/open/floor/wood, /area/service/library) +"qbZ" = ( +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) "qcF" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/techstorage/service, @@ -72913,12 +72873,6 @@ }, /turf/open/floor/wood, /area/service/theater) -"qWR" = ( -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/turf/open/floor/plasteel/dark/corner, -/area/engineering/atmos) "qXd" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -73189,17 +73143,6 @@ }, /turf/open/floor/plasteel/cafeteria, /area/command/heads_quarters/cmo) -"rdg" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 4 - }, -/obj/machinery/door/airlock/atmos/glass{ - name = "Distribution Loop"; - req_access_txt = "24" - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/turf/open/floor/plasteel, -/area/engineering/atmos) "rdv" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/vending/wardrobe/cargo_wardrobe, @@ -73250,6 +73193,13 @@ dir = 5 }, /area/service/kitchen) +"reE" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 5 + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/engineering/atmos) "reM" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ @@ -75508,6 +75458,24 @@ }, /turf/open/space, /area/solars/port/fore) +"ssY" = ( +/obj/machinery/power/apc/highcap/ten_k{ + areastring = "/area/engineering/atmos"; + dir = 1; + name = "Atmospherics APC"; + pixel_y = 23 + }, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/machinery/light_switch{ + pixel_x = -26 + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) "stk" = ( /obj/machinery/camera{ c_tag = "Captain's Office"; @@ -75663,6 +75631,12 @@ }, /turf/open/floor/plasteel/dark, /area/command/bridge) +"swU" = ( +/obj/item/hilbertshotel/ghostdojo{ + pixel_y = 16 + }, +/turf/open/floor/carpet, +/area/hallway/primary/port) "syi" = ( /obj/machinery/door/airlock/external{ name = "Escape Pod Three" @@ -76264,6 +76238,15 @@ }, /turf/open/floor/plasteel/cafeteria, /area/command/heads_quarters/cmo) +"sQT" = ( +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) "sQY" = ( /obj/structure/rack, /obj/machinery/status_display/ai{ @@ -76952,6 +76935,13 @@ }, /turf/open/floor/plasteel, /area/ai_monitored/command/storage/eva) +"tlh" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/light/small, +/turf/open/floor/plasteel, +/area/engineering/atmos) "tlp" = ( /obj/item/candle, /obj/machinery/light_switch{ @@ -77462,13 +77452,6 @@ dir = 1 }, /area/engineering/atmos) -"tFH" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel, -/area/engineering/atmos) "tFJ" = ( /obj/structure/bodycontainer/morgue{ dir = 8 @@ -78607,6 +78590,16 @@ }, /turf/open/floor/plasteel, /area/commons/dorms) +"ukO" = ( +/obj/machinery/power/smes{ + capacity = 9e+006; + charge = 10000 + }, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/turf/open/floor/plating, +/area/maintenance/disposal/incinerator) "ulp" = ( /obj/machinery/vending/sustenance, /turf/open/floor/plasteel/cafeteria, @@ -78894,12 +78887,6 @@ /obj/machinery/mineral/ore_redemption, /turf/open/floor/plasteel/dark, /area/cargo/office) -"usM" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 10 - }, -/turf/open/floor/plasteel, -/area/engineering/atmos) "utH" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -79204,13 +79191,6 @@ }, /turf/open/floor/wood, /area/commons/vacant_room/office) -"uED" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ - dir = 1 - }, -/turf/open/floor/plating, -/area/engineering/atmos) "uFM" = ( /obj/machinery/power/emitter, /obj/machinery/light/small, @@ -79800,6 +79780,13 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /turf/open/floor/engine, /area/engineering/main) +"vax" = ( +/obj/machinery/power/floodlight, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/turf/open/floor/plating, +/area/engineering/atmos) "vaA" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 4 @@ -80647,13 +80634,6 @@ }, /turf/open/floor/wood, /area/service/library) -"vzb" = ( -/obj/structure/chair/office/dark{ - dir = 4 - }, -/obj/effect/landmark/start/atmospheric_technician, -/turf/open/floor/plasteel, -/area/engineering/atmos) "vzs" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 @@ -80834,6 +80814,24 @@ dir = 1 }, /area/service/bar) +"vEr" = ( +/obj/machinery/firealarm{ + pixel_y = 24 + }, +/obj/machinery/pipedispenser, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/camera{ + c_tag = "Atmospherics - Entrance"; + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) "vFz" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -81026,6 +81024,15 @@ }, /turf/open/floor/plasteel, /area/cargo/sorting) +"vMo" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/plasteel/dark/corner, +/area/engineering/atmos) "vMu" = ( /obj/structure/table/wood, /obj/item/folder, @@ -81811,6 +81818,17 @@ }, /turf/open/floor/wood, /area/command/heads_quarters/captain/private) +"wie" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 10 + }, +/obj/machinery/door/airlock/atmos/glass{ + name = "Atmospherics Monitoring"; + req_access_txt = "24" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/plasteel, +/area/engineering/atmos) "wim" = ( /obj/structure/table, /obj/item/stock_parts/micro_laser, @@ -82786,6 +82804,14 @@ /obj/machinery/meter, /turf/closed/wall/r_wall, /area/engineering/atmos) +"wGj" = ( +/obj/machinery/atmospherics/pipe/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 4 + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/engineering/atmos) "wGp" = ( /obj/structure/cable/white{ icon_state = "4-8" @@ -82922,12 +82948,6 @@ /obj/effect/landmark/start/shaft_miner, /turf/open/floor/plasteel, /area/cargo/miningoffice) -"wKg" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 - }, -/turf/closed/wall, -/area/engineering/atmos) "wKo" = ( /obj/effect/turf_decal/stripes/line, /turf/closed/wall, @@ -82978,6 +82998,19 @@ }, /turf/open/floor/plasteel/dark, /area/ai_monitored/command/nuke_storage) +"wLS" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating, +/area/maintenance/disposal/incinerator) "wMe" = ( /obj/item/taperecorder, /obj/item/camera, @@ -84072,6 +84105,16 @@ }, /turf/open/floor/carpet, /area/commons/dorms) +"xpB" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/pipedispenser/disposal, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) "xpD" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -84770,13 +84813,6 @@ }, /turf/open/floor/plasteel, /area/science/mixing) -"xHm" = ( -/obj/machinery/holopad, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/turf/open/floor/plasteel, -/area/engineering/atmos) "xHA" = ( /obj/machinery/atmospherics/components/binary/pump/on{ dir = 8; @@ -85585,6 +85621,16 @@ dir = 1 }, /area/engineering/main) +"ycp" = ( +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/closet/crate, +/turf/open/floor/plasteel, +/area/engineering/atmos) "ycy" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -101006,7 +101052,7 @@ bka blY aeD ahT -agQ +swU aeD kQP rNX @@ -106850,7 +106896,7 @@ xAO hXi viX dCu -pAw +oXc jVo wDM sMe @@ -125424,12 +125470,12 @@ brz bty bvb bxb -byQ +dAr bAz bCf bty bFE -bHo +nSl bIH qtO uYc @@ -125699,8 +125745,8 @@ alq alq bXb bYu -bZD -caY +gPr +wLS ccI ced cfq @@ -125957,7 +126003,7 @@ aut bXc bZz bZE -caZ +fNX ccJ cee cfr @@ -126214,8 +126260,8 @@ bPs bXd apf bZE -cba -ccK +ukO +dak cef cfs czH @@ -126453,9 +126499,9 @@ iLe bCK qxd jJw -usM -lXt -xHm +sQT +qbZ +lzQ tyC kLr kdi @@ -126710,9 +126756,9 @@ iLe bvg odq ipm +fky +hAI hAI -oBF -erz jxI kLr qDJ @@ -126967,12 +127013,12 @@ btz bvh qxd oNX -vzb -iix -woN -tyC +fjC +mMn +eJY +hYl kLr -iix +tlh sKv qxd qxd @@ -127224,12 +127270,12 @@ iLe kqF qxd wtG -qWR -cVp -woN -dtk -lFH -hdJ +nfb +aDt +ipF +ijT +vMo +oGQ shK itH itH @@ -127481,12 +127527,12 @@ iLe iLe qxd oBX -olw -oWF -cWn +kwT +sKv +sKv uKL -ktV -wKg +wie +reE uTg tFA hHh @@ -127737,11 +127783,11 @@ ltg txb trn sKv -oay -fNf -kWW -gGc -grX +ssY +mSc +ycp +uKL +pDg hop ldI elC @@ -127750,7 +127796,7 @@ ooB ibJ ibJ ibJ -ibJ +cWa ibJ ibJ omb @@ -127995,10 +128041,10 @@ lTr xca hZe mZD -mSB -dRb -hAI -tFH +oXz +iVM +krs +nJT tfk sfM kBk @@ -128007,7 +128053,7 @@ eCZ mMn mMn mMn -mMn +aGD mMn mMn eWY @@ -128251,11 +128297,11 @@ vpQ kuk oOQ naf -gaV -fpg -lUs -fFR -fNh +vEr +xpB +oHI +gul +eeL tNF dHR nwU @@ -128264,7 +128310,7 @@ pcs mMn mMn mMn -mMn +aGD mMn mMn mMn @@ -128511,8 +128557,8 @@ uhB jiZ mHn mHn -fGc -rdg +mHn +nBS fGc lHN tac @@ -128521,7 +128567,7 @@ mMn mMn mMn mMn -mMn +aGD mMn mMn mMn @@ -128778,7 +128824,7 @@ mMn mMn mMn mMn -mMn +vax mMn mMn mMn @@ -129027,7 +129073,7 @@ npE pPS esR mMn -uED +leV hfg tac wqG @@ -129541,7 +129587,7 @@ qVE qoD oyV mtM -ixJ +wGj htZ oLm eWY diff --git a/code/controllers/configuration/entries/general.dm b/code/controllers/configuration/entries/general.dm index 57c933edc5..2fe020d544 100644 --- a/code/controllers/configuration/entries/general.dm +++ b/code/controllers/configuration/entries/general.dm @@ -347,3 +347,5 @@ default = FALSE /datum/config_entry/flag/dynamic_config_enabled + +/datum/config_entry/flag/station_name_needs_approval diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm index 2822aa7786..8657db47fc 100644 --- a/code/game/machinery/pipe/construction.dm +++ b/code/game/machinery/pipe/construction.dm @@ -45,7 +45,8 @@ Buildable meters if(make_from) make_from_existing(make_from) else - pipe_type = _pipe_type + if(!initial(src.pipe_type)) + pipe_type = _pipe_type setDir(_dir) update() diff --git a/code/game/objects/items/charter.dm b/code/game/objects/items/charter.dm index 3f5296a1ef..e9c3842619 100644 --- a/code/game/objects/items/charter.dm +++ b/code/game/objects/items/charter.dm @@ -14,6 +14,7 @@ var/response_timer_id = null var/approval_time = 600 var/allow_unicode = FALSE + var/admin_approved = FALSE var/static/regex/standard_station_regex @@ -62,8 +63,32 @@ to_chat(user, "Your name has been sent to your employers for approval.") // Autoapproves after a certain time - response_timer_id = addtimer(CALLBACK(src, .proc/rename_station, new_name, user.name, user.real_name, key_name(user)), approval_time, TIMER_STOPPABLE) - to_chat(GLOB.admins, "CUSTOM STATION RENAME:[ADMIN_LOOKUPFLW(user)] proposes to rename the [name_type] to [html_encode(new_name)] (will autoapprove in [DisplayTimeText(approval_time)]). [ADMIN_SMITE(user)] (REJECT) [ADMIN_CENTCOM_REPLY(user)]") + var/requires_approval = CONFIG_GET(flag/station_name_needs_approval) + response_timer_id = addtimer(CALLBACK(src, .proc/check_state, new_name, user.name, user.real_name, key_name(user)), approval_time, TIMER_STOPPABLE) + to_chat(GLOB.admins, "CUSTOM STATION RENAME:[ADMIN_LOOKUPFLW(user)] proposes to rename the [name_type] to [html_encode(new_name)] ([requires_approval ? "REQUIRES ADMIN APPROVAL and will autodeny" : "will autoapprove"] in [DisplayTimeText(approval_time)]). [ADMIN_SMITE(user)] (REJECT)[requires_approval ? " (APPROVE)" : ""] [ADMIN_CENTCOM_REPLY(user)]") + +/obj/item/station_charter/proc/check_state(designation, uname, ureal_name, ukey) + var/requires_approval = CONFIG_GET(flag/station_name_needs_approval) + if(requires_approval && !admin_approved) + var/turf/T = get_turf(src) + T.visible_message("A note appears on [src], stating this sector requires central command approval for its station names, which was not performed in time for this request. Looks like the change has been auto-rejected.") + var/m = "Station rename has been autorejected due to config requiring admin approval." + message_admins(m) + log_admin(m) + else + rename_station(designation, uname, ureal_name, ukey) + response_timer_id = null + admin_approved = FALSE + +/obj/item/station_charter/proc/allow_pass(user) + if(!user) + return + if(!response_timer_id) + return + admin_approved = TRUE + var/m = "[key_name(user)] has approved the proposed station name. It can still be denied prior to the timer expiring." + message_admins(m) + log_admin(m) /obj/item/station_charter/proc/reject_proposed(user) if(!user) @@ -80,6 +105,7 @@ deltimer(response_timer_id) response_timer_id = null + admin_approved = FALSE /obj/item/station_charter/proc/rename_station(designation, uname, ureal_name, ukey) set_station_name(designation) diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index fd48d5015e..dd5ae3f4e6 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -2046,6 +2046,12 @@ var/obj/item/station_charter/charter = locate(href_list["reject_custom_name"]) if(istype(charter)) charter.reject_proposed(usr) + else if(href_list["approve_custom_name"]) + if(!check_rights(R_ADMIN)) + return + var/obj/item/station_charter/charter = locate(href_list["approve_custom_name"]) + if(istype(charter)) + charter.allow_pass(usr) else if(href_list["jumpto"]) if(!isobserver(usr) && !check_rights(R_ADMIN)) return diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index f7bc8c88d1..08314338dc 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -308,7 +308,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list( AM.Hear(rendered, src, message_language, message, null, spans, message_mode, source) SEND_GLOBAL_SIGNAL(COMSIG_GLOB_LIVING_SAY_SPECIAL, src, message) - if(!eavesdrop_range && say_test(message) == "2") // Yell hook + if(client && !eavesdrop_range && say_test(message) == "2") // Yell hook process_yelling(listening, rendered, src, message_language, message, spans, message_mode, source) //speech bubble diff --git a/config/entries/general.txt b/config/entries/general.txt index 5fc3512c60..7fef691006 100644 --- a/config/entries/general.txt +++ b/config/entries/general.txt @@ -503,3 +503,6 @@ PAI_CUSTOM_HOLOFORMS ## Enables monstermos/"equalization" step in atmos. # ATMOS_EQUALIZATION_ENABLED + +## Do station renames from the station charter require admin approval to pass, as opposed to autoapproving if not denied. +STATION_NAME_NEEDS_APPROVAL diff --git a/html/changelog.html b/html/changelog.html index 07eaabf0bc..8ba9c9a76f 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -64,6 +64,20 @@

PowerfulBacon updated: