From 7d9c65ec5ddfc49c0af96889565e7fc2e06d8e1c Mon Sep 17 00:00:00 2001 From: Ben <91219575+Ben10083@users.noreply.github.com> Date: Sat, 8 Jun 2024 12:40:28 -0400 Subject: [PATCH] PRA Database Freighter Shuttle Airlock Remake (#19354) Database Freighter Shuttle airlock expanded and fixed to properly dock with docking ports. ![image](https://github.com/Aurorastation/Aurora.3/assets/91219575/f244b717-ccb8-4d1c-a856-8f4c52b4bc5a) --------- Co-authored-by: Ben10083 --- code/game/machinery/atmoalter/canister.dm | 1 + .../Ben10083 - Database Airlock.yml | 58 +++ .../database_freighter/database_freighter.dm | 8 +- .../database_freighter/database_freighter.dmm | 457 ++++++++++++------ .../database_freighter/database_landmarks.dm | 8 +- 5 files changed, 383 insertions(+), 149 deletions(-) create mode 100644 html/changelogs/Ben10083 - Database Airlock.yml diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index 883a5078bbf..61123423411 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -167,6 +167,7 @@ icon_state = "grey" canister_color = "grey" can_label = 0 + /obj/machinery/portable_atmospherics/canister/air/airlock start_pressure = 3 * ONE_ATMOSPHERE diff --git a/html/changelogs/Ben10083 - Database Airlock.yml b/html/changelogs/Ben10083 - Database Airlock.yml new file mode 100644 index 00000000000..a119cdfcbce --- /dev/null +++ b/html/changelogs/Ben10083 - Database Airlock.yml @@ -0,0 +1,58 @@ +################################ +# 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: + - bugfix: "PRA Database Freighter Shuttle Airlock remade and fixed." diff --git a/maps/away/ships/pra/database_freighter/database_freighter.dm b/maps/away/ships/pra/database_freighter/database_freighter.dm index 5b043e9a724..324a524acfb 100644 --- a/maps/away/ships/pra/database_freighter/database_freighter.dm +++ b/maps/away/ships/pra/database_freighter/database_freighter.dm @@ -97,16 +97,15 @@ fore_dir = SOUTH vessel_size = SHIP_SIZE_TINY -/obj/machinery/computer/shuttle_control/explore/database_freighter_shuttle +/obj/machinery/computer/shuttle_control/explore/terminal/database_freighter_shuttle name = "shuttle control console" shuttle_tag = "Database Freighter Shuttle" - /datum/shuttle/autodock/overmap/database_freighter_shuttle name = "Database Freighter Shuttle" move_time = 20 shuttle_area = list(/area/shuttle/database_freighter_shuttle) - dock_target = "database_freighter_shuttle" + dock_target = "airlock_database_freighter_shuttle" current_location = "nav_database_freighter_shuttle" landmark_transition = "nav_transit_database_freighter_shuttle" range = 1 @@ -117,4 +116,5 @@ /obj/effect/map_effect/marker/airlock/shuttle/database_freighter_shuttle name = "Database Freighter Shuttle" shuttle_tag = "Database Freighter Shuttle" - master_tag = "nav_database_freighter_shuttle" + master_tag = "airlock_database_freighter_shuttle" + req_one_access = list(209) diff --git a/maps/away/ships/pra/database_freighter/database_freighter.dmm b/maps/away/ships/pra/database_freighter/database_freighter.dmm index 75d00f680c2..c514403e816 100644 --- a/maps/away/ships/pra/database_freighter/database_freighter.dmm +++ b/maps/away/ships/pra/database_freighter/database_freighter.dmm @@ -47,7 +47,11 @@ /area/database_freighter/bridge) "aj" = ( /obj/effect/landmark/entry_point/fore, -/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, +/obj/effect/map_effect/window_spawner/full/shuttle/raider{ + spawn_firedoor = 1; + req_one_access = list(209); + spawn_grille = 1 + }, /turf/simulated/floor/plating, /area/shuttle/database_freighter_shuttle) "al" = ( @@ -85,27 +89,19 @@ }, /area/database_freighter/captain_quarters) "at" = ( -/obj/machinery/door/airlock/external, -/obj/machinery/access_button{ - pixel_x = -28; - pixel_y = 12; - dir = 1 - }, -/obj/machinery/access_button{ - pixel_x = 28; - pixel_y = 12; - dir = 1 - }, -/obj/effect/floor_decal/industrial/hatch/red, -/obj/effect/floor_decal/industrial/warning/full, -/obj/effect/map_effect/marker_helper/airlock/exterior, /obj/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/lattice/catwalk/indoor, +/obj/effect/map_effect/marker_helper/airlock/out, /obj/effect/map_effect/marker/airlock/shuttle/database_freighter_shuttle, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor, /area/shuttle/database_freighter_shuttle) "au" = ( /obj/effect/step_trigger/teleporter, @@ -282,40 +278,17 @@ }, /area/database_freighter/barracks) "bb" = ( -/obj/machinery/embedded_controller/radio/airlock/docking_port{ - dir = 8; - pixel_y = 6; - pixel_x = 20 - }, -/obj/machinery/airlock_sensor{ - pixel_x = 20; - dir = 8; - pixel_y = -6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 8 - }, -/obj/machinery/light/small/emergency{ - dir = 8 - }, -/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux, -/obj/effect/floor_decal/industrial/outline_door/red, -/obj/effect/floor_decal/industrial/outline_door/red{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/outline_straight/red{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/outline_straight/red{ - dir = 8 - }, /obj/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/lattice/catwalk/indoor, /obj/effect/map_effect/marker/airlock/shuttle/database_freighter_shuttle, -/turf/simulated/floor/tiled/dark/full, +/turf/simulated/floor, /area/shuttle/database_freighter_shuttle) "bd" = ( /obj/structure/closet/walllocker/medical{ @@ -536,9 +509,19 @@ }, /area/database_freighter/laboratory) "ce" = ( -/obj/machinery/atmospherics/binary/pump/fuel/on, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled/dark, +/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/database_freighter_shuttle, +/turf/simulated/floor/reinforced, /area/shuttle/database_freighter_shuttle) "cf" = ( /obj/effect/floor_decal/corner/red{ @@ -561,6 +544,12 @@ temperature = 278.15 }, /area/database_freighter) +"ci" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 + }, +/turf/simulated/wall/shuttle/raider, +/area/shuttle/database_freighter_shuttle) "cj" = ( /obj/structure/lattice/catwalk, /obj/structure/railing/mapped, @@ -894,10 +883,24 @@ }, /area/database_freighter/laboratory) "dz" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ - dir = 1 +/obj/structure/bed/handrail{ + dir = 4 }, -/turf/simulated/wall/shuttle/raider, +/obj/machinery/light/small/emergency{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/machinery/airlock_sensor{ + pixel_x = -24; + pixel_y = -6; + dir = 4 + }, +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux, +/obj/effect/decal/cleanable/dirt, +/obj/effect/map_effect/marker/airlock/shuttle/database_freighter_shuttle, +/turf/simulated/floor/tiled/dark/full, /area/shuttle/database_freighter_shuttle) "dA" = ( /obj/effect/floor_decal/industrial/warning, @@ -1024,7 +1027,7 @@ /obj/structure/sign/flag/pra{ pixel_y = -32 }, -/obj/machinery/computer/shuttle_control/explore/database_freighter_shuttle{ +/obj/machinery/computer/shuttle_control/explore/terminal/database_freighter_shuttle{ dir = 4 }, /turf/simulated/floor/tiled/dark, @@ -1052,9 +1055,28 @@ }, /area/database_freighter/bridge) "ej" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ + dir = 1 + }, /turf/simulated/wall/shuttle/raider, /area/shuttle/database_freighter_shuttle) +"em" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/obj/effect/shuttle_landmark/database_freighter_shuttle/hangar{ + dir = 1 + }, +/turf/simulated/floor{ + temperature = 278.15 + }, +/area/database_freighter/hangar) "eo" = ( /obj/effect/floor_decal/corner/red{ dir = 5 @@ -1566,11 +1588,14 @@ }, /area/database_freighter/engineering) "gQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/obj/machinery/atmospherics/binary/pump/fuel/on, /obj/effect/floor_decal/spline/plain/grey{ dir = 4 }, /obj/effect/floor_decal/industrial/outline/grey, +/obj/machinery/alarm/north{ + req_one_access = list(209) + }, /turf/simulated/floor/tiled/dark, /area/shuttle/database_freighter_shuttle) "gT" = ( @@ -1685,6 +1710,11 @@ dir = 9; icon_state = "warning" }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor{ temperature = 278.15 }, @@ -1697,6 +1727,16 @@ temperature = 278.15 }, /area/database_freighter/engineering) +"hB" = ( +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/tiled/dark{ + temperature = 278.15 + }, +/area/database_freighter/hangar) "hE" = ( /obj/effect/floor_decal/corner/red{ dir = 10 @@ -1862,15 +1902,25 @@ }, /area/database_freighter/laboratory) "in" = ( +/obj/structure/lattice/catwalk/indoor, /obj/structure/cable/green{ - icon_state = "2-8" + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/effect/shuttle_landmark/database_freighter_shuttle/hangar{ +/obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 1 }, -/turf/simulated/floor{ - temperature = 278.15 +/obj/machinery/access_button{ + pixel_x = -26; + dir = 1; + pixel_y = 10 }, +/obj/machinery/door/airlock/external, +/obj/effect/map_effect/marker_helper/airlock/exterior, +/obj/effect/map_effect/marker/airlock/shuttle/database_freighter_shuttle, +/obj/effect/landmark/entry_point/aft, +/turf/simulated/floor, /area/shuttle/database_freighter_shuttle) "iv" = ( /obj/effect/step_trigger/teleporter, @@ -1911,7 +1961,7 @@ "iK" = ( /obj/machinery/embedded_controller/radio/simple_docking_controller{ frequency = 1380; - req_one_access = list(31,48,67); + req_one_access = list(209); tag_door = "mining_shuttle_dock_doors"; pixel_x = -25; id_tag = "database_freighter_shuttle_dock" @@ -1939,6 +1989,15 @@ temperature = 278.15 }, /area/database_freighter) +"iV" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 8 + }, +/turf/simulated/wall/shuttle/raider, +/area/shuttle/database_freighter_shuttle) "iZ" = ( /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /obj/effect/floor_decal/industrial/outline/yellow, @@ -1966,7 +2025,7 @@ pixel_x = 28; dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/aux, /obj/effect/floor_decal/industrial/hatch/red, /obj/effect/floor_decal/industrial/warning/full, /obj/effect/map_effect/marker_helper/airlock/interior, @@ -1976,6 +2035,9 @@ icon_state = "1-2" }, /obj/effect/map_effect/marker/airlock/shuttle/database_freighter_shuttle, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/shuttle/database_freighter_shuttle) "ji" = ( @@ -2043,7 +2105,11 @@ }, /area/database_freighter/engineering) "jJ" = ( -/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, +/obj/effect/map_effect/window_spawner/full/shuttle/raider{ + spawn_firedoor = 1; + req_one_access = list(209); + spawn_grille = 1 + }, /obj/machinery/door/blast/regular/open{ dir = 2; id = "database_bridge" @@ -2381,7 +2447,11 @@ }, /area/database_freighter) "lv" = ( -/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, +/obj/effect/map_effect/window_spawner/full/shuttle/raider{ + spawn_firedoor = 1; + req_one_access = list(209); + spawn_grille = 1 + }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 }, @@ -2530,7 +2600,11 @@ }, /area/database_freighter) "mk" = ( -/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, +/obj/effect/map_effect/window_spawner/full/shuttle/raider{ + spawn_firedoor = 1; + req_one_access = list(209); + spawn_grille = 1 + }, /obj/machinery/door/blast/regular/open{ dir = 4; id = "database_bridge" @@ -2562,7 +2636,11 @@ }, /area/database_freighter/barracks) "mr" = ( -/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, +/obj/effect/map_effect/window_spawner/full/shuttle/raider{ + spawn_firedoor = 1; + req_one_access = list(209); + spawn_grille = 1 + }, /obj/effect/landmark/entry_point/fore{ name = "fore, bridge" }, @@ -2649,7 +2727,7 @@ icon_state = "0-2" }, /obj/machinery/power/apc/east{ - req_access = null + req_access = list(209) }, /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /turf/simulated/floor/tiled/dark, @@ -2693,7 +2771,11 @@ }, /area/database_freighter/laboratory) "nq" = ( -/obj/effect/map_effect/window_spawner/full/reinforced, +/obj/effect/map_effect/window_spawner/full/shuttle/raider{ + spawn_firedoor = 1; + req_one_access = list(209); + spawn_grille = 1 + }, /turf/simulated/floor/plating, /area/shuttle/database_freighter_shuttle) "nr" = ( @@ -2827,18 +2909,30 @@ }, /area/database_freighter/laboratory) "oF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 9 +/obj/machinery/atmospherics/portables_connector/aux{ + dir = 8 }, -/obj/machinery/alarm/east{ - req_one_access = null - }, -/obj/effect/floor_decal/industrial/outline/grey, +/obj/machinery/portable_atmospherics/canister/air/airlock, +/obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled/dark, /area/shuttle/database_freighter_shuttle) "oI" = ( -/obj/effect/landmark/entry_point/aft, -/turf/simulated/wall/shuttle/raider, +/obj/structure/bed/handrail{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8; + layer = 2.71 + }, +/obj/machinery/embedded_controller/radio/airlock/docking_port{ + pixel_y = 24 + }, +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 1 + }, +/obj/effect/map_effect/marker_helper/airlock/out, +/obj/effect/map_effect/marker/airlock/shuttle/database_freighter_shuttle, +/turf/simulated/floor/tiled/dark/full, /area/shuttle/database_freighter_shuttle) "oN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ @@ -2846,6 +2940,12 @@ }, /turf/simulated/floor/plating, /area/database_freighter/engine) +"oY" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5 + }, +/turf/simulated/wall/shuttle/raider, +/area/shuttle/database_freighter_shuttle) "pf" = ( /obj/effect/floor_decal/corner/red{ dir = 1 @@ -3033,7 +3133,7 @@ /turf/simulated/floor/tiled/dark{ temperature = 278.15 }, -/area/database_freighter/eva) +/area/database_freighter/hangar) "sn" = ( /obj/structure/bed/stool/chair/shuttle, /turf/simulated/floor/tiled/dark, @@ -3046,6 +3146,19 @@ temperature = 278.15 }, /area/database_freighter/hangar) +"st" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor{ + temperature = 278.15 + }, +/area/database_freighter/hangar) "sx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 8 @@ -3323,6 +3436,11 @@ d2 = 8; icon_state = "4-8" }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 }, @@ -3891,18 +4009,14 @@ /area/database_freighter/storage) "Ez" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 8; + dir = 4; icon_state = "warning" }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, +/obj/machinery/atmospherics/unary/engine, /turf/simulated/floor{ temperature = 278.15 }, -/area/database_freighter/hangar) +/area/shuttle/database_freighter_shuttle) "Fd" = ( /obj/structure/table/standard, /obj/machinery/door/window/brigdoor/westleft{ @@ -4004,6 +4118,13 @@ temperature = 278.15 }, /area/database_freighter/laboratory) +"Hm" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 1; + icon_state = "map" + }, +/turf/simulated/wall/shuttle/raider, +/area/shuttle/database_freighter_shuttle) "Ho" = ( /obj/structure/cable/green{ d2 = 2; @@ -4020,10 +4141,18 @@ /turf/space/transit/north, /area/space) "HD" = ( -/obj/machinery/atmospherics/portables_connector/aux, -/obj/machinery/portable_atmospherics/canister/air/airlock, -/obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled/dark, +/obj/structure/bed/handrail{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 1 + }, +/obj/effect/map_effect/marker_helper/airlock/out, +/obj/effect/map_effect/marker/airlock/shuttle/database_freighter_shuttle, +/turf/simulated/floor/tiled/dark/full, /area/shuttle/database_freighter_shuttle) "HK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ @@ -4515,13 +4644,21 @@ /turf/simulated/floor/plating, /area/database_freighter/engine) "PH" = ( -/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, +/obj/effect/map_effect/window_spawner/full/shuttle/raider{ + spawn_firedoor = 1; + req_one_access = list(209); + spawn_grille = 1 + }, /turf/simulated/floor{ temperature = 278.15 }, /area/database_freighter/laboratory) "PO" = ( -/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, +/obj/effect/map_effect/window_spawner/full/shuttle/raider{ + spawn_firedoor = 1; + req_one_access = list(209); + spawn_grille = 1 + }, /turf/simulated/floor/reinforced{ temperature = 278.15 }, @@ -4570,10 +4707,12 @@ }, /area/database_freighter/hangar) "Ql" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4 +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/turf/simulated/floor{ +/turf/simulated/floor/tiled/dark{ temperature = 278.15 }, /area/database_freighter/hangar) @@ -4585,8 +4724,10 @@ /turf/simulated/floor/plating, /area/database_freighter/engineering) "Qr" = ( -/obj/machinery/atmospherics/unary/engine, -/turf/simulated/floor/plating, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9 + }, +/turf/simulated/wall/shuttle/raider, /area/shuttle/database_freighter_shuttle) "QE" = ( /obj/effect/floor_decal/corner/red/full{ @@ -4612,7 +4753,11 @@ }, /area/database_freighter) "Rg" = ( -/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, +/obj/effect/map_effect/window_spawner/full/shuttle/raider{ + spawn_firedoor = 1; + req_one_access = list(209); + spawn_grille = 1 + }, /obj/effect/landmark/entry_point/starboard{ name = "starboard, hull" }, @@ -4779,15 +4924,26 @@ }, /area/database_freighter/laboratory) "Uv" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 }, -/turf/simulated/floor{ - temperature = 278.15 +/turf/simulated/wall/shuttle/raider, +/area/shuttle/database_freighter_shuttle) +"Uw" = ( +/obj/structure/bed/handrail{ + dir = 8 }, -/area/database_freighter/hangar) +/obj/machinery/light/small/emergency{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8; + layer = 2.71 + }, +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux, +/obj/effect/map_effect/marker/airlock/shuttle/database_freighter_shuttle, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/database_freighter_shuttle) "UN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -5038,6 +5194,21 @@ temperature = 278.15 }, /area/database_freighter/hangar) +"YQ" = ( +/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 = 4 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, +/obj/effect/map_effect/marker_helper/airlock/exterior, +/obj/effect/map_effect/marker/airlock/shuttle/database_freighter_shuttle, +/turf/simulated/floor/reinforced, +/area/shuttle/database_freighter_shuttle) "YR" = ( /obj/effect/landmark/entry_point/starboard{ name = "starboard, engine" @@ -5075,7 +5246,11 @@ /turf/simulated/wall/shuttle/raider, /area/database_freighter/captain_quarters) "Zq" = ( -/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, +/obj/effect/map_effect/window_spawner/full/shuttle/raider{ + spawn_firedoor = 1; + req_one_access = list(209); + spawn_grille = 1 + }, /turf/simulated/floor{ temperature = 278.15 }, @@ -13744,13 +13919,13 @@ xw Az Az Az -ZI -ZI +yo +yo rM -ZI -ZI -ZI -ZI +yo +yo +yo +yo yo fU Zf @@ -14067,20 +14242,20 @@ rj xw iZ Nf -Nf -Nf -Nf -Nf -Nf -Nf -Nf -Nf -Nf -Nf -Nf -Nf -Nf -Nf +hB +Ql +Ql +Ql +Ql +Ql +Ql +Ql +Ql +Ql +Ql +Ql +Ql +Ql wu yo fD @@ -14230,10 +14405,10 @@ xw Nf Nf hx -Ez SW -rg -rg +YQ +Ez +Gr rg nq fV @@ -14391,12 +14566,12 @@ rj xw LD Nf -so +st Uv Qr -Gr +rg +HK eU -ce iJ Ic rg @@ -14553,9 +14728,9 @@ rj xw YD Nf -so -Uv -rg +st +Hm +HD dz ej gQ @@ -14715,7 +14890,7 @@ qs xw kc Nf -so +em in at bb @@ -14878,10 +15053,10 @@ xw YD Nf so -kS +Hm oI -HK -rg +Uw +iV px aP Jn @@ -15040,10 +15215,10 @@ xw LD Nf so -kS -Qr -Kt -HD +ci +oY +rg +HK oF mR cF @@ -15202,10 +15377,10 @@ xw XH Nf rH -Ql DT -rg -rg +ce +Ez +Kt rg rg hO diff --git a/maps/away/ships/pra/database_freighter/database_landmarks.dm b/maps/away/ships/pra/database_freighter/database_landmarks.dm index 994f2496150..6f4c7cecd49 100644 --- a/maps/away/ships/pra/database_freighter/database_landmarks.dm +++ b/maps/away/ships/pra/database_freighter/database_landmarks.dm @@ -25,10 +25,10 @@ /obj/effect/shuttle_landmark/database_freighter/dock/aft name = "Dock, Aft" - landmark_tag = "nav_database_freighter_dock_starboard" - docking_controller = "airlock_database_freighter_dock_starboard" + landmark_tag = "nav_database_freighter_dock_aft" + docking_controller = "airlock_database_freighter_dock_aft" /obj/effect/map_effect/marker/airlock/docking/database_freighter/dock/aft name = "Dock, Aft" - landmark_tag = "nav_database_freighter_dock_starboard" - master_tag = "airlock_database_freighter_starboard" + landmark_tag = "nav_database_freighter_dock_aft" + master_tag = "airlock_database_freighter_aft"