From 9e4ec7a05684702b0506fe33283ee5fdcaea4cdb Mon Sep 17 00:00:00 2001 From: Ben <91219575+Ben10083@users.noreply.github.com> Date: Tue, 18 Jun 2024 00:37:01 -0400 Subject: [PATCH] People's Station Docking Ports + Touch-up (#19388) People's Station.... - Remade Docking Arm to have docks in all directions - Exosuit (like Headmaster) - Firelocks - Random touchups --------- Signed-off-by: Ben <91219575+Ben10083@users.noreply.github.com> Co-authored-by: Ben10083 --- .../changelogs/Ben10083 - Peoples Station.yml | 59 + .../tajara/peoples_station/peoples_station.dm | 6 +- .../peoples_station/peoples_station.dmm | 2479 ++++++++++++----- .../peoples_station_landmarks.dm | 24 + 4 files changed, 1900 insertions(+), 668 deletions(-) create mode 100644 html/changelogs/Ben10083 - Peoples Station.yml diff --git a/html/changelogs/Ben10083 - Peoples Station.yml b/html/changelogs/Ben10083 - Peoples Station.yml new file mode 100644 index 00000000000..1c2cd7f1f2a --- /dev/null +++ b/html/changelogs/Ben10083 - Peoples Station.yml @@ -0,0 +1,59 @@ +################################ +# 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 +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: Ben10083 + +# 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, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Adds Firedoors and aft/starboard docking port for the People's Station." + - rscadd: "People's Station now has cargo delivery points." diff --git a/maps/away/away_site/tajara/peoples_station/peoples_station.dm b/maps/away/away_site/tajara/peoples_station/peoples_station.dm index af013e5917b..9ab7d7c3c98 100644 --- a/maps/away/away_site/tajara/peoples_station/peoples_station.dm +++ b/maps/away/away_site/tajara/peoples_station/peoples_station.dm @@ -11,7 +11,7 @@ id = "peoples_station" shuttles_to_initialise = list(/datum/shuttle/autodock/overmap/peoples_station_fang, /datum/shuttle/autodock/overmap/peoples_station_transport) - unit_test_groups = list(1) + unit_test_groups = list(2) /singleton/submap_archetype/peoples_station map = "People's Space Station" @@ -39,7 +39,9 @@ "nav_peoples_station_ship_3", "nav_peoples_station_ship_4", "nav_peoples_station_fore_dock", - "nav_peoples_station_port_dock" + "nav_peoples_station_aft_dock", + "nav_peoples_station_port_dock", + "nav_peoples_station_starboard_dock" ) initial_restricted_waypoints = list( "Orbital Fleet Fang" = list("nav_hangar_peoples_station_fang"), diff --git a/maps/away/away_site/tajara/peoples_station/peoples_station.dmm b/maps/away/away_site/tajara/peoples_station/peoples_station.dmm index 51b54dff480..442297660dc 100644 --- a/maps/away/away_site/tajara/peoples_station/peoples_station.dmm +++ b/maps/away/away_site/tajara/peoples_station/peoples_station.dmm @@ -41,14 +41,17 @@ }, /area/peoples_station/armory) "ax" = ( +/obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/floor_decal/industrial/warning/cee, +/obj/effect/map_effect/marker/airlock/docking/peoples_station/dock/starboard, +/obj/effect/map_effect/marker_helper/airlock/interior, /obj/machinery/door/airlock/external{ - dir = 1 + dir = 4 }, -/obj/effect/map_effect/marker_helper/airlock/exterior, -/obj/effect/map_effect/marker/airlock/docking/peoples_station/dock/fore, -/turf/simulated/floor/plating{ - temperature = 278.15 +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 }, +/turf/simulated/floor/tiled/dark, /area/peoples_station/hangar) "ay" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -121,11 +124,10 @@ }, /area/peoples_station) "aF" = ( -/obj/effect/map_effect/window_spawner/full/shuttle{ +/obj/effect/map_effect/window_spawner/full/shuttle/raider{ + req_access = list(209); spawn_firedoor = 1; - spawn_grille = 1; - color = "#6C7364"; - frame_color = "#6C7364" + spawn_grille = 1 }, /turf/simulated/floor/plating{ temperature = 278.15 @@ -199,6 +201,11 @@ /obj/structure/sign/flag/pra/large/north{ pixel_y = 32 }, +/obj/machinery/door/firedoor{ + dir = 8; + req_one_access = list(24,11,67,209) + }, +/obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled/dark{ temperature = 278.15 }, @@ -265,13 +272,37 @@ temperature = 278.15 }, /area/peoples_station/mess_hall) +"bk" = ( +/obj/machinery/door/airlock/external{ + dir = 1 + }, +/obj/machinery/access_button{ + pixel_x = 28; + dir = 2 + }, +/obj/effect/map_effect/marker_helper/airlock/exterior, +/obj/effect/map_effect/marker/airlock/docking/peoples_station/dock/fore, +/obj/effect/shuttle_landmark/nav_peoples_station/fore_dock{ + dir = 1 + }, +/obj/machinery/access_button{ + pixel_x = 28; + pixel_y = -12 + }, +/turf/simulated/floor/plating{ + temperature = 278.15 + }, +/area/peoples_station/hangar) "bo" = ( /obj/machinery/door/airlock/engineering{ name = "Engineering"; req_access = list(209); dir = 4 }, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor{ + dir = 8; + req_one_access = list(24,11,67,209) + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -320,6 +351,22 @@ }, /turf/simulated/floor/airless, /area/peoples_station/solars) +"bx" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/door/firedoor{ + dir = 8; + req_one_access = list(24,11,67,209) + }, +/turf/simulated/floor/tiled/dark{ + temperature = 278.15 + }, +/area/peoples_station/transport_hangar) "bz" = ( /obj/structure/window/reinforced{ dir = 8 @@ -330,16 +377,15 @@ }, /area/peoples_station/training) "bA" = ( -/obj/effect/map_effect/window_spawner/full/shuttle{ - spawn_firedoor = 1; - spawn_grille = 1; - color = "#6C7364"; - frame_color = "#6C7364" - }, /obj/machinery/door/blast/regular/open{ id = "peoples_station_transport_blast"; dir = 4 }, +/obj/effect/map_effect/window_spawner/full/shuttle/raider{ + req_access = list(209); + spawn_firedoor = 1; + spawn_grille = 1 + }, /turf/simulated/floor/tiled/full, /area/shuttle/peoples_station_transport) "bB" = ( @@ -351,6 +397,12 @@ /obj/effect/floor_decal/corner/red/full{ dir = 4 }, +/obj/structure/cargo_receptacle{ + override_name = "People's Station - Mess Hall"; + payment_modifier = 0.4; + max_spawn = 2; + min_spawn = 1 + }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 }, @@ -371,6 +423,21 @@ temperature = 278.15 }, /area/peoples_station/mess_hall) +"bH" = ( +/obj/machinery/airlock_sensor{ + dir = 2; + pixel_y = 28; + pixel_x = 6 + }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 1 + }, +/obj/effect/map_effect/marker/airlock/docking/peoples_station/dock/starboard, +/turf/simulated/floor/plating, +/area/peoples_station/hangar) "bK" = ( /obj/structure/ship_weapon_dummy, /obj/effect/floor_decal/industrial/warning{ @@ -490,6 +557,9 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/door/firedoor{ + req_one_access = list(24,11,67,209) + }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 }, @@ -541,6 +611,21 @@ temperature = 278.15 }, /area/peoples_station/restroom) +"ct" = ( +/obj/effect/floor_decal/corner/red{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark{ + temperature = 278.15 + }, +/area/peoples_station/hangar) "cu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -600,7 +685,10 @@ req_access = list(209); dir = 4 }, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor{ + dir = 8; + req_one_access = list(24,11,67,209) + }, /obj/structure/cable/green{ d1 = 4; d2 = 8; @@ -671,6 +759,22 @@ temperature = 278.15 }, /area/peoples_station/transport_hangar) +"cW" = ( +/obj/effect/floor_decal/corner/red{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/dark{ + temperature = 278.15 + }, +/area/peoples_station/hangar) "cX" = ( /obj/machinery/power/smes/buildable/third_party_shuttle, /obj/structure/cable/green{ @@ -803,6 +907,21 @@ }, /turf/simulated/floor/reinforced/airless, /area/peoples_station/defenses) +"dz" = ( +/obj/effect/floor_decal/corner/red{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/tiled/dark{ + temperature = 278.15 + }, +/area/peoples_station/hangar) "dA" = ( /obj/structure/closet/cabinet, /obj/item/book/manual/pra_manifesto, @@ -838,6 +957,18 @@ temperature = 278.15 }, /area/peoples_station) +"dE" = ( +/obj/effect/floor_decal/corner/red{ + dir = 6 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/obj/machinery/alarm/cold/east, +/turf/simulated/floor/tiled/dark{ + temperature = 278.15 + }, +/area/peoples_station/hangar) "dG" = ( /obj/machinery/computer/ship/helm/terminal{ dir = 1 @@ -848,6 +979,10 @@ /area/shuttle/fang) "dI" = ( /obj/structure/curtain/open/bed, +/obj/machinery/door/firedoor{ + dir = 8; + req_one_access = list(24,11,67,209) + }, /turf/simulated/floor/wood{ temperature = 278.15 }, @@ -1108,6 +1243,9 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/firedoor{ + req_one_access = list(24,11,67,209) + }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 }, @@ -1167,7 +1305,10 @@ }, /area/peoples_station/range) "eS" = ( -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor{ + dir = 8; + req_one_access = list(24,11,67,209) + }, /obj/structure/cable/green{ d1 = 4; d2 = 8; @@ -1190,6 +1331,17 @@ temperature = 278.15 }, /area/peoples_station/transport_hangar) +"eV" = ( +/obj/effect/floor_decal/corner/red{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/turf/simulated/floor/tiled/dark{ + temperature = 278.15 + }, +/area/peoples_station/hangar) "eX" = ( /obj/effect/floor_decal/corner/red{ dir = 9 @@ -1289,6 +1441,15 @@ temperature = 278.15 }, /area/peoples_station/hangar) +"fh" = ( +/obj/effect/floor_decal/corner/red{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/turf/simulated/floor/tiled/dark{ + temperature = 278.15 + }, +/area/peoples_station/hangar) "fi" = ( /obj/machinery/door/window/brigdoor/southleft{ name = "Robot Storage"; @@ -1303,6 +1464,22 @@ temperature = 278.15 }, /area/peoples_station/robotics_bay) +"fn" = ( +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/machinery/light/small/emergency{ + dir = 8 + }, +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ + dir = 4 + }, +/obj/effect/map_effect/marker/airlock/docking/peoples_station/dock/aft, +/turf/simulated/floor/plating{ + temperature = 278.15 + }, +/area/peoples_station/hangar) "fq" = ( /obj/structure/table/steel, /obj/item/device/multitool, @@ -1367,7 +1544,10 @@ name = "Hangar"; dir = 4 }, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor{ + dir = 8; + req_one_access = list(24,11,67,209) + }, /obj/effect/floor_decal/corner/red{ dir = 5 }, @@ -1379,11 +1559,14 @@ }, /area/peoples_station/hangar) "fB" = ( -/obj/effect/floor_decal/corner/red/full{ - dir = 1 +/obj/effect/floor_decal/corner/red{ + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 10 + dir = 8 + }, +/obj/structure/sign/flag/pra/large/north{ + pixel_y = 32 }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 @@ -1480,6 +1663,28 @@ }, /turf/simulated/floor/airless, /area/peoples_station/transport_hangar) +"fU" = ( +/obj/machinery/embedded_controller/radio/airlock/docking_port{ + dir = 8; + pixel_y = 6; + pixel_x = 20 + }, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ + dir = 4 + }, +/obj/effect/map_effect/marker/airlock/docking/peoples_station/dock/aft, +/turf/simulated/floor/plating{ + temperature = 278.15 + }, +/area/peoples_station/hangar) +"fX" = ( +/obj/structure/lattice/catwalk, +/turf/template_noop, +/area/peoples_station/bridge) "fY" = ( /obj/machinery/light{ dir = 1 @@ -1611,6 +1816,17 @@ temperature = 278.15 }, /area/peoples_station/training) +"gw" = ( +/obj/effect/floor_decal/corner/red{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 9 + }, +/turf/simulated/floor/tiled/dark{ + temperature = 278.15 + }, +/area/peoples_station/hangar) "gz" = ( /obj/effect/floor_decal/spline/plain/black{ dir = 6 @@ -1669,6 +1885,8 @@ /obj/effect/floor_decal/industrial/warning{ dir = 9 }, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/survey_probe/pra, /turf/simulated/floor/plating{ temperature = 278.15 }, @@ -1679,7 +1897,6 @@ req_access = list(209); dir = 4 }, -/obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -1764,6 +1981,34 @@ }, /turf/simulated/floor/tiled/dark/full, /area/shuttle/peoples_station_transport) +"ha" = ( +/obj/machinery/airlock_sensor{ + pixel_x = 20; + dir = 8; + pixel_y = -6 + }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 4 + }, +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux, +/obj/effect/map_effect/marker/airlock/docking/peoples_station/dock/aft, +/turf/simulated/floor/plating{ + temperature = 278.15 + }, +/area/peoples_station/hangar) +"hb" = ( +/obj/machinery/door/firedoor{ + dir = 8; + req_one_access = list(24,11,67,209) + }, +/obj/structure/curtain/open/bed, +/turf/simulated/floor/wood{ + temperature = 278.15 + }, +/area/peoples_station/barracks) "hc" = ( /obj/structure/closet/secure_closet/kitchen_cabinet/standard{ req_access = null @@ -1890,6 +2135,23 @@ temperature = 278.15 }, /area/peoples_station) +"hx" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8; + icon_state = "map-scrubbers" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/dark{ + temperature = 278.15 + }, +/area/peoples_station) "hz" = ( /turf/simulated/wall/shuttle/raider, /area/peoples_station/fang) @@ -1935,7 +2197,9 @@ }, /area/peoples_station/atmos) "hJ" = ( -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor{ + req_one_access = list(24,11,67,209) + }, /obj/machinery/door/airlock{ req_access = list(209); name = "Restroom"; @@ -2063,6 +2327,18 @@ }, /turf/template_noop, /area/space) +"iv" = ( +/obj/effect/floor_decal/corner/red{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark{ + temperature = 278.15 + }, +/area/peoples_station/hangar) "iw" = ( /turf/simulated/floor/plating{ temperature = 278.15 @@ -2096,11 +2372,10 @@ }, /area/peoples_station/solars) "iD" = ( -/obj/effect/map_effect/window_spawner/full/shuttle{ +/obj/effect/map_effect/window_spawner/full/shuttle/raider{ + req_access = list(209); spawn_firedoor = 1; - spawn_grille = 1; - color = "#6C7364"; - frame_color = "#6C7364" + spawn_grille = 1 }, /turf/simulated/floor/plating{ temperature = 278.15 @@ -2179,7 +2454,9 @@ req_access = list(209); dir = 1 }, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor{ + req_one_access = list(24,11,67,209) + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ @@ -2191,6 +2468,15 @@ temperature = 278.15 }, /area/peoples_station) +"iX" = ( +/obj/effect/floor_decal/corner_wide/black{ + dir = 5 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/dark{ + temperature = 278.15 + }, +/area/peoples_station) "ja" = ( /obj/effect/floor_decal/industrial/loading/yellow, /obj/machinery/light{ @@ -2228,7 +2514,9 @@ req_access = list(209); dir = 4 }, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor{ + req_one_access = list(24,11,67,209) + }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 }, @@ -2281,6 +2569,7 @@ /obj/item/storage/box/fancy/cigarettes/pra, /obj/item/storage/box/fancy/cigarettes/pra, /obj/item/storage/box/fancy/cigarettes/pra, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled/dark{ temperature = 278.15 }, @@ -2294,6 +2583,21 @@ temperature = 278.15 }, /area/peoples_station/mess_hall) +"jD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/obj/effect/floor_decal/corner/red{ + dir = 9 + }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/door/firedoor{ + req_one_access = list(24,11,67,209) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/dark{ + temperature = 278.15 + }, +/area/peoples_station/hangar) "jG" = ( /obj/effect/floor_decal/corner/white{ dir = 5 @@ -2302,22 +2606,15 @@ temperature = 278.15 }, /area/peoples_station/training) -"jH" = ( -/obj/effect/ghostspawpoint{ - identifier = "peoples_station_crew"; - name = "igs - peoples_station_crew" - }, -/turf/simulated/floor/tiled/dark{ - temperature = 278.15 - }, -/area/peoples_station/range) "jL" = ( /obj/machinery/door/airlock/hatch{ name = "Station Hatch"; req_access = list(209); dir = 1 }, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor{ + req_one_access = list(24,11,67,209) + }, /obj/structure/cable/green{ d1 = 1; d2 = 2; @@ -2367,7 +2664,10 @@ req_access = list(209); dir = 4 }, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor{ + dir = 8; + req_one_access = list(24,11,67,209) + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -2447,6 +2747,15 @@ }, /turf/simulated/floor/plating/cooled, /area/peoples_station/transport_hangar) +"kj" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/obj/effect/floor_decal/corner/red{ + dir = 9 + }, +/turf/simulated/floor/tiled/dark{ + temperature = 278.15 + }, +/area/peoples_station/hangar) "kk" = ( /obj/machinery/door/airlock/external{ dir = 4 @@ -2513,6 +2822,10 @@ req_access = list(209); dir = 4 }, +/obj/machinery/door/firedoor{ + dir = 8; + req_one_access = list(24,11,67,209) + }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 }, @@ -2534,6 +2847,38 @@ }, /turf/simulated/floor/tiled/dark, /area/peoples_station/defenses) +"kv" = ( +/obj/effect/floor_decal/corner/red/full{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark{ + temperature = 278.15 + }, +/area/peoples_station/hangar) +"kx" = ( +/obj/effect/floor_decal/corner/red{ + dir = 6 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark{ + temperature = 278.15 + }, +/area/peoples_station/hangar) +"ky" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark{ + temperature = 278.15 + }, +/area/peoples_station) "kA" = ( /obj/structure/table/steel, /obj/item/stamp/denied{ @@ -2605,7 +2950,10 @@ name = "Hangar"; dir = 4 }, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor{ + dir = 8; + req_one_access = list(24,11,67,209) + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -2637,6 +2985,20 @@ temperature = 278.15 }, /area/peoples_station/transport_hangar) +"kN" = ( +/obj/effect/floor_decal/corner/red{ + dir = 5 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 + }, +/turf/simulated/floor/tiled/dark{ + temperature = 278.15 + }, +/area/peoples_station/hangar) "kO" = ( /obj/structure/table/stone/marble, /obj/effect/floor_decal/corner/grey/diagonal, @@ -2790,8 +3152,12 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 }, @@ -2957,12 +3323,18 @@ req_access = list(209); dir = 1 }, +/obj/machinery/door/firedoor{ + req_one_access = list(24,11,67,209) + }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 }, /area/peoples_station/fang) "lG" = ( -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor{ + dir = 8; + req_one_access = list(24,11,67,209) + }, /obj/machinery/door/airlock/glass_security{ name = "Armory Distribution"; req_access = list(209); @@ -3104,12 +3476,18 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/door/firedoor{ + dir = 8; + req_one_access = list(24,11,67,209) + }, /turf/simulated/floor/tiled/white{ temperature = 278.15 }, /area/peoples_station/medbay) "mt" = ( -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor{ + req_one_access = list(24,11,67,209) + }, /obj/machinery/door/airlock/hatch{ name = "Station Hatch"; req_access = list(209); @@ -3136,7 +3514,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 5 + }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 }, @@ -3160,6 +3540,16 @@ temperature = 278.15 }, /area/peoples_station) +"my" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/obj/effect/floor_decal/corner/red{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/dark{ + temperature = 278.15 + }, +/area/peoples_station/hangar) "mF" = ( /obj/machinery/power/smes/buildable/third_party_shuttle, /obj/structure/cable/green{ @@ -3238,8 +3628,8 @@ /turf/simulated/floor/carpet/art, /area/peoples_station/captain_quarters) "mT" = ( -/obj/effect/floor_decal/corner/dark_blue/full{ - dir = 1 +/obj/effect/floor_decal/corner/dark_blue{ + dir = 6 }, /obj/structure/cable/green{ d2 = 8; @@ -3283,6 +3673,18 @@ temperature = 278.15 }, /area/peoples_station) +"mX" = ( +/obj/effect/floor_decal/corner/red{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/tiled/dark{ + temperature = 278.15 + }, +/area/peoples_station/hangar) "nf" = ( /obj/structure/table/rack, /obj/item/stack/rods, @@ -3331,16 +3733,25 @@ /obj/machinery/door/blast/regular/open{ id = "peoples_station_armory" }, +/obj/machinery/door/firedoor{ + dir = 8; + req_one_access = list(24,11,67,209) + }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 }, /area/peoples_station/armory) "ns" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ +/obj/effect/floor_decal/corner/red{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 9 }, -/turf/simulated/wall/shuttle/raider, -/area/shuttle/peoples_station_transport) +/turf/simulated/floor/tiled/dark{ + temperature = 278.15 + }, +/area/peoples_station/hangar) "nz" = ( /turf/simulated/floor/tiled/white{ temperature = 278.15 @@ -3380,10 +3791,23 @@ /obj/machinery/light{ dir = 8 }, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/survey_probe/pra, /turf/simulated/floor/plating{ temperature = 278.15 }, /area/peoples_station/transport_hangar) +"nK" = ( +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_straight/red, +/obj/effect/map_effect/marker/airlock/docking/peoples_station/dock/starboard, +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/peoples_station/hangar) "nL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -3483,7 +3907,10 @@ name = "Hangar"; dir = 4 }, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor{ + dir = 8; + req_one_access = list(24,11,67,209) + }, /obj/machinery/door/blast/regular/open{ id = "peoples_station_hangar" }, @@ -3548,6 +3975,28 @@ temperature = 278.15 }, /area/peoples_station/mess_hall) +"og" = ( +/obj/effect/floor_decal/corner/red{ + dir = 6 + }, +/obj/machinery/door/firedoor{ + req_one_access = list(24,11,67,209) + }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/dark{ + temperature = 278.15 + }, +/area/peoples_station/hangar) +"on" = ( +/obj/machinery/light/small/emergency, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_straight/red, +/obj/effect/map_effect/marker/airlock/docking/peoples_station/dock/starboard, +/obj/machinery/atmospherics/pipe/manifold/hidden/aux, +/turf/simulated/floor/plating, +/area/peoples_station/hangar) "os" = ( /obj/machinery/light/small/red{ dir = 8 @@ -3718,11 +4167,10 @@ }, /area/peoples_station/training) "oU" = ( -/obj/effect/map_effect/window_spawner/full/shuttle{ +/obj/effect/map_effect/window_spawner/full/shuttle/raider{ + req_access = list(209); spawn_firedoor = 1; - spawn_grille = 1; - color = "#6C7364"; - frame_color = "#6C7364" + spawn_grille = 1 }, /turf/simulated/floor/plating{ temperature = 278.15 @@ -3778,6 +4226,20 @@ }, /turf/simulated/floor/reinforced/airless, /area/peoples_station/defenses) +"pn" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/dark{ + temperature = 278.15 + }, +/area/peoples_station) "po" = ( /obj/machinery/light{ dir = 8 @@ -3800,6 +4262,14 @@ "pr" = ( /turf/simulated/wall/shuttle/raider, /area/peoples_station/medbay) +"ps" = ( +/obj/effect/floor_decal/corner/red{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark{ + temperature = 278.15 + }, +/area/peoples_station/hangar) "pt" = ( /obj/structure/table/standard, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -3826,7 +4296,10 @@ req_access = list(209); dir = 4 }, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor{ + dir = 8; + req_one_access = list(24,11,67,209) + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -3988,19 +4461,15 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/machinery/alarm/cold/west{ - req_one_access = list(209) - }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 }, /area/peoples_station/armory) "pZ" = ( -/obj/effect/map_effect/window_spawner/full/shuttle{ +/obj/effect/map_effect/window_spawner/full/shuttle/raider{ + req_access = list(209); spawn_firedoor = 1; - spawn_grille = 1; - color = "#6C7364"; - frame_color = "#6C7364" + spawn_grille = 1 }, /turf/simulated/floor/plating{ temperature = 278.15 @@ -4079,6 +4548,19 @@ /obj/item/pen/fountain, /turf/simulated/floor/carpet/art, /area/peoples_station/captain_quarters) +"qs" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark{ + temperature = 278.15 + }, +/area/peoples_station) "qu" = ( /obj/effect/floor_decal/corner/dark_blue{ dir = 8 @@ -4139,12 +4621,6 @@ }, /area/peoples_station/medbay) "qI" = ( -/obj/effect/map_effect/window_spawner/full/shuttle{ - spawn_firedoor = 1; - spawn_grille = 1; - color = "#6C7364"; - frame_color = "#6C7364" - }, /obj/effect/landmark/entry_point/fore{ name = "fore, cockpit" }, @@ -4152,6 +4628,11 @@ id = "peoples_station_transport_blast"; dir = 4 }, +/obj/effect/map_effect/window_spawner/full/shuttle/raider{ + req_access = list(209); + spawn_firedoor = 1; + spawn_grille = 1 + }, /turf/simulated/floor/tiled/full, /area/shuttle/peoples_station_transport) "qJ" = ( @@ -4196,6 +4677,9 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/door/firedoor{ + req_one_access = list(24,11,67,209) + }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 }, @@ -4249,6 +4733,18 @@ temperature = 278.15 }, /area/peoples_station) +"rg" = ( +/obj/effect/floor_decal/corner/red{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/dark{ + temperature = 278.15 + }, +/area/peoples_station) "rj" = ( /obj/machinery/ammunition_loader/francisca{ weapon_id = "People's Station Rotary Gun" @@ -4289,7 +4785,9 @@ /area/peoples_station/training) "rq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, /obj/structure/cable/green{ d1 = 1; d2 = 2; @@ -4351,8 +4849,9 @@ }, /area/peoples_station/robotics_bay) "rF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8; + icon_state = "map-scrubbers" }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 @@ -4392,7 +4891,9 @@ req_access = list(209); dir = 1 }, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor{ + req_one_access = list(24,11,67,209) + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/dark{ @@ -4421,18 +4922,6 @@ temperature = 278.15 }, /area/peoples_station) -"rQ" = ( -/obj/effect/floor_decal/corner/red{ - dir = 5 - }, -/obj/machinery/atmospherics/unary/vent_pump/on, -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark{ - temperature = 278.15 - }, -/area/peoples_station/hangar) "rR" = ( /obj/structure/window/reinforced{ dir = 8 @@ -4580,7 +5069,10 @@ name = "Hangar"; dir = 4 }, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor{ + dir = 8; + req_one_access = list(24,11,67,209) + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -4693,20 +5185,38 @@ temperature = 268.15 }, /area/peoples_station/visitor) -"sK" = ( +"sJ" = ( /obj/machinery/door/airlock/external{ - dir = 1 + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 }, /obj/machinery/access_button{ - pixel_x = 28; - dir = 2 - }, -/obj/effect/map_effect/marker_helper/airlock/exterior, -/obj/effect/map_effect/marker/airlock/docking/peoples_station/dock/fore, -/obj/effect/shuttle_landmark/nav_peoples_station/fore_dock{ + pixel_x = -24; + pixel_y = -20; dir = 1 }, -/turf/simulated/floor/plating{ +/obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/floor_decal/industrial/warning/cee, +/obj/effect/map_effect/marker_helper/airlock/interior, +/obj/effect/map_effect/marker/airlock/docking/peoples_station/dock/port, +/turf/simulated/floor/tiled/dark, +/area/peoples_station/hangar) +"sK" = ( +/obj/effect/floor_decal/corner/red{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark{ temperature = 278.15 }, /area/peoples_station/hangar) @@ -4765,13 +5275,22 @@ temperature = 278.15 }, /area/peoples_station) +"sY" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9 + }, +/turf/simulated/wall/shuttle/raider, +/area/shuttle/peoples_station_transport) "ta" = ( /obj/machinery/door/airlock/command{ req_access = list(209); name = "Commissar's Quarters"; dir = 4 }, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor{ + dir = 8; + req_one_access = list(24,11,67,209) + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -4957,18 +5476,6 @@ temperature = 278.15 }, /area/peoples_station) -"tF" = ( -/obj/effect/floor_decal/corner/red{ - dir = 5 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark{ - temperature = 278.15 - }, -/area/peoples_station/hangar) "tG" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /obj/effect/floor_decal/industrial/outline/yellow, @@ -5022,11 +5529,10 @@ }, /area/peoples_station/fang) "tS" = ( -/obj/effect/map_effect/window_spawner/full/shuttle{ +/obj/effect/map_effect/window_spawner/full/shuttle/raider{ + req_access = list(209); spawn_firedoor = 1; - spawn_grille = 1; - color = "#6C7364"; - frame_color = "#6C7364" + spawn_grille = 1 }, /turf/simulated/floor/plating{ temperature = 278.15 @@ -5277,7 +5783,10 @@ name = "Barracks"; dir = 4 }, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor{ + dir = 8; + req_one_access = list(24,11,67,209) + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -5330,7 +5839,9 @@ req_access = list(209) }, /obj/structure/table/steel, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor{ + req_one_access = list(24,11,67,209) + }, /obj/item/paper_bin, /obj/item/pen/black, /obj/machinery/door/blast/regular/open{ @@ -5596,6 +6107,18 @@ temperature = 278.15 }, /area/peoples_station/armory) +"wv" = ( +/obj/effect/floor_decal/corner/red{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/alarm/cold/west, +/turf/simulated/floor/tiled/dark{ + temperature = 278.15 + }, +/area/peoples_station/hangar) "wz" = ( /obj/structure/closet/secure_closet/guncabinet{ req_access = list(209); @@ -5663,6 +6186,7 @@ }, /obj/structure/table/standard, /obj/machinery/chemical_dispenser/bar_soft/full, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled/dark{ temperature = 278.15 }, @@ -5675,7 +6199,9 @@ dir = 1 }, /obj/structure/plasticflaps/airtight, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor{ + req_one_access = list(24,11,67,209) + }, /turf/simulated/floor/tiled/freezer{ name = "cooled tiles"; temperature = 253.15 @@ -5745,7 +6271,7 @@ /area/peoples_station/living_quarters) "xj" = ( /obj/effect/floor_decal/corner/dark_blue{ - dir = 6 + dir = 4 }, /obj/structure/cable/green{ d1 = 1; @@ -5824,6 +6350,20 @@ temperature = 278.15 }, /area/peoples_station/bridge) +"xv" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/obj/effect/floor_decal/corner/red{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/sign/flag/pra{ + pixel_x = -32 + }, +/turf/simulated/floor/tiled/dark{ + temperature = 278.15 + }, +/area/peoples_station/hangar) "xx" = ( /obj/structure/table/standard, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -6053,6 +6593,9 @@ name = "Restroom"; dir = 1 }, +/obj/machinery/door/firedoor{ + req_one_access = list(24,11,67,209) + }, /turf/simulated/floor/tiled/freezer{ temperature = 278.15 }, @@ -6142,6 +6685,20 @@ "yK" = ( /turf/simulated/floor/carpet/art, /area/peoples_station/living_quarters) +"yM" = ( +/obj/effect/floor_decal/corner/red{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, +/obj/machinery/alarm/cold/north{ + req_one_access = list(209) + }, +/turf/simulated/floor/tiled/dark{ + temperature = 278.15 + }, +/area/peoples_station/hangar) "yQ" = ( /obj/structure/table/standard, /obj/structure/window/reinforced, @@ -6403,6 +6960,9 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/firedoor{ + req_one_access = list(24,11,67,209) + }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 }, @@ -6440,6 +7000,23 @@ temperature = 278.15 }, /area/peoples_station/living_quarters) +"zW" = ( +/obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/floor_decal/industrial/warning/cee{ + dir = 1 + }, +/obj/effect/map_effect/marker/airlock/docking/peoples_station/dock/starboard, +/obj/effect/map_effect/marker_helper/airlock/interior, +/obj/machinery/door/airlock/external{ + dir = 4 + }, +/obj/machinery/access_button{ + dir = 4; + pixel_x = 12; + pixel_y = 28 + }, +/turf/simulated/floor/tiled/dark, +/area/peoples_station/hangar) "zX" = ( /obj/effect/floor_decal/corner/red{ dir = 9 @@ -6582,11 +7159,10 @@ }, /area/peoples_station/training) "AB" = ( -/obj/effect/map_effect/window_spawner/full/shuttle{ +/obj/effect/map_effect/window_spawner/full/shuttle/raider{ + req_access = list(209); spawn_firedoor = 1; - spawn_grille = 1; - color = "#6C7364"; - frame_color = "#6C7364" + spawn_grille = 1 }, /turf/simulated/floor/tiled/full, /area/shuttle/fang) @@ -6601,6 +7177,21 @@ }, /turf/simulated/floor/carpet/rubber, /area/shuttle/peoples_station_transport) +"AK" = ( +/obj/effect/floor_decal/corner/red{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/obj/structure/sign/flag/pra/large/west{ + pixel_x = -32; + dir = 8 + }, +/turf/simulated/floor/tiled/dark{ + temperature = 278.15 + }, +/area/peoples_station/hangar) "AL" = ( /obj/structure/window/reinforced{ dir = 8 @@ -6618,7 +7209,9 @@ name = "Mess Hall"; dir = 1 }, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor{ + req_one_access = list(24,11,67,209) + }, /obj/structure/cable/green{ d1 = 1; d2 = 2; @@ -6661,6 +7254,18 @@ temperature = 278.15 }, /area/peoples_station/fang) +"Ba" = ( +/obj/effect/floor_decal/corner/red{ + dir = 6 + }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/door/firedoor{ + req_one_access = list(24,11,67,209) + }, +/turf/simulated/floor/tiled/dark{ + temperature = 278.15 + }, +/area/peoples_station/hangar) "Bh" = ( /obj/structure/window/reinforced{ dir = 8 @@ -6715,6 +7320,9 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/door/firedoor{ + req_one_access = list(24,11,67,209) + }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 }, @@ -6754,7 +7362,9 @@ dir = 1 }, /obj/effect/floor_decal/industrial/outline/yellow, -/mob/living/heavy_vehicle/premade/pra_egg/armored, +/mob/living/heavy_vehicle/premade/pra_egg/armored{ + faction = "PRA" + }, /turf/simulated/floor/plating{ temperature = 278.15 }, @@ -6780,6 +7390,25 @@ temperature = 278.15 }, /area/peoples_station/barracks) +"BD" = ( +/obj/effect/floor_decal/corner/red{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/door/firedoor{ + dir = 8; + req_one_access = list(24,11,67,209) + }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/dark{ + temperature = 278.15 + }, +/area/peoples_station/hangar) "BE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -6849,6 +7478,12 @@ /obj/effect/floor_decal/corner/red{ dir = 10 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 }, @@ -6884,11 +7519,8 @@ /turf/simulated/floor/plating/cooled, /area/peoples_station/transport_hangar) "BY" = ( -/obj/effect/floor_decal/corner/red/full{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 5 +/obj/effect/floor_decal/corner/red{ + dir = 6 }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 @@ -7060,6 +7692,23 @@ temperature = 278.15 }, /area/shuttle/fang) +"CJ" = ( +/obj/effect/floor_decal/corner/red{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark{ + temperature = 278.15 + }, +/area/peoples_station/hangar) "CN" = ( /obj/machinery/light/small/red{ dir = 4 @@ -7232,6 +7881,18 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/dark/full, /area/shuttle/peoples_station_transport) +"Dp" = ( +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 8 + }, +/obj/effect/map_effect/marker/airlock/docking/peoples_station/dock/aft, +/turf/simulated/floor/plating{ + temperature = 278.15 + }, +/area/peoples_station/hangar) "Dr" = ( /obj/structure/table/stone/marble, /obj/machinery/light, @@ -7250,6 +7911,18 @@ temperature = 278.15 }, /area/peoples_station/mess_hall) +"Dt" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/obj/effect/floor_decal/corner/red{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/tiled/dark{ + temperature = 278.15 + }, +/area/peoples_station/hangar) "Dv" = ( /obj/structure/cable/green, /obj/machinery/power/solar_control/autostart{ @@ -7352,11 +8025,10 @@ }, /area/peoples_station/training) "DM" = ( -/obj/effect/map_effect/window_spawner/full/shuttle{ +/obj/effect/map_effect/window_spawner/full/shuttle/raider{ + req_access = list(209); spawn_firedoor = 1; - spawn_grille = 1; - color = "#6C7364"; - frame_color = "#6C7364" + spawn_grille = 1 }, /turf/simulated/floor/plating{ temperature = 278.15 @@ -7428,7 +8100,10 @@ req_access = list(209); dir = 4 }, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor{ + dir = 8; + req_one_access = list(24,11,67,209) + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -7494,16 +8169,17 @@ }, /area/peoples_station/fang) "Ep" = ( -/obj/machinery/light{ +/obj/machinery/door/airlock/external{ dir = 1 }, -/obj/effect/floor_decal/corner/red{ - dir = 5 +/obj/machinery/access_button{ + pixel_x = 28; + pixel_y = 12; + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark{ +/obj/effect/map_effect/marker/airlock/docking/peoples_station/dock/aft, +/obj/effect/map_effect/marker_helper/airlock/exterior, +/turf/simulated/floor/plating{ temperature = 278.15 }, /area/peoples_station/hangar) @@ -7577,6 +8253,17 @@ /obj/structure/ship_weapon_dummy/barrel, /turf/simulated/floor/reinforced/airless, /area/peoples_station/defenses) +"ED" = ( +/obj/effect/floor_decal/corner/red{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/dark{ + temperature = 278.15 + }, +/area/peoples_station/hangar) "EH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -7664,11 +8351,10 @@ }, /area/peoples_station/solars) "Fe" = ( -/obj/effect/map_effect/window_spawner/full/shuttle{ +/obj/effect/map_effect/window_spawner/full/shuttle/raider{ + req_access = list(209); spawn_firedoor = 1; - spawn_grille = 1; - color = "#6C7364"; - frame_color = "#6C7364" + spawn_grille = 1 }, /turf/simulated/floor/plating{ temperature = 278.15 @@ -7783,6 +8469,10 @@ /obj/machinery/door/blast/regular/open{ id = "peoples_station_armory" }, +/obj/machinery/door/firedoor{ + dir = 8; + req_one_access = list(24,11,67,209) + }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 }, @@ -7821,6 +8511,20 @@ /obj/effect/step_trigger/teleporter, /turf/template_noop, /area/space) +"FQ" = ( +/obj/machinery/door/airlock/external{ + dir = 1 + }, +/obj/effect/map_effect/marker_helper/airlock/exterior, +/obj/effect/map_effect/marker/airlock/docking/peoples_station/dock/fore, +/obj/machinery/access_button{ + pixel_x = -28; + pixel_y = -12 + }, +/turf/simulated/floor/plating{ + temperature = 278.15 + }, +/area/peoples_station/hangar) "FS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -7843,6 +8547,24 @@ temperature = 278.15 }, /area/peoples_station/bridge) +"FV" = ( +/obj/machinery/access_button{ + pixel_x = -12; + pixel_y = -28; + dir = 8 + }, +/obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/floor_decal/industrial/warning/cee, +/obj/effect/map_effect/marker/airlock/docking/peoples_station/dock/starboard, +/obj/effect/map_effect/marker_helper/airlock/exterior, +/obj/machinery/door/airlock/external{ + dir = 4 + }, +/obj/effect/shuttle_landmark/nav_peoples_station/starboard_dock{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/peoples_station/hangar) "FX" = ( /obj/structure/table/rack, /obj/item/tank/jetpack/oxygen, @@ -7874,6 +8596,21 @@ /obj/effect/shuttle_landmark/peoples_station_transport/transit, /turf/space/transit/north, /area/space) +"Gc" = ( +/obj/effect/floor_decal/corner/red{ + dir = 6 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/obj/structure/sign/flag/pra/large/east{ + dir = 4; + pixel_x = 32 + }, +/turf/simulated/floor/tiled/dark{ + temperature = 278.15 + }, +/area/peoples_station/hangar) "Gd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -7899,10 +8636,6 @@ /obj/structure/bed/stool/chair/sofa/red{ dir = 4 }, -/obj/effect/ghostspawpoint{ - identifier = "peoples_station_crew"; - name = "igs - peoples_station_crew" - }, /turf/simulated/floor/carpet/art, /area/peoples_station/living_quarters) "Gg" = ( @@ -7939,7 +8672,9 @@ name = "Mess Hall"; dir = 1 }, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor{ + req_one_access = list(24,11,67,209) + }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 }, @@ -7953,14 +8688,15 @@ }, /area/peoples_station/commissar_quarters) "Gn" = ( -/obj/effect/floor_decal/corner/red{ +/obj/effect/floor_decal/corner/red, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 8 }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 @@ -7978,6 +8714,9 @@ req_access = list(209); dir = 1 }, +/obj/machinery/door/firedoor{ + req_one_access = list(24,11,67,209) + }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 }, @@ -8013,7 +8752,9 @@ req_access = list(209); dir = 1 }, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor{ + req_one_access = list(24,11,67,209) + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ @@ -8213,7 +8954,9 @@ name = "Captain's Quarters"; dir = 1 }, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor{ + req_one_access = list(24,11,67,209) + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ @@ -8239,6 +8982,18 @@ temperature = 278.15 }, /area/peoples_station/bridge) +"Hx" = ( +/obj/effect/floor_decal/corner/red{ + dir = 5 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/dark{ + temperature = 278.15 + }, +/area/peoples_station) "Hy" = ( /obj/structure/window/reinforced, /turf/simulated/floor/tiled{ @@ -8290,6 +9045,15 @@ temperature = 278.15 }, /area/peoples_station/medbay) +"HN" = ( +/obj/effect/floor_decal/corner/red{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/turf/simulated/floor/tiled/dark{ + temperature = 278.15 + }, +/area/peoples_station/hangar) "HP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -8331,6 +9095,20 @@ temperature = 278.15 }, /area/peoples_station/hangar) +"Ic" = ( +/obj/effect/floor_decal/corner_wide/black{ + dir = 5 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark{ + temperature = 278.15 + }, +/area/peoples_station) "Ie" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -8424,6 +9202,20 @@ temperature = 278.15 }, /area/peoples_station/visitor) +"IE" = ( +/obj/machinery/door/airlock/hatch{ + name = "Station Hatch"; + req_access = list(209); + dir = 4 + }, +/obj/machinery/door/firedoor{ + dir = 8; + req_one_access = list(24,11,67,209) + }, +/turf/simulated/floor/tiled/dark{ + temperature = 278.15 + }, +/area/peoples_station) "IF" = ( /obj/effect/floor_decal/corner/red/full, /obj/structure/dispenser/oxygen, @@ -8460,6 +9252,7 @@ }, /obj/structure/table/standard, /obj/machinery/chemical_dispenser/bar_alc/full, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled/dark{ temperature = 278.15 }, @@ -8512,6 +9305,17 @@ temperature = 278.15 }, /area/peoples_station/bridge) +"Jc" = ( +/obj/effect/floor_decal/corner/red{ + dir = 5 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark{ + temperature = 278.15 + }, +/area/peoples_station/hangar) "Jd" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -8638,7 +9442,10 @@ req_access = list(209); dir = 4 }, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor{ + dir = 8; + req_one_access = list(24,11,67,209) + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -8650,15 +9457,19 @@ }, /area/peoples_station/mess_hall) "JI" = ( -/obj/structure/bed/padded, -/obj/item/bedsheet/brown, -/obj/structure/sign/painting_frame/hadii{ - pixel_y = 32 +/obj/effect/floor_decal/corner/red{ + dir = 5 }, -/turf/simulated/floor/wood{ +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark{ temperature = 278.15 }, -/area/peoples_station/barracks) +/area/peoples_station/hangar) "JJ" = ( /obj/effect/floor_decal/corner/red/full{ dir = 1 @@ -8734,6 +9545,9 @@ dir = 1 }, /obj/machinery/atmospherics/unary/vent_pump/on, +/obj/machinery/alarm/cold/north{ + req_one_access = list(209) + }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 }, @@ -8770,6 +9584,17 @@ temperature = 268.15 }, /area/peoples_station/visitor) +"Kf" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 9 + }, +/obj/effect/floor_decal/corner/red{ + dir = 10 + }, +/turf/simulated/floor/tiled/dark{ + temperature = 278.15 + }, +/area/peoples_station/hangar) "Kj" = ( /obj/machinery/embedded_controller/radio/simple_docking_controller{ frequency = 1337; @@ -8786,6 +9611,18 @@ temperature = 278.15 }, /area/peoples_station/fang) +"Kk" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/floor_decal/corner/red, +/turf/simulated/floor/tiled/dark{ + temperature = 278.15 + }, +/area/peoples_station/hangar) "Kn" = ( /turf/template_noop, /area/space) @@ -8805,6 +9642,10 @@ name = "Zero Gravity Chamber"; dir = 4 }, +/obj/machinery/door/firedoor{ + dir = 8; + req_one_access = list(24,11,67,209) + }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 }, @@ -8838,6 +9679,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/door/firedoor{ + dir = 8; + req_one_access = list(24,11,67,209) + }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 }, @@ -8903,8 +9748,12 @@ }, /area/peoples_station/hangar) "KZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, /obj/effect/floor_decal/corner/red{ dir = 5 }, @@ -8937,6 +9786,21 @@ temperature = 278.15 }, /area/peoples_station/hangar) +"Ld" = ( +/obj/effect/floor_decal/corner/red{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/obj/machinery/door/firedoor{ + req_one_access = list(24,11,67,209) + }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/dark{ + temperature = 278.15 + }, +/area/peoples_station/hangar) "Lf" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -8955,24 +9819,20 @@ }, /area/peoples_station) "Li" = ( -/obj/effect/floor_decal/industrial/outline/engineering, -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 5 }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/map_effect/marker_helper/airlock/exterior, -/obj/effect/floor_decal/industrial/warning{ - dir = 6 +/obj/effect/floor_decal/corner/red/full, +/obj/machinery/light{ + inserted_light = /obj/item/light/tube/colored/blue }, -/obj/effect/map_effect/marker/airlock/shuttle{ - cycle_to_external_air = 1; - master_tag = "peoples_station_transport_dock"; - name = "peoples_station_transport_dock"; - req_one_access = list(209); - shuttle_tag = "People's Station Transport Shuttle" +/obj/structure/sign/flag/pra{ + pixel_x = -32 }, -/turf/simulated/floor/reinforced, -/area/shuttle/peoples_station_transport) +/turf/simulated/floor/tiled/dark{ + temperature = 278.15 + }, +/area/peoples_station/hangar) "Lk" = ( /turf/simulated/wall/shuttle/raider, /area/peoples_station/transport_hangar) @@ -9002,21 +9862,13 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/firedoor{ + req_one_access = list(24,11,67,209) + }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 }, /area/peoples_station/transport_hangar) -"Lt" = ( -/obj/effect/floor_decal/corner/red{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/turf/simulated/floor/tiled/dark{ - temperature = 278.15 - }, -/area/peoples_station/hangar) "Lv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -9041,6 +9893,20 @@ temperature = 278.15 }, /area/peoples_station/restroom) +"Lz" = ( +/obj/structure/bed/padded, +/obj/item/bedsheet/brown, +/obj/structure/sign/painting_frame/hadii{ + pixel_y = 32 + }, +/obj/effect/ghostspawpoint{ + identifier = "peoples_station_crew"; + name = "igs - peoples_station_crew" + }, +/turf/simulated/floor/wood{ + temperature = 278.15 + }, +/area/peoples_station/barracks) "LA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -9063,6 +9929,21 @@ temperature = 278.15 }, /area/peoples_station/transport_hangar) +"LD" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/turf/simulated/floor/tiled/dark{ + temperature = 278.15 + }, +/area/peoples_station/hangar) "LE" = ( /obj/machinery/door/airlock/external{ dir = 4 @@ -9083,11 +9964,10 @@ /turf/simulated/floor/reinforced, /area/shuttle/fang) "LH" = ( -/obj/effect/map_effect/window_spawner/full/shuttle{ +/obj/effect/map_effect/window_spawner/full/shuttle/raider{ + req_access = list(209); spawn_firedoor = 1; - spawn_grille = 1; - color = "#6C7364"; - frame_color = "#6C7364" + spawn_grille = 1 }, /turf/simulated/floor/plating{ temperature = 278.15 @@ -9121,6 +10001,22 @@ temperature = 278.15 }, /area/peoples_station/transport_hangar) +"LP" = ( +/obj/machinery/embedded_controller/radio/airlock/docking_port{ + dir = 2; + pixel_y = 28; + pixel_x = -6 + }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 1 + }, +/obj/effect/map_effect/marker/airlock/docking/peoples_station/dock/starboard, +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux, +/turf/simulated/floor/plating, +/area/peoples_station/hangar) "LT" = ( /obj/structure/ship_weapon_dummy{ is_barrel = 1 @@ -9177,16 +10073,6 @@ temperature = 268.15 }, /area/peoples_station/visitor) -"Mj" = ( -/obj/structure/bed/stool/bar/padded/red, -/obj/effect/ghostspawpoint{ - identifier = "peoples_station_crew"; - name = "igs - peoples_station_crew" - }, -/turf/simulated/floor/tiled/dark{ - temperature = 278.15 - }, -/area/peoples_station/mess_hall) "Ml" = ( /obj/machinery/light{ dir = 8 @@ -9244,16 +10130,6 @@ /obj/machinery/computer/arcade/battle, /turf/simulated/floor/carpet/art, /area/peoples_station/living_quarters) -"Mx" = ( -/obj/structure/bed/stool/chair/office/bridge/generic, -/obj/effect/ghostspawpoint{ - identifier = "peoples_station_crew"; - name = "igs - peoples_station_crew" - }, -/turf/simulated/floor/tiled/dark{ - temperature = 278.15 - }, -/area/peoples_station/bridge) "My" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/hatch/red, @@ -9314,6 +10190,27 @@ temperature = 278.15 }, /area/peoples_station) +"ML" = ( +/obj/effect/floor_decal/industrial/outline/engineering, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 10 + }, +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, +/obj/effect/map_effect/marker_helper/airlock/exterior, +/obj/effect/map_effect/marker/airlock/shuttle{ + cycle_to_external_air = 1; + master_tag = "peoples_station_transport_dock"; + name = "peoples_station_transport_dock"; + req_one_access = list(209); + shuttle_tag = "People's Station Transport Shuttle" + }, +/turf/simulated/floor/reinforced, +/area/shuttle/peoples_station_transport) "MM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -9425,7 +10322,10 @@ req_access = list(209); dir = 4 }, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor{ + dir = 8; + req_one_access = list(24,11,67,209) + }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 }, @@ -9545,6 +10445,17 @@ temperature = 278.15 }, /area/peoples_station/captain_quarters) +"NF" = ( +/obj/effect/floor_decal/corner/red{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark{ + temperature = 278.15 + }, +/area/peoples_station/hangar) "NH" = ( /obj/structure/cable/green{ d2 = 8; @@ -9618,6 +10529,22 @@ temperature = 278.15 }, /area/peoples_station/visitor) +"Oh" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/obj/machinery/door/airlock/external{ + dir = 1 + }, +/obj/machinery/access_button{ + dir = 8; + pixel_x = 24; + pixel_y = -27 + }, +/obj/effect/map_effect/marker/airlock/docking/peoples_station/dock/aft, +/obj/effect/map_effect/marker_helper/airlock/interior, +/turf/simulated/floor/plating{ + temperature = 278.15 + }, +/area/peoples_station/hangar) "Oi" = ( /obj/structure/sign/flag/pra{ pixel_y = 32 @@ -9653,11 +10580,10 @@ /turf/simulated/floor/airless, /area/peoples_station/solars) "Ok" = ( -/obj/effect/map_effect/window_spawner/full/shuttle{ +/obj/effect/map_effect/window_spawner/full/shuttle/raider{ + req_access = list(209); spawn_firedoor = 1; - spawn_grille = 1; - color = "#6C7364"; - frame_color = "#6C7364" + spawn_grille = 1 }, /turf/simulated/floor/plating{ temperature = 278.15 @@ -9678,7 +10604,9 @@ req_access = list(209) }, /obj/structure/table/steel, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor{ + req_one_access = list(24,11,67,209) + }, /obj/item/paper_bin, /obj/item/pen/black, /obj/machinery/door/blast/regular/open{ @@ -10034,6 +10962,22 @@ temperature = 278.15 }, /area/peoples_station/mess_hall) +"PB" = ( +/obj/machinery/door/airlock/external{ + dir = 1 + }, +/obj/machinery/access_button{ + pixel_x = -28; + pixel_y = 12; + dir = 1 + }, +/obj/effect/map_effect/marker/airlock/docking/peoples_station/dock/aft, +/obj/effect/map_effect/marker_helper/airlock/exterior, +/obj/effect/shuttle_landmark/nav_peoples_station/aft_dock, +/turf/simulated/floor/plating{ + temperature = 278.15 + }, +/area/peoples_station/hangar) "PC" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -10057,7 +11001,9 @@ }, /area/peoples_station/solars) "PH" = ( -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor{ + req_one_access = list(24,11,67,209) + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ @@ -10074,6 +11020,19 @@ temperature = 278.15 }, /area/peoples_station/ammo_storage) +"PL" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/obj/effect/floor_decal/corner/red{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/dark{ + temperature = 278.15 + }, +/area/peoples_station/hangar) "PM" = ( /obj/structure/bed/stool/chair/padded/red{ dir = 1 @@ -10319,15 +11278,14 @@ }, /area/peoples_station/armory) "QR" = ( -/obj/effect/map_effect/window_spawner/full/shuttle{ - spawn_firedoor = 1; - spawn_grille = 1; - color = "#6C7364"; - frame_color = "#6C7364" - }, /obj/machinery/door/blast/regular/open{ id = "peoples_station_transport_blast" }, +/obj/effect/map_effect/window_spawner/full/shuttle/raider{ + req_access = list(209); + spawn_firedoor = 1; + spawn_grille = 1 + }, /turf/simulated/floor/tiled/full, /area/shuttle/peoples_station_transport) "QX" = ( @@ -10406,10 +11364,6 @@ /area/peoples_station/bridge) "Rm" = ( /obj/structure/bed/stool/chair/office/dark, -/obj/effect/ghostspawpoint{ - identifier = "peoples_station_crew"; - name = "igs - peoples_station_crew" - }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 }, @@ -10426,9 +11380,6 @@ }, /area/peoples_station) "Rs" = ( -/obj/effect/floor_decal/corner/dark_blue{ - dir = 4 - }, /obj/structure/cable/green{ d1 = 1; d2 = 2; @@ -10468,7 +11419,9 @@ }, /area/peoples_station/transport_hangar) "Rx" = ( -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor{ + req_one_access = list(24,11,67,209) + }, /obj/machinery/door/airlock/hatch{ name = "Station Hatch"; req_access = list(209); @@ -10514,7 +11467,7 @@ /obj/structure/sign/painting_frame/hadii{ pixel_y = 32 }, -/obj/effect/ghostspawpoint{ +/obj/effect/ghostspawpoint/one_use{ identifier = "peoples_station_crew"; name = "igs - peoples_station_crew" }, @@ -10548,11 +11501,10 @@ }, /area/peoples_station/training) "RM" = ( -/obj/effect/map_effect/window_spawner/full/shuttle{ +/obj/effect/map_effect/window_spawner/full/shuttle/raider{ + req_access = list(209); spawn_firedoor = 1; - spawn_grille = 1; - color = "#6C7364"; - frame_color = "#6C7364" + spawn_grille = 1 }, /turf/simulated/floor/plating{ temperature = 278.15 @@ -10731,6 +11683,20 @@ temperature = 278.15 }, /area/peoples_station/atmos) +"Sx" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/dark{ + temperature = 278.15 + }, +/area/peoples_station) "SD" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -10794,6 +11760,9 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/firedoor{ + req_one_access = list(24,11,67,209) + }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 }, @@ -10816,7 +11785,9 @@ "SP" = ( /obj/machinery/mech_recharger, /obj/effect/floor_decal/industrial/hatch/yellow, -/mob/living/heavy_vehicle/premade/ripley/loader, +/mob/living/heavy_vehicle/premade/ripley/loader{ + faction = "PRA" + }, /obj/effect/floor_decal/corner/orange{ dir = 10 }, @@ -10915,6 +11886,17 @@ temperature = 278.15 }, /area/peoples_station/fang) +"Tk" = ( +/obj/effect/floor_decal/corner/red{ + dir = 6 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark{ + temperature = 278.15 + }, +/area/peoples_station/hangar) "Tl" = ( /obj/effect/floor_decal/corner/black{ dir = 5 @@ -10926,6 +11908,16 @@ temperature = 278.15 }, /area/peoples_station/visitor) +"Tm" = ( +/obj/machinery/door/airlock/external{ + dir = 1 + }, +/obj/effect/map_effect/marker/airlock/docking/peoples_station/dock/aft, +/obj/effect/map_effect/marker_helper/airlock/interior, +/turf/simulated/floor/plating{ + temperature = 278.15 + }, +/area/peoples_station/hangar) "To" = ( /obj/structure/window/reinforced, /obj/machinery/computer/ship/navigation/terminal{ @@ -10986,6 +11978,21 @@ temperature = 268.15 }, /area/peoples_station/visitor) +"Tx" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/door/firedoor{ + dir = 8; + req_one_access = list(24,11,67,209) + }, +/turf/simulated/floor/tiled/dark{ + temperature = 278.15 + }, +/area/peoples_station/transport_hangar) "TA" = ( /obj/machinery/light, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -11206,17 +12213,6 @@ temperature = 278.15 }, /area/peoples_station/mess_hall) -"Uk" = ( -/obj/effect/floor_decal/corner/red{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark{ - temperature = 278.15 - }, -/area/peoples_station/hangar) "Ul" = ( /obj/effect/landmark/entry_point/port{ name = "port, crew compartment" @@ -11229,6 +12225,18 @@ "Un" = ( /turf/simulated/wall/shuttle/raider, /area/peoples_station/atmos) +"Uo" = ( +/obj/effect/floor_decal/corner/red{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark{ + temperature = 278.15 + }, +/area/peoples_station) "Up" = ( /obj/effect/floor_decal/corner/red/full{ dir = 4 @@ -11246,9 +12254,8 @@ }, /area/peoples_station/commissar_quarters) "Ux" = ( -/obj/machinery/alarm/west{ - req_access = list(207); - req_one_access = null +/obj/machinery/alarm/cold/west{ + req_one_access = list(209) }, /obj/machinery/computer/ship/engines/terminal{ dir = 4 @@ -11296,6 +12303,10 @@ dir = 4 }, /obj/structure/plasticflaps/airtight, +/obj/machinery/door/firedoor{ + dir = 8; + req_one_access = list(24,11,67,209) + }, /turf/simulated/floor/tiled{ name = "cooled floor"; temperature = 278 @@ -11312,6 +12323,19 @@ }, /turf/simulated/floor/airless, /area/peoples_station/solars) +"UK" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark{ + temperature = 278.15 + }, +/area/peoples_station/transport_hangar) "UN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/freezer{ @@ -11349,6 +12373,16 @@ temperature = 278.15 }, /area/peoples_station/bridge) +"UV" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/suit_cycler/offship/pra, +/obj/structure/sign/flag/pra/large/north{ + pixel_y = 32 + }, +/turf/simulated/floor/tiled/dark{ + temperature = 278.15 + }, +/area/peoples_station/transport_hangar) "UW" = ( /turf/simulated/floor/tiled/freezer{ temperature = 278.15 @@ -11461,6 +12495,9 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/firedoor{ + req_one_access = list(24,11,67,209) + }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 }, @@ -11487,6 +12524,32 @@ temperature = 278.15 }, /area/peoples_station/mess_hall) +"Vv" = ( +/obj/effect/floor_decal/corner/red{ + dir = 5 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/dark{ + temperature = 278.15 + }, +/area/peoples_station) +"VE" = ( +/obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/floor_decal/industrial/warning/cee{ + dir = 1 + }, +/obj/machinery/access_button{ + pixel_x = -12; + pixel_y = 28; + dir = 8 + }, +/obj/effect/map_effect/marker/airlock/docking/peoples_station/dock/starboard, +/obj/effect/map_effect/marker_helper/airlock/exterior, +/obj/machinery/door/airlock/external{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/peoples_station/hangar) "VG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -11495,6 +12558,17 @@ temperature = 278.15 }, /area/shuttle/fang) +"VL" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, +/obj/effect/floor_decal/corner/red{ + dir = 10 + }, +/turf/simulated/floor/tiled/dark{ + temperature = 278.15 + }, +/area/peoples_station/hangar) "VQ" = ( /obj/structure/table/steel, /obj/machinery/door/window/brigdoor/westright, @@ -11546,27 +12620,20 @@ /obj/effect/shuttle_landmark/nav_peoples_station/nav1, /turf/template_noop, /area/space) -"Wb" = ( -/obj/effect/floor_decal/industrial/outline/engineering, -/obj/effect/floor_decal/industrial/warning/dust{ +"VZ" = ( +/obj/effect/floor_decal/corner/red{ dir = 10 }, -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 10 +/turf/simulated/floor/tiled/dark{ + temperature = 278.15 }, -/obj/effect/map_effect/marker_helper/airlock/exterior, -/obj/effect/map_effect/marker/airlock/shuttle{ - cycle_to_external_air = 1; - master_tag = "peoples_station_transport_dock"; - name = "peoples_station_transport_dock"; - req_one_access = list(209); - shuttle_tag = "People's Station Transport Shuttle" - }, -/turf/simulated/floor/reinforced, -/area/shuttle/peoples_station_transport) +/area/peoples_station/hangar) "Wf" = ( /obj/machinery/light, /obj/structure/table/standard, @@ -11662,6 +12729,17 @@ temperature = 278.15 }, /area/peoples_station/atmos) +"WB" = ( +/obj/effect/floor_decal/corner/red{ + dir = 5 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark{ + temperature = 278.15 + }, +/area/peoples_station/hangar) "WD" = ( /obj/structure/bed/stool/chair/office/bridge/generic, /obj/effect/floor_decal/corner_wide/red{ @@ -11842,7 +12920,10 @@ req_access = list(209); dir = 4 }, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor{ + dir = 8; + req_one_access = list(24,11,67,209) + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -12005,13 +13086,29 @@ }, /area/peoples_station/restroom) "XU" = ( -/obj/effect/decal/cleanable/liquid_fuel, -/obj/item/clothing/head/cone, -/obj/effect/floor_decal/industrial/warning{ +/obj/effect/floor_decal/industrial/outline/engineering, +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 4 }, -/turf/simulated/floor/plating/cooled, -/area/peoples_station/transport_hangar) +/obj/effect/decal/cleanable/dirt, +/obj/effect/map_effect/marker_helper/airlock/exterior, +/obj/effect/map_effect/marker/airlock/shuttle{ + cycle_to_external_air = 1; + master_tag = "peoples_station_transport_dock"; + name = "peoples_station_transport_dock"; + req_one_access = list(209); + shuttle_tag = "People's Station Transport Shuttle" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, +/obj/machinery/airlock_sensor/airlock_exterior{ + pixel_y = 28; + pixel_x = 20; + dir = 8 + }, +/turf/simulated/floor/reinforced, +/area/shuttle/peoples_station_transport) "XV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -12053,17 +13150,19 @@ }, /area/peoples_station/fang) "Yf" = ( -/obj/effect/floor_decal/industrial/loading/yellow{ - dir = 4 +/obj/effect/floor_decal/corner/dark_blue/full{ + dir = 1 }, -/obj/effect/ghostspawpoint{ - identifier = "peoples_station_crew"; - name = "igs - peoples_station_crew" +/obj/structure/cargo_receptacle{ + override_name = "People's Station - Training Wing"; + payment_modifier = 0.6; + max_spawn = 2; + min_spawn = 1 }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 }, -/area/peoples_station/defenses) +/area/peoples_station/training) "Yh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -12246,6 +13345,20 @@ }, /turf/simulated/floor/carpet/art, /area/peoples_station/captain_quarters) +"YU" = ( +/obj/effect/floor_decal/corner/red{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8; + icon_state = "map-scrubbers" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/turf/simulated/floor/tiled/dark{ + temperature = 278.15 + }, +/area/peoples_station/hangar) "YV" = ( /obj/structure/table/standard, /obj/item/paper_bin, @@ -12380,27 +13493,27 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/door/firedoor{ + dir = 8; + req_one_access = list(24,11,67,209) + }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 }, /area/peoples_station/fang) "Zq" = ( -/obj/machinery/door/airlock/external{ +/obj/effect/floor_decal/corner/red{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/obj/machinery/access_button{ - pixel_x = -12; - pixel_y = -28; - dir = 8 +/turf/simulated/floor/tiled/dark{ + temperature = 278.15 }, -/obj/effect/floor_decal/industrial/hatch/red, -/obj/effect/floor_decal/industrial/warning/cee, -/obj/effect/map_effect/marker_helper/airlock/interior, -/obj/effect/map_effect/marker/airlock/docking/peoples_station/dock/port, -/turf/simulated/floor/tiled/dark, /area/peoples_station/hangar) "Zr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal{ @@ -12410,13 +13523,22 @@ temperature = 278.15 }, /area/peoples_station/atmos) +"Zs" = ( +/obj/structure/lattice/catwalk, +/obj/machinery/iff_beacon/name_change, +/obj/effect/floor_decal/industrial/warning/full, +/turf/simulated/floor/airless, +/area/peoples_station/bridge) "Zw" = ( /obj/machinery/door/airlock/highsecurity{ name = "Armory"; req_access = list(209); dir = 4 }, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor{ + dir = 8; + req_one_access = list(24,11,67,209) + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -12528,6 +13650,18 @@ temperature = 278.15 }, /area/peoples_station/medbay) +"ZX" = ( +/obj/effect/floor_decal/corner/red{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/dark{ + temperature = 278.15 + }, +/area/peoples_station/hangar) "ZY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -12549,6 +13683,19 @@ temperature = 278.15 }, /area/peoples_station) +"ZZ" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark{ + temperature = 278.15 + }, +/area/peoples_station/transport_hangar) (1,1,1) = {" Kn @@ -41728,7 +42875,7 @@ Uy Dx xo JB -Yf +bq oU Kn Kn @@ -44233,7 +45380,7 @@ Kn Kn BJ Bx -jH +Bx Bx iO BJ @@ -45009,7 +46156,7 @@ BJ BJ BJ HB -HB +Yf mT TH pA @@ -45265,7 +46412,7 @@ Kn Kn Kn Kn -Kn +HB HB HB HB @@ -45541,7 +46688,7 @@ CR CR CR CR -jl +IE CR CR CR @@ -46086,13 +47233,13 @@ zv zv zv zv -zv +Uo zv Yn zv zv zv -zv +rg Yn zv yb @@ -46343,13 +47490,13 @@ BM BM BM BM +ky BM BM BM BM BM -BM -BM +qs BM BM sB @@ -46561,11 +47708,11 @@ yK yK OO Bz -Rq -GT +Hx +Sx hw CR -Nr +iX rF TS CR @@ -47368,7 +48515,7 @@ JL jZ LA jZ -Mj +aM aM aM aM @@ -47652,6 +48799,7 @@ Nu RB nj Kn +dR Kn Kn Kn @@ -47672,8 +48820,7 @@ Kn Kn Kn Kn -Kn -Kn +dR Kn Kn Kn @@ -48139,7 +49286,7 @@ Wp yE Lf jZ -Mj +aM aM aM aM @@ -48361,8 +49508,8 @@ aF Bz Bz qh -GT -hw +dD +UX CR Nr WT @@ -48393,8 +49540,8 @@ Kn Kn Fe II -jZ -LA +yE +Lf jZ jZ jZ @@ -48423,6 +49570,7 @@ tK tK bV tS +dR Kn Kn Kn @@ -48443,8 +49591,7 @@ Kn Kn Kn Kn -Kn -Kn +dR Kn Kn Kn @@ -48635,9 +49782,9 @@ DJ YG pH iD -Kn -Kn -Kn +LJ +NP +qn CR Nr Ms @@ -48650,8 +49797,8 @@ Kn Kn Fe wT -jZ -LA +NK +RC jZ aM aM @@ -48878,7 +50025,7 @@ qh GT Eq CR -sU +Ic WT vA zJ @@ -48892,9 +50039,9 @@ yv lf RQ iD -LJ -NP -qn +VS +Zs +NV CR Nr Ms @@ -49146,11 +50293,11 @@ bs UP Gz DJ -Mx +YG EJ iD VS -WP +fX NV CR Iu @@ -49194,6 +50341,7 @@ tK tK PM tS +dR Kn Kn Kn @@ -49214,8 +50362,7 @@ Kn Kn Kn Kn -Kn -Kn +dR Kn Kn Kn @@ -49406,8 +50553,8 @@ DJ Fv kQ iD -IM -Fo +VS +WP NV CR Nr @@ -49645,8 +50792,8 @@ sE sE Wn Um -qh -GT +Vv +Sx hw CR Nr @@ -49663,9 +50810,9 @@ DJ YG pH iD -Kn -Kn -Kn +IM +Fo +NV CR Nr Ms @@ -49942,7 +51089,7 @@ aM aM aM aM -Mj +aM aM aM aM @@ -49965,6 +51112,7 @@ tK wt nj nj +dR Kn Kn Kn @@ -49985,8 +51133,7 @@ Kn Kn Kn Kn -Kn -Kn +dR Kn Kn Kn @@ -50713,7 +51860,7 @@ aM aM aM aM -Mj +aM aM aM aM @@ -50736,6 +51883,7 @@ tS nj Kn Kn +dR Kn Kn Kn @@ -50756,8 +51904,7 @@ Kn Kn Kn Kn -Kn -Kn +dR Kn Kn Kn @@ -50931,8 +52078,8 @@ no YT Um qh -GT -hw +dD +UX CR sU Ms @@ -51507,6 +52654,7 @@ Kn Kn Kn Kn +dR Kn Kn Kn @@ -51527,8 +52675,7 @@ Kn Kn Kn Kn -Kn -Kn +dR Kn Kn Kn @@ -52278,6 +53425,7 @@ Kn Kn Kn Kn +dR Kn Kn Kn @@ -52298,8 +53446,7 @@ Kn Kn Kn Kn -Kn -Kn +dR Kn Kn Kn @@ -52752,7 +53899,7 @@ CR CR CR CR -jl +IE CR CR CR @@ -53001,12 +54148,12 @@ qo qo qo qo +Jp qo qo qo qo -qo -qo +Jp qo qo yx @@ -53049,6 +54196,7 @@ Kn Kn Kn Kn +dR Kn Kn Kn @@ -53069,8 +54217,7 @@ Kn Kn Kn Kn -Kn -Kn +dR Kn Kn Kn @@ -53249,6 +54396,7 @@ rO rO rO rO +um rO rO rO @@ -53257,13 +54405,12 @@ rO rO rO rO -rO -rO +pn rO rO en rO -rO +hx rO en XE @@ -53294,20 +54441,20 @@ lI lI lI lI -ik +WB Ne lI Kn Kn Kn Kn -ir Kn Kn -ir Kn Kn -ir +Kn +Kn +Kn Kn Kn Kn @@ -53506,7 +54653,7 @@ QK QK No QK -QK +Yj QK QK No @@ -53520,7 +54667,7 @@ QK QK Yh QK -QK +Yj No GT QK @@ -53808,11 +54955,18 @@ sb PR Df DM -ik +Jc cj lI Kn Kn +Kn +Kn +Kn +Kn +Kn +Kn +Kn dR Kn Kn @@ -53834,14 +54988,7 @@ Kn Kn Kn Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn +dR Kn Kn Kn @@ -54022,11 +55169,11 @@ RF bD tU vF -JI +RF bD tU vF -JI +RF bD tU vF @@ -54300,7 +55447,7 @@ Zj Kn Kn Lk -IS +UV oV oV kJ @@ -54336,24 +55483,24 @@ Kn Kn Kn Kn +ir Kn Kn +ir Kn Kn +ir +lI +VE +FV +lI +ir Kn Kn +ir Kn Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn +ir Kn Kn Kn @@ -54534,7 +55681,7 @@ PY PY vF vF -dI +hb vF vF vF @@ -54584,10 +55731,6 @@ PV lI Kn Kn -dR -Kn -Kn -Kn Kn Kn Kn @@ -54604,6 +55747,10 @@ Kn Kn Kn Kn +lI +bH +nK +lI Kn Kn Kn @@ -54820,7 +55967,7 @@ oV CV pt Lk -LK +ZZ TA Lk Kn @@ -54857,10 +56004,10 @@ Kn Kn Kn Kn -Kn -Kn -Kn -Kn +lI +LP +on +lI Kn Kn Kn @@ -55093,31 +56240,31 @@ Kn Kn Kn lI -ik -PV +aZ +BD +lI +lI +lI +lI +DM +DM +DM +DM +lI +lI +lI +lI +lI +DM +DM +DM +DM +lI +lI +lI +zW +ax lI -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn Kn Kn Kn @@ -55328,13 +56475,13 @@ Zj Kn Kn Lk -IS +UV oV oV oV FX Lk -LK +UK WZ Lk Kn @@ -55350,33 +56497,33 @@ Kn Kn Kn lI -Lb -PV +kN +LD +Ld +eV +eV +AK +YU +ED +ED +ED +wv +cW +eV +eV +AK +YU +ED +ED +ED +wv +cW +HN +fh +Kf lI Kn Kn -dR -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn Kn Kn Kn @@ -55564,15 +56711,15 @@ RF bD tU vF -JI +RF bD tU vF -JI +RF bD tU vF -JI +Lz bD tU Zj @@ -55605,33 +56752,33 @@ Kn Kn Kn Kn -Kn -lI -aZ -PV lI lI +qa +Kk +og +BY +BY +kx +Tk +BY +BY +BY +BY +Gc +BY +BY +kx +Tk +BY +BY +BY +BY +Gc +BY +BY +kv lI -lI -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn Kn Kn Kn @@ -55863,32 +57010,32 @@ Kn Kn Kn lI -lI -ik +Ia +gw PV -aP -lt -ov -ax -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn +lI +lI +lI +lI +DM +DM +DM +DM +lI +lI +lI +lI +lI +DM +DM +DM +DM +lI +lI +lI +lI +lI +lI Kn Kn Kn @@ -56105,8 +57252,8 @@ qJ oV tG Lk -LK -WZ +Tx +bx Lk Kn Kn @@ -56123,10 +57270,10 @@ lI Ia ys mv -fG -Px -KU -sK +lI +Kn +Kn +Kn Kn Kn Kn @@ -56379,19 +57526,19 @@ Kn lI BH Dd -PV -lI -lI -lI +sK lI Kn Kn Kn Kn +ir Kn Kn +ir Kn Kn +ir Kn Kn Kn @@ -56636,11 +57783,11 @@ Kn lI lI qa -PV +sK lI Kn Kn -dR +Kn Kn Kn Kn @@ -56893,11 +58040,11 @@ Lk Kn lI xX -PV +sK lI Kn Kn -Kn +dR Kn Kn Kn @@ -57150,8 +58297,8 @@ fS Kn lI Lc -PV -lI +sK +DM Kn Kn Kn @@ -57388,7 +58535,7 @@ Cu mO gi jo -Li +XU sr kB dL @@ -57407,11 +58554,11 @@ fS Kn lI qa -PV -lI +sK +DM +Kn Kn Kn -dR Kn Kn Kn @@ -57645,7 +58792,7 @@ Cu xY dg tv -ns +sY dL Tf cX @@ -57664,11 +58811,11 @@ fS Kn lI qa -PV -lI -Kn +sK +DM Kn Kn +dR Kn Kn Kn @@ -57920,9 +59067,9 @@ Cu fS Kn lI -qa -PV -lI +yM +sK +DM Kn Kn Kn @@ -58177,12 +59324,12 @@ Cu fS Kn lI -qa -PV +mX +ct lI Kn Kn -dR +Kn Kn Kn Kn @@ -58435,11 +59582,11 @@ fS Kn lI xX -PV +sK lI Kn Kn -Kn +dR Kn Kn Kn @@ -58692,19 +59839,19 @@ fS Kn lI Lc -PV +sK +lI +lI +lI lI Kn Kn Kn Kn -ir Kn Kn -ir Kn Kn -ir Kn Kn Kn @@ -58929,8 +60076,8 @@ mh Cu Cu xh -XU -Wb +kh +ML tH fK dL @@ -58949,11 +60096,11 @@ fS Kn lI qa -PV -lI -Kn -Kn -Kn +CJ +aP +lt +ov +FQ Kn Kn Kn @@ -59205,12 +60352,12 @@ Cu fS Kn lI -tF +qa Gn -lI -Kn -Kn -Kn +fG +Px +KU +bk Kn Kn Kn @@ -59463,11 +60610,11 @@ Lk Kn lI qa -Uk +VZ +lI +lI +lI lI -Kn -Kn -Kn Kn Kn Kn @@ -59720,11 +60867,11 @@ Kn Kn lI qa -Uk +VZ lI Kn Kn -Kn +dR Kn Kn Kn @@ -59977,7 +61124,7 @@ Kn Kn lI xX -Uk +VZ lI Kn Kn @@ -60221,21 +61368,21 @@ Kn Kn Kn Kn +ir Kn Kn +ir Kn Kn -Kn -Kn -Kn +ir Kn Kn Kn Kn lI Lc -Uk -lI +VZ +DM Kn Kn Kn @@ -60490,12 +61637,12 @@ Kn Kn Kn lI -rQ -Lt -lI -Kn +qa +BO +DM Kn Kn +dR Kn Kn Kn @@ -60743,13 +61890,13 @@ Kn Kn Kn Kn -Kn +dR Kn Kn lI qa BO -lI +DM Kn Kn Kn @@ -61004,9 +62151,9 @@ Kn Kn Kn lI -qa +JI BO -lI +DM Kn Kn Kn @@ -61261,12 +62408,12 @@ Kn Kn Kn lI -qa -BO +ZX +iv lI Kn Kn -Kn +dR Kn Kn Kn @@ -61514,12 +62661,12 @@ Kn Kn Kn Kn -Kn +dR Kn Kn lI -Ep -BO +qa +Zq lI Kn Kn @@ -61776,19 +62923,19 @@ Kn Kn lI fB -BY +Zq lI Kn Kn Kn Kn +ir Kn Kn +ir Kn Kn -Kn -Kn -Kn +ir Kn Kn Kn @@ -62032,7 +63179,7 @@ Kn Kn Kn lI -LE +yM Zq lI Kn @@ -62285,12 +63432,12 @@ Kn Kn Kn Kn -Kn +dR Kn Kn lI -be -sH +JI +Zq lI Kn Kn @@ -62542,20 +63689,20 @@ Kn Kn Kn Kn -Kn -Kn -Kn lI -vt -uV lI -Kn -Kn -Kn -Kn -Kn -Kn -Kn +lI +lI +qa +Zq +lI +lI +DM +DM +DM +DM +lI +lI Kn Kn Kn @@ -62795,24 +63942,24 @@ Kn Kn Kn Kn -ir Kn Kn -ir Kn Kn -ir +PB +Dp +fn +Tm +NF +dz +jD +xv +PL +my +Dt +kj +Li lI -UY -kk -lI -ir -Kn -Kn -ir -Kn -Kn -ir Kn Kn Kn @@ -63056,20 +64203,20 @@ Kn Kn Kn Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn +Ep +ha +fU +Oh +ns +BY +Ba +BY +Tk +BY +dE +ps +VL +lI Kn Kn Kn @@ -63307,13 +64454,26 @@ Kn Kn Kn Kn -dR Kn Kn Kn Kn Kn Kn +lI +lI +lI +lI +lI +lI +lI +lI +DM +DM +lI +LE +sJ +lI Kn Kn Kn @@ -63328,19 +64488,6 @@ Kn Kn Kn Kn -dR -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn -Kn Kn Kn Kn @@ -63570,6 +64717,7 @@ Kn Kn Kn Kn +dR Kn Kn Kn @@ -63579,11 +64727,10 @@ Kn Kn Kn Kn -Kn -Kn -Kn -Kn -Kn +lI +be +sH +lI Kn Kn Kn @@ -63837,10 +64984,10 @@ Kn Kn Kn Kn -Kn -Kn -Kn -Kn +lI +vt +uV +lI Kn Kn Kn @@ -64078,7 +65225,6 @@ Kn Kn Kn Kn -dR Kn Kn Kn @@ -64088,23 +65234,24 @@ Kn Kn Kn Kn +ir Kn Kn +ir Kn Kn +ir +lI +UY +kk +lI +ir Kn Kn +ir Kn Kn -Kn -Kn -Kn -dR -Kn -Kn -Kn -Kn -Kn +ir Kn Kn Kn @@ -64341,7 +65488,7 @@ Kn Kn Kn Kn -Kn +dR Kn Kn Kn @@ -64599,6 +65746,7 @@ Kn Kn Kn Kn +dR Kn Kn Kn @@ -64619,8 +65767,7 @@ Kn Kn Kn Kn -Kn -Kn +dR Kn Kn Kn @@ -64849,7 +65996,6 @@ Kn Kn Kn Kn -dR Kn Kn Kn @@ -64870,7 +66016,8 @@ Kn Kn Kn Kn -dR +Kn +Kn Kn Kn Kn @@ -65112,7 +66259,7 @@ Kn Kn Kn Kn -Kn +dR Kn Kn Kn @@ -65370,6 +66517,7 @@ Kn Kn Kn Kn +dR Kn Kn Kn @@ -65390,8 +66538,7 @@ Kn Kn Kn Kn -Kn -Kn +dR Kn Kn Kn @@ -65618,13 +66765,13 @@ Kn Kn Kn Kn +ir Kn Kn +ir Kn Kn -Kn -Kn -Kn +ir Kn Kn Kn @@ -66141,6 +67288,7 @@ Kn Kn Kn Kn +dR Kn Kn Kn @@ -66161,8 +67309,7 @@ Kn Kn Kn Kn -Kn -Kn +dR Kn Kn Kn diff --git a/maps/away/away_site/tajara/peoples_station/peoples_station_landmarks.dm b/maps/away/away_site/tajara/peoples_station/peoples_station_landmarks.dm index d88e3564521..9688b058dea 100644 --- a/maps/away/away_site/tajara/peoples_station/peoples_station_landmarks.dm +++ b/maps/away/away_site/tajara/peoples_station/peoples_station_landmarks.dm @@ -69,6 +69,30 @@ // ---- +/obj/effect/shuttle_landmark/nav_peoples_station/starboard_dock + name = "People's Space Station Starboard Dock" + landmark_tag = "nav_peoples_station_starboard_dock" + docking_controller = "peoples_station_port_dock" + +/obj/effect/map_effect/marker/airlock/docking/peoples_station/dock/starboard + name = "People's Space Station Starboard Dock" + landmark_tag = "nav_peoples_station_starboard_dock" + master_tag = "peoples_station_starboard_port" + +// ---- + +/obj/effect/shuttle_landmark/nav_peoples_station/aft_dock + name = "People's Space Station Aft Dock" + landmark_tag = "nav_peoples_station_aft_dock" + docking_controller = "peoples_station_aft_dock" + +/obj/effect/map_effect/marker/airlock/docking/peoples_station/dock/aft + name = "People's Space Station Starboard Dock" + landmark_tag = "nav_peoples_station_aft_dock" + master_tag = "peoples_station_aft_port" + +// ---- + /obj/effect/shuttle_landmark/nav_peoples_station/nav1 name = "People's Space Station Navpoint #1" landmark_tag = "nav_peoples_station_ship_1"