diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index 92663795bee..49f8fc5e2e4 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -7,6 +7,7 @@ simulated = 0 invisibility = 101 var/delete_me = 0 + layer = ABOVE_MOB_LAYER /obj/effect/landmark/New() ..() diff --git a/code/modules/effects/map_effects/window_spawner.dm b/code/modules/effects/map_effects/window_spawner.dm index 049bf4a1345..531e7461f92 100644 --- a/code/modules/effects/map_effects/window_spawner.dm +++ b/code/modules/effects/map_effects/window_spawner.dm @@ -1,19 +1,28 @@ -// -// Window Spawner -// + +// ----------------------------------- window spawner base + /obj/effect/map_effect/window_spawner name = "window spawner" icon = 'icons/effects/map_effects.dmi' + atmos_canpass = CANPASS_NEVER + var/window_path = /obj/structure/window/basic var/frame_path = /obj/structure/window_frame var/grille_path = /obj/structure/grille/over var/firedoor_path = /obj/machinery/door/firedoor - var/single_window = FALSE // For full window panes and full windows. - var/spawn_frame = FALSE // For full windows. - var/spawn_grille = FALSE // For electrified windows. + + /// For full window panes and full windows + var/single_window = FALSE + /// For full windows + var/spawn_frame = FALSE + /// For electrified windows + var/spawn_grille = FALSE var/spawn_firedoor = FALSE + + /// If not null, sets frame to this color + var/frame_color = null + var/activated - atmos_canpass = CANPASS_NEVER /obj/effect/map_effect/window_spawner/CanPass() // Stops ZAS expanding zones past us, the windows will block the zone anyway. return FALSE @@ -41,7 +50,9 @@ if(activated) return if(spawn_frame) - new frame_path(loc) + var/obj/frame = new frame_path(loc) + if(istype(frame) && frame_color) + frame.color = frame_color if(spawn_grille) new grille_path(loc) if(spawn_firedoor) @@ -78,7 +89,8 @@ /obj/effect/map_effect/window_spawner/proc/handle_grille_spawn(var/obj/structure/grille/G) return -/********** Quarter Windows **********/ +// ----------------------------------- old quarter windows subtypes + /obj/effect/map_effect/window_spawner/basic name = "window grille spawner" icon_state = "window-g" @@ -128,7 +140,8 @@ if(id) W.id = id -/********** Full Windows **********/ +// ----------------------------------- windows subtypes + // Window /obj/effect/map_effect/window_spawner/full // Unused. name = "unused" @@ -215,3 +228,16 @@ icon_state = "full_rwindow" frame_path = /obj/structure/window_frame/wood window_path = /obj/structure/window/full/reinforced + +/obj/effect/map_effect/window_spawner/full/shuttle + name = "full reinforced window spawner" + icon_state = "full_rwindow_shuttle" + window_path = /obj/structure/window/full/reinforced + +/obj/effect/map_effect/window_spawner/full/shuttle/scc + icon_state = "full_rwindow_shuttle_scc" + frame_color = "#AAAFC7" + +/obj/effect/map_effect/window_spawner/full/shuttle/mercenary + icon_state = "full_rwindow_shuttle_merc" + frame_color = "#5B5B5B" diff --git a/html/changelogs/DreamySkrell-scout-yacht-windows.yml b/html/changelogs/DreamySkrell-scout-yacht-windows.yml new file mode 100644 index 00000000000..03b2c08a32a --- /dev/null +++ b/html/changelogs/DreamySkrell-scout-yacht-windows.yml @@ -0,0 +1,10 @@ + + +author: DreamySkrell + +delete-after: True + +changes: + - maptweak: "SCC Scout Ship mapping and name tweaks." + - maptweak: "Civilian Yacht mapping tweaks." + - rscadd: "Shuttle window spawners." diff --git a/icons/effects/map_effects.dmi b/icons/effects/map_effects.dmi index 185d09a64c6..adaff77832c 100644 Binary files a/icons/effects/map_effects.dmi and b/icons/effects/map_effects.dmi differ diff --git a/maps/away/ships/scc/scc_scout_ship.dm b/maps/away/ships/scc/scc_scout_ship.dm index 49e58a49cae..897208ead17 100644 --- a/maps/away/ships/scc/scc_scout_ship.dm +++ b/maps/away/ships/scc/scc_scout_ship.dm @@ -54,7 +54,7 @@ ) /obj/effect/overmap/visitable/ship/scc_scout_ship/New() - designation = "[pick("Dew Point", "Monsoon", "Cyclogenesis", "Warm Fronts", "Moisture Deficit", "Borealis", "Surface Tension", "Precipitation", "Oscillation", "Coalescence", "Double Rainbow", "Through a Cloud, Darkly", "Relative Humidity", "Evapotranspiration", "Nocturnal Emission", "Dehydration", "Hydrophobia", "The Rain Formerly Known as Purple", "Lacrimosum", "Island of Ignorance", "Intertropical", "Once in a Lullaby", "A Boat Made from a Sheet of Newspaper", "Flood Control")]" + designation = "[pick("Dew Point", "Monsoon", "Cyclogenesis", "Warm Fronts", "Moisture Deficit", "Borealis", "Surface Tension", "Precipitation", "Oscillation", "Coalescence", "Double Rainbow", "Through a Cloud, Darkly", "Relative Humidity", "Evapotranspiration", "Alluvial Plain", "Dehydration", "Hydrophobia", "The Rain Formerly Known as Purple", "Lacrimosum", "Island of Ignorance", "Intertropical", "Once in a Lullaby", "A Boat Made from a Sheet of Newspaper", "Flood Control")]" ..() // shuttle @@ -84,7 +84,7 @@ return skybox_image /obj/effect/overmap/visitable/ship/landable/scc_scout_shuttle/New() - designation = "[pick("Dew Point", "Monsoon", "Cyclogenesis", "Warm Fronts", "Moisture Deficit", "Borealis", "Surface Tension", "Precipitation", "Oscillation", "Coalescence", "Double Rainbow", "Through a Cloud, Darkly", "Relative Humidity", "Evapotranspiration", "Nocturnal Emission", "Dehydration", "Hydrophobia", "The Rain Formerly Known as Purple", "Lacrimosum", "Island of Ignorance", "Intertropical", "Once in a Lullaby", "A Boat Made from a Sheet of Newspaper", "Flood Control")]" + designation = "[pick("Dew Point", "Monsoon", "Cyclogenesis", "Warm Fronts", "Moisture Deficit", "Borealis", "Surface Tension", "Precipitation", "Oscillation", "Coalescence", "Double Rainbow", "Through a Cloud, Darkly", "Relative Humidity", "Evapotranspiration", "Alluvial Plain", "Dehydration", "Hydrophobia", "The Rain Formerly Known as Purple", "Lacrimosum", "Island of Ignorance", "Intertropical", "Once in a Lullaby", "A Boat Made from a Sheet of Newspaper", "Flood Control")]" ..() /obj/machinery/computer/shuttle_control/explore/terminal/scc_scout_shuttle @@ -102,3 +102,8 @@ fuel_consumption = 2 logging_home_tag = "nav_scc_scout_shuttle_dock" defer_initialisation = TRUE + +/obj/effect/map_effect/marker/airlock/shuttle/scc_scout_ship + name = "SCC Scout Shuttle" + shuttle_tag = "SCC Scout Shuttle" + master_tag = "airlock_scc_scout_shuttle" diff --git a/maps/away/ships/scc/scc_scout_ship.dmm b/maps/away/ships/scc/scc_scout_ship.dmm index 78e33b17f8e..bd0b5857e41 100644 --- a/maps/away/ships/scc/scc_scout_ship.dmm +++ b/maps/away/ships/scc/scc_scout_ship.dmm @@ -1,8 +1,9 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aa" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/noid, -/obj/structure/window/shuttle/scc_space_ship/cardinal, +/obj/effect/map_effect/window_spawner/full/shuttle/scc{ + spawn_firedoor = 1; + spawn_grille = 1 + }, /turf/simulated/floor/plating, /area/shuttle/scc_scout_ship_shuttle/eva) "ad" = ( @@ -57,6 +58,13 @@ /obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ dir = 8 }, +/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 + }, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_atmos) "ay" = ( @@ -154,8 +162,10 @@ pixel_x = -7; pixel_y = 5 }, -/obj/effect/floor_decal/corner/blue/full, /obj/structure/table/reinforced/steel, +/obj/effect/floor_decal/corner/blue{ + dir = 10 + }, /turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/bridge) "aS" = ( @@ -189,11 +199,6 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/scc_scout_ship_shuttle/cargo) "aX" = ( -/obj/effect/map_effect/marker/airlock/shuttle{ - shuttle_tag = "SCCV Scout Shuttle"; - master_tag = "airlock_scc_scout_shuttle"; - name = "airlock_scc_scout_shuttle" - }, /obj/effect/map_effect/marker_helper/airlock/interior, /obj/effect/floor_decal/industrial/hatch/red, /obj/effect/floor_decal/industrial/warning/cee{ @@ -206,7 +211,8 @@ pixel_x = -28; dir = 2 }, -/turf/simulated/floor/plating, +/obj/effect/map_effect/marker/airlock/shuttle/scc_scout_ship, +/turf/simulated/floor/tiled/dark, /area/shuttle/scc_scout_ship_shuttle/eva) "aZ" = ( /obj/structure/lattice, @@ -254,11 +260,24 @@ }, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/mess) +"bo" = ( +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 10 + }, +/turf/simulated/floor/tiled/cargo, +/area/ship/scc_scout_ship/engineering_cargo) "bp" = ( /obj/random/dirt_75, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 4 + }, /turf/simulated/floor/tiled/dark/full, /area/ship/scc_scout_ship/hydroponics) "bq" = ( @@ -268,18 +287,22 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/floor_decal/industrial/hatch/red, /obj/machinery/door/airlock/hatch, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/engineering_cargo) "bu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/firedoor/noid, -/obj/effect/floor_decal/industrial/hatch/red, /obj/structure/cable/pink{ icon_state = "1-2" }, +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/shuttle/scc_scout_ship_shuttle/eva) "bx" = ( @@ -289,15 +312,23 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable{ icon_state = "4-8" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/eva) "by" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/tiled/dark/full, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 5 + }, +/turf/simulated/floor/tiled, /area/ship/scc_scout_ship/mess) "bB" = ( /obj/structure/lattice, @@ -313,6 +344,7 @@ /obj/structure/cable{ icon_state = "1-4" }, +/obj/machinery/light/small/emergency, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_atmos) "bH" = ( @@ -402,14 +434,18 @@ /area/ship/scc_scout_ship/eva) "cj" = ( /obj/random/dirt_75, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 6 + }, /turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/maint_propulsion_port) "cm" = ( -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_scc_scout_dock_port"; - master_tag = "airlock_scc_scout_dock_port"; - landmark_tag = "nav_scc_scout_dock_port" - }, /obj/effect/map_effect/marker_helper/airlock/interior, /obj/effect/floor_decal/industrial/hatch/red, /obj/effect/floor_decal/industrial/warning/cee{ @@ -424,7 +460,8 @@ dir = 2 }, /obj/random/dirt_75, -/turf/simulated/floor/plating, +/obj/effect/map_effect/marker/airlock/docking/scc_scout_ship/dock/port, +/turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/hydroponics) "co" = ( /obj/structure/sign/flag/heph{ @@ -446,13 +483,17 @@ /obj/structure/closet, /obj/item/storage/backpack/messenger/heph, /obj/item/crowbar, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/slate, /area/ship/scc_scout_ship/quarters) "cr" = ( /obj/structure/cable{ icon_state = "1-4" }, /obj/random/dirt_75, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_segment/red, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_atmos) "cs" = ( @@ -481,7 +522,7 @@ /obj/machinery/light/small{ dir = 8 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/cargo, /area/ship/scc_scout_ship/engineering_cargo) "cJ" = ( /obj/structure/dispenser/oxygen, @@ -499,7 +540,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 6 }, -/obj/structure/lattice/catwalk/indoor/grate, /obj/random/dirt_75, /obj/structure/cable{ icon_state = "1-8" @@ -510,6 +550,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/eva) "cS" = ( @@ -561,24 +602,35 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable/pink{ icon_state = "1-2" }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 10 + }, +/turf/simulated/floor/tiled/dark, /area/shuttle/scc_scout_ship_shuttle/cargo) "dh" = ( /obj/machinery/atmospherics/binary/pump/high_power/on{ dir = 4 }, +/obj/effect/floor_decal/industrial/hatch_tiny/yellow{ + dir = 8 + }, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_atmos) "dk" = ( -/obj/machinery/door/firedoor/noid, -/obj/effect/floor_decal/industrial/hatch/red, -/obj/machinery/door/airlock/mining, -/turf/simulated/floor/tiled/dark, -/area/ship/scc_scout_ship/engineering_cargo) +/obj/structure/lattice/catwalk, +/obj/structure/railing/mapped{ + dir = 4 + }, +/obj/item/hullbeacon/green, +/turf/space/dynamic, +/area/ship/scc_scout_ship/exterior) "dm" = ( /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/ship/scc_scout_ship/quarters) @@ -620,14 +672,19 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/eva) "dG" = ( /obj/structure/lattice/catwalk, @@ -682,10 +739,10 @@ /area/shuttle/scc_scout_ship_shuttle/cargo) "dS" = ( /obj/structure/lattice/catwalk, -/obj/item/hullbeacon/red, /obj/structure/railing/mapped{ dir = 8 }, +/obj/item/hullbeacon/green, /turf/space/dynamic, /area/ship/scc_scout_ship/exterior) "dV" = ( @@ -697,10 +754,16 @@ "dW" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable/pink{ icon_state = "2-4" }, +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 10 + }, /turf/simulated/floor/plating, /area/shuttle/scc_scout_ship_shuttle/propulsion_port) "dX" = ( @@ -739,16 +802,16 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/structure/lattice/catwalk/indoor/grate, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/shuttle/scc_scout_ship_shuttle/cargo) "ei" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/obj/structure/lattice/catwalk/indoor/grate, /obj/random/dirt_75, /obj/random/dirt_75, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/bridge) "ek" = ( @@ -779,16 +842,22 @@ /area/shuttle/scc_scout_ship_shuttle/cargo) "es" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/tiled/dark/full, +/turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/eva) "ew" = ( -/obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ icon_state = "1-2" }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 10 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 4 + }, +/turf/simulated/floor/tiled, /area/ship/scc_scout_ship/mess) "eB" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ @@ -800,7 +869,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/lattice/catwalk/indoor/grate, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_propulsion_port) "eG" = ( @@ -846,6 +915,10 @@ /obj/structure/cable{ icon_state = "2-8" }, +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 4 + }, /turf/simulated/floor/tiled/dark/full, /area/ship/scc_scout_ship/maint_power) "eP" = ( @@ -866,6 +939,10 @@ icon_state = "4-8" }, /obj/random/dirt_75, +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 10 + }, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_atmos) "eZ" = ( @@ -889,7 +966,7 @@ /obj/structure/closet, /obj/item/storage/backpack/messenger/zavod, /obj/item/crowbar, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/slate, /area/ship/scc_scout_ship/quarters) "fd" = ( /obj/machinery/portable_atmospherics/canister/carbon_dioxide, @@ -941,18 +1018,21 @@ /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/mech_recharger/hephaestus, /mob/living/heavy_vehicle/premade/ripley/loader, +/obj/machinery/light/small/emergency, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_atmos) "ft" = ( -/obj/effect/map_effect/marker/airlock/shuttle{ - shuttle_tag = "SCCV Scout Shuttle"; - master_tag = "airlock_scc_scout_shuttle"; - name = "airlock_scc_scout_shuttle" - }, /obj/machinery/atmospherics/unary/vent_pump/high_volume/aux, /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/map_effect/marker/airlock/shuttle/scc_scout_ship, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 4 + }, /turf/simulated/floor/plating, /area/shuttle/scc_scout_ship_shuttle/eva) "fw" = ( @@ -973,11 +1053,17 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable{ icon_state = "2-8" }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/maint_propulsion_starboard) "fA" = ( /obj/effect/floor_decal/corner/grey{ @@ -1016,22 +1102,17 @@ /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 9 }, -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable{ icon_state = "1-8" }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/eva) "fN" = ( /obj/effect/shuttle_landmark/scc_scout_ship/dock/aft, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_scc_scout_dock_aft"; - master_tag = "airlock_scc_scout_dock_aft"; - landmark_tag = "nav_scc_scout_dock_aft" - }, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/effect/floor_decal/industrial/hatch/red, /obj/effect/floor_decal/industrial/warning/cee{ @@ -1046,6 +1127,7 @@ dir = 1 }, /obj/random/dirt_75, +/obj/effect/map_effect/marker/airlock/docking/scc_scout_ship/dock/aft, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_propulsion_port) "fO" = ( @@ -1055,7 +1137,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/ship/scc_scout_ship/mess) "fT" = ( /obj/machinery/light, @@ -1066,10 +1148,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 8 }, -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/eva) "fV" = ( @@ -1097,7 +1179,8 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/turf/simulated/floor/tiled/dark/full, +/obj/effect/floor_decal/corner/blue/full, +/turf/simulated/floor/tiled, /area/shuttle/scc_scout_ship_shuttle/cockpit) "gc" = ( /obj/effect/floor_decal/spline/fancy/wood{ @@ -1110,13 +1193,13 @@ /turf/simulated/floor/wood, /area/ship/scc_scout_ship/mess) "gd" = ( -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable{ icon_state = "0-2" }, /obj/machinery/power/apc/north{ req_access = null }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/eva) "ge" = ( @@ -1142,14 +1225,20 @@ /area/ship/scc_scout_ship/quarters) "gf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/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 = 8 + }, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_atmos) "gi" = ( -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable/pink{ icon_state = "1-2" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/shuttle/scc_scout_ship_shuttle/cargo) "gm" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ @@ -1164,11 +1253,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable/pink{ icon_state = "4-8" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/shuttle/scc_scout_ship_shuttle/cargo) "go" = ( /obj/structure/bed/roller, @@ -1208,6 +1296,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 6 + }, /turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/maint_power) "gz" = ( @@ -1253,10 +1344,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_propulsion_port) "gP" = ( @@ -1288,11 +1379,34 @@ }, /turf/simulated/floor/plating, /area/shuttle/scc_scout_ship_shuttle/cargo) +"gW" = ( +/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 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/turf/simulated/floor/plating, +/area/ship/scc_scout_ship/eva) "ha" = ( /obj/structure/cable{ icon_state = "4-8" }, /obj/random/dirt_75, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 9 + }, +/obj/effect/floor_decal/industrial/outline_segment/red, /turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/maint_power) "hd" = ( @@ -1309,6 +1423,9 @@ }, /obj/machinery/door/window/westright, /obj/random/dirt_75, +/obj/structure/cable/pink{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/white, /area/shuttle/scc_scout_ship_shuttle/medbay) "ho" = ( @@ -1335,11 +1452,19 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable/pink{ icon_state = "1-2" }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 5 + }, +/turf/simulated/floor/tiled/dark, /area/shuttle/scc_scout_ship_shuttle/cargo) "hu" = ( /turf/simulated/wall/shuttle/scc_space_ship/cardinal, @@ -1365,7 +1490,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/floor_decal/industrial/hatch_door/red, /turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/quarters) "hz" = ( @@ -1423,11 +1548,6 @@ /obj/effect/shuttle_landmark/scc_scout_ship/dock/starboard{ dir = 4 }, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_scc_scout_dock_starboard"; - master_tag = "airlock_scc_scout_dock_starboard"; - landmark_tag = "nav_scc_scout_dock_starboard" - }, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/effect/floor_decal/industrial/hatch/red, /obj/effect/floor_decal/industrial/warning/cee, @@ -1439,11 +1559,9 @@ pixel_y = -28; dir = 8 }, +/obj/effect/map_effect/marker/airlock/docking/scc_scout_ship/dock/starboard, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_atmos) -"hV" = ( -/turf/simulated/wall/shuttle/scc_space_ship/cardinal, -/area/shuttle/scc_scout_ship_shuttle/cargo) "ii" = ( /obj/machinery/door/firedoor/noid, /obj/structure/grille, @@ -1491,7 +1609,6 @@ /obj/item/reagent_containers/blood/OMinus, /obj/item/reagent_containers/blood/OMinus, /obj/item/reagent_containers/blood/OMinus, -/obj/machinery/light, /obj/structure/closet/crate/medical, /obj/random/dirt_75, /turf/simulated/floor/tiled/white, @@ -1551,7 +1668,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/effect/floor_decal/industrial/hatch/red, /obj/machinery/door/airlock/glass_service{ dir = 4 }, @@ -1561,6 +1677,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/floor_decal/industrial/hatch_door/red, /turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/hydroponics) "jN" = ( @@ -1570,8 +1687,17 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/turf/simulated/floor/tiled/dark/full, +/turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/eva) +"jQ" = ( +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 9 + }, +/turf/simulated/floor/tiled/dark/full, +/area/ship/scc_scout_ship/engineering_cargo) "jR" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /obj/structure/sign/flag/scc{ @@ -1582,8 +1708,10 @@ /area/ship/scc_scout_ship/bridge) "jT" = ( /obj/machinery/door/firedoor/noid, -/obj/effect/floor_decal/industrial/hatch/red, /obj/random/dirt_75, +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/eva) "jV" = ( @@ -1598,15 +1726,15 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/lattice/catwalk/indoor/grate, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_power) +"jY" = ( +/obj/structure/lattice/catwalk, +/obj/item/hullbeacon/green, +/turf/space/dynamic, +/area/ship/scc_scout_ship/exterior) "kb" = ( -/obj/effect/map_effect/marker/airlock/shuttle{ - shuttle_tag = "SCCV Scout Shuttle"; - master_tag = "airlock_scc_scout_shuttle"; - name = "airlock_scc_scout_shuttle" - }, /obj/effect/map_effect/marker_helper/airlock/interior, /obj/machinery/atmospherics/pipe/simple/hidden/aux, /obj/effect/floor_decal/industrial/hatch/red, @@ -1623,26 +1751,30 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/simulated/floor/plating, +/obj/effect/map_effect/marker/airlock/shuttle/scc_scout_ship, +/turf/simulated/floor/tiled/dark, /area/shuttle/scc_scout_ship_shuttle/eva) "kd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable{ icon_state = "2-8" }, /obj/structure/cable{ icon_state = "1-2" }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 5 + }, +/turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/engineering_cargo) "ke" = ( -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_scc_scout_shuttle_dock"; - master_tag = "airlock_scc_scout_shuttle_dock"; - landmark_tag = "nav_scc_scout_shuttle_dock" - }, /obj/effect/map_effect/marker_helper/airlock/interior, /obj/machinery/atmospherics/pipe/simple/hidden/aux, /obj/effect/floor_decal/industrial/hatch/red, @@ -1656,7 +1788,8 @@ icon_state = "1-2" }, /obj/random/dirt_75, -/turf/simulated/floor/plating, +/obj/effect/map_effect/marker/airlock/docking/scc_scout_ship/shuttle_hangar, +/turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/eva) "kf" = ( /obj/structure/closet/crate, @@ -1684,10 +1817,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 10 }, -/obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/hydroponics) "ko" = ( @@ -1734,6 +1867,10 @@ pixel_y = 2; pixel_x = 14 }, +/obj/random/pottedplant_small{ + pixel_y = -15; + pixel_x = 4 + }, /turf/simulated/floor/wood, /area/ship/scc_scout_ship/quarters) "kD" = ( @@ -1743,11 +1880,6 @@ /turf/simulated/floor/plating, /area/shuttle/scc_scout_ship_shuttle/propulsion_port) "kE" = ( -/obj/effect/map_effect/marker/airlock/shuttle{ - shuttle_tag = "SCCV Scout Shuttle"; - master_tag = "airlock_scc_scout_shuttle"; - name = "airlock_scc_scout_shuttle" - }, /obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ dir = 8 }, @@ -1756,6 +1888,7 @@ pixel_y = 28; pixel_x = 6 }, +/obj/effect/map_effect/marker/airlock/shuttle/scc_scout_ship, /turf/simulated/floor/plating, /area/shuttle/scc_scout_ship_shuttle/eva) "kG" = ( @@ -1770,6 +1903,12 @@ /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, /obj/structure/closet/crate/medical, /obj/random/dirt_75, +/obj/structure/cable/pink{ + icon_state = "0-8" + }, +/obj/machinery/power/apc/east{ + req_access = null + }, /turf/simulated/floor/tiled/white, /area/shuttle/scc_scout_ship_shuttle/medbay) "kH" = ( @@ -1844,24 +1983,32 @@ /turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/engineering_cargo) "lc" = ( -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_segment/red, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 9 + }, +/turf/simulated/floor/tiled, /area/shuttle/scc_scout_ship_shuttle/cockpit) "lg" = ( -/obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/engineering_cargo) "lm" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/noid, -/obj/structure/window/shuttle/scc_space_ship/cardinal, /obj/effect/landmark/entry_point/starboard{ name = "starboard, center" }, +/obj/effect/map_effect/window_spawner/full/shuttle/scc{ + spawn_firedoor = 1; + spawn_grille = 1 + }, /turf/simulated/floor/plating, /area/shuttle/scc_scout_ship_shuttle/cargo) "lw" = ( @@ -1879,21 +2026,32 @@ dir = 8; pixel_y = -6 }, -/obj/machinery/light/small{ - dir = 8 - }, /obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ dir = 1 }, +/obj/machinery/light/small/emergency{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 8 + }, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/engineering_cargo) "lA" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/noid, -/obj/structure/window/shuttle/scc_space_ship/cardinal, /obj/effect/landmark/entry_point/port{ name = "port, center" }, +/obj/effect/map_effect/window_spawner/full/shuttle/scc{ + spawn_firedoor = 1; + spawn_grille = 1 + }, /turf/simulated/floor/plating, /area/shuttle/scc_scout_ship_shuttle/medbay) "lG" = ( @@ -1901,10 +2059,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/eva) "lJ" = ( @@ -1913,8 +2071,14 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 10 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/maint_propulsion_port) "lK" = ( /obj/structure/closet/crate, @@ -1931,6 +2095,7 @@ }, /obj/item/clothing/head/helmet/space/anomaly, /obj/item/clothing/glasses/science, +/obj/machinery/light, /turf/simulated/floor/carpet/rubber, /area/shuttle/scc_scout_ship_shuttle/cargo) "lN" = ( @@ -1942,12 +2107,20 @@ /obj/machinery/door/firedoor/noid{ dir = 4 }, -/obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/floor_decal/industrial/hatch_door/red, /turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/quarters) "lO" = ( -/obj/structure/lattice/catwalk/indoor/grate, /obj/random/dirt_75, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/hydroponics) "lV" = ( @@ -1972,6 +2145,10 @@ /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 8 }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_straight/red, /turf/simulated/floor/plating, /area/shuttle/scc_scout_ship_shuttle/cargo) "lZ" = ( @@ -1985,11 +2162,6 @@ /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_atmos) "md" = ( -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_scc_scout_dock_starboard"; - master_tag = "airlock_scc_scout_dock_starboard"; - landmark_tag = "nav_scc_scout_dock_starboard" - }, /obj/effect/map_effect/marker_helper/airlock/interior, /obj/effect/floor_decal/industrial/hatch/red, /obj/effect/floor_decal/industrial/warning/cee, @@ -2002,8 +2174,16 @@ dir = 4 }, /obj/random/dirt_75, +/obj/effect/map_effect/marker/airlock/docking/scc_scout_ship/dock/starboard, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_atmos) +"mm" = ( +/obj/effect/map_effect/window_spawner/full/shuttle/scc{ + spawn_firedoor = 1; + spawn_grille = 1 + }, +/turf/simulated/floor/plating, +/area/shuttle/scc_scout_ship_shuttle/cargo) "mr" = ( /obj/machinery/portable_atmospherics/canister/empty, /obj/effect/floor_decal/industrial/outline/grey, @@ -2019,14 +2199,10 @@ }, /obj/effect/floor_decal/industrial/warning/full, /obj/effect/map_effect/marker_helper/airlock/exterior, -/obj/effect/map_effect/marker/airlock/shuttle{ - shuttle_tag = "SCCV Scout Shuttle"; - master_tag = "airlock_scc_scout_shuttle"; - name = "airlock_scc_scout_shuttle" - }, /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 8 }, +/obj/effect/map_effect/marker/airlock/shuttle/scc_scout_ship, /turf/simulated/floor/airless, /area/shuttle/scc_scout_ship_shuttle/eva) "mv" = ( @@ -2037,9 +2213,14 @@ dir = 8 }, /obj/item/clothing/head/helmet/pilot{ - pixel_x = 1 + pixel_x = -3; + pixel_y = -6 }, /obj/structure/table/reinforced/steel, +/obj/random/pottedplant_small{ + pixel_x = 7; + pixel_y = 3 + }, /turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/bridge) "mw" = ( @@ -2068,7 +2249,10 @@ /obj/machinery/light{ dir = 8 }, -/turf/simulated/floor/tiled/dark/full, +/obj/effect/floor_decal/corner/blue/full{ + dir = 8 + }, +/turf/simulated/floor/tiled, /area/shuttle/scc_scout_ship_shuttle/cockpit) "mB" = ( /obj/item/bedsheet/captain, @@ -2144,6 +2328,16 @@ /obj/effect/floor_decal/corner/blue, /turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/eva) +"mN" = ( +/obj/effect/floor_decal/spline/plain/black{ + dir = 1 + }, +/obj/random/dirt_75, +/obj/effect/floor_decal/corner/blue{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/ship/scc_scout_ship/bridge) "mR" = ( /obj/structure/closet/crate, /obj/effect/floor_decal/corner/brown{ @@ -2156,13 +2350,13 @@ pixel_x = -5 }, /obj/random/dirt_75, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/cargo, /area/ship/scc_scout_ship/engineering_cargo) "mS" = ( /obj/effect/landmark/entry_point/port{ name = "port, cockpit" }, -/turf/simulated/wall/shuttle/scc_space_ship/cardinal, +/turf/simulated/wall/shuttle/scc, /area/shuttle/scc_scout_ship_shuttle/cockpit) "nc" = ( /obj/structure/closet/crate, @@ -2187,11 +2381,6 @@ /obj/machinery/light/small/emergency{ dir = 8 }, -/obj/effect/map_effect/marker/airlock/shuttle{ - shuttle_tag = "SCCV Scout Shuttle"; - master_tag = "airlock_scc_scout_shuttle"; - name = "airlock_scc_scout_shuttle" - }, /obj/effect/map_effect/marker_helper/airlock/out, /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 4 @@ -2201,6 +2390,7 @@ pixel_y = 28; pixel_x = -6 }, +/obj/effect/map_effect/marker/airlock/shuttle/scc_scout_ship, /turf/simulated/floor/plating, /area/shuttle/scc_scout_ship_shuttle/eva) "nm" = ( @@ -2254,11 +2444,6 @@ /turf/simulated/floor/carpet/rubber, /area/shuttle/scc_scout_ship_shuttle/cargo) "nE" = ( -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_scc_scout_dock_starboard"; - master_tag = "airlock_scc_scout_dock_starboard"; - landmark_tag = "nav_scc_scout_dock_starboard" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/aux{ dir = 1 }, @@ -2268,15 +2453,22 @@ pixel_x = -6 }, /obj/random/dirt_75, +/obj/effect/map_effect/marker/airlock/docking/scc_scout_ship/dock/starboard, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 1 + }, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_atmos) "nK" = ( /obj/effect/floor_decal/industrial/hatch/yellow, -/obj/structure/lattice/catwalk/indoor/grate, /obj/random/dirt_75, /obj/structure/cable/pink{ icon_state = "2-8" }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/shuttle/scc_scout_ship_shuttle/eva) "nL" = ( @@ -2308,27 +2500,23 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/aux{ dir = 4 }, -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable/pink{ icon_state = "1-4" }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/shuttle/scc_scout_ship_shuttle/cargo) "nV" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/noid, -/obj/structure/window/shuttle/scc_space_ship/cardinal, /obj/effect/landmark/entry_point/fore{ name = "fore, passenger seating" }, +/obj/effect/map_effect/window_spawner/full/shuttle/scc{ + spawn_firedoor = 1; + spawn_grille = 1 + }, /turf/simulated/floor/plating, /area/shuttle/scc_scout_ship_shuttle/cockpit) "nX" = ( -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_scc_scout_dock_aft"; - master_tag = "airlock_scc_scout_dock_aft"; - landmark_tag = "nav_scc_scout_dock_aft" - }, /obj/effect/map_effect/marker_helper/airlock/interior, /obj/machinery/atmospherics/pipe/simple/hidden/aux, /obj/effect/floor_decal/industrial/hatch/red, @@ -2344,6 +2532,7 @@ dir = 4 }, /obj/random/dirt_75, +/obj/effect/map_effect/marker/airlock/docking/scc_scout_ship/dock/aft, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_propulsion_port) "nY" = ( @@ -2355,11 +2544,11 @@ /area/ship/scc_scout_ship/maint_propulsion_port) "oa" = ( /obj/structure/closet/walllocker/emerglocker/west, -/obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/hydroponics) "oc" = ( @@ -2368,8 +2557,19 @@ "od" = ( /turf/simulated/wall/r_wall, /area/ship/scc_scout_ship/maint_atmos) +"ok" = ( +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 6 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/scc_scout_ship_shuttle/cockpit) "om" = ( -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/extinguisher_cabinet/north, /obj/structure/cable{ icon_state = "2-8" @@ -2383,6 +2583,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/eva) "oq" = ( @@ -2406,11 +2607,10 @@ /turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/eva) "ov" = ( -/obj/machinery/light/small/emergency, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/lattice/catwalk/indoor/grate, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_atmos) "oA" = ( @@ -2475,7 +2675,7 @@ /area/ship/scc_scout_ship/maint_power) "oH" = ( /obj/machinery/atmospherics/unary/vent_pump/on, -/turf/simulated/floor/tiled/dark/full, +/turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/eva) "oK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -2484,10 +2684,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_propulsion_port) "oL" = ( @@ -2496,8 +2696,10 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/floor_decal/industrial/hatch/red, /obj/random/dirt_75, +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/eva) "oN" = ( @@ -2516,10 +2718,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable/pink{ icon_state = "4-8" }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/shuttle/scc_scout_ship_shuttle/cargo) "pf" = ( @@ -2539,7 +2741,9 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/eva) "po" = ( @@ -2579,21 +2783,25 @@ /obj/effect/floor_decal/corner/blue/full{ dir = 4 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/shuttle/scc_scout_ship_shuttle/cockpit) "pv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 6 }, /obj/random/dirt_75, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 6 + }, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/engineering_cargo) "px" = ( -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_scc_scout_shuttle_dock"; - master_tag = "airlock_scc_scout_shuttle_dock"; - landmark_tag = "nav_scc_scout_shuttle_dock" - }, /obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ dir = 4 }, @@ -2608,14 +2816,22 @@ pixel_y = -6 }, /obj/random/dirt_75, +/obj/effect/map_effect/marker/airlock/docking/scc_scout_ship/shuttle_hangar, +/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 = 8 + }, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/eva) "pD" = ( /obj/machinery/door/firedoor/noid{ dir = 4 }, -/obj/effect/floor_decal/industrial/hatch/red, /obj/random/dirt_75, +/obj/effect/floor_decal/industrial/hatch_door/red, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_atmos) "pE" = ( @@ -2662,7 +2878,9 @@ "pU" = ( /obj/machinery/door/firedoor/noid, /obj/machinery/door/airlock/mining, -/obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/engineering_cargo) "pX" = ( @@ -2733,7 +2951,7 @@ pixel_x = 9; pixel_y = 8 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/ship/scc_scout_ship/mess) "qq" = ( /turf/simulated/wall/r_wall, @@ -2743,11 +2961,19 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable{ icon_state = "4-8" }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 6 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 1 + }, +/turf/simulated/floor/tiled, /area/ship/scc_scout_ship/mess) "qA" = ( /obj/effect/floor_decal/corner/blue/diagonal, @@ -2782,14 +3008,16 @@ pixel_x = 28; pixel_y = -6 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/slate, /area/ship/scc_scout_ship/quarters) "qJ" = ( /obj/machinery/door/firedoor/noid, -/obj/effect/floor_decal/industrial/hatch/red, /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/shuttle/scc_scout_ship_shuttle/eva) "qL" = ( @@ -2797,11 +3025,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor/noid, -/obj/effect/floor_decal/industrial/hatch/red, /obj/structure/cable/pink{ icon_state = "1-2" }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, /area/shuttle/scc_scout_ship_shuttle/propulsion_port) "qM" = ( /obj/item/device/taperecorder{ @@ -2817,13 +3047,16 @@ pixel_y = 0; pixel_x = 5 }, +/obj/effect/floor_decal/corner/blue/full{ + dir = 4 + }, /turf/simulated/floor/tiled/dark/full, /area/ship/scc_scout_ship/bridge) "qO" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/obj/structure/lattice/catwalk/indoor/grate, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_atmos) "qU" = ( @@ -2846,10 +3079,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/red{ dir = 4 }, -/obj/effect/map_effect/marker/airlock/shuttle{ - shuttle_tag = "SCCV Scout Shuttle"; - master_tag = "airlock_scc_scout_shuttle"; - name = "airlock_scc_scout_shuttle" +/obj/effect/map_effect/marker/airlock/shuttle/scc_scout_ship, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 8 }, /turf/simulated/floor/plating, /area/shuttle/scc_scout_ship_shuttle/eva) @@ -2872,6 +3104,13 @@ /obj/structure/cable/pink{ icon_state = "1-2" }, +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 10 + }, /turf/simulated/floor/plating, /area/shuttle/scc_scout_ship_shuttle/propulsion_starboard) "rq" = ( @@ -2885,6 +3124,13 @@ "rr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/aux, /obj/random/dirt_75, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_straight/red, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_atmos) "rC" = ( @@ -2908,7 +3154,7 @@ /obj/item/clothing/suit/storage/hooded/wintercoat/orion, /obj/item/storage/backpack/messenger/orion, /obj/item/crowbar/red, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/slate, /area/ship/scc_scout_ship/quarters) "rG" = ( /obj/effect/floor_decal/corner/lime, @@ -2923,7 +3169,7 @@ /obj/machinery/door/firedoor/noid{ dir = 4 }, -/obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/floor_decal/industrial/hatch_door/red, /turf/simulated/floor/tiled/dark/full, /area/shuttle/scc_scout_ship_shuttle/cockpit) "rO" = ( @@ -2933,21 +3179,21 @@ /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 8 }, -/obj/effect/floor_decal/industrial/hatch/red, /obj/random/dirt_75, +/obj/effect/floor_decal/industrial/hatch_door/red, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/engineering_cargo) "rP" = ( -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_scc_scout_dock_starboard"; - master_tag = "airlock_scc_scout_dock_starboard"; - landmark_tag = "nav_scc_scout_dock_starboard" - }, /obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ dir = 1 }, /obj/machinery/light/small/emergency, /obj/random/dirt_75, +/obj/effect/map_effect/marker/airlock/docking/scc_scout_ship/dock/starboard, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_straight/red, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_atmos) "rS" = ( @@ -2955,11 +3201,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 5 }, -/obj/structure/lattice/catwalk/indoor/grate, /obj/random/dirt_75, /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/shuttle/scc_scout_ship_shuttle/eva) "rT" = ( @@ -2976,11 +3222,17 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable/pink{ icon_state = "4-8" }, -/turf/simulated/floor/plating, +/obj/random/dirt_75, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, /area/shuttle/scc_scout_ship_shuttle/cargo) "sf" = ( /obj/machinery/meter{ @@ -2998,11 +3250,11 @@ /obj/machinery/light/small/emergency{ dir = 1 }, -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable{ icon_state = "4-8" }, /obj/random/dirt_75, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_propulsion_starboard) "sq" = ( @@ -3019,11 +3271,6 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/red{ dir = 1 }, -/obj/effect/map_effect/marker/airlock/shuttle{ - shuttle_tag = "SCCV Scout Shuttle"; - master_tag = "airlock_scc_scout_shuttle"; - name = "airlock_scc_scout_shuttle" - }, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/effect/floor_decal/industrial/hatch/red, /obj/effect/floor_decal/industrial/warning/cee{ @@ -3040,7 +3287,8 @@ /obj/structure/cable{ icon_state = "1-4" }, -/turf/simulated/floor/plating, +/obj/effect/map_effect/marker/airlock/shuttle/scc_scout_ship, +/turf/simulated/floor/tiled/dark, /area/shuttle/scc_scout_ship_shuttle/eva) "sw" = ( /obj/machinery/portable_atmospherics/canister/air/airlock, @@ -3053,11 +3301,10 @@ /turf/simulated/floor/plating, /area/ship/scc_scout_ship/engineering_cargo) "sB" = ( -/obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled, /area/shuttle/scc_scout_ship_shuttle/cockpit) "sC" = ( /obj/machinery/atmospherics/unary/vent_pump/on, @@ -3100,6 +3347,10 @@ /obj/effect/decal/cleanable/flour, /turf/simulated/floor/marble, /area/ship/scc_scout_ship/mess) +"sQ" = ( +/obj/random/dirt_75, +/turf/simulated/floor/tiled/cargo/full, +/area/ship/scc_scout_ship/engineering_cargo) "sS" = ( /obj/machinery/appliance/cooker/oven, /obj/effect/floor_decal/corner/dark_blue{ @@ -3121,11 +3372,6 @@ /turf/simulated/floor/airless, /area/shuttle/scc_scout_ship_shuttle/propulsion_starboard) "tj" = ( -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_scc_scout_dock_port"; - master_tag = "airlock_scc_scout_dock_port"; - landmark_tag = "nav_scc_scout_dock_port" - }, /obj/machinery/atmospherics/unary/vent_pump/high_volume/aux, /obj/machinery/embedded_controller/radio/airlock/docking_port{ dir = 2; @@ -3133,11 +3379,21 @@ pixel_x = 6 }, /obj/random/dirt_75, +/obj/effect/map_effect/marker/airlock/docking/scc_scout_ship/dock/port, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 1 + }, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/hydroponics) "tl" = ( /obj/random/dirt_75, /obj/machinery/atmospherics/valve, +/obj/effect/floor_decal/industrial/hatch_tiny/yellow{ + dir = 4 + }, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_propulsion_port) "tn" = ( @@ -3148,7 +3404,9 @@ /obj/machinery/door/firedoor/noid, /obj/machinery/atmospherics/pipe/simple/hidden/aux, /obj/machinery/door/airlock/hatch, -/obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 + }, /turf/simulated/floor/plating, /area/shuttle/scc_scout_ship_shuttle/cargo) "tt" = ( @@ -3170,6 +3428,12 @@ }, /obj/random/dirt_75, /obj/random/dirt_75, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 9 + }, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_atmos) "tw" = ( @@ -3177,6 +3441,9 @@ dir = 10 }, /obj/random/pottedplant, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 5 + }, /turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/eva) "tA" = ( @@ -3191,7 +3458,7 @@ }, /obj/structure/bed/padded, /obj/item/bedsheet, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/slate, /area/ship/scc_scout_ship/quarters) "tC" = ( /obj/structure/lattice, @@ -3217,6 +3484,12 @@ 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 + }, /turf/simulated/floor/plating, /area/shuttle/scc_scout_ship_shuttle/cargo) "tN" = ( @@ -3236,6 +3509,9 @@ dir = 4 }, /obj/random/dirt_75, +/obj/effect/floor_decal/industrial/hatch_tiny/yellow{ + dir = 4 + }, /turf/simulated/floor/plating, /area/shuttle/scc_scout_ship_shuttle/cargo) "tV" = ( @@ -3253,10 +3529,10 @@ /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_propulsion_port) "ub" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 6 - }, /obj/machinery/iff_beacon/name_change, +/obj/effect/floor_decal/industrial/warning, +/obj/random/dirt_75, +/obj/random/dirt_75, /turf/simulated/floor/airless, /area/shuttle/scc_scout_ship_shuttle/cockpit) "uc" = ( @@ -3270,10 +3546,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/eva) "uf" = ( @@ -3322,15 +3598,15 @@ /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_atmos) "uq" = ( -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_scc_scout_dock_port"; - master_tag = "airlock_scc_scout_dock_port"; - landmark_tag = "nav_scc_scout_dock_port" - }, /obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ dir = 8 }, /obj/random/dirt_75, +/obj/effect/map_effect/marker/airlock/docking/scc_scout_ship/dock/port, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_straight/red, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/hydroponics) "ut" = ( @@ -3363,11 +3639,6 @@ /turf/simulated/wall/shuttle/scc, /area/shuttle/scc_scout_ship_shuttle/propulsion_starboard) "uK" = ( -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_scc_scout_shuttle_dock"; - master_tag = "airlock_scc_scout_shuttle_dock"; - landmark_tag = "nav_scc_scout_shuttle_dock" - }, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/effect/floor_decal/industrial/hatch/red, /obj/effect/floor_decal/industrial/warning/cee{ @@ -3383,7 +3654,8 @@ /obj/structure/cable{ icon_state = "2-4" }, -/turf/simulated/floor/plating, +/obj/effect/map_effect/marker/airlock/docking/scc_scout_ship/shuttle_hangar, +/turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/eva) "uZ" = ( /obj/effect/map_effect/marker/airlock{ @@ -3426,10 +3698,10 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_atmos) "vk" = ( @@ -3443,6 +3715,13 @@ "vl" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/random/dirt_75, +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 10 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/ship/scc_scout_ship/quarters) "vm" = ( @@ -3462,34 +3741,27 @@ /obj/machinery/atmospherics/binary/pump/high_power{ dir = 8 }, +/obj/effect/floor_decal/industrial/hatch_tiny/yellow{ + dir = 8 + }, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_propulsion_port) "vD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ dir = 8 }, -/obj/effect/map_effect/marker/airlock/shuttle{ - shuttle_tag = "SCCV Scout Shuttle"; - master_tag = "airlock_scc_scout_shuttle"; - name = "airlock_scc_scout_shuttle" - }, +/obj/effect/map_effect/marker/airlock/shuttle/scc_scout_ship, /turf/simulated/wall/shuttle/scc, /area/shuttle/scc_scout_ship_shuttle/eva) "vE" = ( -/obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ icon_state = "1-2" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/eva) "vG" = ( -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_scc_scout_dock_aft"; - master_tag = "airlock_scc_scout_dock_aft"; - landmark_tag = "nav_scc_scout_dock_aft" - }, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/effect/floor_decal/industrial/hatch/red, /obj/effect/floor_decal/industrial/warning/cee{ @@ -3504,6 +3776,7 @@ dir = 1 }, /obj/random/dirt_75, +/obj/effect/map_effect/marker/airlock/docking/scc_scout_ship/dock/aft, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_propulsion_port) "vN" = ( @@ -3521,17 +3794,32 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 5 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 8 + }, /turf/simulated/floor/tiled/dark/full, /area/ship/scc_scout_ship/maint_power) "vY" = ( -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/structure/lattice/catwalk/indoor/grate, /obj/random/dirt_75, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, /area/shuttle/scc_scout_ship_shuttle/eva) "we" = ( /obj/machinery/atmospherics/pipe/simple/hidden, -/obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/light{ dir = 4 }, @@ -3539,7 +3827,16 @@ /obj/structure/cable/pink{ icon_state = "1-2" }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 5 + }, +/turf/simulated/floor/tiled/dark, /area/shuttle/scc_scout_ship_shuttle/cargo) "wg" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ @@ -3558,9 +3855,6 @@ layer = 2.8 }, /obj/machinery/portable_atmospherics/canister/carbon_dioxide, -/obj/machinery/light/small/emergency{ - dir = 4 - }, /obj/effect/floor_decal/industrial/warning{ dir = 10 }, @@ -3575,10 +3869,10 @@ /obj/effect/floor_decal/corner/brown{ dir = 5 }, -/obj/effect/floor_decal/industrial/outline/grey, /obj/random/dirt_75, /obj/machinery/portable_atmospherics/canister/air, -/turf/simulated/floor/tiled/dark/full, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/cargo, /area/ship/scc_scout_ship/engineering_cargo) "ws" = ( /obj/structure/table/steel, @@ -3619,7 +3913,7 @@ pixel_y = -28; dir = 8 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/shuttle/scc_scout_ship_shuttle/cargo) "wx" = ( /obj/effect/floor_decal/corner/lime/diagonal, @@ -3641,8 +3935,8 @@ pixel_y = -2; pixel_x = 3 }, -/obj/effect/floor_decal/industrial/outline/grey, -/turf/simulated/floor/tiled/dark/full, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/cargo/full, /area/ship/scc_scout_ship/engineering_cargo) "wM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -3651,17 +3945,18 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable{ icon_state = "4-8" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled, /area/ship/scc_scout_ship/mess) "wP" = ( /obj/machinery/door/firedoor/noid, /obj/machinery/atmospherics/pipe/simple/hidden/aux, -/obj/effect/floor_decal/industrial/hatch/red, /obj/random/dirt_75, +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 + }, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_atmos) "wQ" = ( @@ -3686,7 +3981,7 @@ /obj/item/clothing/suit/storage/toggle/longcoat/zeng, /obj/structure/closet, /obj/item/storage/backpack/messenger/zeng, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/slate, /area/ship/scc_scout_ship/quarters) "wR" = ( /obj/effect/floor_decal/industrial/warning{ @@ -3704,32 +3999,37 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/aux{ dir = 8 }, -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable{ icon_state = "1-2" }, /obj/random/dirt_75, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/shuttle/scc_scout_ship_shuttle/eva) "xj" = ( /obj/machinery/door/firedoor/noid, -/obj/effect/floor_decal/industrial/hatch/red, /obj/structure/curtain/black, +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/quarters) +"xk" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, +/obj/item/hullbeacon/red, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/airless, +/area/shuttle/scc_scout_ship_shuttle/cockpit) "xm" = ( -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable{ icon_state = "1-2" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/eva) "xr" = ( -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_scc_scout_dock_aft"; - master_tag = "airlock_scc_scout_dock_aft"; - landmark_tag = "nav_scc_scout_dock_aft" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/aux{ dir = 8 }, @@ -3737,6 +4037,11 @@ dir = 8 }, /obj/random/dirt_75, +/obj/effect/map_effect/marker/airlock/docking/scc_scout_ship/dock/aft, +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 8 + }, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_propulsion_port) "xs" = ( @@ -3748,7 +4053,7 @@ }, /obj/effect/floor_decal/industrial/outline/yellow, /obj/item/pen, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/cargo, /area/ship/scc_scout_ship/engineering_cargo) "xu" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ @@ -3760,7 +4065,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/lattice/catwalk/indoor/grate, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_propulsion_port) "xx" = ( @@ -3768,10 +4073,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable/pink{ icon_state = "1-2" }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/shuttle/scc_scout_ship_shuttle/cargo) "xz" = ( @@ -3783,8 +4088,33 @@ dir = 4 }, /obj/machinery/light/small/emergency, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_straight/red, /turf/simulated/floor/plating, /area/shuttle/scc_scout_ship_shuttle/cargo) +"xG" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/pink{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/scc_scout_ship_shuttle/cargo) "xL" = ( /obj/effect/floor_decal/corner/lime, /obj/random/dirt_75, @@ -3841,11 +4171,6 @@ /turf/simulated/floor/tiled/white, /area/ship/scc_scout_ship/medbay) "yb" = ( -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_scc_scout_dock_starboard"; - master_tag = "airlock_scc_scout_dock_starboard"; - landmark_tag = "nav_scc_scout_dock_starboard" - }, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/effect/floor_decal/industrial/hatch/red, /obj/effect/floor_decal/industrial/warning/cee{ @@ -3859,14 +4184,10 @@ pixel_y = 28; dir = 8 }, +/obj/effect/map_effect/marker/airlock/docking/scc_scout_ship/dock/starboard, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_atmos) "yc" = ( -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_scc_scout_dock_port"; - master_tag = "airlock_scc_scout_dock_port"; - landmark_tag = "nav_scc_scout_dock_port" - }, /obj/effect/map_effect/marker_helper/airlock/interior, /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 4 @@ -3877,7 +4198,8 @@ dir = 4 }, /obj/random/dirt_75, -/turf/simulated/floor/plating, +/obj/effect/map_effect/marker/airlock/docking/scc_scout_ship/dock/port, +/turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/hydroponics) "yd" = ( /obj/machinery/light/small{ @@ -3926,7 +4248,9 @@ /turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/hydroponics) "yB" = ( -/obj/effect/floor_decal/corner/blue, +/obj/effect/floor_decal/corner/blue{ + dir = 6 + }, /turf/simulated/floor/tiled/dark, /area/shuttle/scc_scout_ship_shuttle/cockpit) "yE" = ( @@ -3971,13 +4295,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable/pink{ icon_state = "2-8" }, /obj/structure/cable/pink{ icon_state = "1-8" }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/shuttle/scc_scout_ship_shuttle/cargo) "yU" = ( @@ -3989,11 +4313,11 @@ /obj/machinery/door/firedoor/noid{ dir = 4 }, -/obj/effect/floor_decal/industrial/hatch/red, /obj/machinery/door/airlock/hatch{ dir = 4 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/hatch_door/red, +/turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/maint_propulsion_port) "zd" = ( /obj/effect/floor_decal/corner/yellow{ @@ -4021,11 +4345,15 @@ /obj/machinery/door/airlock/external{ dir = 4 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/shuttle/scc_scout_ship_shuttle/cargo) "zh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/aux, /obj/random/dirt_75, +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_propulsion_port) "zi" = ( @@ -4049,10 +4377,12 @@ /area/ship/scc_scout_ship/maint_propulsion_port) "zq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red, -/obj/effect/map_effect/marker/airlock/shuttle{ - shuttle_tag = "SCCV Scout Shuttle"; - master_tag = "airlock_scc_scout_shuttle"; - name = "airlock_scc_scout_shuttle" +/obj/effect/map_effect/marker/airlock/shuttle/scc_scout_ship, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 8 }, /turf/simulated/floor/plating, /area/shuttle/scc_scout_ship_shuttle/eva) @@ -4066,13 +4396,13 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable/pink{ icon_state = "1-2" }, /obj/structure/cable/pink{ icon_state = "1-4" }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/shuttle/scc_scout_ship_shuttle/cargo) "zx" = ( @@ -4115,19 +4445,21 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable{ icon_state = "4-8" }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 6 + }, +/turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/maint_propulsion_starboard) "zI" = ( /obj/structure/lattice/catwalk, -/obj/item/hullbeacon/red, /obj/structure/railing/mapped{ dir = 8 }, /obj/effect/shuttle_landmark/scc_scout_ship/catwalk/aft, +/obj/item/hullbeacon/green, /turf/space/dynamic, /area/ship/scc_scout_ship/exterior) "zK" = ( @@ -4141,11 +4473,11 @@ /obj/effect/floor_decal/corner/brown{ dir = 6 }, -/obj/effect/floor_decal/industrial/outline/grey, /obj/random/dirt_75, /obj/random/dirt_75, /obj/structure/closet/crate/loot, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/cargo, /area/ship/scc_scout_ship/engineering_cargo) "Ae" = ( /obj/effect/ghostspawpoint{ @@ -4161,7 +4493,7 @@ /obj/machinery/light/small{ dir = 8 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/slate, /area/ship/scc_scout_ship/quarters) "An" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, @@ -4182,7 +4514,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/obj/structure/lattice/catwalk/indoor/grate, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_propulsion_port) "AI" = ( @@ -4229,11 +4561,11 @@ /obj/effect/floor_decal/corner/brown/full{ dir = 1 }, -/obj/effect/floor_decal/industrial/outline/grey, /obj/random/dirt_75, /obj/random/dirt_75, /obj/structure/cargo_receptacle, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/cargo, /area/ship/scc_scout_ship/engineering_cargo) "Bm" = ( /obj/structure/lattice/catwalk, @@ -4293,6 +4625,13 @@ /area/ship/scc_scout_ship/maint_propulsion_port) "BB" = ( /obj/random/dirt_75, +/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 + }, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_atmos) "BC" = ( @@ -4308,15 +4647,30 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable{ icon_state = "1-2" }, /obj/structure/cable{ icon_state = "1-8" }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 8 + }, +/turf/simulated/floor/tiled, /area/ship/scc_scout_ship/mess) +"BI" = ( +/obj/random/dirt_75, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 5 + }, +/turf/simulated/floor/tiled/cargo, +/area/ship/scc_scout_ship/engineering_cargo) "BL" = ( /obj/effect/floor_decal/corner/dark_blue, /turf/simulated/floor/marble, @@ -4334,6 +4688,9 @@ }, /obj/random/dirt_75, /obj/machinery/atmospherics/unary/vent_pump/on, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_propulsion_port) "Cc" = ( @@ -4344,18 +4701,34 @@ /obj/machinery/atmospherics/binary/pump/high_power{ dir = 4 }, -/obj/machinery/light/small/emergency, +/obj/effect/floor_decal/industrial/hatch_tiny/yellow{ + dir = 8 + }, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_propulsion_port) "Cg" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/noid, -/obj/structure/window/shuttle/scc_space_ship/cardinal, /obj/effect/landmark/entry_point/fore{ name = "fore, cockpit" }, +/obj/effect/map_effect/window_spawner/full/shuttle/scc{ + spawn_firedoor = 1; + spawn_grille = 1 + }, /turf/simulated/floor/plating, /area/shuttle/scc_scout_ship_shuttle/cockpit) +"Cq" = ( +/obj/effect/floor_decal/corner/grey{ + dir = 9 + }, +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 10 + }, +/turf/simulated/floor/tiled/slate, +/area/ship/scc_scout_ship/quarters) "Cy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 10 @@ -4364,6 +4737,10 @@ icon_state = "4-8" }, /obj/random/dirt_75, +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 10 + }, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_atmos) "CP" = ( @@ -4428,13 +4805,15 @@ /turf/simulated/floor/carpet/rubber, /area/shuttle/scc_scout_ship_shuttle/cargo) "Da" = ( -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_scc_scout_dock_aft"; - master_tag = "airlock_scc_scout_dock_aft"; - landmark_tag = "nav_scc_scout_dock_aft" - }, /obj/machinery/atmospherics/unary/vent_pump/high_volume/aux, /obj/random/dirt_75, +/obj/effect/map_effect/marker/airlock/docking/scc_scout_ship/dock/aft, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 8 + }, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_propulsion_port) "De" = ( @@ -4451,7 +4830,6 @@ /turf/simulated/floor/plating, /area/shuttle/scc_scout_ship_shuttle/cargo) "Dk" = ( -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable{ icon_state = "1-8" }, @@ -4461,20 +4839,29 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/turf/simulated/floor/plating, +/obj/random/dirt_75, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 9 + }, +/turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/hydroponics) "Dl" = ( -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_scc_scout_dock_port"; - master_tag = "airlock_scc_scout_dock_port"; - landmark_tag = "nav_scc_scout_dock_port" - }, /obj/machinery/airlock_sensor{ dir = 2; pixel_y = 28; pixel_x = -6 }, /obj/random/dirt_75, +/obj/effect/map_effect/marker/airlock/docking/scc_scout_ship/dock/port, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 1 + }, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/hydroponics) "Dn" = ( @@ -4496,10 +4883,17 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_segment/red, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 9 + }, /turf/simulated/floor/tiled/dark/full, /area/ship/scc_scout_ship/quarters) "Dz" = ( -/turf/simulated/wall/shuttle/scc_space_ship/cardinal, +/turf/simulated/wall/shuttle/scc, /area/shuttle/scc_scout_ship_shuttle/medbay) "DG" = ( /obj/structure/sign/flag/nanotrasen{ @@ -4523,13 +4917,14 @@ /obj/structure/closet, /obj/item/storage/backpack/messenger/nt, /obj/item/crowbar/rescue_axe, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/slate, /area/ship/scc_scout_ship/quarters) "DI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 4 }, -/obj/structure/lattice/catwalk/indoor/grate, +/obj/random/dirt_75, +/obj/structure/lattice/catwalk/indoor/grate/dark, /obj/random/dirt_75, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/hydroponics) @@ -4541,6 +4936,9 @@ dir = 1 }, /obj/random/dirt_75, +/obj/effect/floor_decal/industrial/hatch_tiny/yellow{ + dir = 4 + }, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_propulsion_port) "DM" = ( @@ -4582,8 +4980,8 @@ pixel_y = -2; pixel_x = 3 }, -/obj/effect/floor_decal/industrial/outline/grey, -/turf/simulated/floor/tiled/dark/full, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/cargo/full, /area/ship/scc_scout_ship/engineering_cargo) "Ed" = ( /obj/structure/lattice, @@ -4603,8 +5001,10 @@ /area/shuttle/scc_scout_ship_shuttle/propulsion_starboard) "Ek" = ( /obj/machinery/door/firedoor/noid, -/obj/effect/floor_decal/industrial/hatch/red, /obj/random/dirt_75, +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 + }, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_atmos) "Ep" = ( @@ -4646,17 +5046,17 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/door/firedoor/noid{ dir = 4 }, -/obj/machinery/door/airlock/glass{ - dir = 4 - }, /obj/structure/cable{ icon_state = "4-8" }, -/turf/simulated/floor/plating, +/obj/machinery/door/airlock/glass{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/hatch_door/red, +/turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/eva) "EM" = ( /obj/structure/window/reinforced{ @@ -4678,11 +5078,12 @@ /area/shuttle/scc_scout_ship_shuttle/medbay) "EO" = ( /obj/machinery/atmospherics/pipe/simple/hidden, -/obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/firealarm/east, /obj/structure/cable/pink{ icon_state = "1-2" }, +/obj/random/dirt_75, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/shuttle/scc_scout_ship_shuttle/cargo) "EZ" = ( @@ -4699,15 +5100,15 @@ name = "random plushie (5% chance)" }, /obj/structure/bed/padded, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/slate, /area/ship/scc_scout_ship/quarters) "Fe" = ( /obj/machinery/atmospherics/pipe/simple/hidden/aux, -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable{ icon_state = "1-2" }, /obj/random/dirt_75, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/eva) "Ff" = ( @@ -4729,11 +5130,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/red{ dir = 8 }, -/obj/effect/map_effect/marker/airlock/shuttle{ - shuttle_tag = "SCCV Scout Shuttle"; - master_tag = "airlock_scc_scout_shuttle"; - name = "airlock_scc_scout_shuttle" - }, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/effect/floor_decal/industrial/hatch/red, /obj/effect/floor_decal/industrial/warning/cee{ @@ -4750,7 +5146,8 @@ /obj/structure/cable{ icon_state = "2-8" }, -/turf/simulated/floor/plating, +/obj/effect/map_effect/marker/airlock/shuttle/scc_scout_ship, +/turf/simulated/floor/tiled/dark, /area/shuttle/scc_scout_ship_shuttle/eva) "Fp" = ( /obj/effect/floor_decal/corner/blue{ @@ -4785,7 +5182,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/obj/structure/lattice/catwalk/indoor/grate, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/structure/cable{ + icon_state = "1-8" + }, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/bridge) "FF" = ( @@ -4846,6 +5246,9 @@ "Gd" = ( /obj/random/dirt_75, /obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_propulsion_port) "Gi" = ( @@ -4864,8 +5267,8 @@ /obj/structure/cable{ icon_state = "1-4" }, -/obj/structure/lattice/catwalk/indoor/grate, /obj/random/dirt_75, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_power) "Gn" = ( @@ -4904,10 +5307,10 @@ /turf/space/dynamic, /area/ship/scc_scout_ship/maint_propulsion_port) "GE" = ( -/obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/firealarm/west, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/hydroponics) "GM" = ( @@ -4915,13 +5318,26 @@ icon_state = "4-8" }, /obj/random/dirt_75, -/obj/structure/lattice/catwalk/indoor/grate, +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 4 + }, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_atmos) "GR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 10 }, +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 1 + }, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/engineering_cargo) "GT" = ( @@ -4962,7 +5378,7 @@ pixel_y = 28; dir = 4 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/shuttle/scc_scout_ship_shuttle/cargo) "Hc" = ( /obj/structure/lattice/catwalk, @@ -4980,8 +5396,11 @@ dir = 1 }, /obj/random/junk, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/ship/scc_scout_ship/mess) +"Hj" = ( +/turf/simulated/floor/tiled/cargo/full, +/area/ship/scc_scout_ship/engineering_cargo) "Hm" = ( /obj/structure/window/reinforced{ layer = 5; @@ -5020,11 +5439,10 @@ "Hx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable/pink{ icon_state = "1-2" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/shuttle/scc_scout_ship_shuttle/cargo) "HC" = ( /obj/random/dirt_75, @@ -5041,11 +5459,6 @@ /turf/simulated/floor/airless, /area/shuttle/scc_scout_ship_shuttle/propulsion_port) "HN" = ( -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_scc_scout_dock_starboard"; - master_tag = "airlock_scc_scout_dock_starboard"; - landmark_tag = "nav_scc_scout_dock_starboard" - }, /obj/effect/map_effect/marker_helper/airlock/interior, /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 4 @@ -5058,6 +5471,7 @@ dir = 4 }, /obj/random/dirt_75, +/obj/effect/map_effect/marker/airlock/docking/scc_scout_ship/dock/starboard, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_atmos) "HP" = ( @@ -5070,6 +5484,13 @@ }, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_propulsion_port) +"HR" = ( +/obj/effect/map_effect/window_spawner/full/shuttle/scc{ + spawn_firedoor = 1; + spawn_grille = 1 + }, +/turf/simulated/floor/plating, +/area/shuttle/scc_scout_ship_shuttle/cockpit) "HV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -5083,10 +5504,10 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable{ icon_state = "2-8" }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/eva) "HW" = ( @@ -5100,8 +5521,17 @@ /obj/structure/cable{ icon_state = "1-8" }, -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor/plating, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 6 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/maint_power) "Ih" = ( /obj/effect/floor_decal/industrial/hatch/red, @@ -5189,11 +5619,16 @@ 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 + }, /turf/simulated/floor/plating, /area/shuttle/scc_scout_ship_shuttle/cargo) "IG" = ( /obj/machinery/atmospherics/pipe/simple/hidden, -/obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/alarm/east{ req_one_access = null }, @@ -5201,14 +5636,20 @@ /obj/structure/cable/pink{ icon_state = "1-2" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/shuttle/scc_scout_ship_shuttle/cargo) "IH" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_segment/red, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 9 + }, +/turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/maint_propulsion_port) "II" = ( /obj/machinery/vending/engivend{ @@ -5229,7 +5670,7 @@ /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/firealarm/west, /obj/random/dirt_75, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/cargo, /area/ship/scc_scout_ship/engineering_cargo) "IO" = ( /obj/machinery/portable_atmospherics/canister/air/airlock, @@ -5246,8 +5687,14 @@ /turf/simulated/floor/plating, /area/shuttle/scc_scout_ship_shuttle/eva) "IR" = ( -/turf/simulated/floor/tiled/dark, -/area/ship/scc_scout_ship/bridge) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/pink{ + icon_state = "1-2" + }, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/turf/simulated/floor/plating, +/area/shuttle/scc_scout_ship_shuttle/cargo) "IS" = ( /obj/structure/grille, /obj/machinery/door/firedoor/noid, @@ -5283,11 +5730,19 @@ /obj/structure/closet/emcloset, /turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/eva) +"Jn" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, +/obj/item/hullbeacon/green, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/airless, +/area/shuttle/scc_scout_ship_shuttle/cockpit) "Js" = ( /obj/effect/floor_decal/corner/brown{ dir = 6 }, -/obj/effect/floor_decal/industrial/outline/grey, /obj/machinery/light/small{ dir = 4 }, @@ -5301,7 +5756,8 @@ pixel_y = -2; pixel_x = 3 }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/cargo, /area/ship/scc_scout_ship/engineering_cargo) "JB" = ( /obj/effect/floor_decal/spline/plain/black{ @@ -5310,10 +5766,10 @@ /obj/machinery/power/apc/south{ req_access = null }, -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable/pink{ icon_state = "0-8" }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/shuttle/scc_scout_ship_shuttle/cargo) "JC" = ( @@ -5321,10 +5777,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 10 }, -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable/pink{ icon_state = "1-2" }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/shuttle/scc_scout_ship_shuttle/cargo) "JD" = ( @@ -5374,6 +5830,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 5 }, +/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 = 8 + }, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_atmos) "Ka" = ( @@ -5384,7 +5847,7 @@ /obj/machinery/light/small{ dir = 1 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/slate, /area/ship/scc_scout_ship/quarters) "Kj" = ( /obj/effect/floor_decal/corner/lime, @@ -5410,17 +5873,25 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/aux{ dir = 4 }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 5 + }, /turf/simulated/floor/plating, /area/shuttle/scc_scout_ship_shuttle/cargo) "Kq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/extinguisher_cabinet/west, /obj/structure/cable{ icon_state = "1-2" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled, /area/ship/scc_scout_ship/mess) "Kr" = ( /obj/structure/lattice/catwalk/indoor/grate, @@ -5439,11 +5910,6 @@ /turf/simulated/floor/marble, /area/ship/scc_scout_ship/mess) "Ky" = ( -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_scc_scout_shuttle_dock"; - master_tag = "airlock_scc_scout_shuttle_dock"; - landmark_tag = "nav_scc_scout_shuttle_dock" - }, /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 9 }, @@ -5454,6 +5920,14 @@ icon_state = "1-2" }, /obj/random/dirt_75, +/obj/effect/map_effect/marker/airlock/docking/scc_scout_ship/shuttle_hangar, +/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 + }, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/eva) "KB" = ( @@ -5467,6 +5941,9 @@ /obj/machinery/atmospherics/binary/pump/high_power/on{ dir = 8 }, +/obj/effect/floor_decal/industrial/hatch_tiny/yellow{ + dir = 8 + }, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_atmos) "KG" = ( @@ -5488,11 +5965,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 8 }, -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable{ icon_state = "4-8" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/eva) "KQ" = ( /obj/structure/table/wood, @@ -5513,9 +5989,15 @@ /turf/simulated/floor/airless, /area/ship/scc_scout_ship/bridge) "KT" = ( -/obj/structure/lattice/catwalk/indoor/grate, /obj/random/dirt_75, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/eva) "Lc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ @@ -5532,6 +6014,7 @@ /turf/simulated/floor/carpet/rubber, /area/ship/scc_scout_ship/eva) "Lh" = ( +/obj/random/dirt_75, /turf/simulated/floor/tiled/dark/full, /area/ship/scc_scout_ship/eva) "Lp" = ( @@ -5545,7 +6028,7 @@ dir = 4 }, /obj/random/dirt_75, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/shuttle/scc_scout_ship_shuttle/cockpit) "Lq" = ( /obj/structure/closet/secure_closet/guncabinet{ @@ -5560,11 +6043,8 @@ /obj/effect/floor_decal/corner/blue{ dir = 9 }, -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/machinery/power/apc/north{ - req_access = null +/obj/machinery/alarm/west{ + req_one_access = null }, /turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/bridge) @@ -5576,31 +6056,35 @@ req_access = null }, /obj/random/pottedplant, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/ship/scc_scout_ship/mess) "Lv" = ( -/obj/effect/map_effect/marker/airlock/shuttle{ - shuttle_tag = "SCCV Scout Shuttle"; - master_tag = "airlock_scc_scout_shuttle"; - name = "airlock_scc_scout_shuttle" - }, /obj/structure/closet/crate, /obj/item/tank/oxygen, /obj/item/tank/emergency_oxygen{ pixel_x = 5; pixel_y = -2 }, +/obj/effect/map_effect/marker/airlock/shuttle/scc_scout_ship, /turf/simulated/floor/plating, /area/shuttle/scc_scout_ship_shuttle/eva) "Lx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/aux, -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable{ icon_state = "1-2" }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 5 + }, +/turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/eva) "LE" = ( /obj/effect/floor_decal/corner/lime/diagonal, @@ -5621,6 +6105,10 @@ pixel_y = 12 }, /obj/effect/floor_decal/corner/dark_blue, +/obj/random/pottedplant_small{ + pixel_y = -9; + pixel_x = -1 + }, /turf/simulated/floor/marble, /area/ship/scc_scout_ship/mess) "LT" = ( @@ -5658,10 +6146,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 8 }, -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/eva) "Me" = ( @@ -5681,14 +6169,10 @@ "Mn" = ( /obj/effect/floor_decal/industrial/outline/grey, /obj/structure/closet/crate/freezer/rations, +/obj/machinery/light, /turf/simulated/floor/carpet/rubber, /area/shuttle/scc_scout_ship_shuttle/cargo) "Mo" = ( -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_scc_scout_dock_port"; - master_tag = "airlock_scc_scout_dock_port"; - landmark_tag = "nav_scc_scout_dock_port" - }, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/effect/floor_decal/industrial/hatch/red, /obj/effect/floor_decal/industrial/warning/cee, @@ -5700,7 +6184,8 @@ pixel_y = -28; dir = 4 }, -/turf/simulated/floor/plating, +/obj/effect/map_effect/marker/airlock/docking/scc_scout_ship/dock/port, +/turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/hydroponics) "Ms" = ( /obj/structure/bed/stool/chair/shuttle{ @@ -5718,11 +6203,11 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/lattice/catwalk/indoor/grate, /obj/random/dirt_75, /obj/structure/cable/pink{ icon_state = "1-2" }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/shuttle/scc_scout_ship_shuttle/eva) "MJ" = ( @@ -5732,8 +6217,10 @@ /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_propulsion_port) "MN" = ( -/obj/effect/floor_decal/industrial/hatch/red, /obj/machinery/door/firedoor/noid/closed, +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 + }, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_atmos) "MW" = ( @@ -5761,17 +6248,16 @@ /turf/simulated/wall/shuttle/scc_space_ship, /area/ship/scc_scout_ship/hydroponics) "Np" = ( -/obj/effect/map_effect/marker/airlock/shuttle{ - shuttle_tag = "SCCV Scout Shuttle"; - master_tag = "airlock_scc_scout_shuttle"; - name = "airlock_scc_scout_shuttle" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/aux{ dir = 8 }, /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/map_effect/marker/airlock/shuttle/scc_scout_ship, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 4 + }, /turf/simulated/floor/plating, /area/shuttle/scc_scout_ship_shuttle/eva) "Nt" = ( @@ -5830,7 +6316,6 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/structure/lattice/catwalk/indoor/grate, /obj/effect/floor_decal/industrial/hatch/yellow, /obj/structure/cable/pink{ icon_state = "1-8" @@ -5838,6 +6323,7 @@ /obj/structure/cable/pink{ icon_state = "4-8" }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/shuttle/scc_scout_ship_shuttle/cargo) "Ny" = ( @@ -5849,13 +6335,14 @@ /obj/random/dirt_75, /obj/random/dirt_75, /obj/random/dirt_75, -/turf/simulated/floor/tiled/dark/full, +/turf/simulated/floor/tiled/cargo/full, /area/ship/scc_scout_ship/engineering_cargo) "NN" = ( /obj/structure/cable{ icon_state = "1-2" }, -/obj/structure/lattice/catwalk/indoor/grate, +/obj/random/dirt_75, +/obj/structure/lattice/catwalk/indoor/grate/dark, /obj/random/dirt_75, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/eva) @@ -5872,8 +6359,10 @@ "NV" = ( /obj/machinery/door/firedoor/noid, /obj/machinery/atmospherics/pipe/simple/hidden/aux, -/obj/effect/floor_decal/industrial/hatch/red, /obj/random/dirt_75, +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 + }, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_propulsion_port) "NZ" = ( @@ -5884,11 +6373,6 @@ /obj/effect/shuttle_landmark/scc_scout_ship/shuttle_hangar{ dir = 1 }, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_scc_scout_shuttle_dock"; - master_tag = "airlock_scc_scout_shuttle_dock"; - landmark_tag = "nav_scc_scout_shuttle_dock" - }, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/effect/floor_decal/industrial/hatch/red, /obj/effect/floor_decal/industrial/warning/cee{ @@ -5904,7 +6388,8 @@ /obj/structure/cable{ icon_state = "1-8" }, -/turf/simulated/floor/plating, +/obj/effect/map_effect/marker/airlock/docking/scc_scout_ship/shuttle_hangar, +/turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/eva) "Od" = ( /obj/machinery/atmospherics/pipe/manifold/hidden, @@ -5917,11 +6402,6 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/scc_scout_ship_shuttle/cargo) "Ok" = ( -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_scc_scout_dock_aft"; - master_tag = "airlock_scc_scout_dock_aft"; - landmark_tag = "nav_scc_scout_dock_aft" - }, /obj/effect/map_effect/marker_helper/airlock/interior, /obj/effect/floor_decal/industrial/hatch/red, /obj/effect/floor_decal/industrial/warning/cee{ @@ -5931,6 +6411,7 @@ dir = 2 }, /obj/random/dirt_75, +/obj/effect/map_effect/marker/airlock/docking/scc_scout_ship/dock/aft, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_propulsion_port) "Om" = ( @@ -5960,9 +6441,10 @@ /turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/hydroponics) "Ot" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/noid, -/obj/structure/window/shuttle/scc_space_ship/cardinal, +/obj/effect/map_effect/window_spawner/full/shuttle/scc{ + spawn_firedoor = 1; + spawn_grille = 1 + }, /turf/simulated/floor/plating, /area/shuttle/scc_scout_ship_shuttle/medbay) "Oz" = ( @@ -5974,11 +6456,8 @@ /obj/effect/floor_decal/corner/grey{ dir = 1 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/slate, /area/ship/scc_scout_ship/quarters) -"OF" = ( -/turf/simulated/wall/shuttle/scc_space_ship/cardinal, -/area/shuttle/scc_scout_ship_shuttle/cockpit) "OG" = ( /obj/machinery/portable_atmospherics/canister/air/airlock, /obj/effect/floor_decal/industrial/warning{ @@ -5990,11 +6469,6 @@ /turf/simulated/floor/plating, /area/shuttle/scc_scout_ship_shuttle/cargo) "OJ" = ( -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_scc_scout_shuttle_dock"; - master_tag = "airlock_scc_scout_shuttle_dock"; - landmark_tag = "nav_scc_scout_shuttle_dock" - }, /obj/effect/map_effect/marker_helper/airlock/interior, /obj/effect/floor_decal/industrial/hatch/red, /obj/effect/floor_decal/industrial/warning/cee{ @@ -6009,7 +6483,8 @@ dir = 4 }, /obj/random/dirt_75, -/turf/simulated/floor/plating, +/obj/effect/map_effect/marker/airlock/docking/scc_scout_ship/shuttle_hangar, +/turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/eva) "OK" = ( /obj/effect/floor_decal/industrial/outline/firefighting_closet, @@ -6020,10 +6495,10 @@ /obj/machinery/atmospherics/pipe/simple/visible/universal{ dir = 4 }, -/obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/light/small/emergency{ dir = 1 }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_atmos) "OM" = ( @@ -6039,11 +6514,33 @@ /obj/item/gun/energy/rifle/laser{ pixel_y = -6 }, -/obj/machinery/alarm/west{ - req_one_access = null +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/machinery/power/apc/west{ + req_access = null }, /turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/bridge) +"OP" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 8 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/pink{ + icon_state = "4-8" + }, +/obj/random/dirt_75, +/turf/simulated/floor/tiled/dark, +/area/shuttle/scc_scout_ship_shuttle/cargo) "OR" = ( /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/ship/scc_scout_ship/bridge) @@ -6057,7 +6554,7 @@ /area/ship/scc_scout_ship/maint_propulsion_port) "OY" = ( /obj/machinery/atmospherics/unary/vent_pump/on, -/turf/simulated/floor/tiled/dark/full, +/turf/simulated/floor/tiled, /area/ship/scc_scout_ship/mess) "OZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -6065,11 +6562,17 @@ /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 10 }, -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable{ icon_state = "1-2" }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 10 + }, +/turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/engineering_cargo) "Pb" = ( /obj/structure/lattice, @@ -6142,16 +6645,17 @@ /obj/effect/floor_decal/corner/brown/full{ dir = 4 }, -/obj/effect/floor_decal/industrial/outline/grey, /obj/random/dirt_75, /obj/random/dirt_75, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/cargo, /area/ship/scc_scout_ship/engineering_cargo) "PU" = ( /obj/random/pottedplant, /obj/effect/floor_decal/spline/plain/black{ dir = 1 }, +/obj/effect/floor_decal/corner/blue, /turf/simulated/floor/tiled/dark/full, /area/ship/scc_scout_ship/bridge) "PY" = ( @@ -6163,6 +6667,21 @@ /obj/random/dirt_75, /turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/maint_propulsion_port) +"Qh" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 10 + }, +/turf/simulated/floor/tiled/dark, +/area/ship/scc_scout_ship/eva) "Qk" = ( /obj/effect/shuttle_landmark/scc_scout_ship/space/starboard_far, /turf/template_noop, @@ -6205,6 +6724,9 @@ dir = 1 }, /obj/random/dirt_75, +/obj/effect/floor_decal/industrial/hatch_tiny/yellow{ + dir = 4 + }, /turf/simulated/floor/plating, /area/shuttle/scc_scout_ship_shuttle/propulsion_port) "QJ" = ( @@ -6222,7 +6744,7 @@ /obj/structure/bed/stool/chair{ dir = 4 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/ship/scc_scout_ship/mess) "QP" = ( /obj/machinery/portable_atmospherics/hydroponics, @@ -6233,18 +6755,31 @@ /obj/random/dirt_75, /turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/hydroponics) -"QV" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/noid, -/obj/structure/window/shuttle/scc_space_ship/cardinal, +"QW" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, -/area/shuttle/scc_scout_ship_shuttle/cockpit) +/area/ship/scc_scout_ship/eva) "QY" = ( /obj/structure/closet/walllocker/emerglocker/north, /obj/effect/floor_decal/corner/grey{ dir = 6 }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 6 + }, +/turf/simulated/floor/tiled/slate, /area/ship/scc_scout_ship/quarters) "Ra" = ( /obj/machinery/atmospherics/pipe/tank/carbon_dioxide{ @@ -6253,6 +6788,9 @@ /obj/effect/floor_decal/industrial/warning{ dir = 9 }, +/obj/machinery/light/small/emergency{ + dir = 4 + }, /turf/simulated/floor/plating, /area/shuttle/scc_scout_ship_shuttle/propulsion_port) "Rb" = ( @@ -6269,17 +6807,19 @@ }, /turf/simulated/floor/plating, /area/shuttle/scc_scout_ship_shuttle/propulsion_starboard) +"Re" = ( +/obj/effect/floor_decal/corner/blue{ + dir = 5 + }, +/obj/random/dirt_75, +/turf/simulated/floor/tiled/dark, +/area/ship/scc_scout_ship/eva) "Rt" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/aux, -/obj/structure/lattice/catwalk/indoor/grate, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/hydroponics) "Ru" = ( -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_scc_scout_dock_aft"; - master_tag = "airlock_scc_scout_dock_aft"; - landmark_tag = "nav_scc_scout_dock_aft" - }, /obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ dir = 8 }, @@ -6289,6 +6829,11 @@ pixel_x = 20 }, /obj/random/dirt_75, +/obj/effect/map_effect/marker/airlock/docking/scc_scout_ship/dock/aft, +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 4 + }, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_propulsion_port) "RB" = ( @@ -6322,6 +6867,9 @@ pixel_x = 8; pixel_y = 7 }, +/obj/effect/floor_decal/corner/blue{ + dir = 6 + }, /turf/simulated/floor/tiled/dark/full, /area/ship/scc_scout_ship/bridge) "RZ" = ( @@ -6331,10 +6879,12 @@ /obj/machinery/door/airlock/glass_command{ id_tag = "sbridgedoor" }, -/obj/effect/floor_decal/industrial/hatch/red, /obj/structure/cable/pink{ icon_state = "1-2" }, +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/shuttle/scc_scout_ship_shuttle/cockpit) "Sb" = ( @@ -6352,20 +6902,33 @@ /obj/effect/floor_decal/corner/grey{ dir = 9 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/slate, /area/ship/scc_scout_ship/quarters) "Sd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 5 + }, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_atmos) "Si" = ( +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/engineering_cargo) "Sj" = ( @@ -6390,6 +6953,15 @@ /obj/structure/cable{ icon_state = "1-4" }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 6 + }, /turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/quarters) "Sr" = ( @@ -6406,7 +6978,7 @@ name = "random plushie (5% chance)" }, /obj/structure/bed/padded, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/slate, /area/ship/scc_scout_ship/quarters) "SA" = ( /obj/structure/closet/crate/loot, @@ -6420,19 +6992,19 @@ /obj/random/dirt_75, /obj/random/dirt_75, /obj/random/dirt_75, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/cargo, /area/ship/scc_scout_ship/engineering_cargo) "SD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable/pink{ icon_state = "1-2" }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/shuttle/scc_scout_ship_shuttle/cargo) "SF" = ( @@ -6498,8 +7070,23 @@ dir = 6 }, /obj/structure/extinguisher_cabinet/west, +/obj/effect/floor_decal/industrial/hatch_tiny/yellow{ + dir = 4 + }, /turf/simulated/floor/plating, /area/shuttle/scc_scout_ship_shuttle/propulsion_port) +"SU" = ( +/obj/effect/floor_decal/corner/grey{ + dir = 9 + }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 8 + }, +/turf/simulated/floor/tiled/slate, +/area/ship/scc_scout_ship/quarters) "SV" = ( /obj/structure/closet/crate/loot, /obj/effect/floor_decal/industrial/outline/grey, @@ -6528,8 +7115,10 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/floor_decal/industrial/hatch/red, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/maint_power) "Te" = ( /obj/effect/floor_decal/corner/blue{ @@ -6544,25 +7133,27 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/obj/structure/lattice/catwalk/indoor/grate, /obj/random/dirt_75, /obj/structure/cable/pink{ icon_state = "1-2" }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/shuttle/scc_scout_ship_shuttle/eva) "Tm" = ( -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_scc_scout_dock_aft"; - master_tag = "airlock_scc_scout_dock_aft"; - landmark_tag = "nav_scc_scout_dock_aft" - }, /obj/machinery/airlock_sensor{ pixel_x = 20; dir = 8; pixel_y = -6 }, /obj/random/dirt_75, +/obj/effect/map_effect/marker/airlock/docking/scc_scout_ship/dock/aft, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 4 + }, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_propulsion_port) "Tw" = ( @@ -6575,15 +7166,15 @@ /turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/hydroponics) "TG" = ( -/obj/effect/map_effect/marker/airlock/shuttle{ - shuttle_tag = "SCCV Scout Shuttle"; - master_tag = "airlock_scc_scout_shuttle"; - name = "airlock_scc_scout_shuttle" - }, /obj/effect/map_effect/marker_helper/airlock/out, /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 1 }, +/obj/effect/map_effect/marker/airlock/shuttle/scc_scout_ship, +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 8 + }, /turf/simulated/floor/plating, /area/shuttle/scc_scout_ship_shuttle/eva) "TH" = ( @@ -6591,6 +7182,10 @@ dir = 4 }, /obj/random/dirt_75, +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_propulsion_port) "TO" = ( @@ -6614,7 +7209,7 @@ pixel_y = 28; dir = 8 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/shuttle/scc_scout_ship_shuttle/cargo) "TP" = ( /obj/structure/reagent_dispensers/coolanttank, @@ -6643,6 +7238,20 @@ /obj/random/dirt_75, /turf/simulated/floor/tiled/dark/full, /area/ship/scc_scout_ship/maint_propulsion_port) +"Ua" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/map_effect/marker/airlock/shuttle/scc_scout_ship, +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/shuttle/scc_scout_ship_shuttle/eva) "Uh" = ( /obj/structure/lattice, /obj/effect/landmark/entry_point/aft{ @@ -6657,7 +7266,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/turf/simulated/floor/tiled/dark/full, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/turf/simulated/floor/plating, /area/ship/scc_scout_ship/quarters) "Up" = ( /obj/machinery/computer/ship/engines/terminal{ @@ -6683,6 +7293,15 @@ dir = 1 }, /obj/random/dirt_75, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 1 + }, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_atmos) "Uy" = ( @@ -6715,13 +7334,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable/pink{ icon_state = "2-8" }, /obj/structure/cable/pink{ icon_state = "1-8" }, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/structure/cable/pink{ + icon_state = "4-8" + }, /turf/simulated/floor/plating, /area/shuttle/scc_scout_ship_shuttle/cargo) "UL" = ( @@ -6735,13 +7357,13 @@ name = "random plushie (5% chance)" }, /obj/structure/bed/padded, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/slate, /area/ship/scc_scout_ship/quarters) "UR" = ( /obj/effect/floor_decal/corner/grey{ dir = 8 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/slate, /area/ship/scc_scout_ship/quarters) "US" = ( /obj/machinery/door/firedoor/noid, @@ -6784,21 +7406,19 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/floor_decal/industrial/hatch/red, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/maint_atmos) "Vb" = ( -/obj/effect/map_effect/marker/airlock/shuttle{ - shuttle_tag = "SCCV Scout Shuttle"; - master_tag = "airlock_scc_scout_shuttle"; - name = "airlock_scc_scout_shuttle" - }, /obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ dir = 8 }, /obj/machinery/light/small/emergency{ dir = 4 }, +/obj/effect/map_effect/marker/airlock/shuttle/scc_scout_ship, /turf/simulated/floor/plating, /area/shuttle/scc_scout_ship_shuttle/eva) "Vd" = ( @@ -6832,14 +7452,15 @@ /obj/machinery/door/airlock/hatch, /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/door/firedoor/noid, -/obj/effect/floor_decal/industrial/hatch/red, /obj/structure/cable/pink{ icon_state = "1-2" }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, /area/shuttle/scc_scout_ship_shuttle/propulsion_starboard) "Vn" = ( -/obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -6850,7 +7471,14 @@ icon_state = "4-8" }, /obj/random/dirt_75, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 9 + }, +/turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/eva) "Vz" = ( /obj/effect/floor_decal/industrial/outline/firefighting_closet, @@ -6864,7 +7492,9 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/mess) "VB" = ( @@ -6876,12 +7506,12 @@ /turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/hydroponics) "VD" = ( -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_scc_scout_dock_starboard"; - master_tag = "airlock_scc_scout_dock_starboard"; - landmark_tag = "nav_scc_scout_dock_starboard" - }, /obj/random/dirt_75, +/obj/effect/map_effect/marker/airlock/docking/scc_scout_ship/dock/starboard, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_straight/red, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_atmos) "VE" = ( @@ -6897,7 +7527,6 @@ /turf/simulated/floor/tiled/dark/full, /area/shuttle/scc_scout_ship_shuttle/cargo) "VG" = ( -/obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/light{ dir = 1 }, @@ -6910,6 +7539,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/eva) "VO" = ( @@ -6941,17 +7571,41 @@ /turf/simulated/floor/plating, /area/ship/scc_scout_ship/engineering_cargo) "VQ" = ( +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 5 + }, /turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/quarters) "VS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable{ - icon_state = "1-8" + icon_state = "1-2" }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 5 + }, +/turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/bridge) +"VU" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/random/dirt_75, +/turf/simulated/floor/tiled/dark, +/area/ship/scc_scout_ship/eva) "VW" = ( /obj/effect/floor_decal/corner/grey{ dir = 9 @@ -7002,7 +7656,6 @@ /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_propulsion_port) "We" = ( -/obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, @@ -7010,25 +7663,28 @@ /obj/structure/cable/pink{ icon_state = "1-4" }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 5 + }, +/turf/simulated/floor/tiled, /area/shuttle/scc_scout_ship_shuttle/cockpit) "Wg" = ( /obj/machinery/atmospherics/unary/engine/scc_ship_engine, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_propulsion_starboard) -"Wi" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/noid, -/obj/structure/window/shuttle/scc_space_ship/cardinal, -/turf/simulated/floor/plating, -/area/shuttle/scc_scout_ship_shuttle/cargo) "Wj" = ( /obj/machinery/door/firedoor/noid{ dir = 4 }, -/obj/effect/floor_decal/industrial/hatch/red, /obj/random/dirt_75, /obj/random/dirt_75, +/obj/effect/floor_decal/industrial/hatch_door/red, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_atmos) "Wl" = ( @@ -7069,10 +7725,10 @@ /turf/simulated/floor/carpet/darkblue, /area/ship/scc_scout_ship/mess) "Wp" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 10 - }, /obj/machinery/shipsensors, +/obj/effect/floor_decal/industrial/warning, +/obj/random/dirt_75, +/obj/random/dirt_75, /turf/simulated/floor/airless, /area/shuttle/scc_scout_ship_shuttle/cockpit) "Wq" = ( @@ -7105,11 +7761,6 @@ /obj/effect/shuttle_landmark/scc_scout_ship/dock/port{ dir = 8 }, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_scc_scout_dock_port"; - master_tag = "airlock_scc_scout_dock_port"; - landmark_tag = "nav_scc_scout_dock_port" - }, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/effect/floor_decal/industrial/hatch/red, /obj/effect/floor_decal/industrial/warning/cee{ @@ -7123,7 +7774,8 @@ pixel_y = 28; dir = 4 }, -/turf/simulated/floor/plating, +/obj/effect/map_effect/marker/airlock/docking/scc_scout_ship/dock/port, +/turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/hydroponics) "WM" = ( /obj/random/dirt_75, @@ -7149,7 +7801,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/lattice/catwalk/indoor/grate, /obj/effect/floor_decal/industrial/hatch/yellow, /obj/structure/cable/pink{ icon_state = "4-8" @@ -7157,6 +7808,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/shuttle/scc_scout_ship_shuttle/cargo) "WR" = ( @@ -7164,9 +7816,9 @@ /obj/effect/floor_decal/corner/brown{ dir = 10 }, -/obj/effect/floor_decal/industrial/outline/grey, /obj/random/dirt_75, -/turf/simulated/floor/tiled/dark/full, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/cargo, /area/ship/scc_scout_ship/engineering_cargo) "WU" = ( /obj/structure/table/wood, @@ -7178,12 +7830,18 @@ pixel_y = 14; pixel_x = 10 }, +/obj/random/pottedplant_small{ + pixel_y = 1; + pixel_x = 9 + }, /turf/simulated/floor/carpet/darkblue, /area/ship/scc_scout_ship/mess) "WV" = ( /obj/machinery/door/airlock/command, /obj/machinery/door/firedoor/noid, -/obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/quarters) "Xa" = ( @@ -7248,7 +7906,9 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/eva) "Xp" = ( @@ -7269,6 +7929,7 @@ gps_prefix = "SCC"; gpstag = "SCOUTSHUTTLE" }, +/obj/effect/floor_decal/corner/blue/diagonal, /turf/simulated/floor/tiled/dark, /area/shuttle/scc_scout_ship_shuttle/cockpit) "Xu" = ( @@ -7279,14 +7940,18 @@ /area/ship/scc_scout_ship/eva) "Xv" = ( /obj/machinery/door/firedoor/noid, -/obj/effect/floor_decal/industrial/hatch/red, /obj/random/dirt_75, +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 + }, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_propulsion_port) "Xx" = ( /obj/effect/floor_decal/corner/green{ dir = 1 }, +/obj/random/dirt_75, +/obj/random/dirt_75, /turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/hydroponics) "Xy" = ( @@ -7298,14 +7963,10 @@ }, /obj/effect/floor_decal/industrial/warning/full, /obj/effect/map_effect/marker_helper/airlock/exterior, -/obj/effect/map_effect/marker/airlock/shuttle{ - shuttle_tag = "SCCV Scout Shuttle"; - master_tag = "airlock_scc_scout_shuttle"; - name = "airlock_scc_scout_shuttle" - }, /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 4 }, +/obj/effect/map_effect/marker/airlock/shuttle/scc_scout_ship, /turf/simulated/floor/airless, /area/shuttle/scc_scout_ship_shuttle/eva) "Xz" = ( @@ -7338,8 +7999,8 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/effect/floor_decal/industrial/hatch/red, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/hatch_door/red, +/turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/maint_power) "XM" = ( /turf/simulated/wall/shuttle/scc_space_ship, @@ -7351,7 +8012,7 @@ }, /obj/effect/floor_decal/industrial/outline/yellow, /obj/random/dirt_75, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/cargo, /area/ship/scc_scout_ship/engineering_cargo) "XP" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -7360,14 +8021,17 @@ /obj/structure/cable{ icon_state = "1-8" }, +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 4 + }, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_atmos) "XQ" = ( -/obj/machinery/light/small/emergency, /obj/machinery/atmospherics/pipe/simple/visible/universal{ dir = 4 }, -/obj/structure/lattice/catwalk/indoor/grate, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_atmos) "XS" = ( @@ -7377,8 +8041,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/lattice/catwalk/indoor/grate, /obj/random/dirt_75, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/bridge) "XT" = ( @@ -7430,14 +8094,14 @@ /turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/hydroponics) "Yg" = ( -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_scc_scout_dock_port"; - master_tag = "airlock_scc_scout_dock_port"; - landmark_tag = "nav_scc_scout_dock_port" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/aux, /obj/machinery/light/small/emergency, /obj/random/dirt_75, +/obj/effect/map_effect/marker/airlock/docking/scc_scout_ship/dock/port, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_straight/red, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/hydroponics) "Yh" = ( @@ -7466,10 +8130,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 4 }, -/obj/structure/lattice/catwalk/indoor/grate, /obj/random/dirt_75, /obj/machinery/light, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/hydroponics) "YB" = ( /obj/machinery/light/small/emergency, @@ -7480,7 +8146,6 @@ /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_propulsion_port) "YC" = ( -/obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/alarm/west{ @@ -7489,14 +8154,12 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 8 + }, +/turf/simulated/floor/tiled, /area/ship/scc_scout_ship/mess) "YF" = ( -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_scc_scout_dock_starboard"; - master_tag = "airlock_scc_scout_dock_starboard"; - landmark_tag = "nav_scc_scout_dock_starboard" - }, /obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ dir = 4 }, @@ -7506,13 +8169,20 @@ pixel_x = 6 }, /obj/random/dirt_75, +/obj/effect/map_effect/marker/airlock/docking/scc_scout_ship/dock/starboard, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 1 + }, /turf/simulated/floor/plating, /area/ship/scc_scout_ship/maint_atmos) "YL" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/turf/simulated/floor/tiled/dark/full, +/turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/eva) "YQ" = ( /obj/structure/lattice/catwalk, @@ -7548,6 +8218,13 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 4 + }, /turf/simulated/floor/tiled/dark/full, /area/shuttle/scc_scout_ship_shuttle/eva) "Zd" = ( @@ -7574,11 +8251,11 @@ /obj/machinery/door/firedoor/noid{ dir = 4 }, -/obj/effect/floor_decal/industrial/hatch/red, /obj/machinery/door/airlock/hatch{ dir = 4 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/hatch_door/red, +/turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/maint_propulsion_starboard) "Zx" = ( /obj/effect/floor_decal/corner/blue/diagonal, @@ -7675,10 +8352,10 @@ /obj/structure/cable/pink{ icon_state = "0-8" }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/shuttle/scc_scout_ship_shuttle/cockpit) "ZT" = ( -/obj/structure/bed/stool/chair/padded/blue, +/obj/structure/bed/stool/chair/padded/brown, /turf/simulated/floor/carpet, /area/ship/scc_scout_ship/quarters) @@ -36819,7 +37496,7 @@ Px Px Px qY -YQ +jY pJ dm dm @@ -37337,10 +38014,10 @@ qC dm Ka UR -UR Sc +Cq xj -Sc +SU OB DG EZ @@ -38130,7 +38807,7 @@ qY qY qY qY -hz +dS qY pJ pJ @@ -38395,7 +39072,7 @@ RB RB pJ pJ -YQ +jY Xj Xj Xj @@ -39407,11 +40084,11 @@ EZ EZ EZ EZ -Hc +dk jV -hV -Wi -hV +aI +mm +aI TO wt qB @@ -39666,7 +40343,7 @@ aI aI aI lm -hV +aI Oh aI tM @@ -40405,7 +41082,7 @@ Xj Xj Xj Xj -YQ +jY NO qq GZ @@ -40447,7 +41124,7 @@ Ko eq zK aI -Xj +Jn Xj Xj Xj @@ -40699,11 +41376,11 @@ Zx aW aW JB -OF -OF -OF -OF -OF +FN +FN +FN +FN +FN Wp Xj Xj @@ -40951,18 +41628,18 @@ eI KG SX aa -rW +xG FF gP CX lK -OF +FN zC Iv Xr -OF -QV -QV +FN +HR +HR Xj Xj Xj @@ -41213,7 +41890,7 @@ FF sN JO tt -QV +HR pX gr Uy @@ -41447,7 +42124,7 @@ hu gd xm xm -xm +VU NN cP oL @@ -41458,7 +42135,7 @@ Oc Fg ft Np -Np +Ua kb wZ rS @@ -41470,13 +42147,13 @@ qA dQ sN sG -QV +HR SF -lc +ok yB aT qU -QV +HR Xj Xj Xj @@ -41727,13 +42404,13 @@ hd gP nB Mn -OF -OF +FN +FN rJ -QV -OF -QV -QV +HR +FN +HR +HR Xj Xj Xj @@ -41979,16 +42656,16 @@ HF HF HF HF -gm +OP Ut fZ yF yF -OF +FN mA lc gb -QV +HR ub Xj Xj @@ -42237,7 +42914,7 @@ dW qL hs UD -Hx +IR Hx xx dd @@ -42245,8 +42922,8 @@ RZ We XV sB -QV -Xj +HR +xk Xj Ys Xj @@ -42476,8 +43153,8 @@ am Xp ch Lh -MW -KM +Re +gW yM mI xL @@ -42758,8 +43435,8 @@ Wq FN FN mS -QV -QV +HR +HR rT Xj Xj @@ -43247,7 +43924,7 @@ lg OZ pm Lx -Lx +QW fM iH Lg @@ -43267,8 +43944,8 @@ Xj Dz Dz Ot -Wi -hV +mm +aI aI Xj Xj @@ -43766,7 +44443,7 @@ om vE ue lG -vE +Qh Xl VS FB @@ -44266,16 +44943,16 @@ qC pJ pP mr -hD +jQ Si pU -Si +BI NJ -cW -cW -hD -Si -dk +sQ +sQ +Hj +bo +pU dC tw Xp @@ -44284,8 +44961,8 @@ Xp Xp jR ei -GT -IR +mN +cS cS mv vv diff --git a/maps/away/ships/scc/scc_scout_ship_landmarks.dm b/maps/away/ships/scc/scc_scout_ship_landmarks.dm index 2864c7d3484..d3a5df99f22 100644 --- a/maps/away/ships/scc/scc_scout_ship_landmarks.dm +++ b/maps/away/ships/scc/scc_scout_ship_landmarks.dm @@ -12,6 +12,13 @@ landmark_tag = "nav_scc_scout_shuttle_dock" docking_controller = "airlock_scc_scout_shuttle_dock" +/obj/effect/map_effect/marker/airlock/docking/scc_scout_ship/shuttle_hangar + name = "Shuttle Dock" + landmark_tag = "nav_scc_scout_shuttle_dock" + master_tag = "airlock_scc_scout_shuttle_dock" + +// ---- + /obj/effect/shuttle_landmark/scc_scout_ship/shuttle_transit name = "In transit" landmark_tag = "nav_scc_scout_shuttle_transit" @@ -24,16 +31,35 @@ landmark_tag = "nav_scc_scout_dock_starboard" docking_controller = "airlock_scc_scout_dock_starboard" +/obj/effect/map_effect/marker/airlock/docking/scc_scout_ship/dock/starboard + name = "Dock, Starboard" + landmark_tag = "nav_scc_scout_dock_starboard" + master_tag = "airlock_scc_scout_dock_starboard" + +// ---- + /obj/effect/shuttle_landmark/scc_scout_ship/dock/port name = "Dock, Port" landmark_tag = "nav_scc_scout_dock_port" docking_controller = "airlock_scc_scout_dock_port" +/obj/effect/map_effect/marker/airlock/docking/scc_scout_ship/dock/port + name = "Dock, Port" + landmark_tag = "nav_scc_scout_dock_port" + master_tag = "airlock_scc_scout_dock_port" + +// ---- + /obj/effect/shuttle_landmark/scc_scout_ship/dock/aft name = "Dock, Aft" landmark_tag = "nav_scc_scout_dock_aft" docking_controller = "airlock_scc_scout_dock_aft" +/obj/effect/map_effect/marker/airlock/docking/scc_scout_ship/dock/aft + name = "Dock, Aft" + landmark_tag = "nav_scc_scout_dock_aft" + master_tag = "airlock_scc_scout_dock_aft" + // --------------------- catwalk /obj/effect/shuttle_landmark/scc_scout_ship/catwalk/aft diff --git a/maps/away/ships/yacht_civ/yacht_civ.dmm b/maps/away/ships/yacht_civ/yacht_civ.dmm index c6c0ed92a53..8ec589d406d 100644 --- a/maps/away/ships/yacht_civ/yacht_civ.dmm +++ b/maps/away/ships/yacht_civ/yacht_civ.dmm @@ -15,11 +15,12 @@ dir = 8; pixel_y = -6 }, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_yacht_civ_dock_aft"; - master_tag = "airlock_yacht_civ_dock_aft"; - landmark_tag = "nav_yacht_civ_dock_aft"; - req_one_access = null +/obj/effect/map_effect/marker/airlock/docking/yacht_civ/dock/aft, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 4 }, /turf/simulated/floor/plating, /area/ship/yacht_civ/hallway_aft) @@ -56,6 +57,13 @@ }, /turf/simulated/floor/tiled, /area/ship/yacht_civ/engineering) +"aR" = ( +/obj/effect/map_effect/window_spawner/full/shuttle/mercenary{ + spawn_firedoor = 1; + spawn_grille = 1 + }, +/turf/simulated/floor/plating, +/area/ship/yacht_civ/hallway_fore) "aS" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/portable_atmospherics/canister/oxygen, @@ -63,9 +71,6 @@ /turf/simulated/floor/tiled, /area/ship/yacht_civ/storage) "aU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 6 - }, /obj/machinery/airlock_sensor{ dir = 2; pixel_y = 28; @@ -81,6 +86,20 @@ name = "airlock_yacht_civ_mid"; req_one_access = null }, +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux, +/obj/machinery/light/small/emergency{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 1 + }, /turf/simulated/floor/plating, /area/ship/yacht_civ/lounge) "aW" = ( @@ -103,7 +122,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 }, -/turf/simulated/floor/wood/bamboo, +/turf/simulated/floor/wood/walnut, /area/ship/yacht_civ/hallway_mid) "bG" = ( /obj/effect/floor_decal/industrial/outline/grey, @@ -135,6 +154,21 @@ /obj/item/towel_flat, /turf/simulated/floor/exoplanet/grass, /area/ship/yacht_civ/hallway_mid) +"cd" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/corner/grey{ + dir = 9 + }, +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/ship/yacht_civ/hallway_mid) "cj" = ( /obj/structure/bed/stool/chair/office/bridge/generic{ dir = 4 @@ -150,6 +184,13 @@ /turf/simulated/floor/marble/dark, /area/ship/yacht_civ/hallway_mid) "cs" = ( +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/ship/yacht_civ/hallway_aft) "cu" = ( @@ -173,6 +214,15 @@ /turf/simulated/floor/tiled, /area/ship/yacht_civ/hallway_aft) "cA" = ( +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 5 + }, /turf/simulated/floor/marble/dark, /area/ship/yacht_civ/kitchen) "cJ" = ( @@ -187,6 +237,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/ship/yacht_civ/hallway_mid) "cS" = ( @@ -225,6 +278,15 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/ship/yacht_civ/storage) "di" = ( @@ -254,7 +316,7 @@ pixel_y = 2; pixel_x = -2 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/wood/mahogany, /area/ship/yacht_civ/lounge) "dt" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -278,11 +340,12 @@ pixel_y = 28; pixel_x = -6 }, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_yacht_civ_dock_port"; - master_tag = "airlock_yacht_civ_dock_port"; - landmark_tag = "nav_yacht_civ_dock_port"; - req_one_access = null +/obj/effect/map_effect/marker/airlock/docking/yacht_civ/dock/port, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 1 }, /turf/simulated/floor/plating, /area/ship/yacht_civ/hallway_aft) @@ -298,6 +361,9 @@ /turf/simulated/floor/plating, /area/ship/yacht_civ/lounge) "dQ" = ( +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 8 + }, /turf/simulated/floor/tiled/full, /area/ship/yacht_civ/lounge) "dW" = ( @@ -327,6 +393,15 @@ /obj/structure/cable{ icon_state = "1-4" }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 6 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 1 + }, /turf/simulated/floor/marble/dark, /area/ship/yacht_civ/quarters) "ef" = ( @@ -360,7 +435,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 10 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/wood/mahogany, /area/ship/yacht_civ/lounge) "ev" = ( /turf/simulated/wall/shuttle/space_ship/mercenary, @@ -402,10 +477,23 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 }, -/turf/simulated/floor/wood/bamboo, +/turf/simulated/floor/wood/walnut, +/area/ship/yacht_civ/hallway_mid) +"eF" = ( +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_straight/red, +/turf/simulated/floor/tiled/full, /area/ship/yacht_civ/hallway_mid) "eI" = ( -/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, +/obj/effect/map_effect/window_spawner/full/shuttle/mercenary{ + spawn_firedoor = 1; + spawn_grille = 1 + }, /turf/simulated/floor/plating, /area/ship/yacht_civ/lounge) "eL" = ( @@ -415,6 +503,9 @@ /obj/machinery/alarm/south{ req_one_access = null }, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 1 + }, /turf/simulated/floor/plating, /area/ship/yacht_civ/hallway_aft) "eM" = ( @@ -446,7 +537,7 @@ }, /obj/item/reagent_containers/food/drinks/flask/barflask, /obj/item/storage/box/fancy/gum, -/turf/simulated/floor/wood, +/turf/simulated/floor/wood/mahogany, /area/ship/yacht_civ/lounge) "eZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -493,7 +584,7 @@ /mob/living/simple_animal/cat/kitten{ dir = 8 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/wood/mahogany, /area/ship/yacht_civ/lounge) "fA" = ( /turf/simulated/wall/shuttle/space_ship/mercenary, @@ -551,7 +642,9 @@ /obj/machinery/atmospherics/binary/pump/high_power/on{ dir = 4 }, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/hatch_tiny/yellow{ + dir = 8 + }, /turf/simulated/floor/plating, /area/ship/yacht_civ/engineering) "gv" = ( @@ -567,6 +660,9 @@ /obj/machinery/light{ dir = 8 }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/ship/yacht_civ/hallway_aft) "gy" = ( @@ -595,13 +691,8 @@ dir = 1 }, /obj/effect/map_effect/marker_helper/airlock/interior, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_yacht_civ_dock_starboard"; - master_tag = "airlock_yacht_civ_dock_starboard"; - landmark_tag = "nav_yacht_civ_dock_starboard"; - req_one_access = null - }, -/turf/simulated/floor/plating, +/obj/effect/map_effect/marker/airlock/docking/yacht_civ/dock/starboard, +/turf/simulated/floor/tiled/dark, /area/ship/yacht_civ/hallway_aft) "gN" = ( /obj/structure/cable{ @@ -615,7 +706,14 @@ dir = 8; tag_door = "airlock_yacht_civ_shuttle_dock_door" }, -/turf/simulated/floor/tiled, +/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_door/red, +/turf/simulated/floor/tiled/dark, /area/ship/yacht_civ/hallway_aft) "gO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ @@ -634,6 +732,9 @@ /obj/structure/cable{ icon_state = "0-4" }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 5 + }, /turf/simulated/floor/tiled/full, /area/ship/yacht_civ/hallway_mid) "hb" = ( @@ -656,6 +757,12 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 5 + }, /turf/simulated/floor/tiled/full, /area/ship/yacht_civ/hallway_fore) "hr" = ( @@ -685,10 +792,10 @@ /area/ship/yacht_civ/bridge) "hI" = ( /obj/machinery/portable_atmospherics/canister/air, -/obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/light/colored/decayed{ dir = 1 }, +/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/plating, /area/ship/yacht_civ/engineering) "hR" = ( @@ -728,7 +835,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 6 }, -/turf/simulated/floor/wood/bamboo, +/turf/simulated/floor/wood/walnut, /area/ship/yacht_civ/hallway_mid) "ik" = ( /obj/structure/table/stone/marble, @@ -767,6 +874,9 @@ /obj/effect/floor_decal/corner/blue{ dir = 9 }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/ship/yacht_civ/lounge) "iP" = ( @@ -806,6 +916,12 @@ /obj/effect/floor_decal/corner/grey{ dir = 9 }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/ship/yacht_civ/hallway_mid) "ja" = ( @@ -830,6 +946,9 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/ship/yacht_civ/hallway_aft) "jp" = ( @@ -883,9 +1002,7 @@ /turf/simulated/floor/tiled, /area/ship/yacht_civ/bridge) "jw" = ( -/obj/effect/floor_decal/corner/grey{ - dir = 10 - }, +/obj/effect/floor_decal/industrial/outline_straight/grey, /turf/simulated/floor/tiled, /area/ship/yacht_civ/hallway_aft) "jA" = ( @@ -917,18 +1034,39 @@ }, /turf/simulated/floor/exoplanet/grass, /area/ship/yacht_civ/hallway_mid) +"kh" = ( +/obj/machinery/door/firedoor/noid, +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/ship/yacht_civ/hallway_aft) +"kj" = ( +/obj/effect/floor_decal/corner/grey{ + dir = 9 + }, +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/ship/yacht_civ/hallway_mid) "kk" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/aux, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_yacht_civ_dock_aft"; - master_tag = "airlock_yacht_civ_dock_aft"; - landmark_tag = "nav_yacht_civ_dock_aft"; - req_one_access = null +/obj/effect/map_effect/marker/airlock/docking/yacht_civ/dock/aft, +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 8 }, /turf/simulated/floor/plating, /area/ship/yacht_civ/hallway_aft) "kv" = ( -/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, +/obj/effect/map_effect/window_spawner/full/shuttle{ + color = "#BDB6AE"; + frame_color = "#BDB6AE"; + spawn_firedoor = 1; + spawn_grille = 1 + }, /obj/effect/landmark/entry_point/fore, /turf/simulated/floor/plating, /area/shuttle/yacht_civ_shuttle) @@ -951,14 +1089,27 @@ pixel_y = 28; pixel_x = 6 }, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_yacht_civ_dock_starboard"; - master_tag = "airlock_yacht_civ_dock_starboard"; - landmark_tag = "nav_yacht_civ_dock_starboard"; - req_one_access = null +/obj/effect/map_effect/marker/airlock/docking/yacht_civ/dock/starboard, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 1 }, /turf/simulated/floor/plating, /area/ship/yacht_civ/hallway_aft) +"kB" = ( +/obj/effect/floor_decal/corner/grey{ + dir = 10 + }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/ship/yacht_civ/hallway_aft) "kF" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -979,6 +1130,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 6 }, +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/ship/yacht_civ/hallway_fore) "kQ" = ( @@ -1046,14 +1201,21 @@ dir = 10 }, /obj/machinery/light, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/ship/yacht_civ/hallway_fore) "lx" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 }, -/turf/simulated/floor/wood/bamboo, +/turf/simulated/floor/wood/walnut, /area/ship/yacht_civ/hallway_mid) +"lC" = ( +/obj/effect/floor_decal/industrial/outline_door/red, +/turf/simulated/floor/tiled, +/area/ship/yacht_civ/lounge) "lG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel, /obj/effect/floor_decal/spline/plain/grey{ @@ -1149,6 +1311,12 @@ /obj/structure/cable{ icon_state = "2-8" }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 8 + }, /turf/simulated/floor/tiled/full, /area/ship/yacht_civ/hallway_aft) "mi" = ( @@ -1164,6 +1332,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 10 }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_straight/red, /turf/simulated/floor/tiled, /area/ship/yacht_civ/hallway_aft) "mn" = ( @@ -1212,7 +1384,10 @@ /turf/simulated/floor/reinforced/carbon_dioxide, /area/ship/yacht_civ/propulsion) "mL" = ( -/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, +/obj/effect/map_effect/window_spawner/full/shuttle/mercenary{ + spawn_firedoor = 1; + spawn_grille = 1 + }, /turf/simulated/floor/plating, /area/ship/yacht_civ/storage) "mM" = ( @@ -1246,7 +1421,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 9 }, -/turf/simulated/floor/wood/bamboo, +/turf/simulated/floor/wood/walnut, /area/ship/yacht_civ/hallway_mid) "na" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -1254,6 +1429,10 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_door/red, /turf/simulated/floor/tiled/full, /area/ship/yacht_civ/hallway_mid) "nb" = ( @@ -1283,13 +1462,8 @@ dir = 8 }, /obj/effect/map_effect/marker_helper/airlock/exterior, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_yacht_civ_dock_fore"; - master_tag = "airlock_yacht_civ_dock_fore"; - landmark_tag = "nav_yacht_civ_dock_fore"; - req_one_access = null - }, -/turf/simulated/floor/plating, +/obj/effect/map_effect/marker/airlock/docking/yacht_civ/dock/fore, +/turf/simulated/floor/tiled/dark, /area/ship/yacht_civ/hallway_fore) "ns" = ( /obj/effect/floor_decal/industrial/hatch/grey, @@ -1306,6 +1480,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/yellow, /turf/simulated/floor/tiled, /area/ship/yacht_civ/propulsion) +"nD" = ( +/obj/machinery/door/firedoor/noid{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/hatch_door/red, +/turf/simulated/floor/tiled/dark, +/area/ship/yacht_civ/hallway_aft) "nE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ @@ -1321,7 +1502,9 @@ /obj/machinery/atmospherics/binary/pump/high_power/on{ dir = 8 }, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/hatch_tiny/yellow{ + dir = 8 + }, /turf/simulated/floor/plating, /area/ship/yacht_civ/engineering) "nH" = ( @@ -1341,6 +1524,38 @@ }, /turf/simulated/floor/tiled, /area/ship/yacht_civ/bridge) +"nW" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 5 + }, +/turf/simulated/floor/reinforced/airless, +/area/ship/yacht_civ/hangar) +"oc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/corner/grey{ + dir = 9 + }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/ship/yacht_civ/hallway_mid) "og" = ( /obj/effect/floor_decal/industrial/hatch/red, /obj/machinery/door/firedoor/noid, @@ -1402,7 +1617,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 5 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 5 + }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, +/turf/simulated/floor/tiled, /area/ship/yacht_civ/lounge) "oY" = ( /obj/effect/floor_decal/industrial/hatch/red, @@ -1439,6 +1663,16 @@ name = "airlock_yacht_civ_hangar"; req_one_access = null }, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 4 + }, /turf/simulated/floor/plating, /area/ship/yacht_civ/hallway_aft) "pe" = ( @@ -1462,6 +1696,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 8 + }, /turf/simulated/floor/tiled/full, /area/ship/yacht_civ/lounge) "pn" = ( @@ -1471,6 +1708,12 @@ /obj/structure/cable{ icon_state = "1-4" }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/ship/yacht_civ/hallway_fore) "ps" = ( @@ -1596,6 +1839,9 @@ /obj/machinery/alarm/west{ req_one_access = null }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/ship/yacht_civ/hallway_aft) "qq" = ( @@ -1604,6 +1850,13 @@ }, /turf/simulated/floor/tiled/dark/full, /area/shuttle/yacht_civ_shuttle) +"qv" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/industrial/outline_straight/grey, +/turf/simulated/floor/tiled, +/area/ship/yacht_civ/hallway_aft) "qy" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -1617,6 +1870,9 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 8 + }, /turf/simulated/floor/tiled/full, /area/ship/yacht_civ/lounge) "qB" = ( @@ -1659,12 +1915,11 @@ /area/ship/yacht_civ/engineering) "rC" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/aux, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_yacht_civ_dock_starboard"; - master_tag = "airlock_yacht_civ_dock_starboard"; - landmark_tag = "nav_yacht_civ_dock_starboard"; - req_one_access = null +/obj/effect/map_effect/marker/airlock/docking/yacht_civ/dock/starboard, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 4 }, +/obj/effect/floor_decal/industrial/outline_straight/red, /turf/simulated/floor/plating, /area/ship/yacht_civ/hallway_aft) "rN" = ( @@ -1695,7 +1950,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 9 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/wood/mahogany, /area/ship/yacht_civ/lounge) "sk" = ( /obj/structure/lattice/catwalk, @@ -1712,7 +1967,9 @@ /obj/machinery/atmospherics/binary/pump/high_power{ dir = 4 }, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/hatch_tiny/yellow{ + dir = 8 + }, /turf/simulated/floor/plating, /area/ship/yacht_civ/propulsion) "sA" = ( @@ -1769,16 +2026,20 @@ /obj/machinery/light/small/emergency{ dir = 8 }, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_yacht_civ_dock_aft"; - master_tag = "airlock_yacht_civ_dock_aft"; - landmark_tag = "nav_yacht_civ_dock_aft"; - req_one_access = null +/obj/effect/map_effect/marker/airlock/docking/yacht_civ/dock/aft, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 8 }, /turf/simulated/floor/plating, /area/ship/yacht_civ/hallway_aft) "sY" = ( -/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, +/obj/effect/map_effect/window_spawner/full/shuttle/mercenary{ + spawn_firedoor = 1; + spawn_grille = 1 + }, /turf/simulated/floor/plating, /area/ship/yacht_civ/hallway_mid) "tc" = ( @@ -1792,7 +2053,10 @@ /turf/simulated/floor/marble/dark, /area/ship/yacht_civ/kitchen) "tf" = ( -/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, +/obj/effect/map_effect/window_spawner/full/shuttle/mercenary{ + spawn_firedoor = 1; + spawn_grille = 1 + }, /turf/simulated/floor/plating, /area/ship/yacht_civ/kitchen) "to" = ( @@ -1828,11 +2092,12 @@ pixel_y = 28; pixel_x = -6 }, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_yacht_civ_dock_starboard"; - master_tag = "airlock_yacht_civ_dock_starboard"; - landmark_tag = "nav_yacht_civ_dock_starboard"; - req_one_access = null +/obj/effect/map_effect/marker/airlock/docking/yacht_civ/dock/starboard, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 1 }, /turf/simulated/floor/plating, /area/ship/yacht_civ/hallway_aft) @@ -1884,6 +2149,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 4 }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 4 + }, /turf/simulated/floor/tiled/full, /area/ship/yacht_civ/hallway_aft) "uf" = ( @@ -1895,13 +2166,8 @@ dir = 1 }, /obj/effect/map_effect/marker_helper/airlock/interior, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_yacht_civ_dock_port"; - master_tag = "airlock_yacht_civ_dock_port"; - landmark_tag = "nav_yacht_civ_dock_port"; - req_one_access = null - }, -/turf/simulated/floor/plating, +/obj/effect/map_effect/marker/airlock/docking/yacht_civ/dock/port, +/turf/simulated/floor/tiled/dark, /area/ship/yacht_civ/hallway_aft) "un" = ( /obj/structure/table/steel, @@ -1928,6 +2194,15 @@ /obj/machinery/light{ dir = 1 }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/ship/yacht_civ/hallway_aft) "ux" = ( @@ -1939,11 +2214,12 @@ dir = 8; pixel_y = -6 }, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_yacht_civ_dock_fore"; - master_tag = "airlock_yacht_civ_dock_fore"; - landmark_tag = "nav_yacht_civ_dock_fore"; - req_one_access = null +/obj/effect/map_effect/marker/airlock/docking/yacht_civ/dock/fore, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 4 }, /turf/simulated/floor/plating, /area/ship/yacht_civ/hallway_fore) @@ -2006,9 +2282,12 @@ dir = 5 }, /obj/structure/table/fancy, -/turf/simulated/floor/wood/bamboo, +/turf/simulated/floor/wood/walnut, /area/ship/yacht_civ/hallway_mid) "uN" = ( +/obj/effect/floor_decal/industrial/outline_straight/grey{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/ship/yacht_civ/engineering) "uR" = ( @@ -2116,13 +2395,8 @@ /obj/effect/floor_decal/industrial/hatch/red, /obj/effect/floor_decal/industrial/warning/full, /obj/effect/map_effect/marker_helper/airlock/exterior, -/obj/effect/map_effect/marker/airlock/shuttle{ - shuttle_tag = "Civilian Yacht Shuttle"; - master_tag = "airlock_yacht_civ_shuttle"; - name = "airlock_yacht_civ_shuttle"; - req_one_access = null - }, -/turf/simulated/floor/plating, +/obj/effect/map_effect/marker/airlock/shuttle/yacht_civ_shuttle, +/turf/simulated/floor/tiled/dark, /area/shuttle/yacht_civ_shuttle) "vW" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -2174,8 +2448,14 @@ pixel_x = 1; pixel_y = 2 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/wood/mahogany, /area/ship/yacht_civ/lounge) +"wB" = ( +/obj/effect/floor_decal/industrial/outline_straight/grey{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/ship/yacht_civ/engineering) "wM" = ( /obj/structure/bed/stool/chair/folding{ dir = 8 @@ -2189,6 +2469,12 @@ /obj/effect/floor_decal/corner/green/diagonal{ dir = 4 }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 2 + }, /turf/simulated/floor/marble/dark, /area/ship/yacht_civ/hallway_mid) "wZ" = ( @@ -2266,6 +2552,13 @@ /obj/machinery/light{ dir = 8 }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/ship/yacht_civ/hallway_aft) "xS" = ( @@ -2287,6 +2580,20 @@ /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/plating, /area/ship/yacht_civ/hallway_fore) +"yo" = ( +/obj/effect/floor_decal/corner/yellow/diagonal, +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 10 + }, +/obj/effect/floor_decal/industrial/outline_segment/grey{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/ship/yacht_civ/storage) "yu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -2319,6 +2626,9 @@ /obj/machinery/alarm/west{ req_one_access = null }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 8 + }, /turf/simulated/floor/marble, /area/ship/yacht_civ/kitchen) "yA" = ( @@ -2355,6 +2665,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/ship/yacht_civ/hallway_fore) "zi" = ( @@ -2370,6 +2686,9 @@ /obj/structure/cable{ icon_state = "0-2" }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 10 + }, /turf/simulated/floor/marble/dark, /area/ship/yacht_civ/kitchen) "zR" = ( @@ -2379,11 +2698,30 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 2 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/ship/yacht_civ/lounge) "Ab" = ( /turf/simulated/floor/marble, /area/ship/yacht_civ/hallway_mid) +"Ac" = ( +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 9 + }, +/turf/simulated/floor/tiled/full, +/area/ship/yacht_civ/hallway_mid) "Al" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -2438,6 +2776,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/ship/yacht_civ/hallway_fore) "Bu" = ( @@ -2467,32 +2808,23 @@ dir = 8 }, /obj/machinery/atmospherics/unary/vent_pump/high_volume/aux, -/obj/effect/map_effect/marker/airlock/shuttle{ - shuttle_tag = "Civilian Yacht Shuttle"; - master_tag = "airlock_yacht_civ_shuttle"; - name = "airlock_yacht_civ_shuttle"; - req_one_access = null +/obj/effect/map_effect/marker/airlock/shuttle/yacht_civ_shuttle, +/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 }, /turf/simulated/floor/tiled/dark/full, /area/shuttle/yacht_civ_shuttle) "By" = ( -/obj/machinery/door/airlock/external{ - dir = 4 - }, -/obj/machinery/access_button{ - pixel_x = 12; - pixel_y = 28; - dir = 4 - }, -/obj/effect/floor_decal/industrial/hatch/red, -/obj/effect/floor_decal/industrial/warning/full, -/obj/effect/map_effect/marker_helper/airlock/exterior, -/obj/effect/map_effect/marker/airlock{ - master_tag = "airlock_yacht_civ_mid"; - name = "airlock_yacht_civ_mid"; - req_one_access = null - }, -/turf/simulated/floor/plating, +/obj/structure/lattice/catwalk, +/obj/item/hullbeacon/red, +/turf/simulated/floor/airless, /area/ship/yacht_civ/lounge) "BA" = ( /obj/effect/floor_decal/corner/green{ @@ -2540,6 +2872,13 @@ }, /turf/simulated/floor/tiled, /area/ship/yacht_civ/bridge) +"BO" = ( +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/ship/yacht_civ/hallway_mid) "BP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -2550,6 +2889,15 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 2 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/ship/yacht_civ/bridge) "Cg" = ( @@ -2578,13 +2926,8 @@ /obj/effect/floor_decal/industrial/hatch/red, /obj/effect/floor_decal/industrial/warning/cee, /obj/effect/map_effect/marker_helper/airlock/exterior, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_yacht_civ_dock_starboard"; - master_tag = "airlock_yacht_civ_dock_starboard"; - landmark_tag = "nav_yacht_civ_dock_starboard"; - req_one_access = null - }, -/turf/simulated/floor/plating, +/obj/effect/map_effect/marker/airlock/docking/yacht_civ/dock/starboard, +/turf/simulated/floor/tiled/dark, /area/ship/yacht_civ/hallway_aft) "CC" = ( /obj/structure/bed/stool/chair/sofa/violet, @@ -2602,6 +2945,13 @@ /turf/simulated/floor/tiled/dark, /area/ship/yacht_civ/hallway_fore) "CF" = ( +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 10 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 4 + }, /turf/simulated/floor/marble/dark, /area/ship/yacht_civ/quarters) "CK" = ( @@ -2617,17 +2967,22 @@ /turf/simulated/floor/tiled, /area/ship/yacht_civ/hallway_mid) "CL" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ - dir = 8 - }, -/obj/machinery/light/small/emergency{ - dir = 1 +/obj/machinery/door/airlock/external{ + dir = 4 }, +/obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/floor_decal/industrial/warning/full, +/obj/effect/map_effect/marker_helper/airlock/exterior, /obj/effect/map_effect/marker/airlock{ master_tag = "airlock_yacht_civ_mid"; name = "airlock_yacht_civ_mid"; req_one_access = null }, +/obj/machinery/access_button{ + pixel_x = 28; + pixel_y = -20; + dir = 1 + }, /turf/simulated/floor/plating, /area/ship/yacht_civ/lounge) "CP" = ( @@ -2684,12 +3039,11 @@ /area/ship/yacht_civ/quarters) "Da" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/aux, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_yacht_civ_dock_port"; - master_tag = "airlock_yacht_civ_dock_port"; - landmark_tag = "nav_yacht_civ_dock_port"; - req_one_access = null +/obj/effect/map_effect/marker/airlock/docking/yacht_civ/dock/port, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 8 }, +/obj/effect/floor_decal/industrial/outline_straight/red, /turf/simulated/floor/plating, /area/ship/yacht_civ/hallway_aft) "De" = ( @@ -2751,6 +3105,15 @@ /obj/structure/cable{ icon_state = "1-8" }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 6 + }, /turf/simulated/floor/tiled/full, /area/ship/yacht_civ/hallway_fore) "Dq" = ( @@ -2758,6 +3121,17 @@ /obj/machinery/door/firedoor/noid, /turf/simulated/floor/tiled/dark, /area/ship/yacht_civ/hallway_fore) +"Dt" = ( +/obj/effect/floor_decal/corner/yellow/diagonal, +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/ship/yacht_civ/engineering) "Dx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ @@ -2806,6 +3180,7 @@ /turf/simulated/floor/marble/dark, /area/ship/yacht_civ/hallway_mid) "DP" = ( +/obj/effect/floor_decal/industrial/outline_door/red, /turf/simulated/floor/tiled, /area/ship/yacht_civ/hallway_fore) "DU" = ( @@ -2843,6 +3218,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 6 }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_straight/red, /turf/simulated/floor/tiled, /area/ship/yacht_civ/hallway_aft) "Eg" = ( @@ -2850,7 +3232,7 @@ dir = 9 }, /obj/random/pottedplant, -/turf/simulated/floor/wood, +/turf/simulated/floor/wood/mahogany, /area/ship/yacht_civ/lounge) "Ek" = ( /obj/structure/undies_wardrobe, @@ -2859,6 +3241,13 @@ }, /turf/simulated/floor/wood/bamboo, /area/ship/yacht_civ/quarters) +"En" = ( +/obj/effect/floor_decal/corner/grey{ + dir = 10 + }, +/obj/effect/floor_decal/industrial/outline_door/red, +/turf/simulated/floor/tiled, +/area/ship/yacht_civ/hallway_aft) "Es" = ( /obj/effect/floor_decal/corner/red{ dir = 6 @@ -2872,7 +3261,10 @@ /turf/simulated/floor/tiled, /area/ship/yacht_civ/hallway_fore) "Eu" = ( -/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, +/obj/effect/map_effect/window_spawner/full/shuttle/mercenary{ + spawn_firedoor = 1; + spawn_grille = 1 + }, /obj/effect/landmark/entry_point/port{ name = "port, fore" }, @@ -2898,6 +3290,12 @@ /obj/machinery/alarm/west{ req_one_access = null }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/ship/yacht_civ/lounge) "EJ" = ( @@ -2929,13 +3327,8 @@ dir = 1 }, /obj/effect/map_effect/marker_helper/airlock/exterior, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_yacht_civ_dock_starboard"; - master_tag = "airlock_yacht_civ_dock_starboard"; - landmark_tag = "nav_yacht_civ_dock_starboard"; - req_one_access = null - }, -/turf/simulated/floor/plating, +/obj/effect/map_effect/marker/airlock/docking/yacht_civ/dock/starboard, +/turf/simulated/floor/tiled/dark, /area/ship/yacht_civ/hallway_aft) "EP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -2983,6 +3376,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 5 }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 5 + }, /turf/simulated/floor/tiled/dark, /area/shuttle/yacht_civ_shuttle) "Fk" = ( @@ -2995,12 +3397,24 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 4 + }, /turf/simulated/floor/tiled/full, /area/ship/yacht_civ/lounge) "Fo" = ( /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 8 }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 2 + }, /turf/simulated/floor/plating, /area/ship/yacht_civ/hallway_aft) "Fz" = ( @@ -3012,6 +3426,10 @@ /obj/effect/floor_decal/corner/grey{ dir = 9 }, +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/ship/yacht_civ/lounge) "FB" = ( @@ -3034,14 +3452,22 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/floor_decal/industrial/hatch/red, /obj/machinery/door/firedoor/noid, +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/ship/yacht_civ/hallway_aft) "FU" = ( /obj/effect/floor_decal/corner/yellow{ dir = 5 }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/ship/yacht_civ/hallway_aft) "Gi" = ( @@ -3085,8 +3511,27 @@ /turf/simulated/floor/tiled/dark, /area/ship/yacht_civ/propulsion) "GB" = ( +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 2 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 9 + }, /turf/simulated/floor/tiled/freezer, /area/ship/yacht_civ/hallway_mid) +"GO" = ( +/obj/machinery/light, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 6 + }, +/turf/simulated/floor/tiled/dark, +/area/ship/yacht_civ/hallway_aft) "GP" = ( /obj/machinery/power/smes/buildable/third_party_shuttle, /obj/structure/cable{ @@ -3105,6 +3550,9 @@ /obj/machinery/light{ dir = 8 }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 10 + }, /turf/simulated/floor/tiled/full, /area/ship/yacht_civ/lounge) "GT" = ( @@ -3127,6 +3575,9 @@ /obj/effect/floor_decal/corner/yellow{ dir = 1 }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/ship/yacht_civ/hallway_aft) "Hb" = ( @@ -3139,6 +3590,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 9 }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 9 + }, +/obj/effect/floor_decal/industrial/outline_segment/red, /turf/simulated/floor/plating, /area/ship/yacht_civ/engineering) "He" = ( @@ -3191,6 +3649,15 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 6 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 1 + }, /turf/simulated/floor/tiled/full, /area/ship/yacht_civ/hallway_mid) "Hr" = ( @@ -3232,6 +3699,10 @@ }, /turf/simulated/floor/marble/dark, /area/ship/yacht_civ/hallway_mid) +"Hw" = ( +/obj/effect/floor_decal/industrial/outline_straight/red, +/turf/simulated/floor/tiled, +/area/ship/yacht_civ/hallway_aft) "Hx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -3241,6 +3712,10 @@ /obj/effect/floor_decal/corner/grey{ dir = 9 }, +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/ship/yacht_civ/hallway_aft) "HA" = ( @@ -3263,7 +3738,7 @@ frequency = 1380; id_tag = "airlock_yacht_civ_shuttle_dock_door" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/ship/yacht_civ/hallway_aft) "HG" = ( /obj/effect/floor_decal/spline/plain/grey{ @@ -3295,6 +3770,18 @@ /obj/item/hullbeacon/red, /turf/simulated/floor/airless, /area/ship/yacht_civ/hallway_fore) +"Ig" = ( +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 9 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 2 + }, +/turf/simulated/floor/marble/dark, +/area/ship/yacht_civ/hallway_mid) "It" = ( /obj/machinery/door/airlock/external, /obj/machinery/atmospherics/pipe/simple/hidden/aux{ @@ -3305,13 +3792,8 @@ dir = 8 }, /obj/effect/map_effect/marker_helper/airlock/interior, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_yacht_civ_dock_aft"; - master_tag = "airlock_yacht_civ_dock_aft"; - landmark_tag = "nav_yacht_civ_dock_aft"; - req_one_access = null - }, -/turf/simulated/floor/plating, +/obj/effect/map_effect/marker/airlock/docking/yacht_civ/dock/aft, +/turf/simulated/floor/tiled/dark, /area/ship/yacht_civ/hallway_aft) "Iv" = ( /obj/effect/floor_decal/industrial/warning/corner{ @@ -3320,10 +3802,12 @@ /turf/simulated/floor/reinforced/airless, /area/ship/yacht_civ/hangar) "Iw" = ( -/obj/effect/floor_decal/industrial/hatch/red, /obj/machinery/door/firedoor/noid{ dir = 4 }, +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/ship/yacht_civ/hallway_aft) "Ix" = ( @@ -3342,6 +3826,19 @@ }, /turf/simulated/floor/carpet/purple, /area/ship/yacht_civ/lounge) +"Iy" = ( +/obj/effect/floor_decal/corner/green/diagonal, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 6 + }, +/turf/simulated/floor/marble/dark, +/area/ship/yacht_civ/hallway_mid) "IH" = ( /obj/effect/floor_decal/industrial/outline/grey, /obj/machinery/light, @@ -3379,13 +3876,8 @@ /obj/effect/floor_decal/industrial/hatch/red, /obj/effect/floor_decal/industrial/warning/cee, /obj/effect/map_effect/marker_helper/airlock/exterior, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_yacht_civ_dock_port"; - master_tag = "airlock_yacht_civ_dock_port"; - landmark_tag = "nav_yacht_civ_dock_port"; - req_one_access = null - }, -/turf/simulated/floor/plating, +/obj/effect/map_effect/marker/airlock/docking/yacht_civ/dock/port, +/turf/simulated/floor/tiled/dark, /area/ship/yacht_civ/hallway_aft) "IW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ @@ -3394,6 +3886,9 @@ /turf/simulated/wall/shuttle/space_ship/mercenary, /area/ship/yacht_civ/engineering) "Jb" = ( +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 2 + }, /turf/simulated/floor/tiled, /area/ship/yacht_civ/lounge) "Jd" = ( @@ -3414,6 +3909,15 @@ }, /turf/simulated/floor/tiled/dark, /area/shuttle/yacht_civ_shuttle) +"Jk" = ( +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/ship/yacht_civ/hallway_mid) "Jo" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ dir = 1 @@ -3423,11 +3927,10 @@ pixel_y = 6; pixel_x = 20 }, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_yacht_civ_dock_fore"; - master_tag = "airlock_yacht_civ_dock_fore"; - landmark_tag = "nav_yacht_civ_dock_fore"; - req_one_access = null +/obj/effect/map_effect/marker/airlock/docking/yacht_civ/dock/fore, +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 4 }, /turf/simulated/floor/plating, /area/ship/yacht_civ/hallway_fore) @@ -3435,6 +3938,29 @@ /obj/effect/floor_decal/corner/beige/diagonal, /turf/simulated/floor/tiled, /area/ship/yacht_civ/bridge) +"JK" = ( +/obj/effect/floor_decal/corner/grey{ + dir = 10 + }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_segment/red, +/turf/simulated/floor/tiled, +/area/ship/yacht_civ/hallway_aft) +"JM" = ( +/obj/effect/floor_decal/corner/yellow/diagonal, +/obj/effect/floor_decal/industrial/outline_straight/grey{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_straight/grey{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_segment/grey{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/ship/yacht_civ/storage) "JP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -3470,6 +3996,12 @@ /obj/structure/cable{ icon_state = "0-2" }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/ship/yacht_civ/hallway_aft) "JX" = ( @@ -3479,6 +4011,9 @@ /obj/machinery/alarm/north{ req_one_access = null }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/ship/yacht_civ/hallway_aft) "JY" = ( @@ -3493,13 +4028,8 @@ dir = 4 }, /obj/effect/map_effect/marker_helper/airlock/exterior, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_yacht_civ_dock_aft"; - master_tag = "airlock_yacht_civ_dock_aft"; - landmark_tag = "nav_yacht_civ_dock_aft"; - req_one_access = null - }, -/turf/simulated/floor/plating, +/obj/effect/map_effect/marker/airlock/docking/yacht_civ/dock/aft, +/turf/simulated/floor/tiled/dark, /area/ship/yacht_civ/hallway_aft) "JZ" = ( /obj/effect/floor_decal/corner/green{ @@ -3512,6 +4042,25 @@ /area/ship/yacht_civ/hallway_mid) "Kd" = ( /obj/machinery/light/small/emergency, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/ship/yacht_civ/lounge) +"Ke" = ( +/obj/effect/floor_decal/corner/grey{ + dir = 9 + }, +/obj/machinery/alarm/west{ + req_one_access = null + }, +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/ship/yacht_civ/lounge) "Km" = ( @@ -3524,6 +4073,9 @@ }, /obj/structure/mopbucket, /obj/item/mop, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/ship/yacht_civ/lounge) "Ko" = ( @@ -3552,7 +4104,7 @@ /obj/machinery/light{ dir = 4 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/wood/mahogany, /area/ship/yacht_civ/lounge) "KL" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ @@ -3574,6 +4126,12 @@ /obj/effect/floor_decal/corner/grey{ dir = 5 }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/ship/yacht_civ/hallway_aft) "KX" = ( @@ -3586,6 +4144,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/ship/yacht_civ/hallway_fore) "KZ" = ( @@ -3598,7 +4160,10 @@ /turf/simulated/wall/shuttle/space_ship, /area/shuttle/yacht_civ_shuttle) "Ln" = ( -/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, +/obj/effect/map_effect/window_spawner/full/shuttle/mercenary{ + spawn_firedoor = 1; + spawn_grille = 1 + }, /turf/simulated/floor/plating, /area/ship/yacht_civ/bridge) "Lo" = ( @@ -3615,7 +4180,12 @@ /turf/simulated/floor/tiled, /area/ship/yacht_civ/hallway_mid) "Lp" = ( -/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, +/obj/effect/map_effect/window_spawner/full/shuttle{ + color = "#BDB6AE"; + frame_color = "#BDB6AE"; + spawn_firedoor = 1; + spawn_grille = 1 + }, /turf/simulated/floor/plating, /area/shuttle/yacht_civ_shuttle) "Lr" = ( @@ -3623,6 +4193,9 @@ /obj/structure/cable{ icon_state = "1-8" }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 8 + }, /turf/simulated/floor/marble, /area/ship/yacht_civ/kitchen) "Lt" = ( @@ -3658,6 +4231,15 @@ /obj/structure/cable{ icon_state = "0-4" }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 6 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/ship/yacht_civ/propulsion) "LE" = ( @@ -3671,6 +4253,12 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 5 + }, /turf/simulated/floor/tiled, /area/ship/yacht_civ/hallway_mid) "LK" = ( @@ -3680,12 +4268,7 @@ /obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ dir = 4 }, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_yacht_civ_dock_aft"; - master_tag = "airlock_yacht_civ_dock_aft"; - landmark_tag = "nav_yacht_civ_dock_aft"; - req_one_access = null - }, +/obj/effect/map_effect/marker/airlock/docking/yacht_civ/dock/aft, /turf/simulated/floor/plating, /area/ship/yacht_civ/hallway_aft) "LY" = ( @@ -3693,12 +4276,11 @@ dir = 4 }, /obj/machinery/light/small/emergency, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_yacht_civ_dock_starboard"; - master_tag = "airlock_yacht_civ_dock_starboard"; - landmark_tag = "nav_yacht_civ_dock_starboard"; - req_one_access = null +/obj/effect/map_effect/marker/airlock/docking/yacht_civ/dock/starboard, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 8 }, +/obj/effect/floor_decal/industrial/outline_straight/red, /turf/simulated/floor/plating, /area/ship/yacht_civ/hallway_aft) "Mb" = ( @@ -3717,6 +4299,18 @@ }, /turf/simulated/wall/shuttle/space_ship, /area/shuttle/yacht_civ_shuttle) +"Mn" = ( +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 6 + }, +/turf/simulated/floor/tiled/full, +/area/ship/yacht_civ/hallway_mid) "Mr" = ( /obj/effect/floor_decal/corner/yellow/diagonal, /turf/simulated/floor/tiled, @@ -3752,13 +4346,8 @@ dir = 1 }, /obj/effect/map_effect/marker_helper/airlock/exterior, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_yacht_civ_dock_port"; - master_tag = "airlock_yacht_civ_dock_port"; - landmark_tag = "nav_yacht_civ_dock_port"; - req_one_access = null - }, -/turf/simulated/floor/plating, +/obj/effect/map_effect/marker/airlock/docking/yacht_civ/dock/port, +/turf/simulated/floor/tiled/dark, /area/ship/yacht_civ/hallway_aft) "MB" = ( /obj/effect/floor_decal/corner/yellow/diagonal, @@ -3801,10 +4390,16 @@ /obj/structure/cable{ icon_state = "2-8" }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 5 + }, /turf/simulated/floor/tiled, /area/ship/yacht_civ/hallway_aft) "ME" = ( -/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, +/obj/effect/map_effect/window_spawner/full/shuttle/mercenary{ + spawn_firedoor = 1; + spawn_grille = 1 + }, /turf/simulated/floor/plating, /area/ship/yacht_civ/engineering) "MO" = ( @@ -3890,7 +4485,10 @@ /turf/simulated/floor/plating, /area/ship/yacht_civ/hallway_mid) "Oc" = ( -/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, +/obj/effect/map_effect/window_spawner/full/shuttle/mercenary{ + spawn_firedoor = 1; + spawn_grille = 1 + }, /obj/structure/cable{ icon_state = "4-8" }, @@ -3982,12 +4580,16 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 10 }, -/turf/simulated/floor/wood/bamboo, +/turf/simulated/floor/wood/walnut, /area/ship/yacht_civ/hallway_mid) "OR" = ( /obj/effect/floor_decal/corner/yellow{ dir = 9 }, +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/ship/yacht_civ/hallway_aft) "OY" = ( @@ -3997,13 +4599,8 @@ dir = 8 }, /obj/effect/map_effect/marker_helper/airlock/interior, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_yacht_civ_dock_fore"; - master_tag = "airlock_yacht_civ_dock_fore"; - landmark_tag = "nav_yacht_civ_dock_fore"; - req_one_access = null - }, -/turf/simulated/floor/plating, +/obj/effect/map_effect/marker/airlock/docking/yacht_civ/dock/fore, +/turf/simulated/floor/tiled/dark, /area/ship/yacht_civ/hallway_fore) "OZ" = ( /obj/machinery/portable_atmospherics/canister/air/airlock, @@ -4023,13 +4620,8 @@ dir = 4 }, /obj/effect/map_effect/marker_helper/airlock/interior, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_yacht_civ_dock_aft"; - master_tag = "airlock_yacht_civ_dock_aft"; - landmark_tag = "nav_yacht_civ_dock_aft"; - req_one_access = null - }, -/turf/simulated/floor/plating, +/obj/effect/map_effect/marker/airlock/docking/yacht_civ/dock/aft, +/turf/simulated/floor/tiled/dark, /area/ship/yacht_civ/hallway_aft) "Pu" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ @@ -4040,8 +4632,20 @@ }, /turf/simulated/floor/plating, /area/ship/yacht_civ/propulsion) +"Py" = ( +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/ship/yacht_civ/hallway_aft) "PA" = ( -/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, +/obj/effect/map_effect/window_spawner/full/shuttle/mercenary{ + spawn_firedoor = 1; + spawn_grille = 1 + }, /obj/effect/landmark/entry_point/port{ name = "port, bridge" }, @@ -4071,20 +4675,35 @@ }, /turf/simulated/floor/tiled, /area/ship/yacht_civ/lounge) +"PK" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/ship/yacht_civ/lounge) "PM" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ dir = 4 }, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_yacht_civ_dock_fore"; - master_tag = "airlock_yacht_civ_dock_fore"; - landmark_tag = "nav_yacht_civ_dock_fore"; - req_one_access = null +/obj/effect/map_effect/marker/airlock/docking/yacht_civ/dock/fore, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 8 }, /turf/simulated/floor/plating, /area/ship/yacht_civ/hallway_fore) "PO" = ( /obj/effect/floor_decal/corner/green/diagonal, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 10 + }, /turf/simulated/floor/marble/dark, /area/ship/yacht_civ/hallway_mid) "PW" = ( @@ -4100,23 +4719,31 @@ dir = 8 }, /obj/effect/map_effect/marker_helper/airlock/exterior, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_yacht_civ_dock_aft"; - master_tag = "airlock_yacht_civ_dock_aft"; - landmark_tag = "nav_yacht_civ_dock_aft"; - req_one_access = null - }, -/turf/simulated/floor/plating, +/obj/effect/map_effect/marker/airlock/docking/yacht_civ/dock/aft, +/turf/simulated/floor/tiled/dark, /area/ship/yacht_civ/hallway_aft) "Qa" = ( /obj/effect/floor_decal/corner/yellow{ dir = 5 }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 1 + }, /obj/machinery/light{ dir = 1 }, /turf/simulated/floor/tiled, /area/ship/yacht_civ/hallway_aft) +"Qm" = ( +/obj/effect/floor_decal/corner/yellow/diagonal, +/obj/effect/floor_decal/industrial/outline_straight/grey{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/ship/yacht_civ/storage) "Qn" = ( /obj/effect/floor_decal/corner/grey{ dir = 10 @@ -4127,6 +4754,10 @@ /obj/structure/cable{ icon_state = "1-4" }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_segment/red, /turf/simulated/floor/tiled, /area/ship/yacht_civ/hallway_aft) "Qr" = ( @@ -4238,13 +4869,8 @@ dir = 4 }, /obj/effect/map_effect/marker_helper/airlock/exterior, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_yacht_civ_dock_fore"; - master_tag = "airlock_yacht_civ_dock_fore"; - landmark_tag = "nav_yacht_civ_dock_fore"; - req_one_access = null - }, -/turf/simulated/floor/plating, +/obj/effect/map_effect/marker/airlock/docking/yacht_civ/dock/fore, +/turf/simulated/floor/tiled/dark, /area/ship/yacht_civ/hallway_fore) "Re" = ( /turf/simulated/wall/shuttle/space_ship/mercenary, @@ -4257,6 +4883,15 @@ /obj/machinery/shipsensors, /turf/simulated/floor/airless, /area/ship/yacht_civ/hallway_fore) +"Rr" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/ship/yacht_civ/hallway_fore) "Ru" = ( /obj/machinery/alarm/south{ req_one_access = null @@ -4324,6 +4959,21 @@ /obj/structure/closet/firecloset, /turf/simulated/floor/tiled, /area/ship/yacht_civ/lounge) +"RF" = ( +/obj/effect/floor_decal/corner/yellow{ + dir = 5 + }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 4 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/ship/yacht_civ/hallway_aft) "RI" = ( /turf/simulated/floor/reinforced/airless, /area/ship/yacht_civ/hangar) @@ -4350,11 +5000,25 @@ }, /turf/simulated/floor/marble/dark, /area/ship/yacht_civ/kitchen) +"RY" = ( +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 5 + }, +/turf/simulated/floor/marble/dark, +/area/ship/yacht_civ/quarters) "RZ" = ( /obj/machinery/atmospherics/binary/pump/high_power{ dir = 1 }, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/hatch_tiny/yellow{ + dir = 4 + }, /turf/simulated/floor/plating, /area/ship/yacht_civ/propulsion) "Sq" = ( @@ -4382,15 +5046,28 @@ /obj/machinery/alarm/west{ req_one_access = null }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/ship/yacht_civ/lounge) +"Ss" = ( +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/ship/yacht_civ/hallway_aft) "SC" = ( /obj/machinery/atmospherics/portables_connector/aux{ dir = 8 }, /obj/machinery/portable_atmospherics/canister/air/airlock, /obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled, /area/ship/yacht_civ/lounge) "SD" = ( /obj/machinery/hologram/holopad/long_range, @@ -4441,11 +5118,10 @@ pixel_y = 6; pixel_x = 20 }, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_yacht_civ_dock_aft"; - master_tag = "airlock_yacht_civ_dock_aft"; - landmark_tag = "nav_yacht_civ_dock_aft"; - req_one_access = null +/obj/effect/map_effect/marker/airlock/docking/yacht_civ/dock/aft, +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 4 }, /turf/simulated/floor/plating, /area/ship/yacht_civ/hallway_aft) @@ -4528,12 +5204,11 @@ dir = 8 }, /obj/machinery/light/small/emergency, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_yacht_civ_dock_port"; - master_tag = "airlock_yacht_civ_dock_port"; - landmark_tag = "nav_yacht_civ_dock_port"; - req_one_access = null +/obj/effect/map_effect/marker/airlock/docking/yacht_civ/dock/port, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 4 }, +/obj/effect/floor_decal/industrial/outline_straight/red, /turf/simulated/floor/plating, /area/ship/yacht_civ/hallway_aft) "TF" = ( @@ -4580,13 +5255,15 @@ /turf/simulated/floor/tiled/dark, /area/ship/yacht_civ/kitchen) "TQ" = ( -/obj/effect/floor_decal/industrial/hatch/red, /obj/machinery/door/firedoor/noid{ dir = 4 }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/ship/yacht_civ/hallway_aft) "TU" = ( @@ -4641,9 +5318,39 @@ /obj/effect/landmark/entry_point/port, /turf/simulated/wall/shuttle/space_ship, /area/shuttle/yacht_civ_shuttle) +"Uy" = ( +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, +/turf/simulated/floor/tiled/full, +/area/ship/yacht_civ/hallway_aft) +"UA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/ship/yacht_civ/hallway_aft) "UD" = ( /turf/simulated/wall/shuttle/space_ship/mercenary, /area/ship/yacht_civ/kitchen) +"UH" = ( +/obj/effect/floor_decal/corner/grey{ + dir = 5 + }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/ship/yacht_civ/hallway_aft) "UI" = ( /obj/machinery/power/terminal{ dir = 1 @@ -4651,6 +5358,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, +/obj/effect/floor_decal/industrial/hatch_small/yellow, /turf/simulated/floor/plating, /area/ship/yacht_civ/engineering) "UL" = ( @@ -4685,7 +5393,7 @@ pixel_x = 3; pixel_y = 1 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/wood/mahogany, /area/ship/yacht_civ/lounge) "UO" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume/aux, @@ -4694,11 +5402,12 @@ pixel_y = 28; pixel_x = 6 }, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_yacht_civ_dock_port"; - master_tag = "airlock_yacht_civ_dock_port"; - landmark_tag = "nav_yacht_civ_dock_port"; - req_one_access = null +/obj/effect/map_effect/marker/airlock/docking/yacht_civ/dock/port, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 1 }, /turf/simulated/floor/plating, /area/ship/yacht_civ/hallway_aft) @@ -4706,8 +5415,23 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 8 + }, /turf/simulated/floor/tiled/full, /area/ship/yacht_civ/hallway_aft) +"UV" = ( +/obj/effect/floor_decal/corner/grey{ + dir = 5 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/ship/yacht_civ/hallway_aft) "UX" = ( /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/plating, @@ -4730,11 +5454,10 @@ /obj/machinery/light/small/emergency{ dir = 8 }, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_yacht_civ_dock_fore"; - master_tag = "airlock_yacht_civ_dock_fore"; - landmark_tag = "nav_yacht_civ_dock_fore"; - req_one_access = null +/obj/effect/map_effect/marker/airlock/docking/yacht_civ/dock/fore, +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 8 }, /turf/simulated/floor/plating, /area/ship/yacht_civ/hallway_fore) @@ -4751,13 +5474,8 @@ /obj/effect/floor_decal/industrial/hatch/red, /obj/effect/floor_decal/industrial/warning/full, /obj/effect/map_effect/marker_helper/airlock/interior, -/obj/effect/map_effect/marker/airlock/shuttle{ - shuttle_tag = "Civilian Yacht Shuttle"; - master_tag = "airlock_yacht_civ_shuttle"; - name = "airlock_yacht_civ_shuttle"; - req_one_access = null - }, -/turf/simulated/floor/plating, +/obj/effect/map_effect/marker/airlock/shuttle/yacht_civ_shuttle, +/turf/simulated/floor/tiled/dark, /area/shuttle/yacht_civ_shuttle) "VG" = ( /obj/effect/landmark/entry_point/starboard{ @@ -4826,7 +5544,10 @@ /turf/simulated/floor/tiled, /area/ship/yacht_civ/engineering) "VV" = ( -/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, +/obj/effect/map_effect/window_spawner/full/shuttle/mercenary{ + spawn_firedoor = 1; + spawn_grille = 1 + }, /turf/simulated/floor/plating, /area/ship/yacht_civ/quarters) "Wa" = ( @@ -4839,13 +5560,8 @@ /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{ - name = "airlock_yacht_civ_dock_starboard"; - master_tag = "airlock_yacht_civ_dock_starboard"; - landmark_tag = "nav_yacht_civ_dock_starboard"; - req_one_access = null - }, -/turf/simulated/floor/plating, +/obj/effect/map_effect/marker/airlock/docking/yacht_civ/dock/starboard, +/turf/simulated/floor/tiled/dark, /area/ship/yacht_civ/hallway_aft) "Wc" = ( /obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ @@ -4939,13 +5655,8 @@ /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{ - name = "airlock_yacht_civ_dock_port"; - master_tag = "airlock_yacht_civ_dock_port"; - landmark_tag = "nav_yacht_civ_dock_port"; - req_one_access = null - }, -/turf/simulated/floor/plating, +/obj/effect/map_effect/marker/airlock/docking/yacht_civ/dock/port, +/turf/simulated/floor/tiled/dark, /area/ship/yacht_civ/hallway_aft) "WP" = ( /obj/machinery/atmospherics/binary/pump/fuel/on, @@ -4958,6 +5669,12 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 5 + }, /turf/simulated/floor/tiled, /area/ship/yacht_civ/lounge) "WT" = ( @@ -4984,7 +5701,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 6 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/wood/mahogany, /area/ship/yacht_civ/lounge) "Xc" = ( /obj/effect/shuttle_landmark/yacht_civ/space/fore_port{ @@ -4996,7 +5713,7 @@ /turf/template_noop, /area/space) "Xp" = ( -/turf/simulated/floor/wood/bamboo, +/turf/simulated/floor/wood/walnut, /area/ship/yacht_civ/hallway_mid) "Xs" = ( /obj/machinery/door/airlock/external, @@ -5011,13 +5728,8 @@ dir = 4 }, /obj/effect/map_effect/marker_helper/airlock/interior, -/obj/effect/map_effect/marker/airlock/docking{ - name = "airlock_yacht_civ_dock_fore"; - master_tag = "airlock_yacht_civ_dock_fore"; - landmark_tag = "nav_yacht_civ_dock_fore"; - req_one_access = null - }, -/turf/simulated/floor/plating, +/obj/effect/map_effect/marker/airlock/docking/yacht_civ/dock/fore, +/turf/simulated/floor/tiled/dark, /area/ship/yacht_civ/hallway_fore) "Xw" = ( /obj/effect/landmark/entry_point/starboard, @@ -5027,13 +5739,15 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/floor_decal/industrial/hatch/red, /obj/machinery/door/firedoor/noid, +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/ship/yacht_civ/hallway_aft) "XM" = ( /obj/effect/floor_decal/spline/fancy/wood, -/turf/simulated/floor/wood, +/turf/simulated/floor/wood/mahogany, /area/ship/yacht_civ/lounge) "XR" = ( /obj/effect/floor_decal/corner/beige{ @@ -5080,7 +5794,7 @@ }, /obj/effect/floor_decal/spline/fancy/wood, /obj/machinery/light, -/turf/simulated/floor/wood/bamboo, +/turf/simulated/floor/wood/walnut, /area/ship/yacht_civ/hallway_mid) "XZ" = ( /obj/effect/floor_decal/industrial/outline/grey, @@ -5097,6 +5811,10 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 4 + }, /turf/simulated/floor/tiled/full, /area/ship/yacht_civ/hallway_fore) "Yb" = ( @@ -5163,8 +5881,10 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/floor_decal/industrial/hatch/red, /obj/machinery/door/firedoor/noid, +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 + }, /obj/machinery/door/airlock/multi_tile/glass, /turf/simulated/floor/tiled/dark, /area/ship/yacht_civ/hallway_aft) @@ -5204,12 +5924,27 @@ /obj/structure/cable{ icon_state = "2-4" }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_door/red, /turf/simulated/floor/tiled, /area/ship/yacht_civ/hallway_aft) "Zo" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/yellow, /turf/simulated/wall/shuttle/space_ship/mercenary, /area/ship/yacht_civ/engineering) +"ZJ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/ship/yacht_civ/lounge) "ZK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -5236,7 +5971,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/obj/effect/map_effect/window_spawner/full/reinforced, +/obj/effect/map_effect/window_spawner/full/shuttle/mercenary, /turf/simulated/floor/plating, /area/ship/yacht_civ/propulsion) "ZO" = ( @@ -35170,7 +35905,7 @@ rC uU pd hb -Iv +nW Oo Oo vY @@ -35679,7 +36414,7 @@ XV Hb WF fA -KR +UH ml qm Fo @@ -35936,8 +36671,8 @@ oS Hb UX fA -uv -cs +UV +Hw xf eL uU @@ -36189,14 +36924,14 @@ hS WC st ov -Mr -Mr -Mr +JM +Qm +yo CQ -vj -jw -EL -yU +Uy +En +kh +GO uU Ys Mf @@ -36450,7 +37185,7 @@ WB Mr OJ fA -Qa +RF Zk XI gN @@ -36731,7 +37466,7 @@ Ev kQ yw yx -CF +RY wM eh CF @@ -36752,8 +37487,8 @@ GT Tw Tw Tw -Tw -Tw +aR +aR pA Xj Xj @@ -36982,7 +37717,7 @@ RI RI be VO -PO +Iy cl Ev WT @@ -37222,7 +37957,7 @@ NJ fA fA JX -mi +qv cX lc uU @@ -37258,7 +37993,7 @@ Re oY Re fE -Jb +lC Dq hc Es @@ -37266,7 +38001,7 @@ Dp tt Ya Dq -Bk +Rr lu Tw Tw @@ -37477,7 +38212,7 @@ gv qo UP OR -EL +kh GZ mi HG @@ -37496,18 +38231,18 @@ be be gZ JZ -Uh +Ac gy iY pO KM -iY +kj Bf Sr pk iM DZ -EB +Ke Bf EB hR @@ -37733,7 +38468,7 @@ ua MD vp sF -jh +UA FT jh uA @@ -37741,7 +38476,7 @@ fI YU Hx YL -Cg +oc hr qn Al @@ -37749,7 +38484,7 @@ qn Cg GV JQ -Cg +cd ZL eZ Oa @@ -37760,9 +38495,9 @@ Qw cP na CX -WR +PK PD -WR +ZJ Fk qh CX @@ -37993,12 +38728,12 @@ ev ev ev FU -cs +Py vW PB -cs -EL -KZ +Ss +kh +Jk yu Uh Uh @@ -38006,11 +38741,11 @@ Uh KZ CT eM -KZ +BO gy -Uh +Mn BA -Uh +eF be be be @@ -38249,8 +38984,8 @@ aM SI om ev -Iw -Iw +nD +nD uU uU uU @@ -38507,7 +39242,7 @@ Bh VS ev Qa -cs +JK vJ dW dW @@ -38524,7 +39259,7 @@ xO PO wU be -LK +Ig Ab LK be @@ -38551,8 +39286,8 @@ Eu tf UD UD -Tw -Tw +aR +aR QC Xj Xj @@ -38761,9 +39496,9 @@ DU ns gA Ez -Ez +Dt jA -vj +Uy jw cX vj @@ -39021,7 +39756,7 @@ uN XZ ev KR -cs +kB un cu dW @@ -39274,11 +40009,11 @@ HV xN lZ sA -uN +wB IH ev -Iw -Iw +nD +nD uU uU uU diff --git a/maps/away/ships/yacht_civ/yacht_civ_.dm b/maps/away/ships/yacht_civ/yacht_civ_.dm index d88b1ed808e..45a466a2fb5 100644 --- a/maps/away/ships/yacht_civ/yacht_civ_.dm +++ b/maps/away/ships/yacht_civ/yacht_civ_.dm @@ -120,3 +120,8 @@ fuel_consumption = 2 logging_home_tag = "nav_yacht_civ_shuttle_dock" defer_initialisation = TRUE + +/obj/effect/map_effect/marker/airlock/shuttle/yacht_civ_shuttle + name = "Civilian Yacht Shuttle" + shuttle_tag = "Civilian Yacht Shuttle" + master_tag = "airlock_yacht_civ_shuttle" diff --git a/maps/away/ships/yacht_civ/yacht_civ_landmarks.dm b/maps/away/ships/yacht_civ/yacht_civ_landmarks.dm index cf77e105967..756bcbd8c2a 100644 --- a/maps/away/ships/yacht_civ/yacht_civ_landmarks.dm +++ b/maps/away/ships/yacht_civ/yacht_civ_landmarks.dm @@ -11,6 +11,14 @@ name = "Shuttle Hangar" landmark_tag = "nav_yacht_civ_shuttle_dock" docking_controller = "airlock_yacht_civ_shuttle_dock" + base_turf = /turf/simulated/floor/reinforced/airless + +/obj/effect/map_effect/marker/airlock/docking/yacht_civ/shuttle_hangar + name = "Shuttle Hangar" + landmark_tag = "nav_yacht_civ_shuttle_dock" + master_tag = "airlock_yacht_civ_shuttle_dock" + +// ---- /obj/effect/shuttle_landmark/yacht_civ/shuttle_transit name = "In transit" @@ -24,21 +32,47 @@ landmark_tag = "nav_yacht_civ_dock_starboard" docking_controller = "airlock_yacht_civ_dock_starboard" +/obj/effect/map_effect/marker/airlock/docking/yacht_civ/dock/starboard + name = "Dock, Starboard" + landmark_tag = "nav_yacht_civ_dock_starboard" + master_tag = "airlock_yacht_civ_dock_starboard" + +// ---- + /obj/effect/shuttle_landmark/yacht_civ/dock/port name = "Dock, Port" landmark_tag = "nav_yacht_civ_dock_port" docking_controller = "airlock_yacht_civ_dock_port" +/obj/effect/map_effect/marker/airlock/docking/yacht_civ/dock/port + name = "Dock, Port" + landmark_tag = "nav_yacht_civ_dock_port" + master_tag = "airlock_yacht_civ_dock_port" + +// ---- + /obj/effect/shuttle_landmark/yacht_civ/dock/aft name = "Dock, Aft" landmark_tag = "nav_yacht_civ_dock_aft" docking_controller = "airlock_yacht_civ_dock_aft" +/obj/effect/map_effect/marker/airlock/docking/yacht_civ/dock/aft + name = "Dock, Aft" + landmark_tag = "nav_yacht_civ_dock_aft" + master_tag = "airlock_yacht_civ_dock_aft" + +// ---- + /obj/effect/shuttle_landmark/yacht_civ/dock/fore name = "Dock, Fore" landmark_tag = "nav_yacht_civ_dock_fore" docking_controller = "airlock_yacht_civ_dock_fore" +/obj/effect/map_effect/marker/airlock/docking/yacht_civ/dock/fore + name = "Dock, Fore" + landmark_tag = "nav_yacht_civ_dock_fore" + master_tag = "airlock_yacht_civ_dock_fore" + // --------------------- space /obj/effect/shuttle_landmark/yacht_civ/space/fore_starboard