diff --git a/html/changelogs/Lavillastrangiato - offshipfixes.yml b/html/changelogs/Lavillastrangiato - offshipfixes.yml
new file mode 100644
index 00000000000..8d451c7864f
--- /dev/null
+++ b/html/changelogs/Lavillastrangiato - offshipfixes.yml
@@ -0,0 +1,60 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+# bugfix
+# - (fixes bugs)
+# wip
+# - (work in progress)
+# qol
+# - (quality of life)
+# soundadd
+# - (adds a sound)
+# sounddel
+# - (removes a sound)
+# rscadd
+# - (adds a feature)
+# rscdel
+# - (removes a feature)
+# imageadd
+# - (adds an image or sprite)
+# imagedel
+# - (removes an image or sprite)
+# spellcheck
+# - (fixes spelling or grammar)
+# experiment
+# - (experimental change)
+# balance
+# - (balance changes)
+# code_imp
+# - (misc internal code change)
+# refactor
+# - (refactors code)
+# config
+# - (makes a change to the config files)
+# admin
+# - (makes changes to administrator tools)
+# server
+# - (miscellaneous changes to server)
+#################################
+
+# Your name.
+author: Lavillastrangiato
+
+# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made. See valid prefix list above.
+# INDENT WITH TWO SPACES. NOT TABS. SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit.
+# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
+changes:
+ - bugfix: "Fixes problematic docking controllers and airlocks on several offships."
+ - qol: "Adds CO2 tanks to the Cyclops and the Ranger Gunboat."
+ - qol: "Adds several aesthetic features to several offships, like matching window colours."
diff --git a/maps/away/ships/coc/coc_ranger/coc_ship.dm b/maps/away/ships/coc/coc_ranger/coc_ship.dm
index 5c86e9f1a09..c6d3f97f739 100644
--- a/maps/away/ships/coc/coc_ranger/coc_ship.dm
+++ b/maps/away/ships/coc/coc_ranger/coc_ship.dm
@@ -166,11 +166,11 @@
shuttle_area = list(/area/shuttle/ranger_shuttle)
current_location = "nav_hangar_ranger"
landmark_transition = "nav_transit_ranger_shuttle"
+ dock_target = "ranger_shuttle_dock2"
range = 1
fuel_consumption = 2
logging_home_tag = "nav_hangar_ranger"
// defer_initialisation = TRUE
- dock_target = "ranger_shuttle_dock2"
/obj/effect/shuttle_landmark/ranger_shuttle/hangar
name = "Ranger Shuttle Hangar"
diff --git a/maps/away/ships/coc/coc_ranger/coc_ship.dmm b/maps/away/ships/coc/coc_ranger/coc_ship.dmm
index 13318cb156d..ab22eaa603b 100644
--- a/maps/away/ships/coc/coc_ranger/coc_ship.dmm
+++ b/maps/away/ships/coc/coc_ranger/coc_ship.dmm
@@ -1,6 +1,6 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"abx" = (
-/obj/structure/lattice/catwalk/indoor/grate,
+/obj/structure/lattice/catwalk/indoor/grate/dark,
/obj/structure/table/steel,
/obj/machinery/button/remote/blast_door{
id = "coc_fore";
@@ -29,34 +29,42 @@
/turf/simulated/floor/tiled/dark/full,
/area/ship/ranger_corvette/bridge)
"aei" = (
-/obj/machinery/atmospherics/binary/pump/high_power,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
},
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
+/obj/effect/floor_decal/corner_wide/blue/diagonal,
/turf/simulated/floor/tiled,
/area/shuttle/ranger_shuttle)
"agA" = (
-/obj/machinery/atmospherics/unary/vent_pump{
+/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{
dir = 8
},
-/obj/structure/lattice/catwalk/indoor/grate,
-/obj/effect/map_effect/marker/airlock/docking{
- name = "ranger_shuttle_dock";
- master_tag = "ranger_shuttle_dock";
- landmark_tag = "nav_hangar_ranger";
- req_one_access = null;
- frequency = 1394
- },
+/obj/structure/lattice/catwalk/indoor/grate/dark,
/obj/machinery/airlock_sensor{
dir = 1;
pixel_y = -20
},
-/turf/simulated/floor,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/effect/map_effect/marker/airlock/docking{
+ name = "ranger_shuttle_dock";
+ master_tag = "ranger_shuttle_dock";
+ landmark_tag = "nav_hangar_ranger";
+ req_one_access = null
+ },
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/foyer)
"aho" = (
-/obj/effect/shuttle_landmark/ranger_corvette/transit,
-/turf/space/transit/north,
-/area/space)
+/obj/machinery/embedded_controller/radio/simple_docking_controller{
+ pixel_y = 21;
+ pixel_x = -4;
+ id_tag = "ranger_shuttle_dock";
+ name = "Ranger Shuttle docking port controller"
+ },
+/turf/simulated/floor/tiled/dark/full,
+/area/ship/ranger_corvette/foyer)
"aiD" = (
/obj/effect/floor_decal/corner/red/diagonal,
/obj/machinery/door/airlock/glass{
@@ -65,12 +73,20 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/machinery/door/firedoor/noid,
+/obj/machinery/door/firedoor/noid{
+ dir = 4
+ },
/turf/simulated/floor/tiled/white,
/area/ship/ranger_corvette/canteen)
"ajL" = (
-/obj/machinery/atmospherics/unary/engine,
-/turf/simulated/floor,
+/obj/machinery/atmospherics/unary/outlet_injector{
+ dir = 8
+ },
+/obj/effect/map_effect/marker/large_tank{
+ master_tag = "coc_ship_co2_star";
+ name = "coc_ship_co2_star"
+ },
+/turf/simulated/floor/reinforced/carbon_dioxide,
/area/ship/ranger_corvette/engine1)
"aoI" = (
/obj/structure/table/steel,
@@ -91,17 +107,17 @@
/turf/simulated/floor/carpet/red,
/area/ship/ranger_corvette/crew)
"aqk" = (
-/obj/structure/lattice/catwalk/indoor/grate,
+/obj/structure/lattice/catwalk/indoor/grate/dark,
/obj/structure/table/steel,
/obj/item/clothing/head/helmet/pilot,
/turf/simulated/floor/tiled/dark/full,
/area/ship/ranger_corvette/bridge)
"asD" = (
-/obj/machinery/atmospherics/unary/engine,
-/obj/effect/landmark/entry_point/aft{
- name = "aft engines, starboard"
+/obj/effect/map_effect/window_spawner/full/borosilicate/reinforced/firedoor,
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 4
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/engine1)
"avV" = (
/obj/structure/table/steel,
@@ -122,31 +138,16 @@
/turf/simulated/floor/tiled/dark,
/area/ship/ranger_corvette/engineering)
"ayf" = (
-/obj/machinery/door/airlock/external{
- dir = 4
+/obj/machinery/atmospherics/pipe/simple/visible/fuel{
+ dir = 9
},
-/obj/effect/landmark/entry_point/east{
- name = "port, crew compartment"
- },
-/obj/effect/map_effect/marker_helper/airlock/exterior,
-/obj/effect/map_effect/marker/airlock/shuttle{
- name = "ranger_shuttle_dock2";
- master_tag = "ranger_shuttle_dock2";
- shuttle_tag = "Ranger Shuttle";
- req_one_access = null;
- frequency = 1395
- },
-/turf/simulated/floor{
- temperature = 278.15
- },
-/area/shuttle/ranger_shuttle)
+/turf/simulated/wall/shuttle/space_ship/mercenary,
+/area/ship/ranger_corvette/engine1)
"ayD" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 5
+/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{
+ dir = 8
},
-/obj/structure/lattice/catwalk/indoor/grate,
-/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/engine1)
"aDL" = (
/obj/effect/floor_decal/corner/brown/diagonal,
@@ -159,21 +160,30 @@
/turf/simulated/floor/tiled/white,
/area/ship/ranger_corvette/canteen)
"aEq" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden,
-/obj/structure/lattice/catwalk/indoor/grate,
-/turf/simulated/floor,
+/obj/machinery/atmospherics/portables_connector/fuel{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/engine1)
"aFp" = (
-/obj/structure/cable{
- icon_state = "1-2";
- dir = 4
+/obj/machinery/computer/ship/sensors,
+/obj/machinery/embedded_controller/radio/simple_docking_controller{
+ pixel_y = 21;
+ pixel_x = -4;
+ id_tag = "ranger_shuttle_dock";
+ name = "Ranger Shuttle docking port controller"
},
-/turf/simulated/wall/shuttle/space_ship/mercenary,
+/turf/simulated/floor/tiled/full,
/area/shuttle/ranger_shuttle)
"aHv" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/universal{
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/machinery/atmospherics/binary/passive_gate/supply{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner_wide/blue/diagonal,
/turf/simulated/floor/tiled,
/area/shuttle/ranger_shuttle)
"aKd" = (
@@ -212,22 +222,26 @@
/obj/machinery/door/airlock/external{
dir = 4
},
-/obj/effect/map_effect/marker/airlock/docking{
- name = "airlock_ranger_docking";
- master_tag = "airlock_ranger_docking";
- frequency = 1394
- },
/obj/effect/map_effect/marker_helper/airlock/exterior,
-/turf/simulated/floor,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/effect/map_effect/marker/airlock/docking{
+ name = "ranger_shuttle_dock";
+ master_tag = "ranger_shuttle_dock";
+ landmark_tag = "nav_hangar_ranger";
+ req_one_access = null
+ },
+/turf/simulated/floor/tiled/dark/full,
/area/ship/ranger_corvette/foyer)
"aWb" = (
-/obj/structure/lattice/catwalk/indoor/grate,
+/obj/structure/lattice/catwalk/indoor/grate/dark,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/cable/green{
icon_state = "1-2"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/foyer)
"aXC" = (
/obj/machinery/atmospherics/pipe/simple/hidden/universal{
@@ -236,18 +250,16 @@
/obj/structure/cable/green{
icon_state = "1-4"
},
-/turf/simulated/floor,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/atmospherics)
"aYD" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden{
- dir = 4
+/obj/machinery/air_sensor,
+/obj/effect/map_effect/marker/large_tank{
+ master_tag = "coc_ship_co2_star";
+ name = "coc_ship_co2_star"
},
-/obj/structure/lattice/catwalk/indoor/grate,
-/obj/machinery/computer/ship/engines{
- dir = 8
- },
-/obj/effect/decal/cleanable/cobweb2,
-/turf/simulated/floor,
+/turf/simulated/floor/reinforced/carbon_dioxide,
/area/ship/ranger_corvette/engine1)
"aYE" = (
/obj/effect/floor_decal/spline/plain/black{
@@ -270,35 +282,29 @@
/turf/simulated/floor/tiled/dark/full,
/area/ship/ranger_corvette/bridge)
"bbM" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 10
- },
-/obj/machinery/computer/shuttle_control/explore/ranger_shuttle{
+/obj/machinery/atmospherics/pipe/manifold/visible/fuel,
+/turf/simulated/wall/shuttle/space_ship/mercenary,
+/area/ship/ranger_corvette/engine1)
+"bex" = (
+/obj/machinery/atmospherics/binary/pump/fuel{
dir = 4
},
-/obj/structure/sign/flag/coalition{
- pixel_y = 32
- },
-/turf/simulated/floor/tiled,
-/area/shuttle/ranger_shuttle)
-"bex" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden,
-/obj/structure/lattice/catwalk/indoor/grate,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/engine2)
"bgA" = (
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
- dir = 4
+/obj/structure/lattice/catwalk/indoor/grate/dark,
+/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux,
+/obj/effect/map_effect/marker_helper/airlock/out,
+/obj/structure/cable{
+ icon_state = "4-8"
},
-/obj/structure/lattice/catwalk/indoor/grate,
/obj/effect/map_effect/marker/airlock/shuttle{
name = "ranger_shuttle_dock2";
master_tag = "ranger_shuttle_dock2";
shuttle_tag = "Ranger Shuttle";
- req_one_access = null;
- frequency = 1395
+ req_one_access = null
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/shuttle/ranger_shuttle)
"bhp" = (
/turf/simulated/floor/carpet,
@@ -318,12 +324,17 @@
/turf/simulated/floor/tiled/dark,
/area/ship/ranger_corvette/foyer)
"bld" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
dir = 9
},
-/obj/structure/lattice/catwalk/indoor/grate,
-/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
-/turf/simulated/floor,
+/obj/machinery/computer/general_air_control/large_tank_control/wall{
+ pixel_x = 32
+ },
+/obj/effect/map_effect/marker/large_tank{
+ master_tag = "coc_ship_co2_port";
+ name = "coc_ship_co2_port"
+ },
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/engine2)
"bnz" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -336,34 +347,35 @@
name = "Custodial Closet";
dir = 4
},
-/obj/machinery/door/firedoor/noid,
+/obj/machinery/door/firedoor/noid{
+ dir = 4
+ },
/obj/structure/cable/green{
icon_state = "4-8"
},
/turf/simulated/floor/tiled/dark,
/area/ship/ranger_corvette/janitor)
"bom" = (
-/obj/machinery/atmospherics/unary/vent_pump{
+/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{
dir = 8
},
-/obj/structure/lattice/catwalk/indoor/grate,
+/obj/structure/lattice/catwalk/indoor/grate/dark,
/obj/machinery/embedded_controller/radio/airlock/docking_port{
dir = 2;
pixel_y = 28;
frequency = 1394
},
-/obj/effect/map_effect/marker/airlock/docking{
- name = "ranger_shuttle_dock";
- master_tag = "ranger_shuttle_dock";
- landmark_tag = "nav_hangar_ranger";
- req_one_access = null;
- frequency = 1394
- },
/obj/machinery/light/small/emergency{
dir = 1;
pixel_y = 8
},
-/turf/simulated/floor,
+/obj/effect/map_effect/marker/airlock/docking{
+ name = "ranger_shuttle_dock";
+ master_tag = "ranger_shuttle_dock";
+ landmark_tag = "nav_hangar_ranger";
+ req_one_access = null
+ },
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/foyer)
"boM" = (
/obj/machinery/ammunition_loader/francisca{
@@ -371,6 +383,10 @@
},
/turf/simulated/floor/tiled/dark,
/area/ship/ranger_corvette/engine1)
+"bph" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
+/turf/simulated/floor/plating,
+/area/ship/ranger_corvette/engine2)
"brx" = (
/obj/effect/landmark/entry_point/starboard{
name = "starboard, brig"
@@ -378,6 +394,13 @@
/turf/simulated/wall/shuttle/space_ship/mercenary,
/area/ship/ranger_corvette/brig)
"bsL" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 6
+ },
+/obj/effect/floor_decal/corner_wide/blue/diagonal,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/simulated/floor/tiled,
/area/shuttle/ranger_shuttle)
"bsV" = (
@@ -429,20 +452,9 @@
/turf/simulated/floor/tiled/dark,
/area/ship/ranger_corvette/foyer)
"byX" = (
-/obj/structure/bed/stool/chair/shuttle{
- dir = 8
- },
-/obj/machinery/light{
- dir = 4
- },
-/obj/effect/map_effect/marker/airlock/shuttle{
- name = "ranger_shuttle_dock2";
- master_tag = "ranger_shuttle_dock2";
- shuttle_tag = "Ranger Shuttle";
- req_one_access = null
- },
-/turf/simulated/floor/tiled,
-/area/shuttle/ranger_shuttle)
+/obj/machinery/atmospherics/pipe/manifold/visible/fuel,
+/turf/simulated/wall/shuttle/space_ship/mercenary,
+/area/ship/ranger_corvette/engine2)
"bzo" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/light{
@@ -459,11 +471,17 @@
/turf/simulated/floor/carpet,
/area/ship/ranger_corvette/foyer)
"bEt" = (
-/obj/machinery/atmospherics/portables_connector{
- dir = 4
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 5
},
-/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
-/turf/simulated/floor,
+/obj/machinery/computer/general_air_control/large_tank_control/wall{
+ pixel_x = -32
+ },
+/obj/effect/map_effect/marker/large_tank{
+ master_tag = "coc_ship_co2_star";
+ name = "coc_ship_co2_star"
+ },
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/engine1)
"bGA" = (
/obj/structure/sign/directions/engineering{
@@ -482,15 +500,19 @@
/turf/simulated/floor/tiled/dark/full,
/area/ship/ranger_corvette/voidsuits)
"bIQ" = (
-/obj/machinery/atmospherics/binary/pump/high_power{
- dir = 4;
- layer = 2.8
+/obj/machinery/atmospherics/binary/pump/fuel{
+ dir = 8
},
-/turf/simulated/floor,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/engine1)
"bMK" = (
/obj/structure/bed/stool/chair/shuttle{
- dir = 8
+ dir = 1
+ },
+/obj/effect/floor_decal/corner_wide/blue/diagonal,
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 10
},
/turf/simulated/floor/tiled,
/area/shuttle/ranger_shuttle)
@@ -500,6 +522,13 @@
},
/turf/simulated/wall/shuttle/space_ship/mercenary,
/area/ship/ranger_corvette/crew)
+"bOF" = (
+/obj/machinery/atmospherics/unary/engine,
+/obj/effect/landmark/entry_point/aft{
+ name = "aft engines, starboard"
+ },
+/turf/simulated/floor/plating,
+/area/ship/ranger_corvette/engine1)
"bSt" = (
/obj/structure/table/wood,
/obj/structure/sign/flag/kazhkz{
@@ -604,21 +633,27 @@
/turf/simulated/floor/reinforced,
/area/ship/ranger_corvette/gunnery)
"cnJ" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 8
+/obj/effect/map_effect/window_spawner/full/borosilicate/reinforced/firedoor,
+/obj/machinery/atmospherics/pipe/simple/hidden/universal{
+ dir = 4
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/engine1)
"cos" = (
/obj/structure/sign/securearea,
/turf/simulated/wall/shuttle/space_ship/mercenary,
/area/ship/ranger_corvette/foyer)
"coK" = (
-/obj/machinery/meter,
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 9
+/obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{
+ dir = 8;
+ frequency = 1441;
+ id_tag = "headmaster_co2_out_starboard"
},
-/turf/simulated/floor,
+/obj/effect/map_effect/marker/large_tank{
+ master_tag = "coc_ship_co2_star";
+ name = "coc_ship_co2_star"
+ },
+/turf/simulated/floor/reinforced/carbon_dioxide,
/area/ship/ranger_corvette/engine1)
"cpO" = (
/obj/effect/floor_decal/industrial/warning{
@@ -654,13 +689,11 @@
/turf/simulated/floor/tiled/dark,
/area/ship/ranger_corvette/gunnery)
"cHm" = (
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/machinery/atmospherics/pipe/simple/visible{
- dir = 6
- },
-/obj/structure/fuel_port/hydrogen{
- pixel_x = -32
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 9;
+ pixel_y = 0
},
+/obj/effect/floor_decal/corner_wide/blue/diagonal,
/turf/simulated/floor/tiled,
/area/shuttle/ranger_shuttle)
"cIm" = (
@@ -682,15 +715,15 @@
master_tag = "airlock_ranger_external";
name = "airlock_ranger_external"
},
-/obj/machinery/atmospherics/pipe/simple/hidden{
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
dir = 6
},
-/obj/structure/lattice/catwalk/indoor/grate,
+/obj/structure/lattice/catwalk/indoor/grate/dark,
/obj/machinery/light/small/emergency{
dir = 8;
pixel_x = -13
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette)
"cZV" = (
/obj/effect/decal/cleanable/dirt,
@@ -750,14 +783,18 @@
/turf/simulated/floor/tiled/white,
/area/ship/ranger_corvette/canteen)
"diy" = (
-/obj/machinery/atmospherics/pipe/manifold4w/hidden,
-/turf/simulated/floor,
+/obj/effect/map_effect/window_spawner/full/borosilicate/reinforced/firedoor,
+/obj/machinery/atmospherics/pipe/simple/hidden/universal{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/engine2)
"dmm" = (
-/obj/machinery/atmospherics/binary/pump/on{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/hidden/red{
+ dir = 5
},
-/turf/simulated/floor,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/atmospherics)
"doJ" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
@@ -786,12 +823,11 @@
/turf/simulated/floor/tiled/white,
/area/ship/ranger_corvette/canteen)
"dul" = (
-/obj/machinery/meter,
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 5
+/obj/machinery/atmospherics/pipe/manifold/visible/fuel{
+ dir = 8
},
-/turf/simulated/floor,
-/area/ship/ranger_corvette/engine2)
+/turf/simulated/wall/shuttle/space_ship/mercenary,
+/area/ship/ranger_corvette/engine1)
"dun" = (
/obj/structure/closet/crate/bin{
name = "trashbin"
@@ -805,15 +841,21 @@
/turf/simulated/floor/tiled/dark,
/area/ship/ranger_corvette/brig)
"duC" = (
-/obj/machinery/computer/ship/helm,
-/turf/simulated/floor/tiled,
+/obj/effect/map_effect/window_spawner/full/shuttle{
+ color = "#5b5b5b";
+ frame_color = "#5b5b5b";
+ spawn_firedoor = 1;
+ spawn_grille = 1
+ },
+/obj/effect/landmark/entry_point/south{
+ name = "fore, bridge"
+ },
+/turf/simulated/floor/plating{
+ temperature = 278.15
+ },
/area/shuttle/ranger_shuttle)
"dwE" = (
-/obj/machinery/atmospherics/binary/pump/high_power{
- dir = 8;
- layer = 2.8
- },
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/engine2)
"dBx" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -829,12 +871,11 @@
/turf/simulated/floor/tiled/white,
/area/ship/ranger_corvette/cryo)
"dCS" = (
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/machinery/atmospherics/pipe/simple/visible{
- dir = 10
+/obj/machinery/power/terminal{
+ dir = 4
},
-/obj/machinery/meter,
-/turf/simulated/floor/tiled,
+/obj/structure/cable,
+/turf/simulated/floor/tiled/full,
/area/shuttle/ranger_shuttle)
"dFf" = (
/obj/machinery/airlock_sensor{
@@ -846,17 +887,16 @@
master_tag = "airlock_ranger_external";
name = "airlock_ranger_external"
},
-/obj/machinery/atmospherics/pipe/manifold/hidden{
+/obj/machinery/atmospherics/pipe/manifold/hidden/aux{
dir = 8
},
-/obj/structure/lattice/catwalk/indoor/grate,
-/turf/simulated/floor,
+/obj/structure/lattice/catwalk/indoor/grate/dark,
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette)
"dGE" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/lattice/catwalk/indoor/grate,
+/obj/structure/lattice/catwalk/indoor/grate/dark,
/obj/structure/cable/green{
icon_state = "1-2"
},
@@ -864,16 +904,14 @@
name = "\improper DANGER: FLAMMABLE GAS";
pixel_x = -32
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/foyer)
"dHA" = (
-/obj/machinery/atmospherics/portables_connector{
- dir = 8;
- layer = 2.8
+/obj/machinery/computer/ship/engines{
+ dir = 8
},
-/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
-/obj/effect/floor_decal/industrial/outline/yellow,
-/turf/simulated/floor,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/engine2)
"dHT" = (
/obj/effect/floor_decal/corner/green/diagonal,
@@ -893,11 +931,11 @@
master_tag = "airlock_ranger_external";
name = "airlock_ranger_external"
},
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{
dir = 8
},
-/obj/structure/lattice/catwalk/indoor/grate,
-/turf/simulated/floor,
+/obj/structure/lattice/catwalk/indoor/grate/dark,
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette)
"dMX" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
@@ -941,7 +979,7 @@
dir = 1
},
/obj/machinery/door/firedoor/noid,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/engine1)
"enD" = (
/obj/machinery/ammunition_loader/grauwolf{
@@ -981,12 +1019,9 @@
/turf/space/transit/north,
/area/space)
"etR" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 5
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/black{
- dir = 9
- },
+/obj/structure/extinguisher_cabinet/west,
+/obj/machinery/atmospherics/pipe/simple/hidden/aux,
+/obj/effect/floor_decal/corner_wide/blue/diagonal,
/turf/simulated/floor/tiled,
/area/shuttle/ranger_shuttle)
"eue" = (
@@ -999,7 +1034,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/machinery/door/firedoor/noid,
+/obj/machinery/door/firedoor/noid{
+ dir = 4
+ },
/obj/structure/cable/green{
icon_state = "4-8"
},
@@ -1012,27 +1049,29 @@
/turf/simulated/wall/shuttle/space_ship/mercenary,
/area/ship/ranger_corvette/medbay)
"exg" = (
-/obj/machinery/portable_atmospherics/canister/air/airlock,
/obj/machinery/atmospherics/portables_connector{
dir = 4
},
-/turf/simulated/floor,
+/obj/machinery/portable_atmospherics/canister/empty{
+ name = "waste canister"
+ },
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/atmospherics)
"ezi" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4
},
-/obj/structure/lattice/catwalk/indoor/grate,
+/obj/structure/lattice/catwalk/indoor/grate/dark,
/obj/structure/cable/green{
icon_state = "1-2"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/foyer)
"ezP" = (
/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
-/obj/structure/lattice/catwalk/indoor/grate,
+/obj/structure/lattice/catwalk/indoor/grate/dark,
/obj/structure/cable/green{
icon_state = "1-2"
},
@@ -1042,20 +1081,22 @@
/obj/structure/cable/green{
icon_state = "1-4"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/foyer)
"eBG" = (
/obj/structure/bed/stool/chair/shuttle{
dir = 8
},
-/obj/machinery/alarm/east,
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/tiled/full,
/area/shuttle/ranger_shuttle)
"eCy" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 9
+/obj/machinery/atmospherics/binary/pump/on{
+ dir = 8
},
-/turf/simulated/floor,
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
+ dir = 5
+ },
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/atmospherics)
"eCV" = (
/obj/machinery/vending/cigarette/hacked,
@@ -1119,7 +1160,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/machinery/door/firedoor/noid,
+/obj/machinery/door/firedoor/noid{
+ dir = 4
+ },
/obj/structure/cable/green{
icon_state = "4-8"
},
@@ -1179,7 +1222,6 @@
/obj/effect/floor_decal/industrial/warning{
dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/hidden,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/cable/green{
@@ -1215,7 +1257,7 @@
dir = 1
},
/obj/machinery/door/firedoor/noid,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/engine2)
"feE" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -1241,11 +1283,11 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
},
-/obj/structure/lattice/catwalk/indoor/grate,
+/obj/structure/lattice/catwalk/indoor/grate/dark,
/obj/structure/cable/green{
icon_state = "1-2"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/foyer)
"fkX" = (
/obj/effect/floor_decal/industrial/outline/yellow,
@@ -1288,7 +1330,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/machinery/door/firedoor/noid,
+/obj/machinery/door/firedoor/noid{
+ dir = 4
+ },
/obj/structure/cable/green{
icon_state = "4-8"
},
@@ -1306,17 +1350,10 @@
/turf/simulated/floor/tiled/dark,
/area/ship/ranger_corvette/brig)
"fqt" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 5
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable{
- icon_state = "1-2";
- dir = 4
- },
-/turf/simulated/floor/tiled{
- temperature = 278.15
- },
+/obj/machinery/atmospherics/binary/pump/scrubber/on,
+/obj/effect/floor_decal/corner_wide/blue/diagonal,
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
+/turf/simulated/floor/tiled,
/area/shuttle/ranger_shuttle)
"fqT" = (
/obj/structure/sign/radiation{
@@ -1363,6 +1400,15 @@
},
/turf/simulated/floor/tiled/white,
/area/ship/ranger_corvette/medbay)
+"fAg" = (
+/obj/machinery/atmospherics/unary/engine{
+ dir = 1
+ },
+/obj/effect/landmark/entry_point/north{
+ name = "aft, engines"
+ },
+/turf/simulated/floor/airless,
+/area/shuttle/ranger_shuttle)
"fDx" = (
/obj/effect/floor_decal/corner/green/diagonal,
/obj/machinery/atmospherics/unary/vent_pump/on{
@@ -1429,14 +1475,9 @@
/turf/simulated/floor/tiled/dark,
/area/ship/ranger_corvette/foyer)
"fVq" = (
-/obj/machinery/computer/ship/sensors{
- dir = 8
- },
-/obj/structure/sign/flag/coalition{
- pixel_y = 32
- },
-/turf/simulated/floor/tiled,
-/area/shuttle/ranger_shuttle)
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
+/turf/simulated/floor/plating,
+/area/ship/ranger_corvette/engine1)
"gec" = (
/obj/machinery/shower,
/obj/structure/window/basic{
@@ -1473,12 +1514,16 @@
/turf/simulated/floor/tiled/dark,
/area/ship/ranger_corvette/foyer)
"gin" = (
-/obj/effect/map_effect/window_spawner/full/reinforced,
-/obj/machinery/door/firedoor/noid,
+/obj/effect/map_effect/window_spawner/full/shuttle{
+ color = "#5b5b5b";
+ frame_color = "#5b5b5b";
+ spawn_firedoor = 1;
+ spawn_grille = 1
+ },
/turf/simulated/floor/tiled/dark,
/area/ship/ranger_corvette/brig)
"gjg" = (
-/obj/structure/lattice/catwalk/indoor/grate,
+/obj/structure/lattice/catwalk/indoor/grate/dark,
/obj/structure/closet/cabinet,
/obj/item/clothing/accessory/badge/passcard/coalition,
/obj/item/gun/projectile/revolver/derringer,
@@ -1505,7 +1550,7 @@
/obj/item/clothing/under/konyang/male/shortsleeve,
/obj/item/clothing/suit/storage/toggle/leather_jacket/military/old/alt,
/obj/item/clothing/suit/storage/toggle/leather_jacket/military,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/leader)
"gkq" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
@@ -1532,7 +1577,7 @@
/turf/simulated/floor/wood,
/area/ship/ranger_corvette/leader)
"gor" = (
-/obj/structure/lattice/catwalk/indoor/grate,
+/obj/structure/lattice/catwalk/indoor/grate/dark,
/obj/structure/bed,
/obj/item/bedsheet/dorms,
/obj/machinery/light{
@@ -1543,7 +1588,7 @@
identifier = "ranger_leader";
name = "igs - ranger_leader"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/leader)
"goI" = (
/obj/machinery/shower{
@@ -1567,32 +1612,34 @@
/turf/simulated/wall/shuttle/space_ship/mercenary,
/area/ship/ranger_corvette/foyer)
"grA" = (
-/obj/structure/lattice/catwalk/indoor/grate,
+/obj/structure/lattice/catwalk/indoor/grate/dark,
+/obj/machinery/light/small/emergency{
+ pixel_y = -22
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/obj/effect/map_effect/marker/airlock/docking{
name = "ranger_shuttle_dock";
master_tag = "ranger_shuttle_dock";
landmark_tag = "nav_hangar_ranger";
- req_one_access = null;
- frequency = 1394
+ req_one_access = null
},
-/obj/machinery/light/small/emergency{
- pixel_y = -22
- },
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/foyer)
"gtw" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
},
/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
-/obj/structure/lattice/catwalk/indoor/grate,
+/obj/structure/lattice/catwalk/indoor/grate/dark,
/obj/structure/cable/green{
icon_state = "1-2"
},
/obj/structure/cable/green{
icon_state = "1-4"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/foyer)
"gwg" = (
/obj/structure/bed,
@@ -1639,11 +1686,15 @@
/turf/simulated/floor/tiled/dark/full,
/area/ship/ranger_corvette/bridge)
"gLv" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/black{
- dir = 10
+/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{
+ dir = 1
},
-/turf/simulated/floor/tiled,
+/obj/effect/map_effect/marker_helper/airlock/exterior,
+/obj/machinery/airlock_sensor{
+ pixel_x = 24;
+ pixel_y = 6
+ },
+/turf/simulated/floor/airless,
/area/shuttle/ranger_shuttle)
"gMK" = (
/obj/effect/decal/cleanable/dirt,
@@ -1674,8 +1725,8 @@
/obj/structure/cable/green{
icon_state = "2-8"
},
-/obj/structure/lattice/catwalk/indoor/grate,
-/turf/simulated/floor,
+/obj/structure/lattice/catwalk/indoor/grate/dark,
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/foyer)
"gUj" = (
/obj/machinery/door/airlock/service{
@@ -1714,8 +1765,8 @@
/turf/simulated/floor/tiled/dark,
/area/ship/ranger_corvette/janitor)
"gXD" = (
-/obj/structure/lattice/catwalk/indoor/grate,
-/turf/simulated/floor,
+/obj/structure/lattice/catwalk/indoor/grate/dark,
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/foyer)
"han" = (
/obj/machinery/ship_weapon/grauwolf{
@@ -1781,6 +1832,8 @@
"hnE" = (
/obj/machinery/hologram/holopad/long_range,
/obj/effect/overmap/visitable/ship/landable/ranger_shuttle,
+/obj/effect/floor_decal/corner_wide/blue/diagonal,
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
/turf/simulated/floor/tiled,
/area/shuttle/ranger_shuttle)
"hqB" = (
@@ -1800,9 +1853,6 @@
/turf/simulated/floor/tiled/dark/full,
/area/ship/ranger_corvette/engine1)
"htX" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 8
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
@@ -1816,7 +1866,7 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/atmospherics)
"hvo" = (
/obj/machinery/light{
@@ -1909,7 +1959,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/machinery/door/firedoor/noid,
+/obj/machinery/door/firedoor/noid{
+ dir = 4
+ },
/obj/structure/cable/green{
icon_state = "4-8"
},
@@ -1924,20 +1976,15 @@
/turf/simulated/floor/carpet,
/area/ship/ranger_corvette/foyer)
"ibp" = (
-/obj/structure/fuel_port/phoron{
- pixel_x = 10;
- pixel_y = 32
- },
/obj/structure/sign/nosmoking_1{
- pixel_x = -10;
pixel_y = 32
},
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/effect/floor_decal/industrial/warning/corner{
dir = 4
},
-/obj/machinery/atmospherics/pipe/tank/carbon_dioxide,
-/turf/simulated/floor,
+/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/engine2)
"iee" = (
/obj/effect/floor_decal/corner/green/diagonal,
@@ -1972,11 +2019,6 @@
/obj/machinery/door/airlock/external{
dir = 4
},
-/obj/effect/map_effect/marker/airlock/docking{
- name = "airlock_ranger_docking";
- master_tag = "airlock_ranger_docking";
- frequency = 1394
- },
/obj/machinery/access_button{
pixel_x = 12;
pixel_y = 28;
@@ -1989,7 +2031,13 @@
base_turf = null
},
/obj/effect/map_effect/marker_helper/airlock/exterior,
-/turf/simulated/floor,
+/obj/effect/map_effect/marker/airlock/docking{
+ name = "ranger_shuttle_dock";
+ master_tag = "ranger_shuttle_dock";
+ landmark_tag = "nav_hangar_ranger";
+ req_one_access = null
+ },
+/turf/simulated/floor/tiled/dark/full,
/area/ship/ranger_corvette/foyer)
"ioq" = (
/obj/effect/floor_decal/corner/red/diagonal,
@@ -2048,8 +2096,9 @@
/turf/simulated/floor/tiled/dark,
/area/ship/ranger_corvette/engine2)
"iDh" = (
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/machinery/atmospherics/pipe/manifold4w/visible,
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/obj/effect/floor_decal/corner_wide/blue/diagonal,
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
/turf/simulated/floor/tiled,
/area/shuttle/ranger_shuttle)
"iFw" = (
@@ -2119,16 +2168,18 @@
/turf/simulated/floor/tiled/dark,
/area/ship/ranger_corvette/engine1)
"iWc" = (
-/obj/machinery/atmospherics/pipe/simple/hidden,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
},
-/obj/structure/lattice/catwalk/indoor/grate,
+/obj/structure/lattice/catwalk/indoor/grate/dark,
/obj/structure/cable/green{
icon_state = "1-2"
},
-/turf/simulated/floor,
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
+ dir = 10
+ },
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/foyer)
"iXs" = (
/obj/machinery/light{
@@ -2242,7 +2293,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/universal{
dir = 4
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/atmospherics)
"jwy" = (
/obj/machinery/light{
@@ -2260,7 +2311,8 @@
dir = 9
},
/obj/effect/decal/cleanable/spiderling_remains,
-/turf/simulated/floor,
+/obj/machinery/meter,
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/atmospherics)
"jyf" = (
/obj/effect/floor_decal/corner/black/full{
@@ -2304,6 +2356,15 @@
/obj/machinery/power/apc/east,
/turf/simulated/floor/tiled/dark/full,
/area/ship/ranger_corvette/voidsuits)
+"jzV" = (
+/obj/structure/bed/stool/chair/shuttle{
+ dir = 8
+ },
+/obj/machinery/light{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/full,
+/area/shuttle/ranger_shuttle)
"jBp" = (
/obj/machinery/appliance/cooker/fryer,
/obj/effect/floor_decal/corner/brown/diagonal,
@@ -2323,6 +2384,12 @@
"jCF" = (
/turf/simulated/wall/shuttle/space_ship/mercenary,
/area/ship/ranger_corvette/leader)
+"jHg" = (
+/obj/machinery/atmospherics/portables_connector{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/ship/ranger_corvette/engine1)
"jJP" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -2334,11 +2401,11 @@
/area/ship/ranger_corvette/foyer)
"jMZ" = (
/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/machinery/atmospherics/binary/pump/high_power,
-/turf/simulated/floor,
+/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/engine2)
"jPm" = (
-/obj/structure/lattice/catwalk/indoor/grate,
+/obj/structure/lattice/catwalk/indoor/grate/dark,
/obj/structure/table/steel,
/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/metal/coc{
pixel_x = 8;
@@ -2354,13 +2421,16 @@
/turf/simulated/floor/tiled/dark/full,
/area/ship/ranger_corvette/bridge)
"jRF" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
+ dir = 4
},
/obj/effect/floor_decal/industrial/hatch/yellow,
/obj/machinery/door/firedoor/noid{
dir = 4
},
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/simulated/floor/tiled/dark,
/area/ship/ranger_corvette/foyer)
"jVf" = (
@@ -2377,36 +2447,32 @@
/turf/simulated/floor/carpet/lightblue,
/area/ship/ranger_corvette/crew)
"jXb" = (
-/obj/machinery/light/small/emergency{
- dir = 8;
- pixel_x = -11
- },
-/obj/machinery/portable_atmospherics/canister/air/airlock,
-/obj/machinery/atmospherics/portables_connector{
+/obj/machinery/door/airlock/external{
dir = 4
},
-/obj/effect/floor_decal/industrial/outline/blue,
-/turf/simulated/floor/tiled,
+/obj/effect/map_effect/marker_helper/airlock/interior,
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
+ dir = 4
+ },
+/obj/effect/map_effect/marker/airlock/shuttle{
+ name = "ranger_shuttle_dock2";
+ master_tag = "ranger_shuttle_dock2";
+ shuttle_tag = "Ranger Shuttle";
+ req_one_access = null
+ },
+/turf/simulated/floor/tiled/full,
/area/shuttle/ranger_shuttle)
"jXh" = (
/obj/effect/landmark/entry_point/port{
name = "port, airlock"
},
-/obj/structure/cable{
- icon_state = "1-2";
- dir = 4
- },
/turf/simulated/wall/shuttle/space_ship/mercenary,
/area/ship/ranger_corvette/canteen)
"jYe" = (
-/obj/machinery/atmospherics/unary/engine{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/visible/fuel{
+ dir = 10
},
-/obj/structure/window/reinforced{
- dir = 1;
- icon_state = "rwindow"
- },
-/turf/unsimulated/floor/plating,
+/turf/simulated/wall/shuttle/space_ship/mercenary,
/area/shuttle/ranger_shuttle)
"jYf" = (
/obj/structure/ship_weapon_dummy{
@@ -2433,10 +2499,9 @@
/turf/simulated/floor/tiled/dark,
/area/ship/ranger_corvette/engine2)
"kfF" = (
-/obj/machinery/power/smes,
-/obj/structure/cable/green,
-/turf/simulated/floor/tiled,
-/area/shuttle/ranger_shuttle)
+/obj/machinery/atmospherics/unary/engine,
+/turf/simulated/floor/plating,
+/area/ship/ranger_corvette/engine1)
"kiF" = (
/obj/effect/floor_decal/corner/green/diagonal,
/obj/machinery/sleeper,
@@ -2508,8 +2573,13 @@
id = "coc_bridge";
name = "blast door"
},
-/obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
-/turf/simulated/floor,
+/obj/effect/map_effect/window_spawner/full/shuttle{
+ color = "#5b5b5b";
+ frame_color = "#5b5b5b";
+ spawn_firedoor = 1;
+ spawn_grille = 1
+ },
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/bridge)
"kFU" = (
/obj/effect/floor_decal/industrial/outline/yellow,
@@ -2528,7 +2598,7 @@
/obj/structure/railing/mapped{
dir = 1
},
-/obj/machinery/portable_atmospherics/canister/oxygen,
+/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
/turf/simulated/floor/tiled/dark/full,
/area/ship/ranger_corvette/engine1)
"kLL" = (
@@ -2605,7 +2675,7 @@
name = "airlock_ranger_external"
},
/obj/effect/map_effect/marker_helper/airlock/exterior,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette)
"lpY" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
@@ -2615,7 +2685,6 @@
/area/ship/ranger_corvette/bathroom)
"lsl" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/cable/green{
icon_state = "1-2"
@@ -2632,16 +2701,13 @@
/obj/item/modular_computer/console/preset/civilian{
dir = 1
},
-/obj/structure/lattice/catwalk/indoor/grate,
+/obj/structure/lattice/catwalk/indoor/grate/dark,
/turf/simulated/floor/tiled/dark/full,
/area/ship/ranger_corvette/bridge)
"lvN" = (
-/obj/machinery/atmospherics/portables_connector{
- dir = 1
- },
-/obj/effect/floor_decal/industrial/outline/yellow,
-/turf/simulated/floor,
-/area/ship/ranger_corvette/engine2)
+/obj/machinery/computer/shuttle_control/explore/ranger_shuttle,
+/turf/simulated/floor/tiled/full,
+/area/shuttle/ranger_shuttle)
"lxT" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled/dark,
@@ -2675,17 +2741,8 @@
/turf/simulated/floor/tiled/dark/full,
/area/ship/ranger_corvette/bridge)
"lGa" = (
-/obj/machinery/atmospherics/unary/engine{
- dir = 1
- },
-/obj/effect/landmark/entry_point/north{
- name = "aft, engines"
- },
-/obj/structure/window/reinforced{
- dir = 1;
- icon_state = "rwindow"
- },
-/turf/unsimulated/floor/plating,
+/obj/machinery/atmospherics/pipe/manifold4w/visible/fuel,
+/turf/simulated/wall/shuttle/space_ship/mercenary,
/area/shuttle/ranger_shuttle)
"lGr" = (
/obj/effect/floor_decal/corner/black{
@@ -2709,14 +2766,14 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
},
-/obj/structure/lattice/catwalk/indoor/grate,
+/obj/structure/lattice/catwalk/indoor/grate/dark,
/obj/structure/cable/green{
icon_state = "1-2"
},
/obj/structure/cable/green{
icon_state = "1-8"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/foyer)
"lIp" = (
/obj/effect/floor_decal/corner/red/diagonal,
@@ -2839,7 +2896,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/machinery/door/firedoor/noid,
+/obj/machinery/door/firedoor/noid{
+ dir = 4
+ },
/obj/structure/cable/green{
icon_state = "4-8"
},
@@ -2859,7 +2918,14 @@
/area/ship/ranger_corvette/engine1)
"mcN" = (
/obj/item/trash/broken_electronics,
-/turf/simulated/floor,
+/obj/machinery/meter,
+/obj/machinery/atmospherics/pipe/simple/hidden/red{
+ dir = 10
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/atmospherics)
"mdX" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
@@ -2897,7 +2963,7 @@
dir = 8;
icon_state = "tube_empty"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/engineering)
"mmT" = (
/obj/effect/floor_decal/corner/red/diagonal,
@@ -2946,8 +3012,13 @@
/obj/effect/landmark/entry_point/port{
name = "port, bridge"
},
-/obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
-/turf/simulated/floor,
+/obj/effect/map_effect/window_spawner/full/shuttle{
+ color = "#5b5b5b";
+ frame_color = "#5b5b5b";
+ spawn_firedoor = 1;
+ spawn_grille = 1
+ },
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/bridge)
"mvd" = (
/obj/effect/floor_decal/industrial/warning,
@@ -3011,7 +3082,9 @@
/obj/machinery/door/airlock/glass{
dir = 4
},
-/obj/machinery/door/firedoor/noid,
+/obj/machinery/door/firedoor/noid{
+ dir = 4
+ },
/turf/simulated/floor/tiled/white,
/area/ship/ranger_corvette/canteen)
"mHw" = (
@@ -3026,8 +3099,11 @@
/turf/simulated/floor/tiled/dark/full,
/area/ship/ranger_corvette/bridge)
"mLK" = (
-/obj/machinery/atmospherics/pipe/tank/air,
-/turf/simulated/floor,
+/obj/machinery/atmospherics/portables_connector/aux{
+ dir = 8
+ },
+/obj/machinery/portable_atmospherics/canister/air/airlock,
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/atmospherics)
"mMP" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -3050,11 +3126,19 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled/dark,
/area/ship/ranger_corvette/engine2)
+"mQz" = (
+/obj/effect/map_effect/window_spawner/full/borosilicate/reinforced/firedoor,
+/turf/simulated/floor/plating,
+/area/ship/ranger_corvette/engine1)
"mQF" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
+/obj/machinery/computer/ship/engines{
dir = 8
},
-/turf/simulated/floor/tiled,
+/obj/machinery/alarm/east,
+/obj/structure/cable/green{
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/tiled/full,
/area/shuttle/ranger_shuttle)
"mVV" = (
/obj/effect/floor_decal/corner/dark_blue{
@@ -3101,6 +3185,12 @@
},
/turf/simulated/floor/tiled/dark,
/area/ship/ranger_corvette/janitor)
+"niC" = (
+/obj/machinery/atmospherics/pipe/simple/visible/fuel{
+ dir = 5
+ },
+/turf/simulated/wall/shuttle/space_ship/mercenary,
+/area/ship/ranger_corvette/engine2)
"niD" = (
/obj/effect/decal/cleanable/tomato_smudge,
/turf/simulated/floor/wood,
@@ -3130,6 +3220,16 @@
/obj/machinery/door/firedoor/noid,
/turf/simulated/floor/tiled/white,
/area/ship/ranger_corvette/medbay)
+"nou" = (
+/obj/structure/bed/stool/chair/shuttle{
+ dir = 8
+ },
+/obj/machinery/recharger/wallcharger{
+ pixel_x = 32;
+ pixel_y = 2
+ },
+/turf/simulated/floor/tiled/full,
+/area/shuttle/ranger_shuttle)
"ntn" = (
/obj/machinery/shower,
/obj/structure/curtain/open/shower,
@@ -3220,27 +3320,24 @@
/obj/machinery/door/airlock/external{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden/black{
- dir = 9
- },
/obj/effect/map_effect/marker_helper/airlock/interior,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/obj/effect/map_effect/marker/airlock/shuttle{
name = "ranger_shuttle_dock2";
master_tag = "ranger_shuttle_dock2";
shuttle_tag = "Ranger Shuttle";
- req_one_access = null;
- frequency = 1395
- },
-/obj/machinery/access_button{
- pixel_x = 12;
- pixel_y = -28;
- dir = 4;
- frequency = 1395
- },
-/turf/simulated/floor/tiled{
- temperature = 278.15
+ req_one_access = null
},
+/turf/simulated/floor/tiled/full,
/area/shuttle/ranger_shuttle)
+"nQz" = (
+/obj/machinery/atmospherics/pipe/manifold/visible/fuel{
+ dir = 4
+ },
+/turf/simulated/wall/shuttle/space_ship/mercenary,
+/area/ship/ranger_corvette/engine2)
"nRI" = (
/obj/structure/bed/padded,
/obj/item/towel_flat{
@@ -3249,18 +3346,16 @@
/turf/simulated/floor/tiled/dark,
/area/ship/ranger_corvette/brig)
"nTL" = (
-/obj/machinery/atmospherics/portables_connector{
+/obj/machinery/portable_atmospherics/canister/empty,
+/obj/effect/floor_decal/industrial/outline/red,
+/obj/machinery/atmospherics/portables_connector/scrubber{
dir = 4
},
-/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
/obj/machinery/light/small/emergency{
dir = 8;
pixel_x = -11
},
-/obj/effect/floor_decal/industrial/outline/engineering,
-/turf/simulated/floor/tiled{
- temperature = 278.15
- },
+/turf/simulated/floor/tiled/full,
/area/shuttle/ranger_shuttle)
"nTM" = (
/obj/effect/floor_decal/industrial/outline/yellow,
@@ -3274,25 +3369,21 @@
/turf/simulated/floor/tiled/dark/full,
/area/ship/ranger_corvette/engine1)
"nVM" = (
-/obj/structure/table/steel,
-/obj/structure/cable/green{
- icon_state = "1-2"
+/obj/structure/sign/flag/coalition{
+ pixel_y = 32
},
-/obj/structure/closet/walllocker/emerglocker/east,
-/obj/item/storage/bag/inflatable{
- pixel_y = 4
- },
-/obj/item/storage/toolbox/mechanical,
-/obj/machinery/light{
+/obj/effect/floor_decal/industrial/outline/engineering,
+/obj/machinery/atmospherics/portables_connector/fuel{
dir = 4
},
-/turf/simulated/floor/tiled,
+/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
+/turf/simulated/floor/tiled/full,
/area/shuttle/ranger_shuttle)
"nZU" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 10
+/obj/effect/floor_decal/corner_wide/blue/diagonal,
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled,
/area/shuttle/ranger_shuttle)
"oey" = (
@@ -3313,7 +3404,7 @@
/obj/structure/cable/green{
icon_state = "0-4"
},
-/obj/machinery/power/smes/buildable/horizon_shuttle,
+/obj/machinery/power/smes/buildable/third_party_shuttle,
/turf/simulated/floor/tiled/dark,
/area/ship/ranger_corvette/engineering)
"okk" = (
@@ -3374,15 +3465,13 @@
/turf/simulated/wall/shuttle/space_ship/mercenary,
/area/ship/ranger_corvette/engineering)
"oJk" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/effect/floor_decal/corner_wide/blue/diagonal,
/obj/machinery/vending/wallmed1{
name = "Medical Supplies";
req_access = null;
pixel_x = -32
},
-/obj/structure/cable{
- icon_state = "1-2";
- dir = 4
- },
/turf/simulated/floor/tiled,
/area/shuttle/ranger_shuttle)
"oKe" = (
@@ -3407,6 +3496,19 @@
pixel_x = -32;
pixel_y = -6
},
+/obj/machinery/portable_atmospherics/canister/air/airlock,
+/obj/machinery/atmospherics/portables_connector/aux{
+ dir = 4
+ },
+/obj/machinery/door/window/eastleft{
+ dir = 2
+ },
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/obj/structure/window/reinforced{
+ dir = 1
+ },
/turf/simulated/floor/tiled/dark,
/area/ship/ranger_corvette/foyer)
"oNK" = (
@@ -3529,7 +3631,7 @@
"oTH" = (
/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
-/obj/structure/lattice/catwalk/indoor/grate,
+/obj/structure/lattice/catwalk/indoor/grate/dark,
/obj/structure/cable/green{
icon_state = "1-2"
},
@@ -3539,15 +3641,14 @@
/obj/structure/cable/green{
icon_state = "1-8"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/foyer)
"oUC" = (
-/obj/structure/cable{
- icon_state = "1-2";
- dir = 4
+/obj/machinery/atmospherics/pipe/simple/visible/fuel{
+ dir = 6
},
/turf/simulated/wall/shuttle/space_ship/mercenary,
-/area/ship/ranger_corvette/canteen)
+/area/shuttle/ranger_shuttle)
"oUG" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/tiled/dark,
@@ -3562,8 +3663,20 @@
/turf/simulated/floor/tiled/dark,
/area/ship/ranger_corvette/engineering)
"oXn" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden,
-/turf/simulated/floor,
+/obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{
+ frequency = 1984;
+ id_tag = "co2_out";
+ dir = 4
+ },
+/obj/machinery/air_sensor{
+ pixel_y = 18
+ },
+/obj/effect/map_effect/marker/large_tank{
+ master_tag = "coc_ship_co2_port";
+ name = "coc_ship_co2_port"
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/reinforced/carbon_dioxide,
/area/ship/ranger_corvette/engine2)
"oZS" = (
/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
@@ -3580,8 +3693,8 @@
/obj/structure/cable/green{
icon_state = "1-8"
},
-/obj/structure/lattice/catwalk/indoor/grate,
-/turf/simulated/floor,
+/obj/structure/lattice/catwalk/indoor/grate/dark,
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/foyer)
"paq" = (
/obj/effect/floor_decal/corner/red/diagonal,
@@ -3607,16 +3720,18 @@
/obj/machinery/door/airlock/external{
dir = 4
},
-/obj/machinery/atmospherics/pipe/manifold/hidden,
+/obj/machinery/atmospherics/pipe/manifold/hidden/aux,
+/obj/effect/map_effect/marker_helper/airlock/interior,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/obj/effect/map_effect/marker/airlock/docking{
name = "ranger_shuttle_dock";
master_tag = "ranger_shuttle_dock";
landmark_tag = "nav_hangar_ranger";
- req_one_access = null;
- frequency = 1394
+ req_one_access = null
},
-/obj/effect/map_effect/marker_helper/airlock/interior,
-/turf/simulated/floor,
+/turf/simulated/floor/tiled/dark/full,
/area/ship/ranger_corvette/foyer)
"ppM" = (
/obj/structure/sign/directions/medical{
@@ -3626,11 +3741,11 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/lattice/catwalk/indoor/grate,
+/obj/structure/lattice/catwalk/indoor/grate/dark,
/obj/structure/cable/green{
icon_state = "1-2"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/foyer)
"ptP" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -3695,7 +3810,7 @@
/obj/machinery/atmospherics/pipe/tank/air{
dir = 4
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/atmospherics)
"pFK" = (
/obj/effect/landmark/entry_point/starboard{
@@ -3730,21 +3845,22 @@
name = "Medbay";
dir = 4
},
-/obj/machinery/door/firedoor/noid,
+/obj/machinery/door/firedoor/noid{
+ dir = 4
+ },
/obj/structure/cable/green{
icon_state = "4-8"
},
/turf/simulated/floor/tiled/white,
/area/ship/ranger_corvette/medbay)
"pHQ" = (
-/obj/machinery/atmospherics/pipe/simple/hidden,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/lattice/catwalk/indoor/grate,
+/obj/structure/lattice/catwalk/indoor/grate/dark,
/obj/structure/cable/green{
icon_state = "1-2"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/foyer)
"pPX" = (
/obj/effect/floor_decal/corner/green/diagonal,
@@ -3753,9 +3869,10 @@
/turf/simulated/floor/tiled/white,
/area/ship/ranger_corvette/medbay)
"pRf" = (
-/obj/effect/step_trigger/teleporter,
-/turf/template_noop,
-/area/space)
+/obj/machinery/atmospherics/binary/pump/fuel,
+/obj/effect/floor_decal/corner_wide/blue/diagonal,
+/turf/simulated/floor/tiled,
+/area/shuttle/ranger_shuttle)
"pSI" = (
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/machinery/mech_recharger,
@@ -3764,7 +3881,7 @@
dir = 8;
icon_state = "tube_empty"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/gunnery)
"pVf" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -3777,8 +3894,15 @@
/turf/simulated/floor/tiled/dark,
/area/ship/ranger_corvette/telecomms)
"pVw" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner_wide/blue/diagonal,
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/simulated/floor/tiled{
temperature = 278.15
},
@@ -3798,6 +3922,11 @@
},
/turf/simulated/floor/tiled/dark,
/area/ship/ranger_corvette/foyer)
+"qcF" = (
+/obj/machinery/power/smes/buildable/third_party_shuttle,
+/obj/structure/cable/green,
+/turf/simulated/floor/tiled,
+/area/shuttle/ranger_shuttle)
"qcP" = (
/obj/effect/floor_decal/spline/plain/black{
dir = 8
@@ -3872,33 +4001,10 @@
/turf/simulated/floor/tiled/dark,
/area/ship/ranger_corvette/telecomms)
"qsf" = (
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
- dir = 4
- },
-/obj/machinery/light/small/emergency{
+/obj/machinery/atmospherics/unary/engine{
dir = 1
},
-/obj/structure/lattice/catwalk/indoor/grate,
-/obj/effect/map_effect/marker/airlock/shuttle{
- name = "ranger_shuttle_dock2";
- master_tag = "ranger_shuttle_dock2";
- shuttle_tag = "Ranger Shuttle";
- req_one_access = null;
- frequency = 1395
- },
-/obj/machinery/embedded_controller/radio/airlock/docking_port{
- dir = 2;
- pixel_y = 28;
- frequency = 1395
- },
-/obj/machinery/airlock_sensor{
- dir = 2;
- pixel_y = 20;
- frequency = 1395
- },
-/turf/simulated/floor{
- temperature = 278.15
- },
+/turf/simulated/floor/airless,
/area/shuttle/ranger_shuttle)
"qtL" = (
/obj/structure/closet/walllocker/firecloset{
@@ -3924,7 +4030,6 @@
/turf/space/transit/north,
/area/space)
"quw" = (
-/obj/machinery/atmospherics/pipe/simple/hidden,
/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
/obj/structure/cable/green{
@@ -4008,12 +4113,9 @@
/area/ship/ranger_corvette/bridge)
"qGl" = (
/obj/machinery/alarm/south,
-/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
- dir = 8
- },
+/obj/machinery/atmospherics/pipe/manifold/hidden/cyan,
/obj/item/pipewrench,
-/obj/machinery/meter,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/atmospherics)
"qHn" = (
/obj/effect/floor_decal/corner/brown/diagonal,
@@ -4036,7 +4138,7 @@
name = "airlock_ranger_external"
},
/obj/effect/map_effect/marker_helper/airlock/interior,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/atmospherics)
"qQd" = (
/obj/structure/cryofeed/pipes{
@@ -4136,6 +4238,12 @@
/obj/structure/extinguisher_cabinet/east,
/turf/simulated/floor/tiled/white,
/area/ship/ranger_corvette/medbay)
+"rbD" = (
+/obj/effect/shuttle_landmark/ranger_shuttle/transit{
+ dir = 8
+ },
+/turf/space/transit/north,
+/area/space)
"rfo" = (
/obj/effect/floor_decal/corner/white{
dir = 10
@@ -4156,11 +4264,14 @@
/obj/machinery/power/apc/north{
req_access = null
},
-/obj/machinery/pipedispenser,
/obj/structure/cable/green{
icon_state = "0-2"
},
-/turf/simulated/floor,
+/obj/machinery/pipedispenser,
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/atmospherics)
"rki" = (
/obj/item/reagent_containers/glass/bucket{
@@ -4186,9 +4297,14 @@
/turf/simulated/floor/tiled/dark/full,
/area/ship/ranger_corvette/foyer)
"rpr" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 8
+/obj/structure/cable/green{
+ icon_state = "1-2"
},
+/obj/structure/closet/walllocker/emerglocker/east,
+/obj/machinery/light{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner_wide/blue/diagonal,
/turf/simulated/floor/tiled,
/area/shuttle/ranger_shuttle)
"rpP" = (
@@ -4257,7 +4373,7 @@
/obj/structure/cable/green{
icon_state = "0-2"
},
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/tiled/full,
/area/shuttle/ranger_shuttle)
"rKi" = (
/obj/structure/viewport,
@@ -4276,11 +4392,6 @@
/obj/structure/cable/green{
icon_state = "1-2"
},
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "1-4"
- },
/turf/simulated/floor/tiled/dark/full,
/area/ship/ranger_corvette/foyer)
"rQB" = (
@@ -4288,24 +4399,16 @@
/turf/simulated/floor/tiled/dark,
/area/ship/ranger_corvette/telecomms)
"rRu" = (
-/obj/machinery/door/airlock/external{
+/obj/machinery/atmospherics/unary/outlet_injector{
dir = 4
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/black{
- dir = 1
+/obj/effect/map_effect/marker/large_tank{
+ master_tag = "coc_ship_co2_port";
+ name = "coc_ship_co2_port"
},
-/obj/effect/map_effect/marker_helper/airlock/interior,
-/obj/effect/map_effect/marker/airlock/shuttle{
- name = "ranger_shuttle_dock2";
- master_tag = "ranger_shuttle_dock2";
- shuttle_tag = "Ranger Shuttle";
- req_one_access = null;
- frequency = 1395
- },
-/turf/simulated/floor/tiled{
- temperature = 278.15
- },
-/area/shuttle/ranger_shuttle)
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/reinforced/carbon_dioxide,
+/area/ship/ranger_corvette/engine2)
"rVd" = (
/obj/effect/floor_decal/industrial/warning{
dir = 1
@@ -4347,11 +4450,11 @@
/turf/simulated/floor/tiled/white,
/area/ship/ranger_corvette/medbay)
"scs" = (
-/obj/machinery/atmospherics/unary/engine,
-/obj/effect/landmark/entry_point/aft{
- name = "aft engines, port"
+/obj/effect/map_effect/window_spawner/full/borosilicate/reinforced/firedoor,
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 4
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/engine2)
"sfw" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
@@ -4382,7 +4485,6 @@
/area/ship/ranger_corvette/telecomms)
"slN" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/cable/green{
icon_state = "1-2"
@@ -4420,9 +4522,6 @@
dir = 4;
icon_state = "map-scrubbers"
},
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 10
- },
/obj/structure/cable/green{
icon_state = "1-8"
},
@@ -4432,7 +4531,6 @@
/turf/simulated/floor/tiled/dark,
/area/ship/ranger_corvette/foyer)
"sqh" = (
-/obj/machinery/atmospherics/pipe/simple/hidden,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/light{
@@ -4455,9 +4553,6 @@
/turf/simulated/floor/carpet/rubber,
/area/ship/ranger_corvette/crew)
"stX" = (
-/obj/machinery/portable_atmospherics/canister/empty{
- name = "waste canister"
- },
/obj/machinery/atmospherics/portables_connector{
dir = 4
},
@@ -4465,7 +4560,8 @@
dir = 8;
icon_state = "tube_empty"
},
-/turf/simulated/floor,
+/obj/machinery/portable_atmospherics/canister/air/airlock,
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/atmospherics)
"swi" = (
/obj/structure/table/rack,
@@ -4479,20 +4575,19 @@
/turf/simulated/floor/reinforced,
/area/ship/ranger_corvette/munitions)
"sCd" = (
-/obj/structure/lattice/catwalk/indoor/grate,
-/obj/effect/map_effect/marker/airlock/docking{
- name = "ranger_shuttle_dock";
- master_tag = "ranger_shuttle_dock";
- landmark_tag = "nav_hangar_ranger";
- req_one_access = null;
- frequency = 1394
- },
+/obj/structure/lattice/catwalk/indoor/grate/dark,
/obj/machinery/airlock_sensor{
dir = 2;
pixel_y = 20;
frequency = 1394
},
-/turf/simulated/floor,
+/obj/effect/map_effect/marker/airlock/docking{
+ name = "ranger_shuttle_dock";
+ master_tag = "ranger_shuttle_dock";
+ landmark_tag = "nav_hangar_ranger";
+ req_one_access = null
+ },
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/foyer)
"sCu" = (
/obj/effect/floor_decal/corner_wide/blue/diagonal,
@@ -4538,12 +4633,20 @@
/obj/effect/landmark/entry_point/fore{
name = "fore, bridge"
},
-/obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
-/turf/simulated/floor,
+/obj/effect/map_effect/window_spawner/full/shuttle{
+ color = "#5b5b5b";
+ frame_color = "#5b5b5b";
+ spawn_firedoor = 1;
+ spawn_grille = 1
+ },
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/bridge)
"sLq" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
},
/turf/simulated/floor/tiled/dark,
/area/ship/ranger_corvette/foyer)
@@ -4642,22 +4745,22 @@
/turf/simulated/wall/shuttle/space_ship/mercenary,
/area/ship/ranger_corvette/bridge)
"tbY" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 8
+/obj/machinery/light/small/emergency{
+ dir = 8;
+ pixel_x = -11
},
-/obj/structure/cable{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8"
- },
-/turf/simulated/floor/tiled{
- temperature = 278.15
+/obj/machinery/portable_atmospherics/canister/air/airlock,
+/obj/machinery/atmospherics/portables_connector/aux{
+ dir = 4
},
+/obj/effect/floor_decal/industrial/outline/yellow,
+/turf/simulated/floor/tiled/full,
/area/shuttle/ranger_shuttle)
"tcC" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/extinguisher_cabinet/west,
-/obj/machinery/atmospherics/pipe/simple/hidden/black,
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
+ dir = 10
+ },
+/obj/effect/floor_decal/corner_wide/blue/diagonal,
/turf/simulated/floor/tiled,
/area/shuttle/ranger_shuttle)
"teP" = (
@@ -4676,7 +4779,6 @@
/area/ship/ranger_corvette/canteen)
"thB" = (
/obj/machinery/door/airlock/external,
-/obj/machinery/atmospherics/pipe/simple/hidden,
/obj/machinery/access_button{
pixel_x = -28;
pixel_y = -8;
@@ -4688,11 +4790,11 @@
name = "airlock_ranger_external"
},
/obj/effect/map_effect/marker_helper/airlock/interior,
-/turf/simulated/floor,
+/obj/machinery/atmospherics/pipe/simple/hidden/aux,
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/atmospherics)
"thI" = (
-/obj/structure/lattice/catwalk/indoor/grate,
-/obj/machinery/atmospherics/pipe/simple/hidden,
+/obj/structure/lattice/catwalk/indoor/grate/dark,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/alarm/west{
@@ -4702,7 +4804,7 @@
/obj/structure/cable/green{
icon_state = "1-2"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/foyer)
"tlv" = (
/obj/structure/extinguisher_cabinet/east,
@@ -4736,10 +4838,9 @@
/turf/simulated/floor/tiled/white,
/area/ship/ranger_corvette/canteen)
"tnO" = (
-/obj/machinery/atmospherics/pipe/simple/hidden,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/lattice/catwalk/indoor/grate,
+/obj/structure/lattice/catwalk/indoor/grate/dark,
/obj/structure/sign/directions/tcom{
dir = 8;
pixel_x = -32;
@@ -4748,7 +4849,7 @@
/obj/structure/cable/green{
icon_state = "1-2"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/foyer)
"tqM" = (
/obj/structure/closet{
@@ -4909,10 +5010,8 @@
/turf/simulated/floor/tiled/dark,
/area/ship/ranger_corvette/crew)
"twl" = (
-/obj/structure/bed/stool/chair/shuttle{
- dir = 1
- },
-/turf/simulated/floor/tiled,
+/obj/machinery/computer/ship/helm,
+/turf/simulated/floor/tiled/full,
/area/shuttle/ranger_shuttle)
"tAd" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -5080,7 +5179,7 @@
/obj/effect/floor_decal/industrial/warning{
layer = 2.71
},
-/obj/structure/lattice/catwalk/indoor/grate,
+/obj/structure/lattice/catwalk/indoor/grate/dark,
/obj/machinery/button/remote/blast_door{
id = "coc_fore";
name = "fore blast door-control";
@@ -5091,7 +5190,7 @@
/obj/structure/cable/green{
icon_state = "1-2"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/foyer)
"tXz" = (
/obj/structure/bed/stool/chair,
@@ -5146,11 +5245,9 @@
/turf/simulated/floor/tiled/dark,
/area/ship/ranger_corvette/gunnery)
"ueq" = (
-/obj/machinery/recharger/wallcharger{
- pixel_y = 24
- },
-/turf/simulated/wall/shuttle/space_ship/mercenary,
-/area/shuttle/ranger_shuttle)
+/obj/machinery/atmospherics/unary/engine,
+/turf/simulated/floor/plating,
+/area/ship/ranger_corvette/engine2)
"ufB" = (
/obj/effect/floor_decal/corner/brown/diagonal,
/obj/machinery/atmospherics/unary/vent_pump/on{
@@ -5174,13 +5271,16 @@
/turf/simulated/wall/shuttle/space_ship/mercenary,
/area/ship/ranger_corvette/bathroom)
"ulR" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
+ dir = 4
},
/obj/structure/sign/vacuum{
pixel_y = -32
},
-/turf/simulated/floor/tiled/dark,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/tiled/dark/full,
/area/ship/ranger_corvette/foyer)
"umS" = (
/obj/structure/bed,
@@ -5209,8 +5309,13 @@
/obj/effect/landmark/entry_point/starboard{
name = "starboard, bridge"
},
-/obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
-/turf/simulated/floor,
+/obj/effect/map_effect/window_spawner/full/shuttle{
+ color = "#5b5b5b";
+ frame_color = "#5b5b5b";
+ spawn_firedoor = 1;
+ spawn_grille = 1
+ },
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/bridge)
"uoa" = (
/obj/effect/floor_decal/corner/black{
@@ -5225,8 +5330,7 @@
/turf/simulated/floor/tiled/dark/full,
/area/ship/ranger_corvette/bridge)
"uon" = (
-/obj/structure/lattice/catwalk/indoor/grate,
-/obj/machinery/atmospherics/pipe/simple/hidden,
+/obj/structure/lattice/catwalk/indoor/grate/dark,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/cable/green{
@@ -5235,7 +5339,7 @@
/obj/structure/cable/green{
icon_state = "1-8"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/foyer)
"ust" = (
/obj/structure/closet/secure_closet/guncabinet{
@@ -5267,15 +5371,14 @@
/obj/machinery/door/airlock/external{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden{
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
dir = 6
},
/obj/effect/map_effect/marker/airlock/docking{
name = "ranger_shuttle_dock";
master_tag = "ranger_shuttle_dock";
landmark_tag = "nav_hangar_ranger";
- req_one_access = null;
- frequency = 1394
+ req_one_access = null
},
/obj/machinery/access_button{
pixel_x = -23;
@@ -5284,7 +5387,7 @@
frequency = 1394
},
/obj/effect/map_effect/marker_helper/airlock/interior,
-/turf/simulated/floor,
+/turf/simulated/floor/tiled/dark/full,
/area/ship/ranger_corvette/foyer)
"uty" = (
/obj/structure/table/steel,
@@ -5375,8 +5478,13 @@
id = "coc_bridge";
name = "blast door"
},
-/obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
-/turf/simulated/floor,
+/obj/effect/map_effect/window_spawner/full/shuttle{
+ color = "#5b5b5b";
+ frame_color = "#5b5b5b";
+ spawn_firedoor = 1;
+ spawn_grille = 1
+ },
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/bridge)
"uCz" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -5384,12 +5492,12 @@
dir = 4;
icon_state = "map-scrubbers"
},
-/obj/structure/lattice/catwalk/indoor/grate,
+/obj/structure/lattice/catwalk/indoor/grate/dark,
/obj/machinery/alarm/east,
/obj/structure/cable/green{
icon_state = "1-2"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/foyer)
"uFD" = (
/obj/structure/ship_weapon_dummy,
@@ -5400,24 +5508,27 @@
dir = 4
},
/obj/effect/map_effect/marker_helper/airlock/exterior,
+/obj/machinery/access_button{
+ pixel_x = -12;
+ pixel_y = -28;
+ dir = 8
+ },
/obj/effect/map_effect/marker/airlock/shuttle{
name = "ranger_shuttle_dock2";
master_tag = "ranger_shuttle_dock2";
shuttle_tag = "Ranger Shuttle";
- req_one_access = null;
- frequency = 1395
- },
-/obj/machinery/access_button{
- pixel_x = -12;
- pixel_y = -28;
- dir = 8;
- frequency = 1395
- },
-/turf/simulated/floor{
- temperature = 278.15
+ req_one_access = null
},
+/turf/simulated/floor/tiled/full,
/area/shuttle/ranger_shuttle)
"uHL" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/obj/effect/floor_decal/corner_wide/blue/diagonal,
/turf/simulated/floor/tiled{
temperature = 278.15
},
@@ -5479,9 +5590,9 @@
/area/ship/ranger_corvette/brig)
"vpY" = (
/obj/structure/cable{
- icon_state = "1-2";
- dir = 1
+ icon_state = "1-2"
},
+/obj/effect/floor_decal/corner_wide/blue/diagonal,
/turf/simulated/floor/tiled,
/area/shuttle/ranger_shuttle)
"vtO" = (
@@ -5492,13 +5603,19 @@
/obj/machinery/door/firedoor/noid,
/turf/simulated/floor/tiled/dark/full,
/area/ship/ranger_corvette/munitions)
-"vuD" = (
-/obj/machinery/power/terminal{
- dir = 4
+"vtU" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
+ dir = 9
},
-/obj/structure/cable,
+/obj/effect/floor_decal/corner_wide/blue/diagonal,
/turf/simulated/floor/tiled,
/area/shuttle/ranger_shuttle)
+"vuD" = (
+/obj/effect/landmark{
+ name = "carpspawn"
+ },
+/turf/template_noop,
+/area/space)
"vwc" = (
/turf/simulated/floor/tiled/dark/full,
/area/ship/ranger_corvette/gunnery)
@@ -5605,7 +5722,6 @@
/area/ship/ranger_corvette/foyer)
"vPn" = (
/obj/effect/floor_decal/industrial/warning,
-/obj/machinery/atmospherics/pipe/simple/hidden,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4
},
@@ -5645,11 +5761,10 @@
/turf/simulated/floor/tiled/dark,
/area/ship/ranger_corvette/crew)
"vVQ" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/red{
- dir = 4
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 10
},
-/obj/machinery/meter,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/atmospherics)
"vXi" = (
/obj/effect/floor_decal/industrial/warning/corner,
@@ -5738,16 +5853,11 @@
/turf/simulated/floor/tiled/dark/full,
/area/ship/ranger_corvette/crew)
"wlw" = (
-/obj/machinery/atmospherics/pipe/tank/air{
- dir = 4
- },
-/obj/effect/floor_decal/industrial/outline/blue,
-/turf/simulated/floor/tiled{
- temperature = 278.15
- },
+/obj/machinery/atmospherics/pipe/simple/hidden/aux,
+/turf/simulated/wall/shuttle/space_ship/mercenary,
/area/shuttle/ranger_shuttle)
"wlA" = (
-/obj/structure/lattice/catwalk/indoor/grate,
+/obj/structure/lattice/catwalk/indoor/grate/dark,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -5757,7 +5867,7 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/foyer)
"wlN" = (
/obj/effect/landmark/entry_point/starboard{
@@ -5774,7 +5884,7 @@
/turf/simulated/floor/airless,
/area/ship/ranger_corvette)
"wmN" = (
-/obj/structure/lattice/catwalk/indoor/grate,
+/obj/structure/lattice/catwalk/indoor/grate/dark,
/obj/machinery/computer/ship/targeting{
dir = 1
},
@@ -5828,9 +5938,24 @@
/turf/simulated/floor/tiled/white,
/area/ship/ranger_corvette/medbay)
"wrJ" = (
-/obj/effect/shuttle_landmark/ranger_shuttle/transit,
-/turf/space/transit/north,
-/area/space)
+/obj/machinery/door/airlock/external{
+ dir = 4
+ },
+/obj/effect/landmark/entry_point/east{
+ name = "port, crew compartment"
+ },
+/obj/effect/map_effect/marker_helper/airlock/exterior,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/effect/map_effect/marker/airlock/shuttle{
+ name = "ranger_shuttle_dock2";
+ master_tag = "ranger_shuttle_dock2";
+ shuttle_tag = "Ranger Shuttle";
+ req_one_access = null
+ },
+/turf/simulated/floor/tiled/full,
+/area/shuttle/ranger_shuttle)
"wsA" = (
/obj/structure/bed/stool/chair/sofa/right/brown,
/turf/simulated/floor/carpet,
@@ -5893,7 +6018,7 @@
dir = 4;
target_pressure = 250
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/atmospherics)
"wHL" = (
/obj/machinery/door/airlock/external,
@@ -5902,7 +6027,7 @@
name = "airlock_ranger_external"
},
/obj/effect/map_effect/marker_helper/airlock/exterior,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette)
"wMK" = (
/obj/structure/extinguisher_cabinet/west,
@@ -5922,15 +6047,15 @@
master_tag = "airlock_ranger_external";
name = "airlock_ranger_external"
},
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{
dir = 8
},
-/obj/structure/lattice/catwalk/indoor/grate,
+/obj/structure/lattice/catwalk/indoor/grate/dark,
/obj/machinery/light/small/emergency{
dir = 4;
pixel_x = 14
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette)
"wPe" = (
/obj/structure/bed/stool/bar/padded/brown,
@@ -6011,12 +6136,14 @@
/turf/simulated/floor/tiled/dark/full,
/area/ship/ranger_corvette/leader)
"xfP" = (
-/obj/machinery/computer/ship/engines,
-/turf/simulated/floor/tiled,
-/area/shuttle/ranger_shuttle)
+/obj/machinery/atmospherics/unary/engine,
+/obj/effect/landmark/entry_point/aft{
+ name = "aft engines, port"
+ },
+/turf/simulated/floor/plating,
+/area/ship/ranger_corvette/engine2)
"xnk" = (
/obj/effect/floor_decal/industrial/hatch/yellow,
-/obj/machinery/atmospherics/pipe/simple/hidden,
/obj/machinery/door/blast/regular/open{
dir = 4;
id = "coc_aft"
@@ -6029,8 +6156,13 @@
/turf/simulated/floor/tiled/dark,
/area/ship/ranger_corvette/foyer)
"xnY" = (
-/obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
-/turf/simulated/floor,
+/obj/effect/map_effect/window_spawner/full/shuttle{
+ color = "#5b5b5b";
+ frame_color = "#5b5b5b";
+ spawn_firedoor = 1;
+ spawn_grille = 1
+ },
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/canteen)
"xrl" = (
/obj/effect/landmark/entry_point/port{
@@ -6039,10 +6171,6 @@
/turf/simulated/wall/shuttle/space_ship/mercenary,
/area/ship/ranger_corvette/canteen)
"xsE" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 5;
- icon_state = "intact"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
@@ -6052,7 +6180,7 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/atmospherics)
"xtN" = (
/obj/structure/table/rack,
@@ -6094,8 +6222,12 @@
/turf/simulated/floor/reinforced,
/area/ship/ranger_corvette/munitions)
"xuX" = (
-/obj/machinery/atmospherics/unary/engine,
-/turf/simulated/floor,
+/obj/machinery/atmospherics/portables_connector{
+ layer = 2.8;
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/engine2)
"xzg" = (
/turf/simulated/floor/tiled/dark/full,
@@ -6132,14 +6264,35 @@
/turf/simulated/floor/tiled/white,
/area/ship/ranger_corvette/medbay)
"xCw" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 10
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 6
- },
+/obj/effect/floor_decal/corner_wide/blue/diagonal,
/turf/simulated/floor/tiled,
/area/shuttle/ranger_shuttle)
+"xFa" = (
+/obj/machinery/light/small/emergency{
+ dir = 1
+ },
+/obj/structure/lattice/catwalk/indoor/grate/dark,
+/obj/effect/map_effect/marker/airlock/shuttle{
+ name = "ranger_shuttle_dock2";
+ master_tag = "ranger_shuttle_dock2";
+ shuttle_tag = "Ranger Shuttle";
+ req_one_access = null
+ },
+/obj/machinery/embedded_controller/radio/airlock/docking_port{
+ dir = 2;
+ pixel_y = 28;
+ frequency = 1395
+ },
+/obj/machinery/airlock_sensor{
+ dir = 2;
+ pixel_y = 20;
+ frequency = 1395
+ },
+/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/shuttle/ranger_shuttle)
"xFA" = (
/obj/machinery/atmospherics/unary/vent_pump/on,
/obj/structure/cable/green{
@@ -6147,6 +6300,17 @@
},
/turf/simulated/floor/tiled/dark,
/area/ship/ranger_corvette/engineering)
+"xHi" = (
+/obj/structure/sign/flag/coalition{
+ pixel_y = 32
+ },
+/obj/structure/table/steel,
+/obj/item/storage/toolbox/mechanical,
+/obj/item/storage/bag/inflatable{
+ pixel_y = 4
+ },
+/turf/simulated/floor/tiled/full,
+/area/shuttle/ranger_shuttle)
"xJk" = (
/turf/simulated/wall/shuttle/space_ship/mercenary,
/area/ship/ranger_corvette/medbay)
@@ -6159,14 +6323,15 @@
/turf/simulated/floor/tiled/dark,
/area/ship/ranger_corvette/brig)
"xPl" = (
-/obj/machinery/portable_atmospherics/canister/empty,
-/obj/machinery/atmospherics/portables_connector{
+/obj/structure/fuel_port/hydrogen{
+ pixel_x = -32
+ },
+/obj/effect/floor_decal/industrial/outline/blue,
+/obj/machinery/atmospherics/portables_connector/supply{
dir = 4
},
-/obj/effect/floor_decal/industrial/outline/red,
-/turf/simulated/floor/tiled{
- temperature = 278.15
- },
+/obj/machinery/portable_atmospherics/canister/air,
+/turf/simulated/floor/tiled/full,
/area/shuttle/ranger_shuttle)
"xRX" = (
/turf/template_noop,
@@ -6178,8 +6343,8 @@
/turf/simulated/floor/reinforced,
/area/ship/ranger_corvette/munitions)
"xWp" = (
-/obj/structure/lattice/catwalk/indoor/grate,
-/obj/machinery/atmospherics/pipe/simple/hidden{
+/obj/structure/lattice/catwalk/indoor/grate/dark,
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
dir = 5
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -6187,7 +6352,10 @@
/obj/structure/cable/green{
icon_state = "1-2"
},
-/turf/simulated/floor,
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/turf/simulated/floor/plating,
/area/ship/ranger_corvette/foyer)
"xZA" = (
/obj/effect/floor_decal/industrial/warning/corner{
@@ -6210,13 +6378,9 @@
/turf/simulated/wall/shuttle/space_ship/mercenary,
/area/shuttle/ranger_shuttle)
"yep" = (
-/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor,
-/obj/effect/landmark/entry_point/south{
- name = "fore, bridge"
- },
-/turf/simulated/floor/plating{
- temperature = 278.15
- },
+/obj/effect/floor_decal/corner_wide/blue/diagonal,
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
+/turf/simulated/floor/tiled,
/area/shuttle/ranger_shuttle)
"yfz" = (
/turf/simulated/wall/shuttle/space_ship/mercenary,
@@ -6422,90 +6586,90 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+sOb
+que
+que
+que
+que
+que
+que
+que
+que
+que
+que
+que
+que
+que
+que
+que
+que
+que
+que
+que
+que
+que
+que
+que
+que
+que
+que
+que
+que
+que
+que
+que
+que
+que
+que
+que
+que
+que
+sOb
"}
(2,1,1) = {"
xRX
@@ -6679,83 +6843,52 @@ xRX
xRX
xRX
xRX
-pRf
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-sOb
etL
etL
etL
@@ -6763,6 +6896,37 @@ etL
etL
etL
etL
+etL
+etL
+etL
+etL
+etL
+etL
+etL
+etL
+etL
+etL
+etL
+etL
+etL
+etL
+etL
+etL
+etL
+etL
+etL
+etL
+etL
+etL
+etL
+etL
+etL
+etL
+etL
+etL
+etL
+etL
+que
"}
(3,1,1) = {"
xRX
@@ -6936,45 +7100,52 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+que
etL
etL
etL
@@ -7013,13 +7184,6 @@ etL
etL
etL
que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
"}
(4,1,1) = {"
xRX
@@ -7193,45 +7357,52 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+que
etL
etL
etL
@@ -7270,13 +7441,6 @@ etL
etL
etL
que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
"}
(5,1,1) = {"
xRX
@@ -7450,45 +7614,52 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+que
etL
etL
etL
@@ -7527,13 +7698,6 @@ etL
etL
etL
que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
"}
(6,1,1) = {"
xRX
@@ -7707,45 +7871,52 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+que
etL
etL
etL
@@ -7784,13 +7955,6 @@ etL
etL
etL
que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
"}
(7,1,1) = {"
xRX
@@ -7964,45 +8128,52 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+que
etL
etL
etL
@@ -8041,13 +8212,6 @@ etL
etL
etL
que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
"}
(8,1,1) = {"
xRX
@@ -8221,45 +8385,52 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+que
etL
etL
etL
@@ -8298,13 +8469,6 @@ etL
etL
etL
que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
"}
(9,1,1) = {"
xRX
@@ -8478,45 +8642,52 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+que
etL
etL
etL
@@ -8555,13 +8726,6 @@ etL
etL
etL
que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
"}
(10,1,1) = {"
xRX
@@ -8735,45 +8899,52 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+que
etL
etL
etL
@@ -8812,13 +8983,6 @@ etL
etL
etL
que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
"}
(11,1,1) = {"
xRX
@@ -8992,45 +9156,52 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+que
etL
etL
etL
@@ -9069,13 +9240,6 @@ etL
etL
etL
que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
"}
(12,1,1) = {"
xRX
@@ -9249,45 +9413,52 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+que
etL
etL
etL
@@ -9326,13 +9497,6 @@ etL
etL
etL
que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
"}
(13,1,1) = {"
xRX
@@ -9506,45 +9670,52 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+que
etL
etL
etL
@@ -9583,13 +9754,6 @@ etL
etL
etL
que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
"}
(14,1,1) = {"
xRX
@@ -9763,46 +9927,52 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+que
etL
etL
etL
@@ -9821,6 +9991,7 @@ etL
etL
etL
etL
+rbD
etL
etL
etL
@@ -9840,13 +10011,6 @@ etL
etL
etL
que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
"}
(15,1,1) = {"
xRX
@@ -10020,45 +10184,52 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+que
etL
etL
etL
@@ -10097,13 +10268,6 @@ etL
etL
etL
que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
"}
(16,1,1) = {"
xRX
@@ -10277,45 +10441,52 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+que
etL
etL
etL
@@ -10354,13 +10525,6 @@ etL
etL
etL
que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
"}
(17,1,1) = {"
xRX
@@ -10534,45 +10698,52 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+que
etL
etL
etL
@@ -10611,13 +10782,6 @@ etL
etL
etL
que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
"}
(18,1,1) = {"
xRX
@@ -10791,45 +10955,52 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+que
etL
etL
etL
@@ -10868,13 +11039,6 @@ etL
etL
etL
que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
"}
(19,1,1) = {"
xRX
@@ -11048,45 +11212,52 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+que
etL
etL
etL
@@ -11125,13 +11296,6 @@ etL
etL
etL
que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
"}
(20,1,1) = {"
xRX
@@ -11305,45 +11469,52 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+que
etL
etL
etL
@@ -11382,13 +11553,6 @@ etL
etL
etL
que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
"}
(21,1,1) = {"
xRX
@@ -11562,45 +11726,52 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+que
etL
etL
etL
@@ -11639,13 +11810,6 @@ etL
etL
etL
que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
"}
(22,1,1) = {"
xRX
@@ -11819,45 +11983,52 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+que
etL
etL
etL
@@ -11896,13 +12067,6 @@ etL
etL
etL
que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
"}
(23,1,1) = {"
xRX
@@ -12076,45 +12240,52 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+que
etL
etL
etL
@@ -12153,13 +12324,6 @@ etL
etL
etL
que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
"}
(24,1,1) = {"
xRX
@@ -12333,45 +12497,52 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+que
etL
etL
etL
@@ -12410,13 +12581,6 @@ etL
etL
etL
que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
"}
(25,1,1) = {"
xRX
@@ -12590,45 +12754,52 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+que
etL
etL
etL
@@ -12667,13 +12838,6 @@ etL
etL
etL
que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
"}
(26,1,1) = {"
xRX
@@ -12847,45 +13011,52 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+que
etL
etL
etL
@@ -12924,13 +13095,6 @@ etL
etL
etL
que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
"}
(27,1,1) = {"
xRX
@@ -13104,45 +13268,52 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+que
etL
etL
etL
@@ -13181,13 +13352,6 @@ etL
etL
etL
que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
"}
(28,1,1) = {"
xRX
@@ -13361,45 +13525,52 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+que
etL
etL
etL
@@ -13438,13 +13609,6 @@ etL
etL
etL
que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
"}
(29,1,1) = {"
xRX
@@ -13618,45 +13782,52 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+que
etL
etL
etL
@@ -13695,13 +13866,6 @@ etL
etL
etL
que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
"}
(30,1,1) = {"
xRX
@@ -13875,45 +14039,52 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+que
etL
etL
etL
@@ -13952,13 +14123,6 @@ etL
etL
etL
que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
"}
(31,1,1) = {"
xRX
@@ -14132,45 +14296,52 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+que
etL
etL
etL
@@ -14209,13 +14380,6 @@ etL
etL
etL
que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
"}
(32,1,1) = {"
xRX
@@ -14389,45 +14553,52 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+que
etL
etL
etL
@@ -14466,13 +14637,6 @@ etL
etL
etL
que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
"}
(33,1,1) = {"
xRX
@@ -14646,45 +14810,52 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+que
etL
etL
etL
@@ -14723,13 +14894,6 @@ etL
etL
etL
que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
"}
(34,1,1) = {"
xRX
@@ -14903,45 +15067,52 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+que
etL
etL
etL
@@ -14980,13 +15151,6 @@ etL
etL
etL
que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
"}
(35,1,1) = {"
xRX
@@ -15160,7 +15324,52 @@ xRX
xRX
xRX
xRX
-pRf
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+que
etL
etL
etL
@@ -15198,52 +15407,7 @@ etL
etL
etL
etL
-etL
-etL
-etL
-etL
-aho
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
"}
(36,1,1) = {"
xRX
@@ -15417,45 +15581,52 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+que
etL
etL
etL
@@ -15494,13 +15665,6 @@ etL
etL
etL
que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
"}
(37,1,1) = {"
xRX
@@ -15674,45 +15838,52 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+que
etL
etL
etL
@@ -15751,13 +15922,6 @@ etL
etL
etL
que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
"}
(38,1,1) = {"
xRX
@@ -15931,45 +16095,52 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+que
etL
etL
etL
@@ -16008,13 +16179,6 @@ etL
etL
etL
que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
"}
(39,1,1) = {"
xRX
@@ -16188,45 +16352,52 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+que
etL
etL
etL
@@ -16265,13 +16436,6 @@ etL
etL
etL
que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
"}
(40,1,1) = {"
xRX
@@ -16445,90 +16609,90 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+que
+que
+que
+que
+que
+que
+que
+que
+que
+que
+que
+que
+que
+que
+que
+que
+que
+que
+que
+que
+que
+que
+que
+que
+que
+que
+que
+que
+que
+que
+que
+que
+que
+que
+que
+que
+que
+sOb
"}
(41,1,1) = {"
xRX
@@ -16702,90 +16866,90 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
"}
(42,1,1) = {"
xRX
@@ -16959,90 +17123,90 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
"}
(43,1,1) = {"
xRX
@@ -17216,90 +17380,90 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
"}
(44,1,1) = {"
xRX
@@ -17473,90 +17637,90 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
"}
(45,1,1) = {"
xRX
@@ -17730,90 +17894,90 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
"}
(46,1,1) = {"
xRX
@@ -17987,90 +18151,90 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
"}
(47,1,1) = {"
xRX
@@ -18244,90 +18408,90 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
"}
(48,1,1) = {"
xRX
@@ -18501,90 +18665,90 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
"}
(49,1,1) = {"
xRX
@@ -18758,90 +18922,90 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
"}
(50,1,1) = {"
xRX
@@ -19015,90 +19179,90 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
"}
(51,1,1) = {"
xRX
@@ -19272,90 +19436,90 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
"}
(52,1,1) = {"
xRX
@@ -19529,90 +19693,90 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
"}
(53,1,1) = {"
xRX
@@ -19786,90 +19950,90 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
"}
(54,1,1) = {"
xRX
@@ -20043,90 +20207,90 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
"}
(55,1,1) = {"
xRX
@@ -20300,90 +20464,90 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
"}
(56,1,1) = {"
xRX
@@ -20557,90 +20721,90 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
"}
(57,1,1) = {"
xRX
@@ -20814,90 +20978,90 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
"}
(58,1,1) = {"
xRX
@@ -21071,90 +21235,90 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
"}
(59,1,1) = {"
xRX
@@ -21328,90 +21492,90 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
"}
(60,1,1) = {"
xRX
@@ -21585,90 +21749,90 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
"}
(61,1,1) = {"
xRX
@@ -21842,90 +22006,90 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
"}
(62,1,1) = {"
xRX
@@ -22099,90 +22263,90 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
"}
(63,1,1) = {"
xRX
@@ -22356,90 +22520,90 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
"}
(64,1,1) = {"
xRX
@@ -22613,90 +22777,90 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
"}
(65,1,1) = {"
xRX
@@ -22870,90 +23034,90 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
"}
(66,1,1) = {"
xRX
@@ -23127,90 +23291,90 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
"}
(67,1,1) = {"
xRX
@@ -23384,90 +23548,90 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
"}
(68,1,1) = {"
xRX
@@ -23560,6 +23724,90 @@ xRX
xRX
xRX
xRX
+vuD
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
xRX
xRX
xRX
@@ -23641,90 +23889,6 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
"}
(69,1,1) = {"
xRX
@@ -23898,90 +24062,90 @@ xRX
xRX
xRX
xRX
-pRf
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-sOb
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
"}
(70,1,1) = {"
xRX
@@ -24155,90 +24319,90 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
"}
(71,1,1) = {"
xRX
@@ -24374,6 +24538,90 @@ xRX
xRX
xRX
xRX
+vuD
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
xRX
xRX
xRX
@@ -24412,90 +24660,6 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
"}
(72,1,1) = {"
xRX
@@ -24669,90 +24833,90 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
"}
(73,1,1) = {"
xRX
@@ -24926,90 +25090,90 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
"}
(74,1,1) = {"
xRX
@@ -25183,90 +25347,90 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-sOb
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
"}
(75,1,1) = {"
xRX
@@ -25440,90 +25604,90 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
"}
(76,1,1) = {"
xRX
@@ -25697,90 +25861,90 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
"}
(77,1,1) = {"
xRX
@@ -25954,90 +26118,90 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
"}
(78,1,1) = {"
xRX
@@ -26211,90 +26375,90 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
"}
(79,1,1) = {"
xRX
@@ -26468,90 +26632,90 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-wrJ
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
"}
(80,1,1) = {"
xRX
@@ -26725,90 +26889,90 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
"}
(81,1,1) = {"
xRX
@@ -26982,90 +27146,90 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
"}
(82,1,1) = {"
xRX
@@ -27124,6 +27288,90 @@ xRX
xRX
xRX
xRX
+vuD
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
xRX
xRX
xRX
@@ -27239,90 +27487,6 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
"}
(83,1,1) = {"
xRX
@@ -27496,90 +27660,90 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
"}
(84,1,1) = {"
xRX
@@ -27753,90 +27917,90 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-sOb
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-que
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
"}
(85,1,1) = {"
xRX
@@ -28010,90 +28174,90 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
"}
(86,1,1) = {"
xRX
@@ -28267,90 +28431,90 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
"}
(87,1,1) = {"
xRX
@@ -28524,90 +28688,90 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
"}
(88,1,1) = {"
xRX
@@ -28781,90 +28945,90 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
"}
(89,1,1) = {"
xRX
@@ -29038,90 +29202,90 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
"}
(90,1,1) = {"
xRX
@@ -29295,90 +29459,90 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
"}
(91,1,1) = {"
xRX
@@ -29552,90 +29716,90 @@ xRX
xRX
xRX
xRX
-pRf
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
-etL
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
"}
(92,1,1) = {"
xRX
@@ -29809,90 +29973,90 @@ xRX
xRX
xRX
xRX
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
-pRf
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
"}
(93,1,1) = {"
xRX
@@ -35111,8 +35275,8 @@ xRX
xRX
xRX
xRX
-xRX
-xRX
+tWh
+tWh
tWh
tWh
tWh
@@ -35368,9 +35532,9 @@ xRX
xRX
xRX
xRX
-xRX
-xRX
-ajL
+kfF
+dul
+fVq
ayD
bEt
tWh
@@ -35625,9 +35789,9 @@ xRX
xRX
xRX
xRX
-xRX
-xRX
-ajL
+kfF
+bbM
+jHg
aEq
bIQ
eiR
@@ -35882,10 +36046,10 @@ xRX
xRX
xRX
xRX
-xRX
-xRX
+bOF
+bbM
asD
-aEq
+mQz
cnJ
tWh
fJC
@@ -36139,8 +36303,8 @@ xRX
xRX
xRX
xRX
-xRX
-xRX
+kfF
+ayf
ajL
aYD
coK
@@ -36361,6 +36525,7 @@ xRX
xRX
xRX
xRX
+vuD
xRX
xRX
xRX
@@ -36395,9 +36560,8 @@ xRX
xRX
xRX
xRX
-xRX
-xRX
-xRX
+tWh
+tWh
tWh
tWh
tWh
@@ -37768,7 +37932,7 @@ xRX
xRX
xRX
xRX
-xRX
+vuD
xRX
xRX
xRX
@@ -38474,7 +38638,7 @@ qbp
tVB
mdX
sLq
-oUC
+fwA
fwA
aiD
mFt
@@ -38731,7 +38895,7 @@ wUT
wUT
lgK
jRF
-oUC
+fwA
tmL
iwS
lym
@@ -38986,9 +39150,9 @@ tsn
wkO
xzl
wUT
-aKd
+aho
ulR
-oUC
+fwA
paq
qza
lIp
@@ -39245,7 +39409,7 @@ sJD
wUT
usz
pmD
-oUC
+fwA
crw
ilB
mmT
@@ -39502,7 +39666,7 @@ uwT
wUT
bom
agA
-oUC
+fwA
ioq
waI
mmT
@@ -39759,7 +39923,7 @@ wve
wUT
sCd
grA
-oUC
+fwA
fmB
lXU
nmy
@@ -39994,8 +40158,8 @@ xRX
xRX
xRX
xRX
-xRX
-xRX
+gJZ
+gJZ
gJZ
gJZ
uOy
@@ -40251,9 +40415,9 @@ xRX
xRX
xRX
xRX
-xRX
-xRX
-xuX
+ueq
+niC
+rRu
oXn
gJZ
gJZ
@@ -40271,9 +40435,9 @@ xRX
xRX
xRX
yau
-ayf
+wrJ
uGk
-aFp
+yau
xRX
xRX
xRX
@@ -40508,15 +40672,15 @@ xRX
xRX
xRX
xRX
-xRX
-xRX
+xfP
+byX
scs
diy
-dul
+gJZ
gJZ
ibp
jMZ
-lvN
+jMZ
mNJ
ptP
gJZ
@@ -40528,13 +40692,13 @@ yau
yau
yau
yau
-qsf
+xFa
bgA
-aFp
-yau
-yau
-yau
-xRX
+wlw
+wlw
+wlw
+wlw
+gLv
xRX
xRX
xRX
@@ -40765,8 +40929,8 @@ xRX
xRX
xRX
xRX
-xRX
-xRX
+ueq
+byX
xuX
bex
dwE
@@ -40782,12 +40946,12 @@ xRX
xRX
kYm
yau
-wlw
-jXb
+nVM
+tbY
yau
-rRu
+jXb
nPq
-aFp
+yau
nTL
xPl
yau
@@ -41022,9 +41186,9 @@ xRX
xRX
xRX
xRX
-xRX
-xRX
-xuX
+ueq
+nQz
+bph
bld
dHA
gJZ
@@ -41038,17 +41202,17 @@ xRX
xRX
xRX
yau
-yau
-bbM
-gLv
+lvN
+nZU
tcC
etR
+vtU
bsL
oJk
-mQF
aHv
cHm
-jYe
+oUC
+qsf
xRX
xRX
xRX
@@ -41279,8 +41443,8 @@ xRX
xRX
xRX
xRX
-xRX
-xRX
+gJZ
+gJZ
gJZ
gJZ
gJZ
@@ -41294,18 +41458,18 @@ gJZ
xRX
xRX
xRX
-yep
duC
twl
+bMK
hnE
-bsL
-xCw
+yep
+iDh
pVw
fqt
-nZU
aei
-iDh
+pRf
lGa
+fAg
xRX
xRX
xRX
@@ -41552,17 +41716,17 @@ xRX
xRX
xRX
yau
-yau
-fVq
-bsL
-bsL
-rpr
+aFp
+xCw
+xCw
+xCw
+xCw
uHL
-tbY
vpY
-vuD
+vpY
dCS
jYe
+qsf
xRX
xRX
xRX
@@ -41810,14 +41974,14 @@ xRX
xRX
oBx
yau
-xfP
-byX
-bMK
-bMK
+xHi
+jzV
+nou
eBG
rEq
-nVM
-kfF
+mQF
+rpr
+qcF
yau
yau
xRX
@@ -42071,7 +42235,7 @@ yau
yau
yau
wNO
-ueq
+yau
yau
yau
yau
@@ -48963,7 +49127,7 @@ xRX
xRX
xRX
xRX
-xRX
+vuD
xRX
xRX
xRX
@@ -51892,7 +52056,7 @@ xRX
xRX
xRX
xRX
-xRX
+vuD
xRX
xRX
xRX
@@ -55174,7 +55338,7 @@ xRX
xRX
xRX
xRX
-xRX
+vuD
xRX
xRX
xRX
diff --git a/maps/away/ships/dominia/dominian_corvette/dominian_corvette.dmm b/maps/away/ships/dominia/dominian_corvette/dominian_corvette.dmm
index bed223d1a8d..f40c0a419ba 100644
--- a/maps/away/ships/dominia/dominian_corvette/dominian_corvette.dmm
+++ b/maps/away/ships/dominia/dominian_corvette/dominian_corvette.dmm
@@ -9,9 +9,13 @@
/turf/simulated/floor/tiled/dark,
/area/ship/dominian_corvette/engineering)
"aag" = (
-/obj/structure/extinguisher_cabinet/south,
-/turf/simulated/floor/reinforced,
-/area/ship/dominian_corvette/cannon)
+/obj/structure/railing/mapped,
+/obj/structure/railing/mapped{
+ dir = 4
+ },
+/obj/structure/lattice/catwalk,
+/turf/template_noop,
+/area/ship/dominian_corvette/exterior)
"aay" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 2
@@ -155,7 +159,7 @@
/turf/simulated/floor/wood,
/area/ship/dominian_corvette/officer)
"aou" = (
-/obj/machinery/atmospherics/portables_connector{
+/obj/machinery/atmospherics/portables_connector/fuel{
dir = 4
},
/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
@@ -274,7 +278,7 @@
/turf/simulated/floor/tiled/dark,
/area/ship/dominian_corvette/quarters)
"aCd" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden{
+/obj/machinery/atmospherics/pipe/manifold/visible/fuel{
dir = 8
},
/turf/simulated/wall/shuttle/space_ship,
@@ -337,7 +341,7 @@
/turf/simulated/floor/tiled/dark/full,
/area/ship/dominian_corvette/hangar)
"aRd" = (
-/obj/machinery/atmospherics/pipe/simple/visible{
+/obj/machinery/atmospherics/pipe/simple/visible/fuel{
dir = 5
},
/turf/simulated/wall,
@@ -425,7 +429,7 @@
/turf/simulated/floor/carpet/rubber,
/area/ship/dominian_corvette/engineering/atmos)
"bfU" = (
-/obj/machinery/atmospherics/pipe/simple/visible{
+/obj/machinery/atmospherics/pipe/simple/visible/fuel{
dir = 9
},
/turf/simulated/wall,
@@ -467,9 +471,8 @@
/turf/simulated/floor/tiled/dark,
/area/ship/dominian_corvette/engineering/atmos)
"bjN" = (
-/obj/machinery/atmospherics/binary/pump/high_power{
- dir = 4;
- name = "Connector to Fuel Tank"
+/obj/machinery/atmospherics/binary/pump/fuel{
+ dir = 4
},
/turf/simulated/floor/tiled/dark,
/area/ship/dominian_corvette/engineering/atmos)
@@ -820,7 +823,7 @@
/turf/simulated/floor/reinforced/carbon_dioxide,
/area/ship/dominian_corvette/engineering/atmos)
"cpP" = (
-/obj/machinery/atmospherics/pipe/simple/visible,
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
/obj/structure/cable{
icon_state = "1-2"
},
@@ -852,9 +855,20 @@
/turf/simulated/floor/tiled/dark/full,
/area/ship/dominian_corvette/quarters)
"ctK" = (
-/obj/machinery/hologram/holopad/long_range,
-/turf/simulated/floor/tiled/dark,
-/area/shuttle/dominian_shuttle)
+/obj/machinery/door/airlock/external{
+ dir = 4
+ },
+/obj/effect/map_effect/marker/airlock/docking{
+ name = "airlock_dominian_corvette_dock_starboard";
+ master_tag = "airlock_dominian_corvette_dock_starboard";
+ landmark_tag = "airlock_dominian_corvette_dock_starboard"
+ },
+/obj/effect/map_effect/marker_helper/airlock/interior,
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
+ dir = 9
+ },
+/turf/simulated/floor/tiled/dark/full,
+/area/ship/dominian_corvette/docking)
"cwi" = (
/obj/structure/bed/chair,
/obj/structure/bed/chair,
@@ -945,16 +959,11 @@
/turf/simulated/wall,
/area/ship/dominian_corvette/head)
"cUE" = (
-/obj/machinery/alarm/north{
- req_one_access = list(212)
+/obj/effect/floor_decal/corner/red/full{
+ dir = 8
},
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/effect/floor_decal/corner/red{
- dir = 5
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
+ dir = 4
},
/turf/simulated/floor/tiled/dark,
/area/ship/dominian_corvette/docking)
@@ -970,23 +979,58 @@
/turf/simulated/floor/tiled/dark/full,
/area/ship/dominian_corvette/engineering/reactor)
"cZb" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 5;
- icon_state = "intact"
- },
/obj/effect/floor_decal/corner/red{
dir = 5
},
/turf/simulated/floor/tiled/dark,
/area/ship/dominian_corvette/docking/port)
"cZv" = (
-/obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
+/obj/structure/table/rack,
+/obj/effect/floor_decal/industrial/outline/red,
+/obj/machinery/door/window/eastleft{
+ dir = 2
+ },
+/obj/machinery/light/small/emergency{
+ dir = 1
+ },
+/obj/item/ship_ammunition/francisca/ap{
+ pixel_y = 8
+ },
+/obj/item/ship_ammunition/francisca/ap{
+ pixel_y = 8
+ },
+/obj/item/ship_ammunition/francisca/ap{
+ pixel_y = 8
+ },
+/obj/item/ship_ammunition/francisca/ap{
+ pixel_y = 8
+ },
+/obj/item/ship_ammunition/francisca/ap{
+ pixel_y = 8
+ },
+/obj/item/ship_ammunition/francisca/ap{
+ pixel_y = 8
+ },
+/obj/item/ship_ammunition/francisca/ap{
+ pixel_y = 8
+ },
+/obj/structure/sign/securearea{
+ desc = "A danger sign which reads 'DANGER: EXPLOSIVE ORDINANCE' and 'THIS ROOM CONTAINS ORDINANCE THAT WILL KILL YOU INSTANTLY'.";
+ name = "\improper DANGER: EXPLOSIVE ORDINANCE sign";
+ pixel_y = 32
+ },
/turf/simulated/floor/reinforced,
-/area/ship/dominian_corvette/cannon)
+/area/ship/dominian_corvette/franny)
"cZD" = (
-/obj/structure/ship_weapon_dummy,
-/turf/simulated/wall,
-/area/ship/dominian_corvette/cannon)
+/obj/machinery/portable_atmospherics/canister/air/airlock,
+/obj/machinery/door/window/eastleft{
+ dir = 1
+ },
+/obj/machinery/atmospherics/portables_connector/aux{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/dark/full,
+/area/ship/dominian_corvette/docking/port)
"dez" = (
/obj/structure/janitorialcart/full{
dir = 8
@@ -999,13 +1043,13 @@
/turf/simulated/floor/tiled/dark,
/area/ship/dominian_corvette/janitor)
"dfw" = (
-/obj/machinery/atmospherics/pipe/simple/visible{
+/obj/machinery/atmospherics/pipe/simple/visible/fuel{
dir = 9
},
/turf/simulated/wall,
/area/ship/dominian_corvette/propulsion)
"dhp" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/black{
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
dir = 10
},
/obj/structure/lattice/catwalk/indoor/grate,
@@ -1038,7 +1082,12 @@
/turf/simulated/wall/shuttle/space_ship,
/area/ship/dominian_corvette/cic)
"dnW" = (
-/obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
+/obj/effect/map_effect/window_spawner/full/shuttle{
+ spawn_firedoor = 1;
+ spawn_grille = 1;
+ color = "#BDB6AE";
+ frame_color = "#BDB6AE"
+ },
/obj/machinery/door/blast/regular/open{
dir = 4;
id = "dominian_corvette_bridge"
@@ -1049,8 +1098,8 @@
/turf/simulated/floor/plating,
/area/ship/dominian_corvette/bridge)
"doI" = (
-/obj/structure/ship_weapon_dummy,
-/turf/simulated/floor/airless,
+/obj/structure/lattice/catwalk,
+/turf/template_noop,
/area/ship/dominian_corvette/exterior)
"dsC" = (
/obj/effect/shuttle_landmark/dominian_corvette/nav2,
@@ -1136,7 +1185,7 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/simple/hidden{
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
dir = 5
},
/obj/structure/lattice/catwalk/indoor/grate,
@@ -1154,12 +1203,13 @@
/turf/simulated/floor/tiled/white,
/area/ship/dominian_corvette/recroom)
"dMj" = (
-/obj/machinery/atmospherics/pipe/simple/hidden,
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
/obj/structure/lattice/catwalk/indoor/grate,
/obj/machinery/door/airlock/hatch{
name = "Propulsion";
dir = 1
},
+/obj/machinery/door/firedoor/noid,
/turf/simulated/floor/plating,
/area/shuttle/dominian_shuttle)
"dTw" = (
@@ -1255,7 +1305,7 @@
/turf/simulated/floor/tiled/dark,
/area/ship/dominian_corvette/hangar)
"elq" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/black{
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
dir = 10
},
/turf/simulated/floor/tiled/dark,
@@ -1290,7 +1340,7 @@
/obj/machinery/light/small/emergency{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/visible,
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
/turf/simulated/floor/tiled/dark,
/area/ship/dominian_corvette/propulsion)
"eqq" = (
@@ -1348,10 +1398,10 @@
/area/ship/dominian_corvette/hangar)
"exm" = (
/obj/structure/closet/emcloset,
-/obj/effect/floor_decal/industrial/outline/emergency_closet,
/obj/effect/floor_decal/corner/red{
dir = 5
},
+/obj/effect/floor_decal/industrial/outline/emergency_closet,
/turf/simulated/floor/tiled/dark,
/area/ship/dominian_corvette/hangar)
"eze" = (
@@ -1388,7 +1438,7 @@
/turf/simulated/floor/tiled/dark,
/area/ship/dominian_corvette)
"eBK" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
+/obj/machinery/atmospherics/pipe/simple/visible/fuel{
dir = 6
},
/turf/simulated/wall/shuttle/space_ship,
@@ -1411,8 +1461,8 @@
/area/ship/dominian_corvette/propulsion/port)
"eKR" = (
/obj/effect/map_effect/window_spawner/full/borosilicate/reinforced/firedoor,
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/hidden/universal{
+ dir = 4
},
/turf/simulated/floor/tiled/dark,
/area/ship/dominian_corvette/propulsion)
@@ -1424,7 +1474,7 @@
pixel_y = 0;
req_one_access = list(212)
},
-/obj/machinery/atmospherics/portables_connector{
+/obj/machinery/atmospherics/portables_connector/fuel{
dir = 4
},
/obj/structure/cable{
@@ -1492,7 +1542,7 @@
/turf/simulated/floor/reinforced,
/area/ship/dominian_corvette/cannon)
"faF" = (
-/obj/machinery/atmospherics/portables_connector{
+/obj/machinery/atmospherics/portables_connector/fuel{
dir = 4
},
/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
@@ -1552,14 +1602,14 @@
/turf/simulated/floor/tiled/dark,
/area/ship/dominian_corvette/bridge)
"flC" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
dir = 4
},
/turf/simulated/floor/tiled/dark,
/area/shuttle/dominian_shuttle)
"flP" = (
-/obj/structure/lattice/catwalk/indoor/grate,
-/obj/machinery/atmospherics/pipe/simple/hidden,
+/obj/machinery/atmospherics/binary/pump/fuel,
+/obj/effect/floor_decal/industrial/outline/yellow,
/turf/simulated/floor/plating,
/area/shuttle/dominian_shuttle)
"fnj" = (
@@ -1696,7 +1746,7 @@
/turf/simulated/floor/carpet/rubber,
/area/ship/dominian_corvette/engineering/atmos)
"fGW" = (
-/obj/machinery/atmospherics/unary/vent_pump/high_volume,
+/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux,
/obj/machinery/airlock_sensor{
dir = 8;
pixel_x = 20;
@@ -1770,12 +1820,11 @@
/turf/simulated/floor/marble/dark,
/area/ship/dominian_corvette/temple)
"fSC" = (
-/obj/effect/map_effect/window_spawner/full/borosilicate/reinforced/firedoor,
-/obj/machinery/atmospherics/pipe/simple/visible{
- dir = 4
- },
-/turf/simulated/floor/tiled/dark,
-/area/ship/dominian_corvette/propulsion)
+/obj/structure/table/standard,
+/obj/item/clothing/ears/earmuffs,
+/obj/item/device/binoculars,
+/turf/simulated/floor/reinforced,
+/area/ship/dominian_corvette/cannon)
"fUN" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -1786,25 +1835,18 @@
/turf/simulated/floor/tiled/dark,
/area/ship/dominian_corvette/docking)
"fXH" = (
-/obj/structure/railing/mapped{
- dir = 4
+/obj/effect/floor_decal/industrial/loading/yellow{
+ dir = 8
},
-/obj/effect/floor_decal/industrial/outline/emergency_closet,
-/obj/machinery/portable_atmospherics/canister/air/airlock,
-/obj/machinery/atmospherics/portables_connector{
- dir = 4
- },
-/turf/simulated/floor/plating,
-/area/shuttle/dominian_shuttle)
+/turf/simulated/floor/reinforced,
+/area/ship/dominian_corvette/franny)
"fZl" = (
-/obj/structure/railing/mapped{
- dir = 4
- },
-/obj/structure/lattice/catwalk/indoor/grate,
-/turf/simulated/floor/plating,
-/area/shuttle/dominian_shuttle)
+/obj/structure/viewport/zavod,
+/turf/simulated/floor/reinforced,
+/area/ship/dominian_corvette/cannon)
"fZq" = (
/obj/effect/overmap/visitable/ship/landable/dominian_shuttle,
+/obj/machinery/hologram/holopad/long_range,
/turf/simulated/floor/tiled/dark,
/area/shuttle/dominian_shuttle)
"gcq" = (
@@ -1847,7 +1889,7 @@
/turf/simulated/floor/plating,
/area/ship/dominian_corvette/hangar)
"grx" = (
-/obj/machinery/atmospherics/pipe/simple/visible,
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
/obj/structure/lattice/catwalk/indoor/grate,
/turf/simulated/floor/plating,
/area/ship/dominian_corvette/propulsion/port)
@@ -2037,17 +2079,13 @@
/turf/simulated/floor/tiled/dark,
/area/ship/dominian_corvette/quarters)
"hbA" = (
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+/mob/living/heavy_vehicle/premade/ripley/loader,
+/obj/machinery/mech_recharger,
+/obj/machinery/light/small/emergency{
dir = 1
},
-/obj/effect/map_effect/marker/airlock/docking{
- name = "airlock_dominian_corvette_dock_starboard";
- master_tag = "airlock_dominian_corvette_dock_starboard";
- landmark_tag = "airlock_dominian_corvette_dock_starboard"
- },
-/obj/structure/lattice/catwalk/indoor/grate,
-/turf/simulated/floor/plating,
-/area/ship/dominian_corvette/docking)
+/turf/simulated/floor/reinforced,
+/area/ship/dominian_corvette/franny)
"hcl" = (
/turf/simulated/wall,
/area/ship/dominian_corvette/cannon)
@@ -2151,7 +2189,7 @@
dir = 5
},
/obj/machinery/portable_atmospherics/canister/air/airlock,
-/obj/machinery/atmospherics/portables_connector{
+/obj/machinery/atmospherics/portables_connector/aux{
dir = 4
},
/obj/machinery/door/window/eastleft{
@@ -2214,11 +2252,9 @@
/turf/simulated/floor/tiled/dark/full,
/area/ship/dominian_corvette/quarters)
"huE" = (
-/obj/machinery/atmospherics/binary/pump/high_power{
- dir = 8;
- name = "Fuel to Thrusters"
+/obj/machinery/atmospherics/binary/pump/fuel{
+ dir = 8
},
-/obj/structure/lattice/catwalk/indoor/grate,
/turf/simulated/floor/plating,
/area/ship/dominian_corvette/propulsion)
"hzU" = (
@@ -2301,13 +2337,21 @@
/turf/simulated/floor/tiled/dark,
/area/ship/dominian_corvette/hangar)
"hWr" = (
-/obj/structure/lattice/catwalk,
-/obj/structure/railing/mapped{
+/obj/structure/cable{
+ d2 = 4;
+ icon_state = "0-4"
+ },
+/obj/effect/floor_decal/corner/red{
+ dir = 5
+ },
+/obj/machinery/power/apc/north{
+ req_access = list(212)
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
dir = 4
},
-/obj/structure/ship_weapon_dummy,
-/turf/template_noop,
-/area/ship/dominian_corvette/cannon)
+/turf/simulated/floor/tiled/dark,
+/area/ship/dominian_corvette/docking)
"hYY" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
@@ -2315,6 +2359,9 @@
/obj/effect/floor_decal/corner/red{
dir = 10
},
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
+ dir = 4
+ },
/turf/simulated/floor/tiled/dark,
/area/ship/dominian_corvette/docking/port)
"hZq" = (
@@ -2341,7 +2388,7 @@
name = "dominian_shuttle_dock";
req_one_access = list(212)
},
-/obj/machinery/atmospherics/unary/vent_pump/high_volume,
+/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux,
/obj/structure/lattice/catwalk/indoor/grate,
/turf/simulated/floor/plating,
/area/ship/dominian_corvette/hangar)
@@ -2364,7 +2411,7 @@
},
/area/ship/dominian_corvette/engineering/reactor)
"inf" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
+/obj/machinery/atmospherics/pipe/simple/visible/fuel{
dir = 10
},
/turf/simulated/wall/shuttle/space_ship,
@@ -2468,23 +2515,11 @@
/turf/simulated/floor/carpet/rubber,
/area/ship/dominian_corvette/cic)
"iyN" = (
-/obj/machinery/door/airlock/external,
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 10
+/obj/effect/landmark{
+ name = "carpspawn"
},
-/obj/effect/map_effect/marker/airlock/docking{
- name = "airlock_dominian_corvette_dock_starboard";
- master_tag = "airlock_dominian_corvette_dock_starboard";
- landmark_tag = "airlock_dominian_corvette_dock_starboard"
- },
-/obj/effect/map_effect/marker_helper/airlock/interior,
-/obj/machinery/access_button{
- pixel_x = 28;
- pixel_y = 12;
- dir = 1
- },
-/turf/simulated/floor/tiled/dark/full,
-/area/ship/dominian_corvette/docking)
+/turf/template_noop,
+/area/space)
"iCK" = (
/turf/simulated/wall/shuttle/space_ship{
color = "#E14644"
@@ -2514,9 +2549,6 @@
},
/area/ship/dominian_corvette/bridge)
"iJz" = (
-/obj/structure/table/standard,
-/obj/item/device/binoculars,
-/obj/item/clothing/ears/earmuffs,
/obj/machinery/power/apc/high/south,
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
@@ -2528,9 +2560,8 @@
/turf/simulated/wall,
/area/ship/dominian_corvette/engineering/reactor)
"iNt" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden{
- dir = 4;
- icon_state = "map"
+/obj/machinery/atmospherics/pipe/manifold/visible/fuel{
+ dir = 4
},
/turf/simulated/wall/shuttle/space_ship,
/area/shuttle/dominian_shuttle)
@@ -2717,7 +2748,7 @@
/area/ship/dominian_corvette/officer)
"jim" = (
/obj/structure/lattice/catwalk/indoor/grate,
-/obj/machinery/atmospherics/unary/vent_pump/high_volume,
+/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux,
/obj/effect/map_effect/marker_helper/airlock/out,
/obj/effect/map_effect/marker/airlock/shuttle{
name = "airlock_dominian_shuttle";
@@ -2775,10 +2806,10 @@
landmark_tag = "airlock_dominian_corvette_dock_port";
master_tag = "airlock_dominian_corvette_dock_port"
},
-/obj/machinery/atmospherics/pipe/manifold/hidden{
- dir = 1
- },
/obj/effect/map_effect/marker_helper/airlock/interior,
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
+ dir = 6
+ },
/turf/simulated/floor/tiled/dark/full,
/area/ship/dominian_corvette/docking/port)
"jxG" = (
@@ -2810,18 +2841,26 @@
/turf/simulated/floor/tiled/white,
/area/ship/dominian_corvette/recroom)
"jJa" = (
-/obj/machinery/atmospherics/portables_connector,
-/obj/machinery/portable_atmospherics/canister/air/airlock,
-/obj/structure/window/reinforced{
+/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{
dir = 4
},
-/obj/machinery/door/window/eastleft{
- dir = 2
+/obj/effect/map_effect/marker/airlock/docking{
+ name = "airlock_dominian_corvette_dock_starboard";
+ master_tag = "airlock_dominian_corvette_dock_starboard";
+ landmark_tag = "airlock_dominian_corvette_dock_starboard"
},
-/obj/effect/floor_decal/corner/red/full{
- dir = 8
+/obj/structure/lattice/catwalk/indoor/grate,
+/obj/machinery/embedded_controller/radio/airlock/docking_port{
+ dir = 2;
+ pixel_y = 28;
+ pixel_x = -6
},
-/turf/simulated/floor/tiled/dark,
+/obj/machinery/airlock_sensor{
+ dir = 2;
+ pixel_y = 28;
+ pixel_x = 6
+ },
+/turf/simulated/floor/plating,
/area/ship/dominian_corvette/docking)
"jKA" = (
/obj/machinery/door/airlock/external,
@@ -2835,7 +2874,7 @@
name = "dominian_shuttle_dock";
req_one_access = list(212)
},
-/obj/machinery/atmospherics/pipe/manifold/hidden{
+/obj/machinery/atmospherics/pipe/manifold/hidden/aux{
dir = 8
},
/obj/structure/lattice/catwalk/indoor/grate,
@@ -2854,8 +2893,9 @@
/area/ship/dominian_corvette/engineering/atmos)
"jTb" = (
/obj/structure/ship_weapon_dummy/barrel,
+/obj/structure/ship_weapon_dummy/barrel,
/turf/template_noop,
-/area/ship/dominian_corvette/exterior)
+/area/ship/dominian_corvette/cannon)
"jTL" = (
/obj/effect/floor_decal/corner{
dir = 8
@@ -3044,10 +3084,9 @@
/turf/simulated/floor/tiled/white,
/area/ship/dominian_corvette/officer)
"kyi" = (
-/obj/machinery/atmospherics/pipe/simple/visible{
- dir = 4
+/obj/machinery/atmospherics/binary/pump/fuel{
+ dir = 8
},
-/obj/structure/lattice/catwalk/indoor/grate,
/turf/simulated/floor/plating,
/area/ship/dominian_corvette/propulsion/port)
"kze" = (
@@ -3142,10 +3181,8 @@
pixel_x = -22;
dir = 4
},
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
- dir = 1;
- frequency = 1441;
- id_tag = "ssmd_shuttle_pump"
+/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{
+ dir = 1
},
/obj/machinery/light/small/emergency{
dir = 8
@@ -3174,7 +3211,7 @@
/turf/simulated/floor/tiled/dark/full,
/area/shuttle/dominian_shuttle)
"kII" = (
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{
dir = 8
},
/obj/effect/map_effect/marker/airlock/shuttle{
@@ -3213,9 +3250,8 @@
name = "dominian_shuttle_dock";
req_one_access = list(212)
},
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 9;
- icon_state = "intact"
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
+ dir = 9
},
/obj/structure/cable{
icon_state = "1-2"
@@ -3307,7 +3343,7 @@
/turf/simulated/floor/tiled/dark,
/area/ship/dominian_corvette/hangar)
"kWO" = (
-/obj/machinery/atmospherics/pipe/manifold4w/visible,
+/obj/machinery/atmospherics/pipe/manifold4w/visible/fuel,
/turf/simulated/wall,
/area/ship/dominian_corvette/propulsion/port)
"kZr" = (
@@ -3382,14 +3418,6 @@
},
/turf/simulated/floor/tiled/white,
/area/ship/dominian_corvette/officer)
-"lsj" = (
-/obj/structure/lattice/catwalk,
-/obj/structure/railing/mapped{
- dir = 8
- },
-/obj/structure/ship_weapon_dummy/barrel,
-/turf/template_noop,
-/area/ship/dominian_corvette/exterior)
"lsu" = (
/turf/simulated/wall/shuttle/space_ship,
/area/ship/dominian_corvette/propulsion/port)
@@ -3431,6 +3459,9 @@
/obj/effect/floor_decal/corner/red{
dir = 5
},
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
+ dir = 9
+ },
/turf/simulated/floor/tiled/dark,
/area/ship/dominian_corvette/docking)
"luU" = (
@@ -3454,7 +3485,7 @@
/turf/simulated/floor/reinforced,
/area/ship/dominian_corvette/franny)
"lCA" = (
-/obj/machinery/atmospherics/pipe/simple/visible,
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
/obj/structure/cable{
icon_state = "1-8"
},
@@ -3486,7 +3517,12 @@
/turf/simulated/floor/tiled/dark,
/area/ship/dominian_corvette/engineering/atmos)
"lGZ" = (
-/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor,
+/obj/effect/map_effect/window_spawner/full/shuttle{
+ spawn_firedoor = 1;
+ spawn_grille = 1;
+ color = "#E14644";
+ frame_color = "#E14644"
+ },
/obj/effect/landmark/entry_point/aft{
name = "aft, cockpit"
},
@@ -3539,7 +3575,7 @@
/turf/simulated/floor/airless,
/area/ship/dominian_corvette/franny)
"lXK" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/black,
+/obj/machinery/atmospherics/pipe/simple/hidden/aux,
/turf/simulated/floor/tiled/dark,
/area/shuttle/dominian_shuttle)
"mbl" = (
@@ -3616,7 +3652,12 @@
/turf/simulated/wall,
/area/ship/dominian_corvette/hangar)
"mqx" = (
-/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor,
+/obj/effect/map_effect/window_spawner/full/shuttle{
+ spawn_firedoor = 1;
+ spawn_grille = 1;
+ color = "#E14644";
+ frame_color = "#E14644"
+ },
/turf/simulated/floor/plating,
/area/shuttle/dominian_shuttle)
"mqS" = (
@@ -3714,13 +3755,10 @@
/turf/simulated/floor/wood,
/area/ship/dominian_corvette/officer)
"mJZ" = (
-/obj/structure/bed/stool/chair/shuttle{
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden/black{
- dir = 8
- },
-/turf/simulated/floor/tiled/dark/full,
+/turf/simulated/floor/tiled/dark,
/area/shuttle/dominian_shuttle)
"mLa" = (
/obj/structure/table/steel,
@@ -3755,16 +3793,6 @@
},
/turf/simulated/floor/tiled/white,
/area/ship/dominian_corvette/infirmary)
-"mMv" = (
-/obj/machinery/door/airlock/external,
-/obj/effect/map_effect/marker/airlock/docking{
- name = "airlock_dominian_corvette_dock_starboard";
- master_tag = "airlock_dominian_corvette_dock_starboard";
- landmark_tag = "airlock_dominian_corvette_dock_starboard"
- },
-/obj/effect/map_effect/marker_helper/airlock/exterior,
-/turf/simulated/floor/plating,
-/area/ship/dominian_corvette/docking)
"mRY" = (
/turf/simulated/wall/shuttle/space_ship{
color = "#E14644"
@@ -3804,6 +3832,9 @@
/obj/effect/floor_decal/corner/red{
dir = 10
},
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
+ dir = 4
+ },
/turf/simulated/floor/tiled/dark,
/area/ship/dominian_corvette/docking/port)
"ncl" = (
@@ -3835,11 +3866,12 @@
/turf/simulated/floor/carpet/rubber,
/area/ship/dominian_corvette/cic)
"ndQ" = (
-/obj/structure/bed/stool/chair/shuttle{
- dir = 4
+/obj/effect/floor_decal/corner/red/full,
+/obj/structure/sign/vacuum{
+ pixel_y = -32
},
/turf/simulated/floor/tiled/dark,
-/area/shuttle/dominian_shuttle)
+/area/ship/dominian_corvette/docking)
"niu" = (
/turf/simulated/wall{
can_open = 1
@@ -3907,7 +3939,7 @@
/turf/simulated/floor/tiled/dark,
/area/ship/dominian_corvette/eva)
"noq" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
dir = 4
},
/obj/structure/cable{
@@ -3957,7 +3989,7 @@
/obj/machinery/alarm/south{
req_one_access = list(212)
},
-/obj/machinery/atmospherics/portables_connector{
+/obj/machinery/atmospherics/portables_connector/fuel{
dir = 4
},
/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
@@ -3981,6 +4013,9 @@
/obj/effect/floor_decal/corner/red{
dir = 10
},
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
+ dir = 4
+ },
/turf/simulated/floor/tiled/dark,
/area/ship/dominian_corvette/docking/port)
"nEY" = (
@@ -4252,16 +4287,9 @@
/turf/simulated/floor/tiled/dark,
/area/ship/dominian_corvette/engineering)
"oNR" = (
-/mob/living/heavy_vehicle/premade/ripley/loader,
-/obj/machinery/mech_recharger,
/obj/machinery/light/small/emergency{
dir = 1
},
-/obj/structure/sign/securearea{
- desc = "A danger sign which reads 'DANGER: EXPLOSIVE ORDINANCE' and 'THIS ROOM CONTAINS ORDINANCE THAT WILL KILL YOU INSTANTLY'.";
- name = "\improper DANGER: EXPLOSIVE ORDINANCE sign";
- pixel_y = 32
- },
/turf/simulated/floor/reinforced,
/area/ship/dominian_corvette/franny)
"oPa" = (
@@ -4271,10 +4299,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/visible,
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
/obj/structure/cable{
icon_state = "1-2"
},
+/obj/effect/floor_decal/industrial/warning,
/turf/simulated/floor/carpet/rubber,
/area/ship/dominian_corvette/engineering/atmos)
"oQe" = (
@@ -4295,12 +4324,16 @@
/turf/simulated/floor/tiled/white,
/area/ship/dominian_corvette/infirmary)
"oWU" = (
-/obj/machinery/atmospherics/pipe/simple/hidden,
-/obj/effect/floor_decal/corner/red/full,
-/obj/structure/sign/vacuum{
- pixel_x = -32
+/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{
+ dir = 4
},
-/turf/simulated/floor/tiled/dark,
+/obj/effect/map_effect/marker/airlock/docking{
+ name = "airlock_dominian_corvette_dock_starboard";
+ master_tag = "airlock_dominian_corvette_dock_starboard";
+ landmark_tag = "airlock_dominian_corvette_dock_starboard"
+ },
+/obj/structure/lattice/catwalk/indoor/grate,
+/turf/simulated/floor/plating,
/area/ship/dominian_corvette/docking)
"oXP" = (
/obj/machinery/atmospherics/unary/vent_pump/on,
@@ -4315,9 +4348,6 @@
/turf/simulated/floor/plating,
/area/ship/dominian_corvette/janitor)
"oYG" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 8
- },
/obj/structure/sign/vacuum{
pixel_y = 32
},
@@ -4531,10 +4561,10 @@
landmark_tag = "airlock_dominian_corvette_dock_port";
master_tag = "airlock_dominian_corvette_dock_port"
},
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+/obj/structure/lattice/catwalk/indoor/grate,
+/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{
dir = 8
},
-/obj/structure/lattice/catwalk/indoor/grate,
/turf/simulated/floor/plating,
/area/ship/dominian_corvette/docking/port)
"pLQ" = (
@@ -4632,8 +4662,8 @@
/turf/simulated/floor/tiled/white,
/area/ship/dominian_corvette/infirmary)
"qbw" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/black{
- dir = 8
+/obj/machinery/atmospherics/pipe/manifold/hidden/aux{
+ dir = 4
},
/obj/structure/lattice/catwalk/indoor/grate,
/obj/machinery/door/airlock/external{
@@ -4710,6 +4740,12 @@
/obj/effect/floor_decal/corner/red{
dir = 5
},
+/obj/machinery/alarm/north{
+ req_one_access = list(212)
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
+ dir = 4
+ },
/turf/simulated/floor/tiled/dark,
/area/ship/dominian_corvette/docking)
"qoT" = (
@@ -4749,9 +4785,8 @@
/area/space)
"qvK" = (
/obj/structure/lattice/catwalk/indoor/grate,
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 9;
- icon_state = "intact"
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
+ dir = 9
},
/turf/simulated/floor/plating,
/area/ship/dominian_corvette/hangar)
@@ -4769,27 +4804,9 @@
/turf/simulated/floor/tiled/white,
/area/ship/dominian_corvette/head)
"qAT" = (
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
- dir = 1
- },
-/obj/effect/map_effect/marker/airlock/docking{
- name = "airlock_dominian_corvette_dock_starboard";
- master_tag = "airlock_dominian_corvette_dock_starboard";
- landmark_tag = "airlock_dominian_corvette_dock_starboard"
- },
-/obj/machinery/embedded_controller/radio/airlock/docking_port{
- dir = 8;
- pixel_y = -6;
- pixel_x = 20
- },
-/obj/machinery/airlock_sensor{
- pixel_x = 20;
- dir = 8;
- pixel_y = 5
- },
-/obj/structure/lattice/catwalk/indoor/grate,
-/turf/simulated/floor/plating,
-/area/ship/dominian_corvette/docking)
+/obj/structure/ship_weapon_dummy,
+/turf/template_noop,
+/area/ship/dominian_corvette/franny)
"qHm" = (
/obj/effect/floor_decal/corner{
dir = 5
@@ -4819,14 +4836,20 @@
/obj/machinery/light{
dir = 4
},
+/obj/machinery/embedded_controller/radio/simple_docking_controller{
+ pixel_y = 26;
+ id_tag = "dominian_shuttle_dock";
+ name = "Dominian Shuttle docking port controller"
+ },
/turf/simulated/floor/tiled/dark/full,
/area/shuttle/dominian_shuttle)
"qJS" = (
-/obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
/obj/effect/landmark/entry_point/fore{
name = "fore, primary armament"
},
-/turf/simulated/floor/plating,
+/turf/simulated/wall/shuttle/space_ship{
+ color = "#E14644"
+ },
/area/ship/dominian_corvette/cannon)
"qLt" = (
/turf/simulated/wall/shuttle/space_ship{
@@ -4902,17 +4925,15 @@
/turf/simulated/floor/wood,
/area/ship/dominian_corvette/officer)
"qSI" = (
-/obj/machinery/door/airlock/external,
-/obj/machinery/atmospherics/pipe/manifold/hidden{
- dir = 8;
- icon_state = "map"
+/obj/machinery/door/airlock/external{
+ dir = 4
},
/obj/effect/map_effect/marker/airlock/docking{
name = "airlock_dominian_corvette_dock_starboard";
master_tag = "airlock_dominian_corvette_dock_starboard";
landmark_tag = "airlock_dominian_corvette_dock_starboard"
},
-/obj/effect/map_effect/marker_helper/airlock/interior,
+/obj/effect/map_effect/marker_helper/airlock/exterior,
/turf/simulated/floor/tiled/dark/full,
/area/ship/dominian_corvette/docking)
"qTV" = (
@@ -4959,6 +4980,9 @@
/obj/effect/floor_decal/corner/red{
dir = 10
},
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
+ dir = 4
+ },
/turf/simulated/floor/tiled/dark,
/area/ship/dominian_corvette/docking/port)
"rbu" = (
@@ -4984,9 +5008,8 @@
/turf/simulated/floor/holofloor/tiled/ramp,
/area/ship/dominian_corvette/bridge)
"rdJ" = (
-/obj/machinery/atmospherics/binary/pump/high_power{
- dir = 4;
- name = "Connector to Fuel Tank"
+/obj/machinery/atmospherics/binary/pump/fuel{
+ dir = 4
},
/obj/structure/cable{
d1 = 2;
@@ -5048,20 +5071,21 @@
/turf/simulated/floor/marble/dark,
/area/ship/dominian_corvette/temple)
"rog" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
+/obj/machinery/light{
+ dir = 1
},
/obj/effect/floor_decal/corner/red{
dir = 5
},
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
+ dir = 4
+ },
/turf/simulated/floor/tiled/dark,
/area/ship/dominian_corvette/docking)
"rpY" = (
/obj/effect/map_effect/window_spawner/full/borosilicate/reinforced/firedoor,
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/hidden/universal{
+ dir = 4
},
/turf/simulated/floor/tiled/dark,
/area/ship/dominian_corvette/engineering/atmos)
@@ -5087,20 +5111,24 @@
/turf/simulated/floor/tiled/white,
/area/ship/dominian_corvette/head)
"rsA" = (
-/obj/machinery/power/apc/north{
- req_access = list(212)
+/obj/machinery/door/airlock/external{
+ dir = 8
},
-/obj/structure/cable{
- d2 = 4;
- icon_state = "0-4"
+/obj/effect/map_effect/marker/airlock/docking{
+ name = "airlock_dominian_corvette_dock_starboard";
+ master_tag = "airlock_dominian_corvette_dock_starboard";
+ landmark_tag = "airlock_dominian_corvette_dock_starboard"
},
-/obj/machinery/light{
+/obj/effect/map_effect/marker_helper/airlock/interior,
+/obj/machinery/atmospherics/pipe/manifold/hidden/aux{
dir = 1
},
-/obj/effect/floor_decal/corner/red{
- dir = 5
+/obj/machinery/access_button{
+ pixel_x = 28;
+ pixel_y = 32;
+ dir = 2
},
-/turf/simulated/floor/tiled/dark,
+/turf/simulated/floor/tiled/dark/full,
/area/ship/dominian_corvette/docking)
"rtf" = (
/obj/structure/sign/flag/dominia{
@@ -5165,6 +5193,12 @@
icon_state = "1-2"
},
/obj/structure/lattice/catwalk/indoor/grate,
+/obj/machinery/embedded_controller/radio/simple_docking_controller{
+ id_tag = "dominian_shuttle_dock";
+ name = "Dominian Shuttle docking port controller";
+ dir = 8;
+ pixel_x = 23
+ },
/turf/simulated/floor/plating,
/area/ship/dominian_corvette/hangar)
"rJj" = (
@@ -5229,7 +5263,7 @@
/turf/simulated/floor/marble/dark,
/area/ship/dominian_corvette/temple)
"rYH" = (
-/obj/machinery/atmospherics/pipe/manifold4w/visible,
+/obj/machinery/atmospherics/pipe/manifold4w/visible/fuel,
/turf/simulated/wall,
/area/ship/dominian_corvette/propulsion)
"saf" = (
@@ -5242,9 +5276,8 @@
/turf/simulated/floor/plating,
/area/ship/dominian_corvette)
"scv" = (
-/obj/machinery/atmospherics/binary/pump/high_power{
- dir = 8;
- name = "Fuel to Thrusters"
+/obj/machinery/atmospherics/binary/pump/fuel{
+ dir = 8
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/tiled/dark,
@@ -5276,7 +5309,7 @@
"sfW" = (
/obj/structure/ship_weapon_dummy,
/turf/template_noop,
-/area/ship/dominian_corvette/exterior)
+/area/ship/dominian_corvette/cannon)
"shi" = (
/obj/machinery/alarm/west{
req_one_access = list(212)
@@ -5317,14 +5350,13 @@
/turf/simulated/floor/carpet/red,
/area/ship/dominian_corvette/recroom)
"sts" = (
-/obj/structure/ship_weapon_dummy,
-/obj/machinery/ship_weapon/lammergeier{
- pixel_y = -224;
- pixel_x = -32;
- weapon_id = "Lammergeier Cannon"
+/obj/structure/lattice/catwalk,
+/obj/structure/railing/mapped{
+ dir = 8
},
-/turf/simulated/floor/reinforced/airless,
-/area/ship/dominian_corvette/cannon)
+/obj/structure/ship_weapon_dummy/barrel,
+/turf/template_noop,
+/area/ship/dominian_corvette/franny)
"svf" = (
/obj/structure/table/standard,
/obj/item/device/multitool,
@@ -5352,7 +5384,7 @@
/obj/machinery/atmospherics/pipe/simple/visible/universal{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/visible,
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
/obj/structure/cable{
icon_state = "1-2"
},
@@ -5382,7 +5414,7 @@
/obj/structure/bed/stool/chair/office/bridge/pilot{
dir = 8
},
-/turf/simulated/floor/tiled/dark,
+/turf/simulated/floor/tiled/dark/full,
/area/shuttle/dominian_shuttle)
"sGv" = (
/obj/machinery/atmospherics/unary/engine,
@@ -5393,7 +5425,7 @@
/area/ship/dominian_corvette/propulsion)
"sKi" = (
/obj/structure/lattice/catwalk/indoor/grate,
-/obj/machinery/atmospherics/unary/vent_pump/high_volume,
+/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux,
/obj/effect/map_effect/marker_helper/airlock/out,
/obj/effect/map_effect/marker/airlock/shuttle{
name = "airlock_dominian_shuttle";
@@ -5423,10 +5455,12 @@
/turf/space,
/area/space)
"sRv" = (
-/obj/machinery/portable_atmospherics/powered/pump/filled,
/obj/structure/cable{
icon_state = "1-2"
},
+/obj/structure/table/rack,
+/obj/item/tank/hydrogen/shuttle,
+/obj/item/tank/hydrogen/shuttle,
/turf/simulated/floor/tiled/dark,
/area/ship/dominian_corvette/engineering/atmos)
"tca" = (
@@ -5466,7 +5500,12 @@
/turf/simulated/floor/plating,
/area/ship/dominian_corvette)
"tqX" = (
-/obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
+/obj/effect/map_effect/window_spawner/full/shuttle{
+ spawn_firedoor = 1;
+ spawn_grille = 1;
+ color = "#E14644";
+ frame_color = "#E14644"
+ },
/obj/machinery/door/blast/regular/open{
id = "dominian_corvette_bridge"
},
@@ -5478,9 +5517,6 @@
landmark_tag = "airlock_dominian_corvette_dock_port";
master_tag = "airlock_dominian_corvette_dock_port"
},
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
- dir = 8
- },
/obj/machinery/embedded_controller/radio/airlock/docking_port{
dir = 2;
pixel_y = 28;
@@ -5492,6 +5528,9 @@
pixel_x = 6
},
/obj/structure/lattice/catwalk/indoor/grate,
+/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{
+ dir = 8
+ },
/turf/simulated/floor/plating,
/area/ship/dominian_corvette/docking/port)
"trX" = (
@@ -5521,7 +5560,7 @@
},
/area/ship/dominian_corvette/engineering)
"tuF" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
dir = 10
},
/obj/structure/lattice/catwalk/indoor/grate,
@@ -5535,14 +5574,9 @@
/turf/simulated/floor/plating,
/area/shuttle/dominian_shuttle)
"tvD" = (
-/obj/effect/map_effect/marker/airlock/docking{
- name = "airlock_dominian_corvette_dock_port";
- landmark_tag = "airlock_dominian_corvette_dock_port";
- master_tag = "airlock_dominian_corvette_dock_port"
- },
-/obj/structure/lattice/catwalk/indoor/grate,
-/turf/simulated/floor/plating,
-/area/ship/dominian_corvette/docking/port)
+/obj/structure/ship_weapon_dummy,
+/turf/simulated/floor/airless,
+/area/ship/dominian_corvette/franny)
"txu" = (
/obj/machinery/light{
dir = 1
@@ -5647,7 +5681,12 @@
/turf/simulated/floor/plating,
/area/ship/dominian_corvette)
"tPT" = (
-/obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
+/obj/effect/map_effect/window_spawner/full/shuttle{
+ spawn_firedoor = 1;
+ spawn_grille = 1;
+ color = "#BDB6AE";
+ frame_color = "#BDB6AE"
+ },
/obj/machinery/door/blast/regular/open{
dir = 4;
id = "dominian_corvette_bridge"
@@ -5660,19 +5699,19 @@
},
/area/ship/dominian_corvette/engineering/atmos)
"tYf" = (
-/obj/machinery/atmospherics/portables_connector,
-/obj/machinery/portable_atmospherics/canister/air/airlock,
-/obj/machinery/door/window/eastleft{
- dir = 2
+/obj/effect/floor_decal/corner/red{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
+ dir = 4
},
/turf/simulated/floor/tiled/dark,
-/area/ship/dominian_corvette/docking/port)
+/area/ship/dominian_corvette/docking)
"tYz" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden{
+/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{
dir = 8
},
/obj/structure/lattice/catwalk/indoor/grate,
-/obj/structure/extinguisher_cabinet/west,
/turf/simulated/floor/plating,
/area/shuttle/dominian_shuttle)
"ubT" = (
@@ -5715,7 +5754,6 @@
/turf/simulated/floor/tiled/dark,
/area/shuttle/dominian_shuttle)
"umF" = (
-/obj/machinery/portable_atmospherics/powered/scrubber,
/obj/machinery/power/apc/high/south{
req_access = list(212)
},
@@ -5723,23 +5761,16 @@
/obj/machinery/light{
dir = 8
},
+/obj/machinery/portable_atmospherics/canister/hydrogen,
/turf/simulated/floor/tiled/dark,
/area/ship/dominian_corvette/engineering/atmos)
-"umS" = (
-/obj/structure/lattice/catwalk,
-/obj/structure/railing/mapped{
- dir = 8
- },
-/obj/structure/ship_weapon_dummy,
-/turf/template_noop,
-/area/ship/dominian_corvette/exterior)
"upC" = (
/turf/simulated/floor/tiled/ramp/bottom{
dir = 4
},
/area/ship/dominian_corvette/temple)
"urn" = (
-/obj/machinery/atmospherics/pipe/simple/visible{
+/obj/machinery/atmospherics/pipe/simple/visible/fuel{
dir = 5
},
/turf/simulated/wall,
@@ -5832,16 +5863,13 @@
landmark_tag = "airlock_dominian_corvette_dock_port";
master_tag = "airlock_dominian_corvette_dock_port"
},
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 5;
- icon_state = "intact"
- },
/obj/effect/map_effect/marker_helper/airlock/interior,
/obj/machinery/access_button{
pixel_x = -28;
pixel_y = -19;
dir = 1
},
+/obj/machinery/atmospherics/pipe/manifold/visible/aux,
/turf/simulated/floor/tiled/dark/full,
/area/ship/dominian_corvette/docking/port)
"uNg" = (
@@ -5958,9 +5986,8 @@
pixel_x = -28;
dir = 2
},
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 9;
- icon_state = "intact"
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
+ dir = 9
},
/obj/structure/lattice/catwalk/indoor/grate,
/obj/effect/landmark/entry_point/fore{
@@ -6018,7 +6045,7 @@
/turf/simulated/floor/plating,
/area/shuttle/dominian_shuttle)
"vwK" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
+/obj/machinery/atmospherics/pipe/simple/visible/aux{
dir = 4
},
/turf/simulated/wall/shuttle/space_ship,
@@ -6102,10 +6129,12 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/machinery/light,
/obj/effect/floor_decal/corner/red{
dir = 10
},
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
+ dir = 6
+ },
/turf/simulated/floor/tiled/dark,
/area/ship/dominian_corvette/docking/port)
"vPq" = (
@@ -6145,7 +6174,7 @@
name = "Propulsion";
dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/visible,
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
/obj/structure/cable{
icon_state = "1-2"
},
@@ -6153,22 +6182,13 @@
/turf/simulated/floor/tiled/dark,
/area/ship/dominian_corvette/propulsion/port)
"wjB" = (
-/obj/machinery/door/airlock/external,
-/obj/effect/map_effect/marker/airlock/docking{
- name = "airlock_dominian_corvette_dock_starboard";
- master_tag = "airlock_dominian_corvette_dock_starboard";
- landmark_tag = "airlock_dominian_corvette_dock_starboard"
+/obj/structure/lattice/catwalk,
+/obj/structure/railing/mapped{
+ dir = 8
},
-/obj/effect/map_effect/marker_helper/airlock/exterior,
-/obj/machinery/access_button{
- pixel_x = 28;
- dir = 2
- },
-/obj/effect/shuttle_landmark/dominian_corvette/dock{
- dir = 1
- },
-/turf/simulated/floor/plating,
-/area/ship/dominian_corvette/docking)
+/obj/structure/ship_weapon_dummy,
+/turf/template_noop,
+/area/ship/dominian_corvette/franny)
"woN" = (
/obj/structure/lattice/catwalk/indoor/grate,
/obj/machinery/light/small/emergency{
@@ -6212,7 +6232,9 @@
/turf/simulated/floor/tiled/dark,
/area/ship/dominian_corvette)
"wxN" = (
-/obj/machinery/atmospherics/binary/pump/high_power,
+/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/machinery/atmospherics/portables_connector/fuel,
/obj/structure/sign/flag/dominia{
pixel_x = -32
},
@@ -6234,10 +6256,24 @@
/turf/simulated/floor/tiled/dark,
/area/ship/dominian_corvette/janitor)
"wAt" = (
-/obj/effect/landmark/entry_point/starboard{
- name = "starboard, starboard docking"
+/obj/machinery/door/airlock/external{
+ dir = 4
},
-/turf/simulated/wall/shuttle/space_ship,
+/obj/effect/map_effect/marker/airlock/docking{
+ name = "airlock_dominian_corvette_dock_starboard";
+ master_tag = "airlock_dominian_corvette_dock_starboard";
+ landmark_tag = "airlock_dominian_corvette_dock_starboard"
+ },
+/obj/effect/map_effect/marker_helper/airlock/exterior,
+/obj/machinery/access_button{
+ pixel_x = -8;
+ dir = 8;
+ pixel_y = -28
+ },
+/obj/effect/shuttle_landmark/dominian_corvette/dock{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/dark/full,
/area/ship/dominian_corvette/docking)
"wBq" = (
/obj/effect/floor_decal/corner{
@@ -6263,10 +6299,10 @@
/turf/simulated/floor/reinforced,
/area/ship/dominian_corvette/cannon)
"wDu" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden/black,
+/obj/machinery/atmospherics/pipe/simple/hidden/aux,
/turf/simulated/floor/tiled/dark,
/area/shuttle/dominian_shuttle)
"wEY" = (
@@ -6280,7 +6316,7 @@
/turf/simulated/floor/carpet/rubber,
/area/ship/dominian_corvette/cic)
"wGu" = (
-/obj/machinery/atmospherics/pipe/manifold/visible,
+/obj/machinery/atmospherics/pipe/manifold/hidden/fuel,
/obj/structure/lattice/catwalk/indoor/grate,
/turf/simulated/floor/plating,
/area/ship/dominian_corvette/propulsion)
@@ -6316,7 +6352,7 @@
/turf/simulated/floor/tiled/dark,
/area/ship/dominian_corvette/bridge)
"wIV" = (
-/obj/machinery/atmospherics/pipe/simple/visible{
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
dir = 5
},
/turf/simulated/floor/tiled/dark,
@@ -6332,7 +6368,7 @@
/turf/simulated/floor/carpet/rubber,
/area/ship/dominian_corvette/engineering/atmos)
"wQu" = (
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{
dir = 4
},
/obj/effect/map_effect/marker/airlock/shuttle{
@@ -6349,7 +6385,7 @@
/turf/simulated/floor/airless,
/area/shuttle/dominian_shuttle)
"wQA" = (
-/obj/machinery/atmospherics/pipe/manifold/visible{
+/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{
dir = 4
},
/obj/structure/cable{
@@ -6392,37 +6428,13 @@
/turf/simulated/floor/carpet/rubber,
/area/ship/dominian_corvette/engineering/atmos)
"xbK" = (
-/obj/structure/table/rack,
-/obj/effect/floor_decal/industrial/outline/red,
+/obj/machinery/portable_atmospherics/canister/air/airlock,
/obj/machinery/door/window/eastleft{
dir = 2
},
-/obj/machinery/light/small/emergency{
- dir = 1
- },
-/obj/item/ship_ammunition/francisca/ap{
- pixel_y = 8
- },
-/obj/item/ship_ammunition/francisca/ap{
- pixel_y = 8
- },
-/obj/item/ship_ammunition/francisca/ap{
- pixel_y = 8
- },
-/obj/item/ship_ammunition/francisca/ap{
- pixel_y = 8
- },
-/obj/item/ship_ammunition/francisca/ap{
- pixel_y = 8
- },
-/obj/item/ship_ammunition/francisca/ap{
- pixel_y = 8
- },
-/obj/item/ship_ammunition/francisca/ap{
- pixel_y = 8
- },
-/turf/simulated/floor/reinforced,
-/area/ship/dominian_corvette/franny)
+/obj/machinery/atmospherics/portables_connector/aux,
+/turf/simulated/floor/tiled/dark,
+/area/ship/dominian_corvette/docking)
"xbY" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -6433,9 +6445,6 @@
/turf/simulated/floor/tiled/dark,
/area/ship/dominian_corvette/recroom)
"xdJ" = (
-/obj/effect/floor_decal/industrial/loading/yellow{
- dir = 8
- },
/obj/machinery/light/small/emergency,
/turf/simulated/floor/reinforced,
/area/ship/dominian_corvette/franny)
@@ -6536,10 +6545,8 @@
pixel_y = -6;
pixel_x = 20
},
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
- dir = 1;
- frequency = 1441;
- id_tag = "ssmd_shuttle_pump"
+/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{
+ dir = 1
},
/obj/machinery/light/small/emergency{
dir = 4
@@ -6595,9 +6602,11 @@
/turf/simulated/floor/tiled/dark,
/area/ship/dominian_corvette/hangar)
"xPN" = (
-/obj/machinery/atmospherics/portables_connector,
-/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
-/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/effect/floor_decal/industrial/outline/emergency_closet,
+/obj/machinery/portable_atmospherics/canister/air/airlock,
+/obj/machinery/atmospherics/portables_connector/aux{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/shuttle/dominian_shuttle)
"xRk" = (
@@ -6702,12 +6711,14 @@
/turf/simulated/floor/tiled/white,
/area/ship/dominian_corvette/head)
"yhK" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 4
+/obj/machinery/ship_weapon/lammergeier{
+ pixel_y = -33;
+ pixel_x = 1;
+ weapon_id = "Lammergeier Cannon"
},
-/obj/structure/lattice/catwalk/indoor/grate,
-/turf/simulated/floor/plating,
-/area/shuttle/dominian_shuttle)
+/obj/structure/ship_weapon_dummy/barrel,
+/turf/template_noop,
+/area/ship/dominian_corvette/cannon)
"yjk" = (
/obj/effect/map_effect/marker/airlock/docking{
landmark_tag = "nav_hangar_dominia";
@@ -24070,7 +24081,7 @@ xRX
xRX
xRX
xRX
-xRX
+iyN
xRX
xRX
xRX
@@ -26336,7 +26347,7 @@ xRX
xRX
xRX
xRX
-xRX
+iyN
xRX
xRX
xRX
@@ -32076,7 +32087,7 @@ xRX
xRX
xRX
xRX
-xRX
+iyN
xRX
xRX
xRX
@@ -33310,10 +33321,8 @@ xRX
xRX
xRX
xfv
-xfv
+qSI
wAt
-pMz
-xfv
xfv
xRX
xRX
@@ -33464,6 +33473,8 @@ xRX
xRX
xRX
xRX
+xRX
+xRX
"}
(105,1,1) = {"
xRX
@@ -33569,9 +33580,9 @@ xRX
pMz
jJa
oWU
-qSI
-hbA
-mMv
+pMz
+xRX
+xRX
xRX
xRX
xRX
@@ -33823,12 +33834,12 @@ xRX
xRX
xRX
xRX
-xfv
+pMz
rsA
-fif
-iyN
-qAT
-wjB
+ctK
+pMz
+xRX
+xRX
xRX
xRX
xRX
@@ -34021,7 +34032,7 @@ xRX
xRX
xRX
xRX
-xRX
+iyN
xRX
xRX
xRX
@@ -34082,9 +34093,7 @@ xRX
xRX
xfv
cUE
-fif
-pMz
-xfv
+ndQ
xfv
xRX
xRX
@@ -34235,6 +34244,8 @@ xRX
xRX
xRX
xRX
+xRX
+xRX
"}
(108,1,1) = {"
xRX
@@ -34338,7 +34349,7 @@ xRX
xRX
xRX
pMz
-rog
+tYf
fif
pMz
xRX
@@ -34594,10 +34605,10 @@ xRX
xRX
xRX
xRX
-pMz
+xfv
rog
fif
-jrv
+xfv
xRX
xRX
xRX
@@ -34851,10 +34862,10 @@ xRX
xRX
xRX
xRX
-xfv
-rog
+pMz
+hWr
fif
-xfv
+jrv
xRX
xRX
xRX
@@ -35107,7 +35118,7 @@ xRX
xRX
xRX
xRX
-xRX
+pMz
xfv
qnr
kis
@@ -35364,8 +35375,8 @@ tub
tub
uNg
xRX
-xRX
pMz
+xbK
luJ
fUN
pMz
@@ -36379,7 +36390,7 @@ sGv
dfw
kPs
eKR
-fSC
+eKR
iKq
iKq
iKq
@@ -36402,12 +36413,12 @@ xRX
xRX
xRX
xRX
-xRX
-xRX
-xRX
-xRX
-xRX
-xRX
+qAT
+tvD
+tvD
+wjB
+sts
+bTU
xRX
xRX
xRX
@@ -36657,14 +36668,14 @@ uxh
xDn
bja
wCU
-xRX
-xRX
-sfW
-doI
-doI
-umS
-lsj
-bTU
+jLX
+jLX
+lPG
+qIf
+rya
+vwC
+vwC
+rde
xRX
xRX
xRX
@@ -36914,14 +36925,14 @@ kLr
xDn
nBv
phv
-jLX
-jLX
-lPG
-qIf
-rya
-vwC
-vwC
-rde
+phv
+phv
+uOY
+phv
+wCU
+xRX
+xRX
+xRX
xRX
xRX
xRX
@@ -37171,9 +37182,9 @@ lKG
xmH
oXW
phv
-phv
-phv
-uOY
+cZv
+qgN
+fXH
phv
wCU
xRX
@@ -37428,8 +37439,8 @@ bot
xmH
niu
phv
-xbK
-qgN
+aaJ
+lwX
xdJ
phv
lGD
@@ -37685,9 +37696,9 @@ qpo
xmH
xTW
phv
-aaJ
-lwX
+fBb
lwX
+hbA
phv
awG
iJi
@@ -37942,7 +37953,7 @@ fvv
xmH
wzs
phv
-fBb
+lwX
aRr
ejW
phv
@@ -38427,9 +38438,9 @@ paP
mZy
aSc
hiw
-fXH
-fZl
-yhK
+mJZ
+aMY
+flC
cMo
qZm
cMo
@@ -38685,7 +38696,7 @@ aMY
rxI
agx
mJZ
-ndQ
+aMY
flC
cMo
cMo
@@ -38936,7 +38947,7 @@ xRX
xRX
xRX
lGZ
-orm
+uCS
fZq
aow
asL
@@ -39193,7 +39204,7 @@ xRX
xRX
xRX
mqx
-uCS
+orm
rLK
nva
ugF
@@ -39454,7 +39465,7 @@ iCK
qIu
kIy
aMY
-ctK
+aMY
aMY
aMY
flC
@@ -40514,7 +40525,7 @@ cnH
hcl
hhf
fyC
-aag
+lfC
hcl
awG
iJi
@@ -40771,16 +40782,16 @@ aeN
hcl
hcl
txu
-lfC
-hcl
-hDV
-xRX
-xRX
-xRX
-xRX
-xRX
-xRX
-xRX
+fyC
+cno
+cno
+sfW
+sfW
+sfW
+sfW
+sfW
+sfW
+yhK
xRX
xRX
xRX
@@ -41028,9 +41039,9 @@ gVp
dTw
aep
fyC
-ssT
-cZD
-ssT
+cno
+cno
+cno
ssT
sfW
sfW
@@ -41285,16 +41296,16 @@ uFI
iWi
aep
fyC
+cno
+cno
+cno
ssT
-ssT
-ssT
-sts
-sfW
-sfW
-sfW
-sfW
-sfW
-jTb
+doI
+vwC
+vwC
+vwC
+rde
+xRX
xRX
xRX
xRX
@@ -41541,16 +41552,16 @@ aep
oDq
iEY
aep
-pLQ
-cno
-cno
-cno
-hWr
+fyC
+erT
+fSC
+fZl
vwC
-vwC
-vwC
-vwC
-rde
+aag
+xRX
+xRX
+xRX
+xRX
xRX
xRX
xRX
@@ -41797,10 +41808,10 @@ aCZ
aep
aHt
ogz
-aep
+nuI
+pLQ
+kDV
fyC
-erT
-cZv
qJS
xRX
xRX
@@ -42055,10 +42066,10 @@ nuI
rzi
mCr
nuI
-pLQ
-kDV
+pGp
+qLt
+hDV
hDV
-xRX
xRX
xRX
xRX
@@ -42311,10 +42322,10 @@ xRX
xRX
xRX
xRX
-nuI
-pGp
-qLt
-hDV
+xRX
+xRX
+xRX
+xRX
xRX
xRX
xRX
@@ -42815,6 +42826,7 @@ tSZ
pfE
ioG
vJm
+cZD
pfE
xRX
xRX
@@ -42972,7 +42984,6 @@ xRX
xRX
xRX
xRX
-xRX
"}
(142,1,1) = {"
xRX
@@ -43073,7 +43084,7 @@ pfE
jpw
nDC
pfE
-xRX
+pfE
xRX
xRX
xRX
@@ -43582,7 +43593,7 @@ xRX
xRX
xRX
xRX
-pfE
+xRX
eqL
pKp
nbQ
@@ -43839,8 +43850,8 @@ xRX
xRX
xRX
xRX
+xRX
iTC
-tYf
cZb
raf
pfE
@@ -44096,7 +44107,7 @@ xRX
xRX
xRX
xRX
-pfE
+xRX
eqL
oYG
raf
@@ -44869,8 +44880,8 @@ xRX
xRX
xRX
eqL
-tvD
-tvD
+myM
+sdI
eqL
xRX
xRX
@@ -45125,10 +45136,6 @@ xRX
xRX
xRX
xRX
-eqL
-myM
-sdI
-eqL
xRX
xRX
xRX
@@ -45189,6 +45196,10 @@ xRX
xRX
xRX
xRX
+iyN
+xRX
+xRX
+xRX
xRX
xRX
xRX
@@ -49715,7 +49726,7 @@ xRX
xRX
xRX
xRX
-xRX
+iyN
xRX
xRX
xRX
@@ -55184,8 +55195,8 @@ xRX
xRX
xRX
xRX
-xRX
-xRX
+iyN
+iyN
xRX
xRX
xRX
@@ -56685,7 +56696,7 @@ xRX
xRX
xRX
xRX
-xRX
+iyN
xRX
xRX
xRX
diff --git a/maps/away/ships/elyra/elyra_corvette/elyra_corvette.dmm b/maps/away/ships/elyra/elyra_corvette/elyra_corvette.dmm
index bb1de024778..3a3ee0d055b 100644
--- a/maps/away/ships/elyra/elyra_corvette/elyra_corvette.dmm
+++ b/maps/away/ships/elyra/elyra_corvette/elyra_corvette.dmm
@@ -155,7 +155,9 @@
/turf/simulated/floor/tiled/dark,
/area/ship/elyran_corvette/hangar)
"aw" = (
-/obj/machinery/door/firedoor/noid,
+/obj/machinery/door/firedoor/noid{
+ dir = 4
+ },
/obj/structure/cable{
d1 = 4;
d2 = 8;
@@ -229,12 +231,8 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/starboardhallway)
-"aM" = (
-/obj/effect/decal/cleanable/blood/oil,
-/turf/simulated/floor,
-/area/ship/elyran_corvette/hangar)
"aN" = (
/obj/structure/railing/mapped{
icon_state = "railing0-0";
@@ -484,7 +482,7 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/engineering)
"cn" = (
/obj/structure/cable{
@@ -598,7 +596,7 @@
/area/ship/elyran_corvette/porthallway)
"cI" = (
/obj/machinery/floodlight,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/hangar)
"cJ" = (
/obj/structure/sign/nosmoking_1{
@@ -731,7 +729,7 @@
dir = 8
},
/obj/structure/lattice/catwalk/indoor/grate/dark,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/portthrust)
"dV" = (
/obj/effect/floor_decal/industrial/warning{
@@ -767,7 +765,7 @@
target_pressure = 250
},
/obj/structure/lattice/catwalk/indoor/grate/dark,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/shuttle/elyran_shuttle)
"ef" = (
/obj/structure/bed/stool/chair/office/dark{
@@ -802,7 +800,7 @@
/area/ship/elyran_corvette/portwep)
"et" = (
/obj/structure/lattice/catwalk/indoor/grate/dark,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/portthrust)
"ew" = (
/obj/effect/landmark/entry_point/starboard{
@@ -825,7 +823,7 @@
dir = 4;
icon_state = "map-scrubbers"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/starboardhallway)
"ez" = (
/obj/effect/floor_decal/corner/brown{
@@ -838,7 +836,7 @@
dir = 5
},
/obj/structure/lattice/catwalk/indoor/grate/dark,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/portthrust)
"eD" = (
/obj/effect/floor_decal/corner/yellow{
@@ -901,7 +899,12 @@
/turf/simulated/floor/tiled,
/area/ship/elyran_corvette/porthallway)
"eY" = (
-/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor,
+/obj/effect/map_effect/window_spawner/full/shuttle{
+ spawn_firedoor = 1;
+ spawn_grille = 1;
+ color = "#BDB6AE";
+ frame_color = "#BDB6AE"
+ },
/obj/effect/landmark/entry_point/port{
name = "port, captains quarters"
},
@@ -1117,7 +1120,7 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/mainhallway)
"fN" = (
/obj/machinery/washing_machine{
@@ -1232,7 +1235,12 @@
/turf/simulated/floor/tiled/white,
/area/ship/elyran_corvette/medbay)
"gc" = (
-/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor,
+/obj/effect/map_effect/window_spawner/full/shuttle{
+ spawn_firedoor = 1;
+ spawn_grille = 1;
+ color = "#BDB6AE";
+ frame_color = "#BDB6AE"
+ },
/obj/structure/cable{
icon_state = "0-8"
},
@@ -1423,7 +1431,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/lattice/catwalk/indoor/grate/dark,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/starboardthrust)
"hh" = (
/obj/structure/lattice/catwalk,
@@ -1443,6 +1451,9 @@
/obj/machinery/computer/ship/navigation/terminal{
dir = 1
},
+/obj/structure/sign/flag/damascus{
+ pixel_y = -32
+ },
/turf/simulated/floor/tiled/dark,
/area/ship/elyran_corvette/cic)
"hp" = (
@@ -1616,7 +1627,7 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/mainhallway)
"ig" = (
/obj/machinery/door/firedoor/noid,
@@ -1695,11 +1706,6 @@
/obj/machinery/atmospherics/pipe/manifold/hidden{
dir = 1
},
-/obj/machinery/access_button{
- pixel_x = -22;
- dir = 4;
- pixel_y = 30
- },
/obj/machinery/door/airlock/external,
/obj/effect/map_effect/marker_helper/airlock/exterior,
/obj/effect/map_effect/marker/airlock/shuttle{
@@ -1709,7 +1715,20 @@
req_one_access = list(207);
shuttle_tag = "Elyran Naval Shuttle"
},
-/turf/simulated/floor,
+/obj/machinery/airlock_sensor/airlock_exterior{
+ pixel_x = 26;
+ pixel_y = 8;
+ dir = 1
+ },
+/obj/machinery/access_button{
+ pixel_x = 37;
+ dir = 1;
+ pixel_y = 7
+ },
+/obj/effect/landmark/entry_point/aft{
+ name = "aft, airlock"
+ },
+/turf/simulated/floor/plating,
/area/shuttle/elyran_shuttle)
"iz" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -1741,7 +1760,7 @@
/area/ship/elyran_corvette/dorm)
"iI" = (
/obj/effect/decal/cleanable/generic,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/hangar)
"iK" = (
/obj/effect/floor_decal/corner/red{
@@ -1767,7 +1786,7 @@
dir = 6
},
/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/mainhallway)
"iQ" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
@@ -1801,7 +1820,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/lattice/catwalk/indoor/grate/dark,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/portthrust)
"iX" = (
/turf/simulated/wall/shuttle/space_ship,
@@ -1837,7 +1856,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/lattice/catwalk/indoor/grate/dark,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/starboardthrust)
"js" = (
/obj/machinery/power/apc/east{
@@ -1911,7 +1930,7 @@
d2 = 8;
icon_state = "4-8"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/hangar)
"jX" = (
/obj/structure/cable{
@@ -1938,7 +1957,7 @@
"kf" = (
/obj/item/clothing/head/cone,
/obj/effect/decal/cleanable/liquid_fuel,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/hangar)
"kr" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
@@ -1996,7 +2015,9 @@
/turf/simulated/floor/tiled/dark,
/area/ship/elyran_corvette/starboardhallway)
"kH" = (
-/obj/machinery/door/firedoor/noid,
+/obj/machinery/door/firedoor/noid{
+ dir = 4
+ },
/obj/structure/cable{
d1 = 4;
d2 = 8;
@@ -2176,7 +2197,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/lattice/catwalk/indoor/grate/dark,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/starboardthrust)
"lC" = (
/obj/structure/platform,
@@ -2268,7 +2289,7 @@
master_tag = "airlock_elyran_corvette_dock_port";
name = "airlock_elyran_corvette_dock_port"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/mainhallway)
"mj" = (
/obj/effect/floor_decal/spline/fancy/wood{
@@ -2345,7 +2366,7 @@
icon_state = "2-4"
},
/obj/structure/lattice/catwalk/indoor/grate/dark,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/starboardthrust)
"mV" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -2426,7 +2447,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/mainhallway)
"nj" = (
/obj/structure/table/steel,
@@ -2441,6 +2462,9 @@
/obj/machinery/light/colored/decayed{
dir = 1
},
+/obj/structure/sign/flag/newsuez{
+ pixel_y = 32
+ },
/turf/simulated/floor/tiled/dark,
/area/ship/elyran_corvette/cic)
"nm" = (
@@ -2452,7 +2476,7 @@
dir = 10
},
/obj/structure/lattice/catwalk/indoor/grate/dark,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/starboardthrust)
"nt" = (
/obj/machinery/atmospherics/pipe/simple/hidden/black{
@@ -2622,7 +2646,7 @@
dir = 8
},
/obj/structure/lattice/catwalk/indoor/grate,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/engineering)
"og" = (
/obj/structure/cable{
@@ -2643,7 +2667,7 @@
dir = 8
},
/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/engineering)
"ol" = (
/obj/effect/floor_decal/industrial/outline/engineering,
@@ -2910,7 +2934,9 @@
/turf/simulated/floor/tiled/white,
/area/ship/elyran_corvette/messhall)
"pK" = (
-/obj/machinery/door/firedoor/noid,
+/obj/machinery/door/firedoor/noid{
+ dir = 4
+ },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 8
},
@@ -2970,15 +2996,12 @@
/turf/simulated/floor/lino,
/area/ship/elyran_corvette/messhall)
"qy" = (
-/obj/effect/shuttle_landmark/elyran_shuttle/hangar{
- dir = 1
- },
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/hangar)
"qA" = (
/obj/machinery/door/firedoor/noid,
@@ -3140,7 +3163,7 @@
master_tag = "airlock_elyran_corvette_dock_starboard";
name = "airlock_elyran_corvette_dock_starboard"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/mainhallway)
"rk" = (
/obj/effect/floor_decal/spline/plain/cee/beige,
@@ -3184,7 +3207,7 @@
pixel_y = 32;
pixel_x = 2
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/mainhallway)
"rp" = (
/obj/effect/floor_decal/corner/beige{
@@ -3219,7 +3242,7 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/porthallway)
"rL" = (
/obj/structure/table/steel,
@@ -3316,7 +3339,7 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/mainhallway)
"ss" = (
/obj/structure/railing/mapped{
@@ -3360,6 +3383,9 @@
/obj/machinery/light/colored/decayed{
dir = 1
},
+/obj/structure/sign/flag/medina{
+ pixel_y = 32
+ },
/turf/simulated/floor/tiled/dark,
/area/ship/elyran_corvette/cic)
"sJ" = (
@@ -3512,34 +3538,20 @@
d2 = 8;
icon_state = "4-8"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/hangar)
"tM" = (
-/obj/effect/landmark/entry_point/aft{
- name = "aft, airlock"
- },
/obj/structure/bed/handrail{
dir = 8
},
-/obj/structure/lattice/catwalk/indoor,
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/machinery/airlock_sensor/airlock_exterior{
- pixel_x = -21;
- pixel_y = 8;
- dir = 4
+/obj/effect/shuttle_landmark/elyran_shuttle/hangar{
+ dir = 1
},
-/obj/effect/map_effect/marker_helper/airlock/exterior,
-/obj/effect/map_effect/marker/airlock/shuttle{
- cycle_to_external_air = 1;
- master_tag = "airlock_elyran_shuttle";
- name = "airlock_elyran_shuttle";
- req_one_access = list(207);
- shuttle_tag = "Elyran Naval Shuttle"
- },
-/turf/simulated/floor,
-/area/shuttle/elyran_shuttle)
+/turf/simulated/floor/plating,
+/area/ship/elyran_corvette/hangar)
"tS" = (
/obj/machinery/light/colored/decayed{
dir = 8
@@ -3598,6 +3610,9 @@
/obj/machinery/computer/ship/sensors/terminal{
dir = 1
},
+/obj/structure/sign/flag/elyra{
+ pixel_y = -32
+ },
/turf/simulated/floor/tiled/dark,
/area/ship/elyran_corvette/cic)
"uf" = (
@@ -3690,7 +3705,7 @@
master_tag = "airlock_elyra_corvette_port_1";
name = "airlock_elyra_corvette_port_1"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/portthrust)
"uD" = (
/obj/structure/lattice/catwalk/indoor/grate,
@@ -3705,7 +3720,7 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/mainhallway)
"uH" = (
/obj/machinery/door/airlock/external{
@@ -3744,7 +3759,9 @@
},
/area/ship/elyran_corvette/cic)
"vc" = (
-/obj/machinery/door/firedoor/noid,
+/obj/machinery/door/firedoor/noid{
+ dir = 4
+ },
/obj/structure/cable{
d1 = 4;
d2 = 8;
@@ -3843,7 +3860,12 @@
/turf/simulated/floor/tiled/dark/full,
/area/ship/elyran_corvette/hangar)
"vI" = (
-/obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
+/obj/effect/map_effect/window_spawner/full/shuttle{
+ spawn_firedoor = 1;
+ spawn_grille = 1;
+ color = "#BDB6AE";
+ frame_color = "#BDB6AE"
+ },
/obj/effect/landmark/entry_point/fore{
name = "fore, cockpit"
},
@@ -3942,7 +3964,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/effect/decal/cleanable/dirt,
/obj/structure/lattice/catwalk/indoor/grate/dark,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/portthrust)
"wm" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
@@ -4053,7 +4075,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/engineering)
"wW" = (
/obj/machinery/portable_atmospherics/canister/oxygen,
@@ -4097,7 +4119,9 @@
/turf/simulated/floor/tiled/dark/full,
/area/ship/elyran_corvette/hangar)
"xc" = (
-/obj/machinery/door/firedoor/noid,
+/obj/machinery/door/firedoor/noid{
+ dir = 4
+ },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -4198,7 +4222,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/mainhallway)
"xC" = (
/obj/structure/railing/mapped{
@@ -4220,7 +4244,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 8
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/cic)
"xE" = (
/obj/structure/table/rack,
@@ -4322,13 +4346,11 @@
master_tag = "airlock_elyra_corvette_starboard_1";
name = "airlock_elyra_corvette_starboard_1"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/starboardthrust)
"yi" = (
/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/machinery/power/smes/buildable/horizon_shuttle{
- charge = 2e+006
- },
+/obj/machinery/power/smes/buildable/third_party_shuttle,
/obj/structure/cable{
d2 = 4;
icon_state = "0-4"
@@ -4336,7 +4358,7 @@
/obj/structure/sign/electricshock{
pixel_x = -32
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/engineering)
"yl" = (
/obj/structure/platform_deco{
@@ -4355,7 +4377,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/lattice/catwalk/indoor/grate/dark,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/starboardthrust)
"ys" = (
/obj/effect/floor_decal/spline/fancy/wood{
@@ -4519,7 +4541,12 @@
/turf/simulated/floor/tiled/white,
/area/ship/elyran_corvette/messhall)
"zv" = (
-/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor,
+/obj/effect/map_effect/window_spawner/full/shuttle{
+ spawn_firedoor = 1;
+ spawn_grille = 1;
+ color = "#BDB6AE";
+ frame_color = "#BDB6AE"
+ },
/obj/machinery/door/blast/regular/open{
id = "elyran_corvette_crew_viewing"
},
@@ -4543,7 +4570,12 @@
},
/area/ship/elyran_corvette/hangar)
"zB" = (
-/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor,
+/obj/effect/map_effect/window_spawner/full/shuttle{
+ spawn_firedoor = 1;
+ spawn_grille = 1;
+ color = "#BDB6AE";
+ frame_color = "#BDB6AE"
+ },
/obj/machinery/door/blast/regular/open{
id = "elyran_corvette_crew_viewing"
},
@@ -4569,7 +4601,12 @@
/turf/simulated/floor/tiled/dark,
/area/ship/elyran_corvette/portthrust)
"zJ" = (
-/obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
+/obj/effect/map_effect/window_spawner/full/shuttle{
+ spawn_firedoor = 1;
+ spawn_grille = 1;
+ color = "#BDB6AE";
+ frame_color = "#BDB6AE"
+ },
/obj/machinery/door/blast/regular/open{
id = "elyran_shuttle_shutters"
},
@@ -4597,13 +4634,11 @@
/turf/simulated/floor/tiled/dark,
/area/ship/elyran_corvette/starboardhallway)
"zP" = (
-/obj/effect/decal/cleanable/generic{
- layer = 2.81
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 5
},
-/obj/effect/decal/cleanable/liquid_fuel,
-/obj/effect/decal/cleanable/liquid_fuel,
-/turf/simulated/floor,
-/area/ship/elyran_corvette/hangar)
+/turf/simulated/wall/shuttle/space_ship,
+/area/shuttle/elyran_shuttle)
"zR" = (
/obj/machinery/atmospherics/binary/pump/high_power{
dir = 8;
@@ -4627,7 +4662,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/mainhallway)
"zZ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -4747,7 +4782,9 @@
/area/ship/elyran_corvette/portwep)
"AM" = (
/obj/structure/table/stone/marble,
-/obj/machinery/door/firedoor/noid,
+/obj/machinery/door/firedoor/noid{
+ dir = 4
+ },
/turf/simulated/floor/tiled/white,
/area/ship/elyran_corvette/messhall)
"AN" = (
@@ -4779,7 +4816,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/structure/lattice/catwalk/indoor/grate/dark,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/portthrust)
"AT" = (
/obj/effect/floor_decal/corner/brown{
@@ -4843,7 +4880,7 @@
d2 = 4;
icon_state = "2-4"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/mainhallway)
"Bd" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -4921,7 +4958,7 @@
dir = 9
},
/obj/structure/lattice/catwalk/indoor/grate/dark,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/starboardthrust)
"BF" = (
/obj/structure/closet/emcloset,
@@ -4961,9 +4998,8 @@
/turf/simulated/floor/carpet/rubber,
/area/ship/elyran_corvette/engineering)
"BR" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden{
- dir = 4;
- icon_state = "map"
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 9
},
/turf/simulated/wall/shuttle/space_ship,
/area/shuttle/elyran_shuttle)
@@ -5087,7 +5123,7 @@
dir = 1
},
/obj/effect/floor_decal/industrial/outline/yellow,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/shuttle/elyran_shuttle)
"CY" = (
/obj/effect/floor_decal/corner/yellow/full,
@@ -5215,7 +5251,7 @@
dir = 8
},
/obj/structure/lattice/catwalk/indoor/grate,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/porthallway)
"DG" = (
/obj/structure/platform,
@@ -5277,7 +5313,7 @@
master_tag = "airlock_elyra_corvette_port_2";
name = "airlock_elyra_corvette_port_2"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/hangar)
"DZ" = (
/turf/simulated/wall/shuttle/space_ship,
@@ -5494,7 +5530,7 @@
/obj/structure/cable{
icon_state = "1-4"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/porthallway)
"Ff" = (
/obj/structure/table/steel,
@@ -5586,7 +5622,7 @@
master_tag = "airlock_elyran_corvette_dock_starboard";
name = "airlock_elyran_corvette_dock_starboard"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/mainhallway)
"FD" = (
/turf/simulated/wall/shuttle/space_ship,
@@ -5625,11 +5661,11 @@
"Gd" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/clothing/head/cone,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/hangar)
"Gi" = (
/obj/structure/closet/crate/freezer/rations,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/hangar)
"Gk" = (
/obj/effect/floor_decal/corner/beige{
@@ -5664,7 +5700,7 @@
/turf/simulated/floor/tiled/dark,
/area/ship/elyran_corvette/cic)
"Gw" = (
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/hangar)
"Gx" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
@@ -5703,7 +5739,7 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/engineering)
"GN" = (
/obj/machinery/body_scanconsole{
@@ -5845,7 +5881,7 @@
icon_state = "2-8"
},
/obj/structure/lattice/catwalk/indoor/grate/dark,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/portthrust)
"HC" = (
/obj/effect/floor_decal/corner_wide/green{
@@ -5875,7 +5911,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/starboardhallway)
"HF" = (
/obj/structure/cable{
@@ -5925,7 +5961,7 @@
req_one_access = list(207);
shuttle_tag = "Elyran Naval Shuttle"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/shuttle/elyran_shuttle)
"HP" = (
/obj/effect/floor_decal/industrial/warning{
@@ -5999,7 +6035,7 @@
icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/engineering)
"Ir" = (
/obj/effect/floor_decal/industrial/warning{
@@ -6055,7 +6091,7 @@
master_tag = "airlock_elyran_corvette_dock_port";
name = "airlock_elyran_corvette_dock_port"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/mainhallway)
"IA" = (
/obj/effect/floor_decal/industrial/warning{
@@ -6115,7 +6151,7 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/cic)
"IP" = (
/obj/structure/cable{
@@ -6234,7 +6270,7 @@
/obj/structure/sign/crush{
pixel_x = -32
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/hangar)
"JA" = (
/obj/structure/window/reinforced{
@@ -6314,7 +6350,7 @@
master_tag = "airlock_elyran_corvette_dock_port";
name = "airlock_elyran_corvette_dock_port"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/mainhallway)
"JW" = (
/obj/effect/landmark/entry_point/aft{
@@ -6405,7 +6441,7 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/mainhallway)
"Kr" = (
/obj/structure/railing/mapped,
@@ -6471,7 +6507,9 @@
name = "Engineering";
dir = 4
},
-/obj/machinery/door/firedoor/noid,
+/obj/machinery/door/firedoor/noid{
+ dir = 4
+ },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -6516,7 +6554,12 @@
/turf/simulated/floor/tiled/white,
/area/ship/elyran_corvette/medbay)
"Ld" = (
-/obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
+/obj/effect/map_effect/window_spawner/full/shuttle{
+ spawn_firedoor = 1;
+ spawn_grille = 1;
+ color = "#BDB6AE";
+ frame_color = "#BDB6AE"
+ },
/obj/machinery/door/blast/regular/open{
id = "elyran_shuttle_shutters";
dir = 4
@@ -6562,6 +6605,9 @@
/obj/item/device/binoculars{
pixel_y = 5
},
+/obj/structure/sign/flag/persepolis{
+ pixel_y = -32
+ },
/turf/simulated/floor/tiled/dark,
/area/ship/elyran_corvette/cic)
"Li" = (
@@ -6576,7 +6622,7 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/starboardhallway)
"Ll" = (
/obj/effect/map_effect/window_spawner/full/borosilicate/reinforced/firedoor,
@@ -6607,7 +6653,12 @@
/turf/simulated/floor/tiled/dark/full,
/area/shuttle/elyran_shuttle)
"Lp" = (
-/obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
+/obj/effect/map_effect/window_spawner/full/shuttle{
+ spawn_firedoor = 1;
+ spawn_grille = 1;
+ color = "#BDB6AE";
+ frame_color = "#BDB6AE"
+ },
/turf/simulated/floor/tiled/full,
/area/ship/elyran_corvette/hangar)
"Lq" = (
@@ -6957,7 +7008,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/engineering)
"Nw" = (
/obj/effect/floor_decal/spline/plain/black,
@@ -7018,7 +7069,7 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/engineering)
"ND" = (
/obj/effect/floor_decal/spline/plain/cee/beige{
@@ -7056,7 +7107,7 @@
/area/ship/elyran_corvette/captain)
"NG" = (
/obj/machinery/atmospherics/pipe/manifold/hidden{
- dir = 8;
+ dir = 1;
icon_state = "map"
},
/turf/simulated/wall/shuttle/space_ship,
@@ -7128,7 +7179,12 @@
/turf/simulated/floor/carpet/rubber,
/area/ship/elyran_corvette/portthrust)
"Ok" = (
-/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor,
+/obj/effect/map_effect/window_spawner/full/shuttle{
+ spawn_firedoor = 1;
+ spawn_grille = 1;
+ color = "#BDB6AE";
+ frame_color = "#BDB6AE"
+ },
/obj/machinery/door/blast/regular/open{
id = "elyran_corvette_kitchen_viewing"
},
@@ -7145,7 +7201,7 @@
/obj/machinery/floodlight{
dir = 1
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/hangar)
"Ov" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -7186,7 +7242,7 @@
master_tag = "airlock_elyran_corvette_dock_starboard";
name = "airlock_elyran_corvette_dock_starboard"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/mainhallway)
"OJ" = (
/obj/machinery/power/apc/north{
@@ -7234,6 +7290,9 @@
/obj/machinery/light/colored/decayed,
/obj/structure/table/steel,
/obj/item/clipboard,
+/obj/structure/sign/flag/aemaq{
+ pixel_y = -32
+ },
/turf/simulated/floor/tiled/dark,
/area/ship/elyran_corvette/cic)
"OQ" = (
@@ -7307,7 +7366,7 @@
master_tag = "airlock_elyran_corvette_dock_starboard";
name = "airlock_elyran_corvette_dock_starboard"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/mainhallway)
"Po" = (
/obj/machinery/door/airlock/external{
@@ -7344,7 +7403,7 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/cic)
"Pw" = (
/turf/simulated/wall/shuttle/space_ship,
@@ -7440,6 +7499,31 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/tiled/dark,
/area/ship/elyran_corvette/brig)
+"PS" = (
+/obj/machinery/door/firedoor/noid{
+ dir = 4
+ },
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 8
+ },
+/obj/machinery/door/airlock/command/gold{
+ req_access = list(207);
+ name = "Control Center";
+ dir = 4
+ },
+/obj/machinery/door/blast/regular/open{
+ id = "elyran_corvette_cic_lockdown"
+ },
+/turf/simulated/floor/tiled/full,
+/area/ship/elyran_corvette/cic)
"PT" = (
/obj/structure/closet/cabinet{
anchored = 1;
@@ -7595,7 +7679,7 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/starboardhallway)
"Qu" = (
/obj/effect/floor_decal/industrial/hatch/yellow,
@@ -7640,7 +7724,7 @@
master_tag = "airlock_elyran_corvette_dock_port";
name = "airlock_elyran_corvette_dock_port"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/mainhallway)
"QJ" = (
/obj/structure/table/rack,
@@ -7712,7 +7796,7 @@
/obj/structure/cable{
icon_state = "1-8"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/hangar)
"Re" = (
/obj/structure/closet/firecloset,
@@ -7786,7 +7870,7 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/starboardhallway)
"Rr" = (
/obj/structure/bed/stool/chair,
@@ -7830,7 +7914,7 @@
/obj/machinery/light/colored/decayed{
dir = 1
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/mainhallway)
"RG" = (
/obj/effect/floor_decal/industrial/warning,
@@ -7897,7 +7981,7 @@
/area/ship/elyran_corvette/captain)
"RT" = (
/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/hangar)
"RU" = (
/obj/effect/decal/cleanable/blood/drip/oil,
@@ -7919,7 +8003,7 @@
dir = 6
},
/obj/structure/lattice/catwalk/indoor/grate/dark,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/portthrust)
"RZ" = (
/obj/machinery/power/apc/north{
@@ -7966,7 +8050,7 @@
/area/ship/elyran_corvette/medbay)
"Sn" = (
/obj/machinery/space_heater,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/hangar)
"Sq" = (
/obj/structure/lattice/catwalk/indoor/grate,
@@ -7979,7 +8063,7 @@
dir = 8
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/cic)
"St" = (
/obj/effect/floor_decal/industrial/hatch/yellow,
@@ -8049,7 +8133,7 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/porthallway)
"SI" = (
/obj/effect/floor_decal/industrial/warning{
@@ -8068,7 +8152,7 @@
dir = 4
},
/obj/structure/lattice/catwalk/indoor/grate/dark,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/shuttle/elyran_shuttle)
"SO" = (
/turf/simulated/wall/shuttle/space_ship,
@@ -8089,7 +8173,7 @@
icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/engineering)
"SR" = (
/obj/effect/floor_decal/corner/beige{
@@ -8119,7 +8203,7 @@
req_one_access = list(207);
shuttle_tag = "Elyran Naval Shuttle"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/shuttle/elyran_shuttle)
"SX" = (
/obj/structure/bed/stool/padded/red{
@@ -8183,7 +8267,12 @@
/turf/simulated/floor/tiled/dark/full,
/area/ship/elyran_corvette/hangar)
"TB" = (
-/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor,
+/obj/effect/map_effect/window_spawner/full/shuttle{
+ spawn_firedoor = 1;
+ spawn_grille = 1;
+ color = "#BDB6AE";
+ frame_color = "#BDB6AE"
+ },
/obj/machinery/door/blast/regular/open{
id = "elyran_corvette_captain_viewing"
},
@@ -8330,7 +8419,7 @@
pixel_y = 32;
pixel_x = -2
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/mainhallway)
"Uo" = (
/obj/effect/floor_decal/corner/beige{
@@ -8397,7 +8486,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/porthallway)
"UN" = (
/obj/machinery/chemical_dispenser/full{
@@ -8459,7 +8548,7 @@
req_one_access = list(207);
shuttle_tag = "Elyran Naval Shuttle"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/shuttle/elyran_shuttle)
"Vj" = (
/obj/effect/floor_decal/corner/brown/full{
@@ -8497,7 +8586,7 @@
master_tag = "airlock_elyra_corvette_starboard_2";
name = "airlock_elyra_corvette_starboard_2"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/hangar)
"VG" = (
/obj/effect/floor_decal/corner_wide/green{
@@ -8530,7 +8619,7 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/porthallway)
"VP" = (
/obj/structure/sign/nosmoking_1{
@@ -8567,7 +8656,9 @@
/obj/machinery/door/window/northright{
dir = 4
},
-/obj/machinery/door/firedoor/noid,
+/obj/machinery/door/firedoor/noid{
+ dir = 4
+ },
/obj/effect/floor_decal/spline/plain/beige{
dir = 1
},
@@ -8667,7 +8758,9 @@
dir = 4;
pixel_x = 14
},
-/obj/machinery/door/firedoor/noid,
+/obj/machinery/door/firedoor/noid{
+ dir = 4
+ },
/turf/simulated/floor/tiled/white,
/area/ship/elyran_corvette/messhall)
"WH" = (
@@ -8752,7 +8845,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/mainhallway)
"WW" = (
/obj/structure/sign/poster{
@@ -8806,7 +8899,7 @@
/obj/structure/sign/crush{
pixel_x = 32
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/hangar)
"Xv" = (
/obj/structure/sign/poster{
@@ -8839,7 +8932,12 @@
/turf/simulated/floor/tiled/white,
/area/ship/elyran_corvette/messhall)
"Xz" = (
-/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor,
+/obj/effect/map_effect/window_spawner/full/shuttle{
+ spawn_firedoor = 1;
+ spawn_grille = 1;
+ color = "#BDB6AE";
+ frame_color = "#BDB6AE"
+ },
/obj/machinery/door/blast/regular/open{
id = "elyran_corvette_kitchen_viewing"
},
@@ -8979,7 +9077,7 @@
/area/ship/elyran_corvette/starboardthrust)
"XW" = (
/obj/item/clothing/head/cone,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/hangar)
"XX" = (
/obj/effect/floor_decal/corner/beige{
@@ -9073,7 +9171,7 @@
/obj/structure/cable{
icon_state = "1-8"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/engineering)
"YF" = (
/obj/effect/floor_decal/spline/fancy/cee{
@@ -9236,11 +9334,11 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/cic)
"ZR" = (
/obj/structure/lattice/catwalk/indoor/grate/dark,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/elyran_corvette/starboardthrust)
"ZY" = (
/obj/effect/landmark/entry_point/port{
@@ -42003,7 +42101,7 @@ dV
tK
cI
XW
-aM
+ES
mW
oW
Vr
@@ -42258,9 +42356,9 @@ NO
PJ
Zx
QX
-ES
-Vr
-Vr
+Gw
+lu
+BR
Vr
TZ
CS
@@ -42515,7 +42613,7 @@ xk
Lp
av
jV
-mz
+Gw
NG
ag
lP
@@ -43029,8 +43127,8 @@ qq
Lp
gV
Gw
-lu
-BR
+Gw
+NG
ap
pd
nt
@@ -43286,9 +43384,9 @@ wT
TE
No
Gw
-YZ
-Vr
-Vr
+Gw
+mz
+zP
Vr
TZ
Jh
@@ -43545,7 +43643,7 @@ ze
Gw
cI
kf
-zP
+YZ
gh
zg
Vr
@@ -43784,7 +43882,7 @@ bm
Nf
Nf
Nf
-nM
+PS
Nf
Nf
Nf
diff --git a/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dmm b/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dmm
index 9b2a146d3f4..d5b2dbd7db8 100644
--- a/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dmm
+++ b/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dmm
@@ -42,7 +42,7 @@
/obj/item/bikehorn/rubberducky{
name = "Clem"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/aux_cic)
"aj" = (
/obj/effect/floor_decal/industrial/hatch/yellow,
@@ -86,7 +86,7 @@
/area/hegemony_ship/canteen)
"ap" = (
/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/starboard_propulsion)
"aw" = (
/obj/effect/floor_decal/corner/yellow{
@@ -114,7 +114,7 @@
req_one_access = list(113);
dir = 1
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/engineering)
"aB" = (
/obj/machinery/atmospherics/pipe/simple/visible/black{
@@ -127,8 +127,7 @@
/turf/simulated/floor/reinforced/carbon_dioxide,
/area/hegemony_ship/engineering)
"aF" = (
-/obj/machinery/atmospherics/portables_connector{
- layer = 2.8;
+/obj/machinery/atmospherics/portables_connector/aux{
dir = 8
},
/obj/machinery/portable_atmospherics/canister/air/airlock,
@@ -161,7 +160,7 @@
/obj/structure/cable/green{
icon_state = "1-8"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/atmos_waste)
"aR" = (
/obj/effect/decal/cleanable/dirt,
@@ -176,7 +175,7 @@
d2 = 2;
icon_state = "1-2"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship)
"aX" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
@@ -227,7 +226,7 @@
icon_state = "1-8"
},
/obj/structure/lattice/catwalk/indoor/grate,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/gun_deck_bruiser)
"bh" = (
/obj/effect/floor_decal/corner/yellow{
@@ -245,13 +244,13 @@
/obj/machinery/light{
dir = 4
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/port_propulsion)
"bk" = (
/turf/simulated/wall/shuttle/space_ship/mercenary,
/area/hegemony_ship/docking_port)
"bo" = (
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/port_propulsion)
"bs" = (
/turf/simulated/floor/tiled,
@@ -266,13 +265,13 @@
/obj/item/clothing/accessory/holster/hip,
/obj/item/clothing/accessory/holster/hip,
/obj/item/clothing/accessory/holster/hip,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/armory)
"bw" = (
/obj/machinery/atmospherics/pipe/simple/visible/black{
dir = 5
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/shuttle/hegemony)
"bA" = (
/obj/structure/railing/mapped{
@@ -291,7 +290,10 @@
/obj/effect/floor_decal/corner/yellow{
dir = 10
},
-/obj/machinery/door/firedoor/noid,
+/obj/machinery/door/firedoor/noid{
+ dir = 4
+ },
+/obj/effect/floor_decal/industrial/hatch/yellow,
/turf/simulated/floor/tiled,
/area/hegemony_ship)
"bJ" = (
@@ -304,6 +306,18 @@
},
/turf/simulated/floor/tiled,
/area/hegemony_ship/crew_quarters)
+"bO" = (
+/obj/effect/floor_decal/corner/yellow{
+ dir = 6
+ },
+/obj/machinery/light{
+ dir = 4
+ },
+/obj/effect/floor_decal/industrial/outline_straight/yellow{
+ dir = 1
+ },
+/turf/simulated/floor/tiled,
+/area/hegemony_ship)
"bU" = (
/obj/effect/landmark/entry_point/aft,
/turf/simulated/wall/shuttle/space_ship/mercenary,
@@ -314,7 +328,7 @@
},
/obj/structure/lattice/catwalk/indoor/grate,
/obj/machinery/computer/ship/navigation,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/gun_deck_bruiser)
"cc" = (
/obj/structure/closet/secure_closet/guncabinet{
@@ -336,8 +350,20 @@
},
/turf/simulated/floor/carpet/rubber,
/area/hegemony_ship/aux_cic)
+"ce" = (
+/obj/effect/floor_decal/corner/yellow{
+ dir = 9
+ },
+/obj/machinery/light{
+ dir = 8
+ },
+/obj/effect/floor_decal/industrial/outline_straight/yellow{
+ dir = 1
+ },
+/turf/simulated/floor/tiled,
+/area/hegemony_ship)
"co" = (
-/obj/machinery/atmospherics/portables_connector{
+/obj/machinery/atmospherics/portables_connector/aux{
dir = 4
},
/obj/machinery/portable_atmospherics/canister/air/airlock,
@@ -358,7 +384,7 @@
"cp" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/extinguisher_cabinet/north,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/engineering)
"cr" = (
/obj/effect/floor_decal/corner/yellow{
@@ -370,6 +396,10 @@
req_one_access = list(113);
id = "hegemony3"
},
+/obj/machinery/firealarm/east,
+/obj/effect/floor_decal/industrial/outline_straight/yellow{
+ dir = 1
+ },
/turf/simulated/floor/tiled,
/area/hegemony_ship)
"cw" = (
@@ -407,8 +437,8 @@
},
/obj/effect/floor_decal/corner_wide/red/diagonal,
/obj/machinery/alarm/east{
- pixel_x = 28;
- req_one_access = null
+ req_one_access = null;
+ req_access = list(113)
},
/turf/simulated/floor/tiled,
/area/hegemony_ship/armory)
@@ -450,6 +480,26 @@
/obj/machinery/light,
/turf/simulated/floor/wood,
/area/hegemony_ship/temple)
+"cX" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/structure/cable/green{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 4
+ },
+/obj/effect/floor_decal/industrial/outline_straight/yellow{
+ dir = 8
+ },
+/turf/simulated/floor/tiled,
+/area/hegemony_ship)
"cY" = (
/obj/effect/floor_decal/spline/fancy/wood/cee{
dir = 1
@@ -457,7 +507,9 @@
/obj/structure/flora/pottedplant{
pixel_y = 12
},
-/obj/machinery/power/apc/north,
+/obj/machinery/power/apc/north{
+ req_access = list(113)
+ },
/obj/structure/cable/green{
icon_state = "0-2"
},
@@ -466,8 +518,10 @@
"da" = (
/obj/machinery/computer/ship/helm,
/obj/structure/lattice/catwalk/indoor/grate,
-/obj/structure/sign/flag/hegemony/large/south,
-/turf/simulated/floor,
+/obj/structure/sign/flag/hegemony/large/south{
+ pixel_y = -32
+ },
+/turf/simulated/floor/plating,
/area/hegemony_ship/aux_cic)
"de" = (
/obj/structure/lattice/catwalk/indoor/grate,
@@ -483,7 +537,7 @@
d2 = 8;
icon_state = "4-8"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/bridge)
"di" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
@@ -532,7 +586,7 @@
/obj/machinery/light/colored/red{
dir = 8
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/engineering)
"dz" = (
/obj/effect/floor_decal/corner/red/diagonal{
@@ -556,26 +610,22 @@
pixel_x = -4;
pixel_y = -4
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/trophy_room)
"dL" = (
-/obj/machinery/firealarm/west{
- dir = 2;
- pixel_x = 0;
- pixel_y = -31
- },
-/turf/simulated/floor,
+/obj/machinery/firealarm/south,
+/turf/simulated/floor/plating,
/area/hegemony_ship/starboard_propulsion)
"dN" = (
/obj/machinery/atmospherics/pipe/manifold4w/visible/black,
-/turf/simulated/floor,
+/turf/simulated/wall/shuttle/space_ship/mercenary,
/area/shuttle/hegemony)
"dO" = (
/obj/structure/railing/mapped{
dir = 1
},
/obj/structure/lattice/catwalk/indoor/grate,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/bridge)
"dT" = (
/obj/effect/floor_decal/corner_wide/red/diagonal,
@@ -585,6 +635,19 @@
},
/turf/simulated/floor/tiled,
/area/hegemony_ship/armory)
+"dU" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/green{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/effect/floor_decal/industrial/outline_straight/yellow{
+ dir = 1
+ },
+/turf/simulated/floor/tiled,
+/area/hegemony_ship)
"dX" = (
/obj/structure/lattice/catwalk,
/obj/structure/magshield/nav_light/red,
@@ -629,7 +692,7 @@
/obj/item/stack/material/tritium/full,
/obj/item/stack/material/tritium/full,
/obj/effect/decal/cleanable/greenglow,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/engineering)
"eh" = (
/obj/machinery/atmospherics/pipe/simple/visible/black{
@@ -682,7 +745,7 @@
dir = 1
},
/obj/machinery/portable_atmospherics/powered/scrubber,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/engineering)
"eI" = (
/obj/machinery/door/blast/regular{
@@ -693,20 +756,37 @@
/obj/effect/landmark/entry_point/starboard{
name = "starboard, captains quarters"
},
-/obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
-/turf/simulated/floor,
+/obj/effect/map_effect/window_spawner/full/shuttle{
+ color = "#5b5b5b";
+ frame_color = "#5b5b5b";
+ spawn_firedoor = 1;
+ spawn_grille = 1
+ },
+/turf/simulated/floor/plating,
/area/hegemony_ship/captains_quarters)
"eO" = (
/obj/structure/lattice/catwalk/indoor/grate,
/obj/machinery/light,
/obj/machinery/suit_cycler/offship/hegemony/specialist,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/eva_storage)
"eQ" = (
/obj/effect/floor_decal/corner_wide/red/diagonal,
/obj/machinery/firealarm/west,
/turf/simulated/floor/tiled,
/area/hegemony_ship/docking_port)
+"eT" = (
+/obj/structure/railing/mapped{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/yellow{
+ dir = 9
+ },
+/obj/effect/floor_decal/industrial/outline_straight/yellow{
+ dir = 1
+ },
+/turf/simulated/floor/tiled,
+/area/hegemony_ship)
"eZ" = (
/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
@@ -737,12 +817,12 @@
d2 = 4;
icon_state = "2-4"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/engineering)
"ff" = (
/obj/machinery/computer/ship/targeting,
/obj/structure/lattice/catwalk/indoor/grate,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/aux_cic)
"fg" = (
/obj/effect/floor_decal/corner/grey/diagonal,
@@ -761,7 +841,7 @@
icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/starboard_propulsion)
"fi" = (
/obj/structure/bed/handrail{
@@ -793,12 +873,33 @@
},
/turf/simulated/floor/tiled,
/area/hegemony_ship/gun_deck_bruiser)
+"fl" = (
+/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{
+ dir = 8
+ },
+/obj/machinery/embedded_controller/radio/airlock/docking_port{
+ dir = 2;
+ pixel_y = 28;
+ pixel_x = -6
+ },
+/obj/machinery/airlock_sensor{
+ dir = 2;
+ pixel_y = 28;
+ pixel_x = 6
+ },
+/obj/effect/map_effect/marker/airlock/docking{
+ req_one_access = list(13,113);
+ name = "airlock_hegemony_generic";
+ landmark_tag = "nav_hegemony_corvette_generic";
+ master_tag = "airlock_hegemony_generic"
+ },
+/turf/simulated/floor/plating,
+/area/hegemony_ship)
"fn" = (
-/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{
dir = 1
},
-/turf/simulated/floor,
+/turf/simulated/wall/shuttle/space_ship/mercenary,
/area/hegemony_ship/starboard_propulsion)
"fo" = (
/obj/effect/floor_decal/corner/yellow{
@@ -806,6 +907,9 @@
},
/obj/effect/floor_decal/industrial/warning,
/obj/structure/extinguisher_cabinet/west,
+/obj/effect/floor_decal/industrial/outline_straight/yellow{
+ dir = 1
+ },
/turf/simulated/floor/tiled,
/area/hegemony_ship)
"fr" = (
@@ -819,13 +923,13 @@
"fu" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/power/apc/north{
- is_critical = 1
+ req_access = list(113)
},
/obj/structure/cable/green{
d2 = 8;
icon_state = "0-8"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/atmos_waste)
"fw" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -886,6 +990,7 @@
dir = 8
},
/obj/machinery/door/firedoor/noid,
+/obj/effect/floor_decal/industrial/hatch/yellow,
/turf/simulated/floor/tiled,
/area/hegemony_ship)
"fQ" = (
@@ -915,7 +1020,8 @@
pixel_y = 0
},
/obj/machinery/alarm/north{
- req_one_access = null
+ req_one_access = null;
+ req_access = list(113)
},
/obj/structure/cable/green{
d1 = 4;
@@ -931,7 +1037,7 @@
/obj/machinery/atmospherics/pipe/manifold/visible/black{
dir = 8
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/shuttle/hegemony)
"gd" = (
/obj/structure/table/reinforced/steel,
@@ -947,10 +1053,11 @@
/turf/simulated/floor/carpet/rubber,
/area/hegemony_ship/aux_cic)
"gf" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
+/obj/machinery/atmospherics/binary/passive_gate/supply{
+ dir = 4;
+ target_pressure = 250
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/shuttle/hegemony)
"gg" = (
/obj/structure/sign/directions/com{
@@ -967,6 +1074,9 @@
/obj/effect/floor_decal/corner/yellow{
dir = 5
},
+/obj/effect/floor_decal/industrial/outline_straight/yellow{
+ dir = 8
+ },
/turf/simulated/floor/tiled,
/area/hegemony_ship)
"gk" = (
@@ -991,18 +1101,18 @@
shuttle_tag = "Hegemony Shuttle"
},
/obj/effect/map_effect/marker_helper/airlock/exterior,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/shuttle/hegemony)
"gm" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/power/apc/south{
- is_critical = 1
+ req_access = list(113)
},
/obj/structure/cable/green{
d2 = 4;
icon_state = "0-4"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/atmos_distro)
"gA" = (
/obj/structure/lattice/catwalk/indoor/grate,
@@ -1018,7 +1128,8 @@
d2 = 2;
icon_state = "1-2"
},
-/turf/simulated/floor,
+/obj/machinery/door/firedoor/noid,
+/turf/simulated/floor/plating,
/area/hegemony_ship/bridge)
"gC" = (
/obj/effect/floor_decal/corner_wide/red/diagonal,
@@ -1050,14 +1161,16 @@
dir = 4
},
/obj/structure/lattice/catwalk/indoor/grate,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship)
"gK" = (
/obj/effect/floor_decal/corner_wide/red/diagonal,
/obj/structure/bed/stool/chair/shuttle{
dir = 8
},
-/obj/structure/sign/flag/hegemony/large/east,
+/obj/structure/sign/flag/hegemony/large/east{
+ pixel_x = 32
+ },
/turf/simulated/floor/tiled,
/area/shuttle/hegemony)
"gQ" = (
@@ -1072,12 +1185,27 @@
/obj/machinery/light/small/emergency,
/turf/simulated/floor/tiled,
/area/hegemony_ship)
+"gX" = (
+/obj/effect/floor_decal/corner/yellow{
+ dir = 9
+ },
+/obj/machinery/light{
+ dir = 8
+ },
+/obj/effect/floor_decal/industrial/outline_straight/yellow,
+/turf/simulated/floor/tiled,
+/area/hegemony_ship)
"ha" = (
-/obj/effect/map_effect/window_spawner/reinforced/firedoor,
+/obj/effect/map_effect/window_spawner/full/shuttle{
+ color = "#5b5b5b";
+ frame_color = "#5b5b5b";
+ spawn_firedoor = 1;
+ spawn_grille = 1
+ },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/trophy_room)
"hc" = (
/obj/structure/table/stone/marble,
@@ -1118,8 +1246,7 @@
/area/hegemony_ship/eva_storage)
"hm" = (
/obj/machinery/atmospherics/unary/engine,
-/obj/structure/window/borosilicate/reinforced,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/starboard_propulsion)
"hn" = (
/obj/effect/floor_decal/corner/dark_blue/diagonal,
@@ -1131,7 +1258,7 @@
dir = 1;
icon_state = "map-supply"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/shuttle/hegemony)
"ht" = (
/obj/effect/floor_decal/corner/yellow{
@@ -1156,7 +1283,7 @@
/obj/machinery/light/colored/red{
dir = 1
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/engineering)
"hC" = (
/obj/machinery/door/airlock/multi_tile/glass{
@@ -1184,7 +1311,7 @@
/area/hegemony_ship/warpriests_quarters)
"hJ" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/fuel,
-/turf/simulated/floor,
+/turf/simulated/wall/shuttle/space_ship/mercenary,
/area/hegemony_ship/port_propulsion)
"hK" = (
/obj/structure/cable/green{
@@ -1195,7 +1322,7 @@
master_tag = "airlock_hegemony_dock";
name = "airlock_hegemony_dock"
},
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{
dir = 8
},
/obj/machinery/embedded_controller/radio/airlock/docking_port{
@@ -1206,7 +1333,7 @@
pixel_x = 6;
pixel_y = 28
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/docking_port)
"hL" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -1236,6 +1363,14 @@
},
/turf/simulated/floor/carpet/rubber,
/area/hegemony_ship/aux_cic)
+"hU" = (
+/obj/effect/floor_decal/corner/yellow{
+ dir = 9
+ },
+/obj/structure/extinguisher_cabinet/west,
+/obj/effect/floor_decal/industrial/outline_straight/yellow,
+/turf/simulated/floor/tiled,
+/area/hegemony_ship)
"hV" = (
/obj/effect/floor_decal/corner/yellow/full{
dir = 4
@@ -1257,13 +1392,28 @@
/obj/effect/shuttle_landmark/hegemony_corvette/dock2{
dir = 8
},
-/turf/simulated/floor,
+/obj/machinery/door/airlock/external{
+ dir = 4
+ },
+/obj/machinery/access_button{
+ pixel_x = 12;
+ pixel_y = 28;
+ dir = 4
+ },
+/obj/effect/map_effect/marker/airlock/docking{
+ req_one_access = list(13,113);
+ name = "airlock_hegemony_generic";
+ landmark_tag = "nav_hegemony_corvette_generic";
+ master_tag = "airlock_hegemony_generic"
+ },
+/obj/effect/map_effect/marker_helper/airlock/exterior,
+/turf/simulated/floor/plating,
/area/hegemony_ship)
"ie" = (
/obj/machinery/atmospherics/pipe/simple/visible/blue{
dir = 4
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/shuttle/hegemony)
"if" = (
/obj/structure/cable/green{
@@ -1278,7 +1428,7 @@
/area/hegemony_ship)
"ii" = (
/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/starboard_propulsion)
"ij" = (
/obj/structure/curtain/open/bed,
@@ -1302,7 +1452,7 @@
/area/hegemony_ship/tcomms)
"iu" = (
/obj/structure/ship_weapon_dummy,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/space)
"iw" = (
/turf/simulated/floor/tiled/dark,
@@ -1399,7 +1549,7 @@
/area/hegemony_ship/medbay)
"jt" = (
/obj/effect/decal/cleanable/blood/oil,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/port_propulsion)
"jz" = (
/obj/structure/closet/cabinet,
@@ -1415,12 +1565,26 @@
/obj/item/clothing/suit/unathi/robe/robe_coat/blue,
/turf/simulated/floor/wood,
/area/hegemony_ship/warpriests_quarters)
+"jC" = (
+/obj/effect/floor_decal/corner/yellow{
+ dir = 5
+ },
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/effect/floor_decal/industrial/outline_straight/yellow{
+ dir = 8
+ },
+/turf/simulated/floor/tiled,
+/area/hegemony_ship)
"jD" = (
/obj/machinery/door/airlock/glass{
name = "Trophy Room";
dir = 4
},
-/obj/machinery/door/firedoor/noid,
+/obj/machinery/door/firedoor/noid{
+ dir = 4
+ },
/obj/structure/cable/green{
d1 = 4;
d2 = 8;
@@ -1458,7 +1622,7 @@
/obj/item/clothing/head/helmet/unathi/hegemony,
/obj/item/clothing/head/helmet/unathi/hegemony,
/obj/item/clothing/head/helmet/unathi/hegemony,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/armory)
"kd" = (
/obj/effect/floor_decal/spline/plain{
@@ -1466,6 +1630,16 @@
},
/turf/simulated/floor/tiled/dark,
/area/hegemony_ship/bridge)
+"ke" = (
+/obj/effect/floor_decal/corner/yellow{
+ dir = 10
+ },
+/obj/machinery/light,
+/obj/effect/floor_decal/industrial/outline_straight/yellow{
+ dir = 4
+ },
+/turf/simulated/floor/tiled,
+/area/hegemony_ship)
"kh" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -1475,6 +1649,7 @@
icon_state = "1-2"
},
/obj/machinery/door/firedoor/noid,
+/obj/effect/floor_decal/industrial/hatch/yellow,
/turf/simulated/floor/tiled,
/area/hegemony_ship)
"kj" = (
@@ -1490,11 +1665,21 @@
/area/hegemony_ship/docking_port)
"kt" = (
/obj/effect/floor_decal/corner_wide/red/diagonal,
-/obj/machinery/atmospherics/unary/vent_pump{
- dir = 8
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 8;
+ level = 2
},
/turf/simulated/floor/tiled,
/area/shuttle/hegemony)
+"ku" = (
+/obj/effect/floor_decal/corner/yellow{
+ dir = 5
+ },
+/obj/effect/floor_decal/industrial/outline_straight/yellow{
+ dir = 8
+ },
+/turf/simulated/floor/tiled,
+/area/hegemony_ship)
"kw" = (
/obj/structure/table/glass,
/obj/effect/floor_decal/corner_wide/lime{
@@ -1585,7 +1770,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/universal{
dir = 4
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/engineering)
"kR" = (
/obj/effect/floor_decal/spline/fancy/wood{
@@ -1607,12 +1792,11 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 5;
- icon_state = "intact"
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
+ dir = 5
},
/obj/structure/lattice/catwalk/indoor/grate,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship)
"le" = (
/obj/effect/floor_decal/spline/fancy/wood/cee{
@@ -1625,7 +1809,8 @@
dir = 10
},
/obj/machinery/alarm/north{
- req_one_access = null
+ req_one_access = null;
+ req_access = list(113)
},
/turf/simulated/floor/wood,
/area/hegemony_ship/trophy_room)
@@ -1634,14 +1819,20 @@
dir = 9
},
/obj/machinery/door/firedoor/noid,
+/obj/effect/floor_decal/industrial/hatch/yellow,
/turf/simulated/floor/tiled,
/area/hegemony_ship)
"lm" = (
/obj/effect/landmark/entry_point/fore{
name = "fore, bridge"
},
-/obj/effect/map_effect/window_spawner/full/reinforced,
-/turf/simulated/floor,
+/obj/effect/map_effect/window_spawner/full/shuttle{
+ color = "#5b5b5b";
+ frame_color = "#5b5b5b";
+ spawn_firedoor = 1;
+ spawn_grille = 1
+ },
+/turf/simulated/floor/plating,
/area/hegemony_ship/bridge)
"lo" = (
/obj/effect/floor_decal/corner/dark_blue/diagonal,
@@ -1658,10 +1849,8 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
- dir = 4;
- frequency = 1385;
- id_tag = "hegemony_shuttle_pump_in"
+/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{
+ dir = 4
},
/obj/effect/map_effect/marker/airlock/shuttle{
master_tag = "airlock_hegemony_shuttle";
@@ -1669,8 +1858,17 @@
req_one_access = list(113);
shuttle_tag = "Hegemony Shuttle"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/shuttle/hegemony)
+"lw" = (
+/obj/effect/floor_decal/corner/yellow{
+ dir = 9
+ },
+/obj/effect/floor_decal/industrial/outline_straight/yellow{
+ dir = 1
+ },
+/turf/simulated/floor/tiled,
+/area/hegemony_ship)
"ly" = (
/obj/effect/floor_decal/spline/plain{
dir = 9
@@ -1714,7 +1912,7 @@
/obj/machinery/atmospherics/pipe/simple/visible/universal{
dir = 4
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/shuttle/hegemony)
"lN" = (
/obj/effect/floor_decal/corner_wide/red/diagonal,
@@ -1751,7 +1949,7 @@
dir = 8
},
/obj/structure/lattice/catwalk/indoor/grate,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/bridge)
"lU" = (
/turf/simulated/wall/shuttle/space_ship/mercenary,
@@ -1786,12 +1984,13 @@
dir = 10
},
/obj/machinery/alarm/north{
- req_one_access = null
+ req_one_access = null;
+ req_access = list(113)
},
/obj/machinery/atmospherics/portables_connector/fuel{
dir = 8
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/engineering)
"mc" = (
/obj/effect/floor_decal/spline/fancy/wood{
@@ -1815,12 +2014,14 @@
/turf/simulated/wall/shuttle/space_ship/mercenary,
/area/hegemony_ship/gun_deck_flak)
"ml" = (
-/obj/machinery/power/apc/south,
+/obj/machinery/power/apc/south{
+ req_access = list(113)
+ },
/obj/structure/cable/green{
d2 = 8;
icon_state = "0-8"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/starboard_propulsion)
"mm" = (
/obj/structure/bed/stool/chair/office/bridge,
@@ -1831,6 +2032,7 @@
dir = 6
},
/obj/machinery/door/firedoor/noid,
+/obj/effect/floor_decal/industrial/hatch/yellow,
/turf/simulated/floor/tiled,
/area/hegemony_ship)
"mv" = (
@@ -1843,12 +2045,15 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
/obj/structure/lattice/catwalk/indoor/grate,
-/turf/simulated/floor,
+/obj/effect/floor_decal/industrial/outline_straight/yellow{
+ dir = 1
+ },
+/turf/simulated/floor/plating,
/area/hegemony_ship)
"mw" = (
/obj/machinery/computer/shuttle_control/explore/hegemony_shuttle,
/obj/structure/lattice/catwalk/indoor/grate,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/shuttle/hegemony)
"mz" = (
/obj/effect/floor_decal/corner_wide/red/diagonal,
@@ -1877,8 +2082,8 @@
"mG" = (
/obj/effect/floor_decal/corner_wide/red/diagonal,
/obj/machinery/alarm/west{
- pixel_x = -28;
- req_one_access = null
+ req_one_access = null;
+ req_access = list(113)
},
/obj/structure/cable/green{
d1 = 1;
@@ -1900,7 +2105,7 @@
dir = 10
},
/obj/machinery/power/apc/south{
- is_critical = 1
+ req_access = list(113)
},
/obj/structure/cable/green,
/obj/machinery/light,
@@ -1965,7 +2170,7 @@
/obj/machinery/light{
dir = 8
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/starboard_propulsion)
"mY" = (
/obj/effect/floor_decal/spline/plain{
@@ -1985,7 +2190,7 @@
/obj/item/toy/plushie/mouse{
name = "Khrazahk"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/brig)
"nd" = (
/obj/effect/floor_decal/corner_wide/red/diagonal,
@@ -2003,7 +2208,9 @@
/obj/effect/floor_decal/corner/red/diagonal{
dir = 8
},
-/obj/machinery/door/firedoor/noid,
+/obj/machinery/door/firedoor/noid{
+ dir = 4
+ },
/obj/machinery/door/airlock/service{
name = "Crew's Quarters";
dir = 4
@@ -2019,7 +2226,7 @@
d2 = 8;
icon_state = "4-8"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/crew_quarters)
"nm" = (
/obj/machinery/firealarm/east,
@@ -2034,6 +2241,10 @@
"nC" = (
/turf/space/transit/north,
/area/space)
+"nD" = (
+/obj/effect/decal/cleanable/blood/oil,
+/turf/simulated/floor/plating,
+/area/hegemony_ship/starboard_propulsion)
"nG" = (
/turf/simulated/wall/shuttle/space_ship/mercenary,
/area/hegemony_ship/medbay)
@@ -2065,7 +2276,7 @@
icon_state = "1-2"
},
/obj/structure/lattice/catwalk/indoor/grate,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/gun_deck_bruiser)
"nS" = (
/obj/structure/window/reinforced{
@@ -2079,7 +2290,7 @@
/obj/machinery/light/colored/red{
dir = 1
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/engineering)
"nT" = (
/obj/effect/shuttle_landmark/hegemony_shuttle/transit,
@@ -2096,13 +2307,13 @@
d2 = 8;
icon_state = "4-8"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/bridge)
"oe" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/starboard_propulsion)
"og" = (
/obj/effect/floor_decal/corner/yellow{
@@ -2112,15 +2323,15 @@
dir = 1
},
/obj/machinery/alarm/east{
- pixel_x = 28;
- req_one_access = null
+ req_one_access = null;
+ req_access = list(113)
},
/turf/simulated/floor/tiled,
/area/hegemony_ship/gun_deck_flak)
"oi" = (
/obj/machinery/computer/ship/navigation,
/obj/structure/lattice/catwalk/indoor/grate,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/aux_cic)
"oj" = (
/obj/structure/table/rack,
@@ -2185,7 +2396,7 @@
req_one_access = list(113);
dir = 1
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/port_propulsion)
"os" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -2242,7 +2453,9 @@
/obj/machinery/light{
dir = 1
},
-/obj/structure/sign/flag/hegemony/large/north,
+/obj/structure/sign/flag/hegemony/large/north{
+ pixel_y = 32
+ },
/turf/simulated/floor/tiled/dark/full,
/area/hegemony_ship/gun_deck_flak)
"oB" = (
@@ -2260,12 +2473,22 @@
/obj/effect/landmark/entry_point/starboard{
name = "starboard, center"
},
-/obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
-/turf/simulated/floor,
+/obj/effect/map_effect/window_spawner/full/shuttle{
+ color = "#5b5b5b";
+ frame_color = "#5b5b5b";
+ spawn_firedoor = 1;
+ spawn_grille = 1
+ },
+/turf/simulated/floor/plating,
/area/hegemony_ship)
"oI" = (
-/obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
-/turf/simulated/floor,
+/obj/effect/map_effect/window_spawner/full/shuttle{
+ color = "#5b5b5b";
+ frame_color = "#5b5b5b";
+ spawn_firedoor = 1;
+ spawn_grille = 1
+ },
+/turf/simulated/floor/plating,
/area/hegemony_ship/canteen)
"oP" = (
/obj/structure/table/rack,
@@ -2324,8 +2547,10 @@
d2 = 4;
icon_state = "2-4"
},
-/obj/structure/sign/flag/hegemony/large/north,
-/turf/simulated/floor,
+/obj/structure/sign/flag/hegemony/large/north{
+ pixel_y = 32
+ },
+/turf/simulated/floor/plating,
/area/hegemony_ship/bridge)
"pf" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
@@ -2345,7 +2570,7 @@
icon_state = "1-4"
},
/obj/structure/lattice/catwalk/indoor/grate,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/gun_deck_bruiser)
"pi" = (
/obj/effect/floor_decal/industrial/hatch/yellow,
@@ -2393,7 +2618,7 @@
/turf/simulated/floor/tiled/white,
/area/hegemony_ship/medbay)
"pq" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
dir = 4
},
/obj/effect/floor_decal/industrial/loading/yellow{
@@ -2413,8 +2638,8 @@
pixel_y = 0
},
/obj/machinery/alarm/east{
- pixel_x = 28;
- req_one_access = null
+ req_one_access = null;
+ req_access = list(113)
},
/turf/simulated/floor/wood,
/area/hegemony_ship/temple)
@@ -2431,25 +2656,21 @@
/turf/template_noop,
/area/space)
"pF" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light{
- dir = 8
- },
/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
dir = 5
},
-/turf/simulated/floor,
+/turf/simulated/wall/shuttle/space_ship/mercenary,
/area/hegemony_ship/starboard_propulsion)
"pH" = (
/obj/structure/lattice/catwalk/indoor/grate,
/obj/machinery/suit_cycler/offship/hegemony/priest,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/eva_storage)
"pI" = (
/obj/machinery/vending/engivend{
req_access = list(113)
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/engineering)
"pJ" = (
/obj/structure/railing/mapped,
@@ -2466,8 +2687,11 @@
/turf/simulated/wall/shuttle/space_ship/mercenary,
/area/hegemony_ship/port_propulsion)
"pL" = (
-/obj/effect/map_effect/airlock/w_to_e/long/square,
-/turf/simulated/wall/shuttle/space_ship/mercenary,
+/obj/effect/floor_decal/corner/yellow{
+ dir = 6
+ },
+/obj/effect/floor_decal/industrial/outline_straight/yellow,
+/turf/simulated/floor/tiled,
/area/hegemony_ship)
"pO" = (
/obj/item/clothing/mask/breath/medical,
@@ -2493,7 +2717,7 @@
/obj/machinery/atmospherics/pipe/tank/air{
dir = 4
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/atmos_distro)
"pX" = (
/obj/structure/closet/firecloset/full,
@@ -2502,12 +2726,11 @@
/area/hegemony_ship/bridge)
"qb" = (
/obj/effect/floor_decal/corner/yellow{
- dir = 9
+ dir = 6
},
-/obj/machinery/light{
- dir = 8
+/obj/effect/floor_decal/industrial/outline_straight/yellow{
+ dir = 1
},
-/obj/machinery/door/firedoor/noid,
/turf/simulated/floor/tiled,
/area/hegemony_ship)
"qc" = (
@@ -2547,9 +2770,6 @@
/area/hegemony_ship/medbay)
"qr" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/structure/cable/green{
d1 = 4;
@@ -2565,7 +2785,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
dir = 4
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship)
"qs" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -2580,7 +2800,9 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/machinery/door/firedoor/noid,
+/obj/machinery/door/firedoor/noid{
+ dir = 4
+ },
/obj/machinery/door/airlock/highsecurity{
name = "Shuttle Dock";
req_one_access = list(113);
@@ -2621,11 +2843,14 @@
"qL" = (
/obj/structure/lattice/catwalk/indoor/grate,
/obj/machinery/suit_cycler/offship/hegemony,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/eva_storage)
"qO" = (
/obj/machinery/light/colored/red,
-/turf/simulated/floor,
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 8
+ },
+/turf/simulated/floor/plating,
/area/shuttle/hegemony)
"qU" = (
/obj/effect/floor_decal/spline/plain{
@@ -2678,6 +2903,13 @@
},
/turf/simulated/floor/tiled,
/area/hegemony_ship)
+"rk" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/hegemony_ship/port_propulsion)
"ro" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -2697,7 +2929,9 @@
/obj/structure/cable{
dir = 4
},
-/obj/machinery/power/apc/north,
+/obj/machinery/power/apc/north{
+ req_access = list(113)
+ },
/turf/simulated/floor/tiled,
/area/shuttle/hegemony)
"rq" = (
@@ -2707,7 +2941,7 @@
/obj/machinery/light{
dir = 4
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/starboard_propulsion)
"rs" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -2752,7 +2986,7 @@
"rJ" = (
/obj/machinery/computer/ship/sensors,
/obj/structure/lattice/catwalk/indoor/grate,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/shuttle/hegemony)
"rK" = (
/obj/structure/closet/cabinet,
@@ -2791,6 +3025,12 @@
/obj/effect/floor_decal/corner/yellow{
dir = 4
},
+/obj/effect/floor_decal/industrial/outline_straight/yellow{
+ dir = 4
+ },
+/obj/effect/floor_decal/industrial/outline_straight/yellow{
+ dir = 1
+ },
/turf/simulated/floor/tiled,
/area/hegemony_ship)
"rZ" = (
@@ -2802,7 +3042,7 @@
/obj/machinery/light{
dir = 4
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/gun_deck_bruiser)
"sl" = (
/obj/effect/floor_decal/corner_wide/red/diagonal,
@@ -2816,7 +3056,7 @@
/obj/structure/lattice/catwalk/indoor/grate,
/obj/machinery/power/apc/east,
/obj/structure/cable/green,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/bridge)
"sp" = (
/obj/structure/table/stone/marble,
@@ -2887,7 +3127,7 @@
icon_state = "1-8"
},
/obj/machinery/vending/tool,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/engineering)
"sF" = (
/obj/effect/floor_decal/industrial/warning,
@@ -2902,7 +3142,7 @@
/area/hegemony_ship)
"sG" = (
/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/engineering)
"sI" = (
/obj/effect/landmark/entry_point/starboard{
@@ -2921,7 +3161,7 @@
shuttle_tag = "Hegemony Shuttle"
},
/obj/effect/map_effect/marker_helper/airlock/exterior,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/shuttle/hegemony)
"sJ" = (
/obj/structure/lattice/catwalk/indoor/grate,
@@ -2934,7 +3174,7 @@
/obj/machinery/light{
dir = 1
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/bridge)
"sK" = (
/obj/machinery/door/airlock/multi_tile/glass{
@@ -2948,10 +3188,13 @@
/turf/simulated/floor/tiled,
/area/hegemony_ship/bridge)
"sO" = (
-/obj/machinery/vending/zora{
- pixel_y = -10
+/obj/effect/floor_decal/corner/yellow{
+ dir = 5
},
-/turf/simulated/wall/shuttle/space_ship/mercenary,
+/obj/effect/floor_decal/industrial/outline_straight/yellow{
+ dir = 4
+ },
+/turf/simulated/floor/tiled,
/area/hegemony_ship)
"sQ" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
@@ -2964,6 +3207,7 @@
icon_state = "1-2"
},
/obj/machinery/door/firedoor/noid,
+/obj/effect/floor_decal/industrial/hatch/yellow,
/turf/simulated/floor/tiled,
/area/hegemony_ship)
"sS" = (
@@ -3087,7 +3331,7 @@
"tx" = (
/obj/machinery/computer/ship/sensors,
/obj/structure/lattice/catwalk/indoor/grate,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/aux_cic)
"tA" = (
/obj/structure/cable/green{
@@ -3104,7 +3348,7 @@
d2 = 2;
icon_state = "1-2"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/engineering)
"tG" = (
/obj/structure/closet/cabinet,
@@ -3142,7 +3386,7 @@
/obj/effect/floor_decal/industrial/warning/cee{
dir = 8
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/engineering)
"tP" = (
/obj/effect/floor_decal/industrial/hatch/yellow,
@@ -3160,7 +3404,7 @@
/area/hegemony_ship)
"tR" = (
/obj/machinery/firealarm/north,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/atmos_waste)
"tU" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -3186,7 +3430,8 @@
/obj/structure/table/standard,
/obj/effect/floor_decal/corner/dark_blue/diagonal,
/obj/machinery/alarm/north{
- req_one_access = null
+ req_one_access = null;
+ req_access = list(113)
},
/obj/machinery/light{
dir = 1
@@ -3211,11 +3456,12 @@
/turf/simulated/floor/tiled,
/area/hegemony_ship/brig)
"ue" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
- dir = 4
+/obj/effect/floor_decal/corner/yellow{
+ dir = 5
},
-/turf/simulated/floor,
-/area/hegemony_ship/port_propulsion)
+/obj/machinery/vending/zora,
+/turf/simulated/floor/tiled,
+/area/hegemony_ship)
"ul" = (
/obj/effect/floor_decal/spline/fancy/wood/corner{
dir = 1
@@ -3257,13 +3503,15 @@
/obj/machinery/door/airlock/hatch{
dir = 4
},
-/obj/machinery/door/firedoor/noid,
+/obj/machinery/door/firedoor/noid{
+ dir = 4
+ },
/obj/structure/cable/green{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/engineering)
"uv" = (
/obj/structure/closet/cabinet,
@@ -3304,6 +3552,7 @@
d2 = 8;
icon_state = "4-8"
},
+/obj/effect/floor_decal/industrial/outline_straight/yellow,
/turf/simulated/floor/tiled,
/area/hegemony_ship)
"uE" = (
@@ -3319,7 +3568,7 @@
icon_state = "4-8"
},
/obj/structure/reagent_dispensers/fueltank,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/engineering)
"uK" = (
/obj/structure/dispenser/oxygen,
@@ -3351,7 +3600,7 @@
/area/hegemony_ship/restroom)
"uS" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/fuel,
-/turf/simulated/floor,
+/turf/simulated/wall/shuttle/space_ship/mercenary,
/area/hegemony_ship/starboard_propulsion)
"uW" = (
/obj/effect/floor_decal/industrial/hatch/yellow,
@@ -3416,7 +3665,7 @@
/area/hegemony_ship/warpriests_quarters)
"vh" = (
/obj/machinery/vending/sovietsoda,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/brig)
"vj" = (
/obj/structure/closet/emcloset,
@@ -3454,6 +3703,9 @@
/obj/effect/floor_decal/corner/yellow{
dir = 5
},
+/obj/effect/floor_decal/industrial/outline_straight/yellow{
+ dir = 4
+ },
/turf/simulated/floor/tiled,
/area/hegemony_ship)
"vu" = (
@@ -3489,12 +3741,14 @@
/obj/item/clothing/suit/space/void/sol/sfa,
/obj/item/clothing/head/helmet/space/void/sol/sfa,
/obj/item/gun/projectile/pistol/sol,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/trophy_room)
"vB" = (
/obj/machinery/portable_atmospherics/canister/oxygen,
/obj/effect/floor_decal/corner/dark_blue/diagonal,
-/obj/structure/sign/flag/hegemony/large/north,
+/obj/structure/sign/flag/hegemony/large/north{
+ pixel_y = 32
+ },
/turf/simulated/floor/tiled,
/area/hegemony_ship/eva_storage)
"vM" = (
@@ -3528,8 +3782,8 @@
dir = 6
},
/obj/machinery/alarm/east{
- pixel_x = 28;
- req_one_access = null
+ req_one_access = null;
+ req_access = list(113)
},
/obj/structure/cable/green{
icon_state = "2-8"
@@ -3568,14 +3822,14 @@
d2 = 4;
icon_state = "2-4"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/engineering)
"wk" = (
/obj/structure/railing/mapped{
dir = 4
},
/obj/structure/lattice/catwalk/indoor/grate,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/bridge)
"wn" = (
/obj/item/ammo_casing/slugger,
@@ -3611,7 +3865,12 @@
/turf/simulated/floor/tiled,
/area/hegemony_ship/armory)
"wB" = (
-/obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
+/obj/effect/map_effect/window_spawner/full/shuttle{
+ color = "#5b5b5b";
+ frame_color = "#5b5b5b";
+ spawn_firedoor = 1;
+ spawn_grille = 1
+ },
/turf/simulated/floor/tiled,
/area/hegemony_ship/brig)
"wC" = (
@@ -3622,7 +3881,7 @@
/obj/structure/cable/green{
icon_state = "0-4"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/engineering)
"wF" = (
/obj/effect/floor_decal/industrial/warning{
@@ -3738,7 +3997,7 @@
icon_state = "1-8"
},
/obj/structure/lattice/catwalk/indoor/grate,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship)
"xt" = (
/obj/structure/window/reinforced,
@@ -3765,7 +4024,7 @@
/obj/effect/shuttle_landmark/hegemony_shuttle/dock{
dir = 8
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/docking_port)
"xw" = (
/obj/effect/floor_decal/corner/yellow{
@@ -3784,7 +4043,7 @@
d2 = 8;
icon_state = "4-8"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/engineering)
"xB" = (
/obj/effect/floor_decal/corner_wide/red/diagonal,
@@ -3792,7 +4051,7 @@
dir = 4;
icon_state = "map_scrubber_on"
},
-/obj/machinery/atmospherics/pipe/simple/hidden,
+/obj/machinery/atmospherics/pipe/simple/hidden/aux,
/turf/simulated/floor/tiled,
/area/shuttle/hegemony)
"xF" = (
@@ -3838,7 +4097,7 @@
shuttle_tag = "Hegemony Shuttle"
},
/obj/effect/map_effect/marker_helper/airlock/interior,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/shuttle/hegemony)
"xL" = (
/obj/effect/floor_decal/spline/fancy/wood{
@@ -3851,11 +4110,16 @@
/turf/simulated/floor/wood,
/area/hegemony_ship/captains_quarters)
"xS" = (
-/obj/effect/map_effect/window_spawner/reinforced/firedoor,
+/obj/effect/map_effect/window_spawner/full/shuttle{
+ color = "#5b5b5b";
+ frame_color = "#5b5b5b";
+ spawn_firedoor = 1;
+ spawn_grille = 1
+ },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/trophy_room)
"xT" = (
/obj/machinery/atmospherics/unary/outlet_injector{
@@ -3886,7 +4150,7 @@
dir = 4
},
/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/atmos_waste)
"yd" = (
/obj/effect/floor_decal/industrial/hatch/yellow,
@@ -3910,7 +4174,7 @@
/area/hegemony_ship/gun_deck_bruiser)
"yf" = (
/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/port_propulsion)
"yh" = (
/obj/effect/floor_decal/industrial/warning{
@@ -3941,7 +4205,7 @@
/area/hegemony_ship/medbay)
"yo" = (
/obj/machinery/atmospherics/pipe/manifold/visible/black,
-/turf/simulated/floor,
+/turf/simulated/wall/shuttle/space_ship/mercenary,
/area/shuttle/hegemony)
"yq" = (
/obj/effect/floor_decal/corner/black{
@@ -3956,14 +4220,14 @@
/obj/machinery/atmospherics/portables_connector{
layer = 2.8
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/atmos_waste)
"yv" = (
/obj/machinery/atmospherics/binary/pump/on{
dir = 4
},
/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/atmos_waste)
"yy" = (
/obj/effect/floor_decal/corner_wide/lime{
@@ -4030,23 +4294,11 @@
/turf/simulated/floor/tiled,
/area/hegemony_ship/gun_deck_bruiser)
"yQ" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 1
- },
-/obj/structure/cable/green{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
- dir = 4
+/obj/effect/floor_decal/corner/yellow{
+ dir = 5
},
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/obj/machinery/vending/cigarette/merchant,
/turf/simulated/floor/tiled,
/area/hegemony_ship)
"yV" = (
@@ -4054,7 +4306,7 @@
/obj/machinery/atmospherics/portables_connector{
dir = 1
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/engineering)
"yW" = (
/turf/simulated/wall/shuttle/space_ship/mercenary,
@@ -4142,7 +4394,7 @@
req_one_access = list(113);
dir = 1
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/starboard_propulsion)
"zt" = (
/obj/structure/closet/crate/bin{
@@ -4173,7 +4425,7 @@
dir = 4
},
/obj/machinery/power/apc/south{
- is_critical = 1
+ req_access = list(113)
},
/obj/structure/cable/green,
/turf/simulated/floor/carpet/rubber,
@@ -4196,7 +4448,7 @@
"zC" = (
/obj/effect/floor_decal/spline/fancy/wood,
/obj/machinery/power/apc/north{
- is_critical = 1
+ req_access = list(113)
},
/obj/structure/cable/green{
icon_state = "0-2"
@@ -4209,8 +4461,8 @@
dir = 8
},
/obj/machinery/alarm/west{
- pixel_x = -28;
- req_one_access = null
+ req_one_access = null;
+ req_access = list(113)
},
/turf/simulated/floor/carpet/rubber,
/area/hegemony_ship/aux_cic)
@@ -4232,25 +4484,15 @@
/turf/simulated/floor/tiled,
/area/hegemony_ship/crew_quarters)
"zI" = (
-/obj/effect/floor_decal/corner/yellow{
- dir = 9
- },
-/obj/machinery/alarm/west{
- pixel_x = -28;
- req_one_access = null
- },
-/obj/machinery/light{
- dir = 8
- },
-/obj/machinery/door/firedoor/noid,
-/turf/simulated/floor/tiled,
-/area/hegemony_ship)
+/obj/machinery/light/colored/red,
+/turf/simulated/floor/plating,
+/area/shuttle/hegemony)
"zJ" = (
/obj/structure/closet/crate,
/obj/item/tank/hydrogen/shuttle,
/obj/item/tank/hydrogen/shuttle,
/obj/item/tank/hydrogen/shuttle,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/engineering)
"zL" = (
/obj/effect/floor_decal/industrial/warning{
@@ -4263,13 +4505,14 @@
dir = 4
},
/obj/effect/map_effect/window_spawner/full/borosilicate/reinforced/firedoor,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/engineering)
"zO" = (
-/obj/machinery/atmospherics/unary/vent_pump{
- dir = 8
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 8;
+ level = 2
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/shuttle/hegemony)
"zQ" = (
/obj/effect/floor_decal/industrial/warning{
@@ -4281,17 +4524,20 @@
/obj/machinery/atmospherics/pipe/simple/visible/black{
dir = 10
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/engineering)
"zR" = (
/obj/machinery/meter,
-/turf/simulated/floor,
+/obj/machinery/light{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
/area/hegemony_ship/starboard_propulsion)
"zS" = (
/obj/machinery/atmospherics/pipe/simple/visible/red{
dir = 4
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/shuttle/hegemony)
"Aa" = (
/obj/structure/janitorialcart/full/water{
@@ -4324,9 +4570,11 @@
"Af" = (
/obj/structure/table/rack,
/obj/structure/lattice/catwalk/indoor/grate,
-/obj/structure/sign/flag/hegemony/large/north,
+/obj/structure/sign/flag/hegemony/large/north{
+ pixel_y = 32
+ },
/obj/item/rig/unathi/fancy/equipped,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/armory)
"Ai" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -4358,7 +4606,7 @@
dir = 8;
icon_state = "term"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/shuttle/hegemony)
"Aq" = (
/obj/effect/floor_decal/corner/dark_blue/diagonal,
@@ -4425,8 +4673,7 @@
/area/hegemony_ship)
"Az" = (
/obj/machinery/atmospherics/unary/engine,
-/obj/structure/window/borosilicate/reinforced,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/shuttle/hegemony)
"AG" = (
/obj/effect/floor_decal/industrial/hatch/yellow,
@@ -4511,7 +4758,9 @@
/obj/structure/cable/green{
icon_state = "0-4"
},
-/obj/structure/sign/flag/hegemony/large/west,
+/obj/structure/sign/flag/hegemony/large/west{
+ pixel_x = -32
+ },
/turf/simulated/floor/tiled,
/area/hegemony_ship/gun_deck_bruiser)
"Ba" = (
@@ -4535,7 +4784,7 @@
master_tag = "airlock_hegemony_dock";
name = "airlock_hegemony_dock"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/docking_port)
"Bk" = (
/obj/structure/window/reinforced{
@@ -4543,7 +4792,7 @@
},
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/engineering)
"Bo" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -4556,7 +4805,7 @@
icon_state = "1-2"
},
/obj/structure/lattice/catwalk/indoor/grate,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship)
"Bq" = (
/obj/structure/table/glass,
@@ -4629,8 +4878,8 @@
d2 = 4;
icon_state = "0-4"
},
-/obj/machinery/power/smes/buildable/main_engine,
-/turf/simulated/floor,
+/obj/machinery/power/smes/buildable/third_party_shuttle,
+/turf/simulated/floor/plating,
/area/hegemony_ship/engineering)
"BI" = (
/obj/structure/grille,
@@ -4659,6 +4908,16 @@
"BX" = (
/turf/simulated/wall/shuttle/space_ship/mercenary,
/area/hegemony_ship/canteen)
+"BY" = (
+/obj/structure/railing/mapped{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/yellow{
+ dir = 9
+ },
+/obj/effect/floor_decal/industrial/outline_straight/yellow,
+/turf/simulated/floor/tiled,
+/area/hegemony_ship)
"BZ" = (
/turf/simulated/wall/shuttle/space_ship/mercenary,
/area/hegemony_ship/eva_storage)
@@ -4683,7 +4942,7 @@
/area/hegemony_ship)
"Cp" = (
/obj/machinery/pipedispenser,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/engineering)
"Cr" = (
/obj/machinery/door/airlock/external{
@@ -4695,8 +4954,8 @@
name = "airlock_hegemony_dock"
},
/obj/effect/map_effect/marker_helper/airlock/interior,
-/obj/machinery/atmospherics/pipe/manifold/hidden,
-/turf/simulated/floor,
+/obj/machinery/atmospherics/pipe/manifold/hidden/aux,
+/turf/simulated/floor/plating,
/area/hegemony_ship/docking_port)
"Cw" = (
/obj/effect/landmark/entry_point/aft{
@@ -4705,15 +4964,20 @@
/turf/simulated/wall/shuttle/space_ship/mercenary,
/area/hegemony_ship/starboard_propulsion)
"Cx" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
- dir = 4
+/obj/effect/floor_decal/corner/yellow{
+ dir = 10
},
-/turf/simulated/floor,
-/area/hegemony_ship/starboard_propulsion)
+/obj/effect/floor_decal/industrial/outline_straight/yellow{
+ dir = 8
+ },
+/turf/simulated/floor/tiled,
+/area/hegemony_ship)
"Cy" = (
/obj/structure/table/rack,
/obj/structure/lattice/catwalk/indoor/grate,
-/obj/machinery/power/apc/west,
+/obj/machinery/power/apc/west{
+ req_access = list(113)
+ },
/obj/structure/cable/green{
icon_state = "0-4"
},
@@ -4724,7 +4988,7 @@
/obj/item/gun/energy/pistol/hegemony,
/obj/item/gun/energy/pistol/hegemony,
/obj/item/gun/energy/pistol/hegemony,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/armory)
"CK" = (
/obj/structure/closet/secure_closet/guncabinet{
@@ -4745,7 +5009,7 @@
/area/hegemony_ship/brig)
"CM" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden,
+/obj/machinery/atmospherics/pipe/simple/hidden/aux,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/cable/green{
d1 = 1;
@@ -4754,7 +5018,8 @@
},
/obj/machinery/door/firedoor/noid,
/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
-/obj/machinery/atmospherics/pipe/simple/hidden,
+/obj/machinery/atmospherics/pipe/simple/hidden/aux,
+/obj/effect/floor_decal/industrial/hatch/yellow,
/turf/simulated/floor/tiled,
/area/hegemony_ship)
"CN" = (
@@ -4765,12 +5030,10 @@
/turf/simulated/floor/tiled/dark/full,
/area/hegemony_ship/gun_deck_bruiser)
"CP" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/oil,
/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
dir = 4
},
-/turf/simulated/floor,
+/turf/simulated/wall/shuttle/space_ship/mercenary,
/area/hegemony_ship/starboard_propulsion)
"CQ" = (
/obj/effect/floor_decal/industrial/warning{
@@ -4813,7 +5076,7 @@
/obj/machinery/light/colored/red,
/obj/item/reagent_containers/glass/bucket,
/obj/effect/floor_decal/industrial/outline/blue,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/engineering)
"Dk" = (
/obj/structure/bed/stool/chair/office/dark{
@@ -4851,7 +5114,7 @@
d2 = 8;
icon_state = "4-8"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/engineering)
"Dr" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
@@ -4892,16 +5155,19 @@
/obj/structure/window/reinforced,
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/machinery/portable_atmospherics/canister/hydrogen,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/engineering)
"DA" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 8;
+ icon_state = "map-scrubbers"
+ },
/obj/structure/cable{
icon_state = "1-2";
dir = 1
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/shuttle/hegemony)
"DD" = (
/obj/structure/table/stone/marble,
@@ -4924,7 +5190,7 @@
dir = 1
},
/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/atmos_distro)
"DK" = (
/obj/effect/floor_decal/corner/dark_blue/diagonal,
@@ -4940,31 +5206,31 @@
/obj/structure/cable/green{
icon_state = "1-8"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/engineering)
"DQ" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/port_propulsion)
"DU" = (
/obj/machinery/computer/ship/engines,
/obj/structure/lattice/catwalk/indoor/grate,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/aux_cic)
"DX" = (
/obj/structure/cable{
icon_state = "1-2";
dir = 8
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/shuttle/hegemony)
"DZ" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{
dir = 1
},
-/turf/simulated/floor,
+/turf/simulated/wall/shuttle/space_ship/mercenary,
/area/hegemony_ship/port_propulsion)
"Ec" = (
/obj/effect/floor_decal/corner/dark_blue/diagonal,
@@ -5017,8 +5283,13 @@
/turf/simulated/wall/shuttle/space_ship/mercenary,
/area/hegemony_ship/bridge)
"Eq" = (
-/obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
-/turf/simulated/floor,
+/obj/effect/map_effect/window_spawner/full/shuttle{
+ color = "#5b5b5b";
+ frame_color = "#5b5b5b";
+ spawn_firedoor = 1;
+ spawn_grille = 1
+ },
+/turf/simulated/floor/plating,
/area/hegemony_ship/temple)
"Es" = (
/obj/effect/floor_decal/spline/fancy/wood/cee,
@@ -5033,7 +5304,7 @@
/obj/structure/closet/radiation,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/colored/red,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/engineering)
"Ex" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -5060,14 +5331,17 @@
/obj/effect/floor_decal/corner/yellow{
dir = 5
},
-/obj/machinery/door/firedoor/noid,
+/obj/machinery/door/firedoor/noid{
+ dir = 4
+ },
+/obj/effect/floor_decal/industrial/hatch/yellow,
/turf/simulated/floor/tiled,
/area/hegemony_ship)
"EA" = (
/obj/machinery/atmospherics/pipe/manifold/visible/black{
dir = 1
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/shuttle/hegemony)
"EB" = (
/obj/effect/decal/cleanable/dirt,
@@ -5089,7 +5363,7 @@
"EY" = (
/obj/machinery/computer/ship/helm,
/obj/structure/lattice/catwalk/indoor/grate,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/shuttle/hegemony)
"Ff" = (
/obj/effect/floor_decal/industrial/hatch/yellow,
@@ -5195,10 +5469,10 @@
/obj/item/clothing/head/dominia/fleet/officer,
/obj/item/shield/energy/dominia,
/obj/item/gun/projectile/automatic/rifle/dominia,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/trophy_room)
"FO" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden,
+/obj/machinery/atmospherics/pipe/manifold/hidden/aux,
/obj/machinery/door/airlock/external{
dir = 4
},
@@ -5214,7 +5488,7 @@
shuttle_tag = "Hegemony Shuttle"
},
/obj/effect/map_effect/marker_helper/airlock/interior,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/shuttle/hegemony)
"FQ" = (
/obj/structure/sign/securearea{
@@ -5257,6 +5531,12 @@
/obj/effect/floor_decal/spline/fancy/wood,
/turf/simulated/floor/wood,
/area/hegemony_ship/temple)
+"FZ" = (
+/obj/machinery/light{
+ dir = 8
+ },
+/turf/simulated/floor/plating,
+/area/hegemony_ship/starboard_propulsion)
"Ga" = (
/obj/machinery/computer/ship/sensors,
/obj/effect/floor_decal/spline/plain{
@@ -5269,7 +5549,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/machinery/power/apc/north,
+/obj/machinery/power/apc/north{
+ req_access = list(113)
+ },
/obj/structure/cable/green{
d2 = 8;
icon_state = "0-8"
@@ -5278,7 +5560,10 @@
/area/hegemony_ship/restroom)
"Gh" = (
/obj/machinery/meter,
-/turf/simulated/floor,
+/obj/machinery/light{
+ dir = 8
+ },
+/turf/simulated/floor/plating,
/area/hegemony_ship/port_propulsion)
"Gk" = (
/obj/structure/table/rack,
@@ -5307,6 +5592,7 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
+/obj/effect/floor_decal/industrial/outline_straight/yellow,
/turf/simulated/floor/tiled,
/area/hegemony_ship)
"Go" = (
@@ -5352,7 +5638,7 @@
dir = 4
},
/obj/structure/lattice/catwalk/indoor/grate,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship)
"GB" = (
/obj/effect/floor_decal/corner/yellow{
@@ -5374,8 +5660,8 @@
/area/hegemony_ship/gun_deck_bruiser)
"GF" = (
/obj/machinery/alarm/west{
- pixel_x = -28;
- req_one_access = null
+ req_one_access = null;
+ req_access = list(113)
},
/turf/simulated/floor/wood,
/area/hegemony_ship/canteen)
@@ -5387,10 +5673,8 @@
/turf/simulated/floor/tiled/white,
/area/hegemony_ship/medbay)
"GJ" = (
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
- dir = 4;
- frequency = 1385;
- id_tag = "hegemony_shuttle_pump_in"
+/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{
+ dir = 4
},
/obj/effect/map_effect/marker/airlock/shuttle{
master_tag = "airlock_hegemony_shuttle";
@@ -5398,7 +5682,7 @@
req_one_access = list(113);
shuttle_tag = "Hegemony Shuttle"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/shuttle/hegemony)
"GL" = (
/obj/effect/floor_decal/corner/yellow{
@@ -5408,11 +5692,24 @@
/turf/simulated/floor/tiled,
/area/hegemony_ship/gun_deck_bruiser)
"GM" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
+/obj/machinery/door/airlock/external{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/aux,
+/obj/machinery/access_button{
+ pixel_x = -12;
+ pixel_y = -28;
dir = 8
},
-/turf/simulated/floor,
-/area/shuttle/hegemony)
+/obj/effect/map_effect/marker/airlock/docking{
+ req_one_access = list(13,113);
+ name = "airlock_hegemony_generic";
+ landmark_tag = "nav_hegemony_corvette_generic";
+ master_tag = "airlock_hegemony_generic"
+ },
+/obj/effect/map_effect/marker_helper/airlock/interior,
+/turf/simulated/floor/plating,
+/area/hegemony_ship)
"GN" = (
/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -5427,11 +5724,11 @@
icon_state = "1-4"
},
/obj/structure/lattice/catwalk/indoor/grate,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship)
"GS" = (
/obj/machinery/power/apc/north{
- is_critical = 1
+ req_access = list(113)
},
/obj/structure/cable/green{
d2 = 8;
@@ -5460,10 +5757,14 @@
/turf/simulated/floor/tiled,
/area/hegemony_ship)
"Ha" = (
-/obj/machinery/vending/cigarette/merchant{
- pixel_y = -10
+/obj/effect/floor_decal/corner/yellow{
+ dir = 10
},
-/turf/simulated/wall/shuttle/space_ship/mercenary,
+/obj/machinery/light,
+/obj/effect/floor_decal/industrial/outline_straight/yellow{
+ dir = 8
+ },
+/turf/simulated/floor/tiled,
/area/hegemony_ship)
"Hb" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
@@ -5495,7 +5796,7 @@
dir = 4
},
/obj/structure/lattice/catwalk/indoor/grate,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship)
"Hc" = (
/obj/item/device/healthanalyzer,
@@ -5546,12 +5847,15 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
-/obj/machinery/atmospherics/pipe/simple/hidden,
+/obj/machinery/atmospherics/pipe/simple/hidden/aux,
+/obj/effect/floor_decal/industrial/outline_straight/yellow{
+ dir = 1
+ },
/turf/simulated/floor/tiled,
/area/hegemony_ship)
"Hn" = (
/obj/machinery/power/apc/south{
- is_critical = 1
+ req_access = list(113)
},
/obj/structure/cable/green{
icon_state = "0-4"
@@ -5580,7 +5884,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/trophy_room)
"Hq" = (
/obj/structure/lattice/catwalk/indoor/grate,
@@ -5597,21 +5901,21 @@
"HB" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small/emergency,
-/obj/machinery/alarm/north{
- pixel_y = -32;
- req_one_access = null
+/obj/machinery/alarm/south{
+ req_one_access = null;
+ req_access = list(113)
},
/obj/structure/cable/green{
icon_state = "1-8"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/atmos_distro)
"HF" = (
/turf/simulated/floor/foamedmetal,
/area/hegemony_ship)
"HH" = (
/obj/machinery/door/blast/odin/open,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/bridge)
"HI" = (
/obj/structure/viewport/unathi,
@@ -5643,7 +5947,7 @@
/area/hegemony_ship/captains_quarters)
"HT" = (
/obj/effect/map_effect/window_spawner/full/borosilicate/reinforced/firedoor,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/engineering)
"Ie" = (
/obj/effect/floor_decal/corner/yellow{
@@ -5666,11 +5970,11 @@
/turf/simulated/floor/tiled,
/area/shuttle/hegemony)
"In" = (
-/obj/machinery/alarm/north{
- pixel_y = -32;
- req_one_access = null
+/obj/machinery/alarm/south{
+ req_one_access = null;
+ req_access = list(113)
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/starboard_propulsion)
"Ip" = (
/obj/effect/floor_decal/corner_wide/red/diagonal,
@@ -5687,7 +5991,7 @@
dir = 10
},
/obj/machinery/power/apc/south{
- is_critical = 1
+ req_access = list(113)
},
/obj/structure/cable/green{
icon_state = "0-4"
@@ -5708,7 +6012,7 @@
d2 = 2;
icon_state = "1-2"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/bridge)
"IE" = (
/obj/effect/floor_decal/corner_wide/red/diagonal,
@@ -5728,9 +6032,13 @@
/area/shuttle/hegemony)
"IG" = (
/obj/effect/floor_decal/corner_wide/red/diagonal,
-/obj/machinery/power/apc/west,
+/obj/machinery/power/apc/west{
+ req_access = list(113)
+ },
/obj/structure/cable/green,
-/obj/structure/sign/flag/hegemony/large/south,
+/obj/structure/sign/flag/hegemony/large/south{
+ pixel_y = -32
+ },
/turf/simulated/floor/tiled,
/area/hegemony_ship/docking_port)
"IH" = (
@@ -5742,7 +6050,7 @@
"IJ" = (
/obj/structure/lattice/catwalk/indoor/grate,
/obj/machinery/light,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/bridge)
"IK" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -5801,14 +6109,13 @@
/area/shuttle/hegemony)
"IZ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8;
- icon_state = "map-scrubbers"
- },
/obj/structure/cable{
icon_state = "2-8"
},
-/turf/simulated/floor,
+/obj/machinery/atmospherics/binary/pump/scrubber/on{
+ dir = 1
+ },
+/turf/simulated/floor/plating,
/area/shuttle/hegemony)
"Jb" = (
/obj/machinery/atmospherics/pipe/simple/hidden/red,
@@ -5852,7 +6159,9 @@
req_one_access = list(113);
dir = 4
},
-/obj/machinery/door/firedoor/noid,
+/obj/machinery/door/firedoor/noid{
+ dir = 4
+ },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
@@ -5905,11 +6214,10 @@
/turf/simulated/wall/shuttle/space_ship/mercenary,
/area/hegemony_ship/canteen)
"Jv" = (
-/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
dir = 4
},
-/turf/simulated/floor,
+/turf/simulated/wall/shuttle/space_ship/mercenary,
/area/hegemony_ship/port_propulsion)
"Jz" = (
/obj/structure/ship_weapon_dummy,
@@ -5953,13 +6261,13 @@
/obj/item/shield/energy/hegemony,
/obj/item/recharger_backpack/high,
/obj/item/recharger_backpack/high,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/armory)
"JO" = (
/obj/effect/floor_decal/corner_wide/red/diagonal,
/obj/machinery/alarm/east{
- pixel_x = 28;
- req_one_access = null
+ req_one_access = null;
+ req_access = list(113)
},
/obj/machinery/light/colored/red{
dir = 4
@@ -5998,7 +6306,7 @@
/area/hegemony_ship)
"JX" = (
/obj/effect/floor_decal/corner_wide/red/diagonal,
-/obj/machinery/atmospherics/pipe/simple/hidden{
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
dir = 6
},
/turf/simulated/floor/tiled,
@@ -6013,13 +6321,15 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/port_propulsion)
"Kf" = (
/obj/effect/floor_decal/spline/plain{
dir = 9
},
-/obj/machinery/power/apc/west,
+/obj/machinery/power/apc/west{
+ req_access = list(113)
+ },
/obj/structure/cable/green{
icon_state = "0-4"
},
@@ -6035,17 +6345,13 @@
d2 = 2;
icon_state = "1-2"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/bridge)
"Kt" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
dir = 9
},
-/turf/simulated/floor,
+/turf/simulated/wall/shuttle/space_ship/mercenary,
/area/hegemony_ship/starboard_propulsion)
"Ku" = (
/obj/effect/decal/fake_object{
@@ -6054,7 +6360,7 @@
icon_state = "droppod";
name = "Modified SUPB Pod"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/bridge)
"Kz" = (
/obj/machinery/meter,
@@ -6068,7 +6374,7 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/fuel,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/engineering)
"KB" = (
/obj/effect/floor_decal/corner/yellow/full,
@@ -6078,8 +6384,10 @@
/obj/structure/cable/green{
icon_state = "0-4"
},
-/obj/machinery/power/apc/south,
-/turf/simulated/floor,
+/obj/machinery/power/apc/south{
+ req_access = list(113)
+ },
+/turf/simulated/floor/plating,
/area/hegemony_ship/port_propulsion)
"KG" = (
/obj/structure/bed/stool/padded,
@@ -6092,7 +6400,8 @@
/obj/structure/table/steel,
/obj/item/storage/box/zipties,
/obj/machinery/alarm/north{
- req_one_access = null
+ req_one_access = null;
+ req_access = list(113)
},
/turf/simulated/floor/tiled,
/area/hegemony_ship/brig)
@@ -6105,7 +6414,7 @@
/obj/structure/lattice/catwalk/indoor/grate,
/obj/item/book/manual/dominia_honor,
/obj/item/clothing/head/beret/dominia/priest/red,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/trophy_room)
"KN" = (
/obj/structure/cable/green{
@@ -6120,7 +6429,7 @@
name = "airlock_hegemony_dock"
},
/obj/effect/map_effect/marker_helper/airlock/interior,
-/obj/machinery/atmospherics/pipe/simple/hidden{
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
dir = 6
},
/obj/machinery/access_button{
@@ -6128,7 +6437,7 @@
pixel_x = -12;
pixel_y = 28
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/docking_port)
"KR" = (
/obj/structure/sign/radiation,
@@ -6214,8 +6523,13 @@
id = "headmaster_bridge";
icon_state = "pdoor0"
},
-/obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
-/turf/simulated/floor,
+/obj/effect/map_effect/window_spawner/full/shuttle{
+ color = "#5b5b5b";
+ frame_color = "#5b5b5b";
+ spawn_firedoor = 1;
+ spawn_grille = 1
+ },
+/turf/simulated/floor/plating,
/area/hegemony_ship)
"Lq" = (
/obj/machinery/appliance/cooker/oven,
@@ -6256,11 +6570,11 @@
/obj/effect/floor_decal/corner/yellow{
dir = 6
},
-/obj/structure/extinguisher_cabinet/east,
/obj/machinery/light{
dir = 4
},
/obj/machinery/door/firedoor/noid,
+/obj/effect/floor_decal/industrial/hatch/yellow,
/turf/simulated/floor/tiled,
/area/hegemony_ship)
"LC" = (
@@ -6327,15 +6641,23 @@
/obj/machinery/atmospherics/pipe/simple/visible/black{
dir = 9
},
-/obj/machinery/light/colored/red{
- dir = 4
- },
-/turf/simulated/floor,
+/turf/simulated/wall/shuttle/space_ship/mercenary,
/area/shuttle/hegemony)
"LZ" = (
/obj/effect/floor_decal/industrial/loading/yellow,
/turf/simulated/floor/tiled/dark/full,
/area/hegemony_ship/gun_deck_bruiser)
+"Md" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/green{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/effect/floor_decal/industrial/outline_straight/yellow,
+/turf/simulated/floor/tiled,
+/area/hegemony_ship)
"Mg" = (
/obj/effect/floor_decal/spline/fancy/wood/corner{
dir = 8
@@ -6446,12 +6768,28 @@
req_access = list(113);
dir = 4
},
+/obj/machinery/door/firedoor/noid{
+ dir = 4
+ },
/turf/simulated/floor/tiled,
/area/hegemony_ship/brig)
"MF" = (
/obj/effect/floor_decal/corner_wide/red/diagonal,
/turf/simulated/floor/tiled,
/area/shuttle/hegemony)
+"MH" = (
+/obj/effect/floor_decal/corner/yellow{
+ dir = 10
+ },
+/obj/machinery/alarm/south{
+ req_one_access = null;
+ req_access = list(113)
+ },
+/obj/effect/floor_decal/industrial/outline_straight/yellow{
+ dir = 4
+ },
+/turf/simulated/floor/tiled,
+/area/hegemony_ship)
"MJ" = (
/obj/effect/floor_decal/corner/yellow{
dir = 6
@@ -6496,22 +6834,19 @@
/turf/simulated/floor/carpet/red,
/area/hegemony_ship/temple)
"MQ" = (
-/obj/machinery/light{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
dir = 9
},
-/turf/simulated/floor,
+/turf/simulated/wall/shuttle/space_ship/mercenary,
/area/hegemony_ship/port_propulsion)
"MS" = (
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/shuttle/hegemony)
"MW" = (
/obj/machinery/atmospherics/pipe/simple/hidden/universal{
dir = 4
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/atmos_distro)
"MZ" = (
/obj/machinery/door/airlock/command{
@@ -6519,7 +6854,9 @@
req_one_access = list(114);
dir = 4
},
-/obj/machinery/door/firedoor/noid,
+/obj/machinery/door/firedoor/noid{
+ dir = 4
+ },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
@@ -6605,20 +6942,29 @@
dir = 1
},
/obj/machinery/alarm/north{
- req_one_access = null
+ req_one_access = null;
+ req_access = list(113)
},
/obj/structure/cable/green{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/atmos_waste)
"Ng" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/manifold/hidden/fuel,
-/turf/simulated/floor,
-/area/hegemony_ship/starboard_propulsion)
+/obj/machinery/door/airlock/external{
+ dir = 4
+ },
+/obj/effect/map_effect/marker/airlock/docking{
+ req_one_access = list(13,113);
+ name = "airlock_hegemony_generic";
+ landmark_tag = "nav_hegemony_corvette_generic";
+ master_tag = "airlock_hegemony_generic"
+ },
+/obj/effect/map_effect/marker_helper/airlock/interior,
+/turf/simulated/floor/plating,
+/area/hegemony_ship)
"Ni" = (
/obj/effect/floor_decal/corner_wide/red/diagonal,
/obj/machinery/light/colored/red{
@@ -6641,7 +6987,7 @@
dir = 8
},
/obj/item/material/twohanded/pike/flag/hegemony,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/armory)
"Nu" = (
/obj/effect/floor_decal/corner/yellow/full{
@@ -6657,7 +7003,8 @@
dir = 8
},
/obj/machinery/alarm/north{
- req_one_access = null
+ req_one_access = null;
+ req_access = list(113)
},
/turf/simulated/floor/tiled/dark,
/area/hegemony_ship/medbay)
@@ -6672,7 +7019,7 @@
icon_state = "1-2"
},
/obj/structure/lattice/catwalk/indoor/grate,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship)
"Nz" = (
/obj/machinery/iv_drip,
@@ -6702,8 +7049,13 @@
id = "headmaster_bridge";
icon_state = "pdoor0"
},
-/obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
-/turf/simulated/floor,
+/obj/effect/map_effect/window_spawner/full/shuttle{
+ color = "#5b5b5b";
+ frame_color = "#5b5b5b";
+ spawn_firedoor = 1;
+ spawn_grille = 1
+ },
+/turf/simulated/floor/plating,
/area/hegemony_ship/captains_quarters)
"NP" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -6717,10 +7069,13 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/machinery/door/firedoor/noid,
+/obj/machinery/door/firedoor/noid{
+ dir = 4
+ },
/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
dir = 4
},
+/obj/effect/floor_decal/industrial/hatch/yellow,
/turf/simulated/floor/tiled,
/area/hegemony_ship)
"NR" = (
@@ -6783,7 +7138,7 @@
/obj/machinery/ammunition_loader/francisca{
weapon_id = "Hegemony Corvette Rotary Cannon"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/gun_deck_flak)
"Oo" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
@@ -6801,7 +7156,7 @@
icon_state = "1-8"
},
/obj/structure/lattice/catwalk/indoor/grate,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship)
"Op" = (
/turf/simulated/floor/foamedmetal,
@@ -6824,6 +7179,7 @@
},
/obj/machinery/door/firedoor/noid,
/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
+/obj/effect/floor_decal/industrial/hatch/yellow,
/turf/simulated/floor/tiled,
/area/hegemony_ship)
"OF" = (
@@ -6841,7 +7197,7 @@
pixel_x = 12;
pixel_y = -28
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/docking_port)
"OG" = (
/obj/effect/floor_decal/industrial/warning{
@@ -6869,7 +7225,7 @@
master_tag = "airlock_hegemony_dock";
name = "airlock_hegemony_dock"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/docking_port)
"OW" = (
/obj/structure/lattice/catwalk,
@@ -6917,11 +7273,11 @@
/obj/effect/floor_decal/corner/yellow{
dir = 9
},
-/obj/structure/extinguisher_cabinet/west,
/obj/machinery/light{
dir = 8
},
/obj/machinery/door/firedoor/noid,
+/obj/effect/floor_decal/industrial/hatch/yellow,
/turf/simulated/floor/tiled,
/area/hegemony_ship)
"Pr" = (
@@ -6938,7 +7294,7 @@
d2 = 2;
icon_state = "1-2"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/engineering)
"Px" = (
/turf/simulated/floor/foamedmetal,
@@ -6982,7 +7338,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
/obj/structure/lattice/catwalk/indoor/grate,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship)
"PK" = (
/obj/effect/shuttle_landmark/hegemony_corvette/nav1,
@@ -6990,17 +7346,17 @@
/area/space)
"PO" = (
/obj/effect/floor_decal/corner_wide/red/diagonal,
-/obj/machinery/atmospherics/unary/vent_pump{
+/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden,
+/obj/machinery/atmospherics/pipe/simple/hidden/aux,
/turf/simulated/floor/tiled,
/area/shuttle/hegemony)
"PP" = (
/obj/machinery/atmospherics/pipe/simple/visible/black{
dir = 4
},
-/turf/simulated/floor,
+/turf/simulated/wall/shuttle/space_ship/mercenary,
/area/shuttle/hegemony)
"PQ" = (
/obj/structure/sign/poster{
@@ -7015,7 +7371,10 @@
/obj/machinery/atmospherics/pipe/tank/air{
dir = 4
},
-/turf/simulated/floor,
+/obj/machinery/light/colored/red{
+ dir = 8
+ },
+/turf/simulated/floor/plating,
/area/shuttle/hegemony)
"Qb" = (
/obj/structure/table/glass,
@@ -7059,7 +7418,7 @@
/turf/simulated/floor/tiled/white,
/area/hegemony_ship/restroom)
"Qp" = (
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/starboard_propulsion)
"Qr" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -7069,21 +7428,24 @@
/turf/simulated/floor/wood,
/area/hegemony_ship/canteen)
"Qt" = (
-/obj/effect/floor_decal/corner/yellow{
- dir = 6
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/green{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
-/obj/machinery/firealarm/east,
-/obj/machinery/light{
- dir = 4
+/obj/structure/lattice/catwalk/indoor/grate,
+/obj/effect/floor_decal/industrial/outline_straight/yellow{
+ dir = 1
},
-/obj/machinery/door/firedoor/noid,
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/plating,
/area/hegemony_ship)
"Qu" = (
/obj/structure/fuel_port/hydrogen{
pixel_y = -32
},
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{
dir = 8
},
/obj/effect/map_effect/marker/airlock/shuttle{
@@ -7094,7 +7456,7 @@
},
/obj/effect/map_effect/marker_helper/airlock/out,
/obj/machinery/light,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/shuttle/hegemony)
"Qv" = (
/obj/machinery/atmospherics/portables_connector{
@@ -7102,14 +7464,14 @@
dir = 8
},
/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/shuttle/hegemony)
"QA" = (
/obj/machinery/atmospherics/portables_connector{
dir = 4
},
/obj/machinery/portable_atmospherics/canister/empty,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/shuttle/hegemony)
"QD" = (
/obj/effect/floor_decal/spline/plain{
@@ -7124,7 +7486,7 @@
dir = 1
},
/obj/machinery/suit_cycler/offship/hegemony,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/eva_storage)
"QM" = (
/obj/machinery/ammunition_loader/bruiser{
@@ -7156,7 +7518,7 @@
/obj/machinery/vending/engineering{
req_access = list(113)
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/engineering)
"Rc" = (
/obj/effect/floor_decal/corner/yellow/full{
@@ -7174,7 +7536,9 @@
/turf/simulated/wall/shuttle/space_ship/mercenary,
/area/hegemony_ship)
"Rh" = (
-/obj/item/modular_computer/console/preset/civilian,
+/obj/item/modular_computer/console/preset/civilian{
+ dir = 8
+ },
/turf/simulated/floor/carpet/rubber,
/area/hegemony_ship/tcomms)
"Rk" = (
@@ -7193,6 +7557,18 @@
dir = 1
},
/area/hegemony_ship/bridge)
+"Rv" = (
+/obj/effect/floor_decal/corner/yellow{
+ dir = 5
+ },
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/effect/floor_decal/industrial/outline_straight/yellow{
+ dir = 4
+ },
+/turf/simulated/floor/tiled,
+/area/hegemony_ship)
"Rw" = (
/obj/effect/floor_decal/corner_wide/red/diagonal,
/turf/simulated/floor/tiled,
@@ -7203,10 +7579,10 @@
master_tag = "airlock_hegemony_dock";
name = "airlock_hegemony_dock"
},
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{
dir = 8
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/docking_port)
"RI" = (
/obj/effect/floor_decal/corner/yellow{
@@ -7232,10 +7608,7 @@
/obj/machinery/atmospherics/pipe/simple/visible/black{
dir = 5
},
-/obj/machinery/light/colored/red{
- dir = 8
- },
-/turf/simulated/floor,
+/turf/simulated/wall/shuttle/space_ship/mercenary,
/area/shuttle/hegemony)
"RQ" = (
/obj/structure/lattice/catwalk/indoor/grate,
@@ -7243,14 +7616,15 @@
dir = 4
},
/obj/machinery/alarm/north{
- req_one_access = null
+ req_one_access = null;
+ req_access = list(113)
},
/obj/structure/cable/green{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/bridge)
"RS" = (
/turf/simulated/wall/shuttle/space_ship/mercenary,
@@ -7275,7 +7649,7 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{
dir = 8
},
/obj/machinery/embedded_controller/radio/airlock/docking_port{
@@ -7293,13 +7667,14 @@
shuttle_tag = "Hegemony Shuttle"
},
/obj/effect/map_effect/marker_helper/airlock/out,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/shuttle/hegemony)
"Se" = (
/obj/machinery/door/airlock/service{
name = "Custodial Closet";
dir = 1
},
+/obj/machinery/door/firedoor/noid,
/turf/simulated/floor/tiled,
/area/hegemony_ship)
"Sf" = (
@@ -7318,7 +7693,7 @@
/area/hegemony_ship)
"Sh" = (
/obj/effect/floor_decal/corner_wide/red/diagonal,
-/obj/machinery/atmospherics/pipe/simple/hidden{
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
dir = 10
},
/turf/simulated/floor/tiled,
@@ -7333,7 +7708,9 @@
name = "Restroom";
dir = 4
},
-/obj/machinery/door/firedoor/noid,
+/obj/machinery/door/firedoor/noid{
+ dir = 4
+ },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
@@ -7372,6 +7749,9 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
+/obj/effect/floor_decal/industrial/outline_straight/yellow{
+ dir = 8
+ },
/turf/simulated/floor/tiled,
/area/hegemony_ship)
"Sx" = (
@@ -7386,6 +7766,13 @@
},
/turf/simulated/floor/tiled,
/area/hegemony_ship)
+"Sy" = (
+/obj/effect/floor_decal/corner/yellow{
+ dir = 9
+ },
+/obj/effect/floor_decal/industrial/outline_straight/yellow,
+/turf/simulated/floor/tiled,
+/area/hegemony_ship)
"Sz" = (
/obj/effect/floor_decal/corner_wide/red/diagonal,
/obj/machinery/light/colored/red{
@@ -7426,7 +7813,8 @@
dir = 8
},
/obj/machinery/alarm/north{
- req_one_access = null
+ req_one_access = null;
+ req_access = list(113)
},
/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/hegemony{
pixel_y = -4
@@ -7436,6 +7824,12 @@
},
/turf/simulated/floor/wood,
/area/hegemony_ship/captains_quarters)
+"SI" = (
+/obj/machinery/light/colored/red{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/shuttle/hegemony)
"SL" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -7445,7 +7839,7 @@
icon_state = "1-2"
},
/obj/structure/lattice/catwalk/indoor/grate,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship)
"SN" = (
/obj/machinery/door/airlock/atmos{
@@ -7462,7 +7856,7 @@
d2 = 8;
icon_state = "4-8"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/atmos_waste)
"SP" = (
/obj/effect/floor_decal/corner/dark_blue/diagonal,
@@ -7515,7 +7909,7 @@
dir = 4
},
/obj/machinery/portable_atmospherics/powered/pump,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/engineering)
"Tb" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -7536,12 +7930,27 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/blood/oil,
/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/port_propulsion)
"Tf" = (
-/obj/effect/map_effect/window_spawner/full/reinforced,
-/turf/simulated/floor,
+/obj/effect/map_effect/window_spawner/full/shuttle{
+ color = "#5b5b5b";
+ frame_color = "#5b5b5b";
+ spawn_firedoor = 1;
+ spawn_grille = 1
+ },
+/turf/simulated/floor/plating,
/area/hegemony_ship/bridge)
+"Th" = (
+/obj/effect/floor_decal/corner/yellow{
+ dir = 6
+ },
+/obj/machinery/light{
+ dir = 4
+ },
+/obj/effect/floor_decal/industrial/outline_straight/yellow,
+/turf/simulated/floor/tiled,
+/area/hegemony_ship)
"Tj" = (
/obj/structure/cable/green{
d1 = 2;
@@ -7563,7 +7972,7 @@
d2 = 8;
icon_state = "4-8"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/bridge)
"Ts" = (
/obj/structure/bed/handrail{
@@ -7586,6 +7995,10 @@
/area/hegemony_ship/temple)
"TA" = (
/obj/effect/floor_decal/corner/yellow,
+/obj/effect/floor_decal/industrial/outline_straight/yellow{
+ dir = 4
+ },
+/obj/effect/floor_decal/industrial/outline_straight/yellow,
/turf/simulated/floor/tiled,
/area/hegemony_ship)
"TC" = (
@@ -7600,7 +8013,7 @@
"TD" = (
/obj/machinery/power/smes/buildable/power_shuttle,
/obj/structure/cable,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/shuttle/hegemony)
"TI" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
@@ -7611,7 +8024,7 @@
d2 = 2;
icon_state = "1-2"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/engineering)
"TL" = (
/obj/machinery/atmospherics/binary/passive_gate/supply{
@@ -7624,7 +8037,7 @@
d2 = 4;
icon_state = "2-4"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/atmos_distro)
"TN" = (
/obj/structure/cable{
@@ -7633,11 +8046,26 @@
/obj/machinery/computer/ship/engines{
dir = 4
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/shuttle/hegemony)
+"TQ" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 8
+ },
+/obj/structure/cable/green{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/structure/lattice/catwalk/indoor/grate,
+/obj/effect/floor_decal/industrial/outline_straight/yellow,
+/turf/simulated/floor/plating,
+/area/hegemony_ship)
"TW" = (
/obj/machinery/alarm/north{
- req_one_access = null
+ req_one_access = null;
+ req_access = list(113)
},
/obj/structure/cable/green{
icon_state = "2-8"
@@ -7671,13 +8099,14 @@
dir = 8
},
/obj/machinery/alarm/north{
- req_one_access = null
+ req_one_access = null;
+ req_access = list(113)
},
/turf/simulated/floor/tiled,
/area/hegemony_ship/crew_quarters)
"Uk" = (
/obj/machinery/firealarm/south,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/port_propulsion)
"Um" = (
/obj/structure/table/glass,
@@ -7694,11 +8123,11 @@
/turf/simulated/floor/tiled/white,
/area/hegemony_ship/medbay)
"Uo" = (
-/obj/machinery/alarm/north{
- pixel_y = -32;
- req_one_access = null
+/obj/machinery/alarm/south{
+ req_one_access = null;
+ req_access = list(113)
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/port_propulsion)
"Up" = (
/obj/item/hullbeacon/red,
@@ -7721,8 +8150,7 @@
/area/hegemony_ship)
"Uv" = (
/obj/machinery/atmospherics/unary/engine,
-/obj/structure/window/borosilicate/reinforced,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/port_propulsion)
"Uz" = (
/obj/effect/floor_decal/corner/yellow{
@@ -7768,8 +8196,10 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/sign/flag/hegemony/large/north,
-/turf/simulated/floor,
+/obj/structure/sign/flag/hegemony/large/north{
+ pixel_y = 32
+ },
+/turf/simulated/floor/plating,
/area/hegemony_ship/bridge)
"UI" = (
/turf/simulated/floor/holofloor/desert,
@@ -7809,15 +8239,20 @@
/turf/template_noop,
/area/space)
"UY" = (
-/obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
-/turf/simulated/floor,
+/obj/effect/map_effect/window_spawner/full/shuttle{
+ color = "#5b5b5b";
+ frame_color = "#5b5b5b";
+ spawn_firedoor = 1;
+ spawn_grille = 1
+ },
+/turf/simulated/floor/plating,
/area/shuttle/hegemony)
"Va" = (
/obj/effect/floor_decal/corner/yellow{
dir = 5
},
/obj/machinery/power/apc/north{
- is_critical = 1
+ req_access = list(113)
},
/obj/structure/cable/green{
icon_state = "0-2"
@@ -7862,7 +8297,7 @@
"Ve" = (
/obj/item/modular_computer/console/preset/civilian,
/obj/structure/lattice/catwalk/indoor/grate,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/aux_cic)
"Vm" = (
/obj/effect/floor_decal/corner/yellow{
@@ -7879,7 +8314,7 @@
dir = 9
},
/obj/machinery/firealarm/south,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/atmos_distro)
"Vx" = (
/obj/item/clothing/suit/pirate{
@@ -7899,7 +8334,7 @@
pixel_y = -32
},
/obj/machinery/light,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/trophy_room)
"VB" = (
/obj/item/device/binoculars,
@@ -7990,11 +8425,24 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
-/obj/machinery/atmospherics/pipe/simple/hidden{
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
dir = 6
},
+/obj/effect/floor_decal/industrial/outline_straight/yellow,
/turf/simulated/floor/tiled,
/area/hegemony_ship)
+"VS" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/green{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/structure/lattice/catwalk/indoor/grate,
+/obj/effect/floor_decal/industrial/outline_straight/yellow,
+/turf/simulated/floor/plating,
+/area/hegemony_ship)
"VW" = (
/obj/effect/floor_decal/industrial/hatch/yellow,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -8014,7 +8462,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/shuttle/hegemony)
"Wl" = (
/obj/effect/floor_decal/corner/yellow/full{
@@ -8025,9 +8473,8 @@
/area/hegemony_ship/gun_deck_bruiser)
"Wt" = (
/obj/effect/floor_decal/corner_wide/red/diagonal,
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 9;
- icon_state = "intact"
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
+ dir = 9
},
/turf/simulated/floor/tiled,
/area/shuttle/hegemony)
@@ -8054,7 +8501,7 @@
dir = 4
},
/obj/structure/lattice/catwalk/indoor/grate,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship)
"WG" = (
/obj/structure/ship_weapon_dummy/barrel,
@@ -8071,29 +8518,57 @@
/obj/machinery/atmospherics/pipe/simple/hidden/red{
dir = 9
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/atmos_waste)
"WM" = (
/obj/machinery/atmospherics/binary/pump/high_power{
dir = 8
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/shuttle/hegemony)
-"WR" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light{
- dir = 8
+"WO" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/structure/cable/green{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 4
+ },
+/obj/effect/floor_decal/industrial/outline_straight/yellow{
+ dir = 4
+ },
+/turf/simulated/floor/tiled,
+/area/hegemony_ship)
+"WR" = (
/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
dir = 5
},
-/turf/simulated/floor,
+/turf/simulated/wall/shuttle/space_ship/mercenary,
/area/hegemony_ship/port_propulsion)
"WW" = (
/obj/effect/floor_decal/spline/plain,
/obj/machinery/computer/ship/navigation,
/turf/simulated/floor/tiled/dark,
/area/hegemony_ship/bridge)
+"WX" = (
+/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{
+ dir = 8
+ },
+/obj/effect/map_effect/marker/airlock/docking{
+ req_one_access = list(13,113);
+ name = "airlock_hegemony_generic";
+ landmark_tag = "nav_hegemony_corvette_generic";
+ master_tag = "airlock_hegemony_generic"
+ },
+/turf/simulated/floor/plating,
+/area/hegemony_ship)
"Xa" = (
/turf/simulated/wall/shuttle/space_ship/mercenary,
/area/hegemony_ship/crew_quarters)
@@ -8105,14 +8580,14 @@
d2 = 8;
icon_state = "0-8"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/engineering)
"Xi" = (
/obj/machinery/atmospherics/binary/pump/high_power{
dir = 4;
layer = 2.8
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/engineering)
"Xm" = (
/obj/effect/floor_decal/spline/plain{
@@ -8127,15 +8602,12 @@
/obj/machinery/light{
dir = 8
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/port_propulsion)
"Xr" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -8148,7 +8620,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
dir = 4
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship)
"Xs" = (
/obj/effect/landmark/entry_point/port{
@@ -8170,17 +8642,22 @@
d2 = 4;
icon_state = "1-4"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/bridge)
"XF" = (
/obj/effect/floor_decal/corner_wide/red/diagonal,
/obj/effect/overmap/visitable/ship/landable/hegemony_shuttle,
+/obj/machinery/hologram/holopad/long_range,
/turf/simulated/floor/tiled,
/area/shuttle/hegemony)
"XG" = (
/obj/effect/floor_decal/corner/yellow{
dir = 8
},
+/obj/effect/floor_decal/industrial/outline_straight/yellow{
+ dir = 8
+ },
+/obj/effect/floor_decal/industrial/outline_straight/yellow,
/turf/simulated/floor/tiled,
/area/hegemony_ship)
"XJ" = (
@@ -8193,16 +8670,30 @@
/turf/simulated/floor/carpet/red,
/area/hegemony_ship/temple)
"XL" = (
-/obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
+/obj/effect/map_effect/window_spawner/full/shuttle{
+ color = "#5b5b5b";
+ frame_color = "#5b5b5b";
+ spawn_firedoor = 1;
+ spawn_grille = 1
+ },
/obj/effect/landmark/entry_point/fore{
name = "fore, bridge"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/shuttle/hegemony)
"XM" = (
/obj/structure/ship_weapon_dummy/barrel,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/space)
+"XN" = (
+/obj/effect/map_effect/marker/airlock/docking{
+ req_one_access = list(13,113);
+ name = "airlock_hegemony_generic";
+ landmark_tag = "nav_hegemony_corvette_generic";
+ master_tag = "airlock_hegemony_generic"
+ },
+/turf/simulated/floor/plating,
+/area/hegemony_ship)
"XU" = (
/obj/machinery/portable_atmospherics/canister/air/airlock,
/obj/machinery/atmospherics/portables_connector{
@@ -8278,8 +8769,13 @@
id = "headmaster_bridge";
icon_state = "pdoor0"
},
-/obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
-/turf/simulated/floor,
+/obj/effect/map_effect/window_spawner/full/shuttle{
+ color = "#5b5b5b";
+ frame_color = "#5b5b5b";
+ spawn_firedoor = 1;
+ spawn_grille = 1
+ },
+/turf/simulated/floor/plating,
/area/hegemony_ship/trophy_room)
"Yt" = (
/obj/structure/table/wood,
@@ -8296,6 +8792,10 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
},
+/obj/effect/floor_decal/industrial/outline_straight/yellow{
+ dir = 4
+ },
+/obj/effect/floor_decal/industrial/outline_straight/yellow,
/turf/simulated/floor/tiled,
/area/hegemony_ship)
"Yw" = (
@@ -8320,7 +8820,7 @@
dir = 5
},
/obj/structure/lattice/catwalk/indoor/grate,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship)
"Yy" = (
/obj/structure/lattice/catwalk/indoor/grate,
@@ -8335,7 +8835,7 @@
d2 = 8;
icon_state = "4-8"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/bridge)
"YC" = (
/obj/structure/table/wood,
@@ -8355,8 +8855,13 @@
/turf/simulated/floor/carpet/lightblue,
/area/hegemony_ship/canteen)
"YD" = (
-/obj/effect/map_effect/window_spawner/full/reinforced,
-/turf/simulated/floor,
+/obj/effect/map_effect/window_spawner/full/shuttle{
+ color = "#5b5b5b";
+ frame_color = "#5b5b5b";
+ spawn_firedoor = 1;
+ spawn_grille = 1
+ },
+/turf/simulated/floor/plating,
/area/hegemony_ship/gun_deck_flak)
"YG" = (
/obj/structure/window/reinforced,
@@ -8374,7 +8879,7 @@
/obj/structure/window/reinforced{
dir = 4
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/eva_storage)
"YK" = (
/obj/effect/landmark/entry_point/aft{
@@ -8382,6 +8887,20 @@
},
/turf/simulated/wall/shuttle/space_ship/mercenary,
/area/hegemony_ship/temple)
+"YL" = (
+/obj/effect/floor_decal/industrial/warning,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/green{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/effect/floor_decal/industrial/outline_straight/yellow{
+ dir = 1
+ },
+/turf/simulated/floor/tiled,
+/area/hegemony_ship)
"YM" = (
/obj/machinery/door/airlock/atmos{
name = "Atmospherics Air Supply";
@@ -8391,13 +8910,15 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/machinery/door/firedoor/noid,
+/obj/machinery/door/firedoor/noid{
+ dir = 4
+ },
/obj/structure/cable/green{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/atmos_distro)
"YN" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -8425,7 +8946,17 @@
/turf/simulated/floor/tiled,
/area/hegemony_ship)
"YZ" = (
-/turf/simulated/floor,
+/obj/machinery/door/airlock/external{
+ dir = 4
+ },
+/obj/effect/map_effect/marker/airlock/docking{
+ req_one_access = list(13,113);
+ name = "airlock_hegemony_generic";
+ landmark_tag = "nav_hegemony_corvette_generic";
+ master_tag = "airlock_hegemony_generic"
+ },
+/obj/effect/map_effect/marker_helper/airlock/exterior,
+/turf/simulated/floor/plating,
/area/hegemony_ship)
"Zi" = (
/obj/effect/floor_decal/corner/yellow{
@@ -8446,7 +8977,8 @@
pixel_y = 0
},
/obj/machinery/alarm/north{
- req_one_access = null
+ req_one_access = null;
+ req_access = list(113)
},
/obj/structure/cable/green{
icon_state = "2-8"
@@ -8508,7 +9040,7 @@
/turf/simulated/floor/tiled/white,
/area/hegemony_ship/canteen)
"ZF" = (
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/engineering)
"ZH" = (
/obj/machinery/door/airlock/silver{
@@ -8554,7 +9086,9 @@
req_one_access = list(113);
dir = 4
},
-/obj/machinery/door/firedoor/noid,
+/obj/machinery/door/firedoor/noid{
+ dir = 4
+ },
/turf/simulated/floor/tiled,
/area/hegemony_ship/brig)
"ZR" = (
@@ -8568,7 +9102,7 @@
d2 = 8;
icon_state = "2-8"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hegemony_ship/bridge)
"ZU" = (
/obj/effect/floor_decal/corner/yellow/diagonal,
@@ -17883,18 +18417,18 @@ aJ
aJ
hm
pF
-Qp
+FZ
Qp
mX
eC
Nu
-Ay
+gX
ll
-rE
+lw
Sf
-rE
+Sy
ll
-Ay
+ce
KB
Ev
cD
@@ -18054,9 +18588,9 @@ Gn
OA
mv
Yw
-Bo
+TQ
kh
-os
+dU
Dr
PG
fk
@@ -18212,13 +18746,13 @@ ii
ml
eC
Ex
-Ej
+Th
mr
rU
-Gt
+WO
Yu
mr
-Ej
+bO
FS
Ev
Wl
@@ -18368,7 +18902,7 @@ aJ
aJ
aJ
eC
-Cx
+CP
Qp
ii
In
@@ -18531,16 +19065,16 @@ aJ
aJ
eC
CP
-Qp
+nD
Qp
dL
eC
Tb
iB
ip
-Yk
-Gt
-Hz
+jC
+cX
+Ha
Ym
Nf
aN
@@ -18692,7 +19226,7 @@ aJ
aJ
aJ
hm
-Ng
+uS
ii
Qp
Qp
@@ -18854,7 +19388,7 @@ aJ
aJ
aJ
Cw
-Cx
+CP
ii
ii
Qp
@@ -18862,7 +19396,7 @@ eC
TW
zw
ip
-Go
+yQ
va
SB
Ym
@@ -19024,7 +19558,7 @@ eC
rZ
Rh
ip
-xI
+ue
GA
SB
Ym
@@ -20643,10 +21177,10 @@ oE
oE
wQ
wQ
+wQ
sO
-xI
-Gt
-SB
+WO
+MH
wQ
HF
lU
@@ -20805,7 +21339,7 @@ YN
jz
wQ
HF
-Ha
+wQ
Ey
NP
bB
@@ -20969,9 +21503,9 @@ wQ
HF
wQ
gg
-Gt
+cX
XG
-zI
+ll
fo
pi
ee
@@ -20986,18 +21520,18 @@ rE
Ay
bh
Pc
-rE
+hU
Pp
-ta
+eT
xV
xV
ta
Fs
ta
ta
-ta
+BY
ll
-rE
+lw
Pc
zu
yd
@@ -21132,9 +21666,9 @@ wQ
wQ
Va
Hb
-SL
+VS
kh
-sF
+YL
US
ZW
Sx
@@ -21148,18 +21682,18 @@ Lf
Bo
Nx
eZ
-os
+Md
kh
-os
+dU
Sx
SL
SL
wa
os
os
-os
+Md
sQ
-SL
+Qt
Oo
Lu
Ck
@@ -21293,9 +21827,9 @@ GF
zt
BX
vr
-Gt
+WO
TA
-Qt
+mr
cr
fB
TC
@@ -21310,18 +21844,18 @@ rg
GB
IH
iU
-IH
+pL
LB
-IH
+qb
qc
IH
Ej
iU
IH
IH
-Ej
+Th
fM
-IH
+qb
IH
Mt
jb
@@ -21616,9 +22150,9 @@ hc
eb
Bq
oI
-xI
-Gt
-SB
+ku
+cX
+Cx
nG
qY
nG
@@ -22265,7 +22799,7 @@ nX
ao
oI
xI
-yQ
+Mi
sB
nG
qY
@@ -23390,7 +23924,7 @@ aJ
aJ
aJ
IL
-ue
+Jv
yf
bo
yf
@@ -23420,7 +23954,7 @@ PP
gf
lI
DX
-qO
+zI
rL
MF
Sh
@@ -23714,7 +24248,7 @@ aJ
aJ
aJ
oB
-ue
+Jv
yf
bo
Uk
@@ -23722,9 +24256,9 @@ oB
TL
HB
BS
-Yk
-Gt
-Hz
+Rv
+WO
+ke
Ot
zN
zN
@@ -23743,7 +24277,7 @@ rL
PP
zO
WM
-GM
+MS
qO
rL
OY
@@ -23876,7 +24410,7 @@ aJ
aJ
aJ
oB
-ue
+Jv
bo
yf
Uo
@@ -24044,11 +24578,11 @@ bo
KD
oB
uA
-qb
-rE
+Pp
+lw
Su
-Gt
-SB
+cX
+Cx
Ot
kQ
zQ
@@ -24227,7 +24761,7 @@ aJ
aJ
Az
LX
-MS
+SI
rL
rL
rL
@@ -24363,15 +24897,15 @@ aJ
aJ
Uv
MQ
-yf
+rk
yf
bi
oB
aF
wQ
-YZ
-YZ
-pL
+Ng
+GM
+wQ
Ut
Ot
lY
@@ -24531,8 +25065,8 @@ oB
oB
wQ
wQ
-YZ
-YZ
+fl
+WX
wQ
wQ
Ot
@@ -24693,8 +25227,8 @@ aJ
aJ
aJ
wQ
-YZ
-YZ
+XN
+XN
wQ
aJ
aJ
diff --git a/maps/away/ships/heph/cyclops/cyclops.dmm b/maps/away/ships/heph/cyclops/cyclops.dmm
index a773877c949..8b90cb0ad3f 100644
--- a/maps/away/ships/heph/cyclops/cyclops.dmm
+++ b/maps/away/ships/heph/cyclops/cyclops.dmm
@@ -46,13 +46,8 @@
dir = 1
},
/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/machinery/embedded_controller/radio/docking_port_multi{
- child_names_txt = "Cyclops Shuttle Airlock";
- child_tags_txt = "cyclops_shuttle";
- frequency = 1380;
- id_tag = "cyclops_shuttle";
- pixel_y = 25;
- pixel_x = -9
+/obj/machinery/light/small/emergency{
+ dir = 1
},
/turf/simulated/floor/tiled/dark,
/area/shuttle/cyclops_shuttle)
@@ -63,7 +58,6 @@
/obj/effect/floor_decal/corner/brown{
dir = 5
},
-/obj/machinery/atmospherics/pipe/simple/hidden/red,
/obj/effect/floor_decal/industrial/outline/yellow,
/turf/simulated/floor/tiled/dark,
/area/shuttle/cyclops_shuttle)
@@ -131,11 +125,15 @@
shuttle_tag = "Cyclops Shuttle";
cycle_to_external_air = 1
},
-/obj/effect/map_effect/marker_helper/airlock/out,
+/obj/effect/map_effect/marker_helper/airlock/exterior,
/obj/structure/bed/handrail{
dir = 8
},
-/turf/simulated/floor,
+/obj/machinery/airlock_sensor{
+ pixel_x = 24;
+ pixel_y = 6
+ },
+/turf/simulated/floor/plating,
/area/shuttle/cyclops_shuttle)
"bd" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -160,7 +158,7 @@
/obj/machinery/light{
dir = 8
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hephmining_ship/cyclops/cyclops_hangar)
"bl" = (
/obj/machinery/atmospherics/binary/passive_gate/supply,
@@ -194,14 +192,7 @@
/obj/structure/bed/handrail{
dir = 1
},
-/obj/machinery/airlock_sensor{
- frequency = 1380;
- id_tag = "cyclops_shuttle_exterior";
- pixel_x = -10;
- pixel_y = -20;
- dir = 1
- },
-/turf/simulated/floor/tiled/dark/full/airless,
+/turf/simulated/floor/tiled/dark/full,
/area/shuttle/cyclops_shuttle)
"bC" = (
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
@@ -255,26 +246,30 @@
/turf/simulated/floor/tiled/dark,
/area/hephmining_ship/cyclops/cyclops_barracks)
"cl" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 4
- },
-/turf/simulated/floor/tiled/dark/full,
-/area/hephmining_ship/cyclops/cyclops_starboard_thrust)
-"co" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 5
- },
-/obj/effect/floor_decal/industrial/warning{
+/obj/machinery/computer/ship/engines{
dir = 1
},
/turf/simulated/floor/tiled/dark,
/area/hephmining_ship/cyclops/cyclops_starboard_thrust)
+"co" = (
+/obj/machinery/atmospherics/unary/outlet_injector{
+ dir = 4
+ },
+/obj/effect/map_effect/marker/large_tank{
+ name = "cyclops_tank_star";
+ master_tag = "cyclops_tank_star"
+ },
+/obj/machinery/air_sensor{
+ pixel_y = 18
+ },
+/turf/simulated/floor/reinforced/carbon_dioxide,
+/area/hephmining_ship/cyclops/cyclops_starboard_thrust)
"cp" = (
/obj/effect/floor_decal/industrial/warning{
dir = 4
},
/obj/item/clothing/head/cone,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hephmining_ship/cyclops/cyclops_hangar)
"cr" = (
/obj/machinery/door/airlock/mining{
@@ -305,11 +300,16 @@
/obj/effect/landmark/entry_point/fore{
name = "fore, bridge"
},
-/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor,
+/obj/effect/map_effect/window_spawner/full/shuttle{
+ spawn_firedoor = 1;
+ spawn_grille = 1;
+ color = "#4c4324";
+ frame_color = "#4c4324"
+ },
/obj/machinery/door/blast/shutters/open{
id = "cyclops_bridge_lockdown"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hephmining_ship/cyclops/cyclops_bridge)
"cP" = (
/obj/machinery/door/airlock/external{
@@ -336,8 +336,13 @@
/turf/simulated/floor/tiled/dark,
/area/hephmining_ship/cyclops/cyclops_starboard_thrust)
"cW" = (
-/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor,
-/turf/simulated/floor,
+/obj/effect/map_effect/window_spawner/full/shuttle{
+ spawn_firedoor = 1;
+ spawn_grille = 1;
+ color = "#4c4324";
+ frame_color = "#4c4324"
+ },
+/turf/simulated/floor/plating,
/area/hephmining_ship/cyclops/cyclops_hangar)
"cX" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
@@ -365,11 +370,13 @@
/turf/simulated/floor/tiled/dark/full,
/area/shuttle/cyclops_shuttle)
"dn" = (
-/obj/machinery/computer/ship/engines{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/visible/fuel{
+ dir = 5
},
-/turf/simulated/floor/tiled/dark,
-/area/hephmining_ship/cyclops/cyclops_port_thrust)
+/turf/simulated/wall/shuttle/space_ship{
+ color = "#4c4324"
+ },
+/area/hephmining_ship/cyclops/cyclops_starboard_thrust)
"dp" = (
/obj/machinery/atmospherics/binary/pump{
dir = 4;
@@ -451,7 +458,7 @@
dir = 8
},
/obj/effect/floor_decal/industrial/outline/yellow,
-/turf/simulated/floor/tiled/dark/full/airless,
+/turf/simulated/floor/tiled/dark/full,
/area/shuttle/cyclops_shuttle)
"dN" = (
/obj/structure/cable/green{
@@ -462,7 +469,6 @@
name = "port, crew compartment"
},
/obj/machinery/door/airlock/external{
- frequency = 1380;
icon_state = "door_locked";
id_tag = "cyclops_shuttle_out";
dir = 4
@@ -552,11 +558,19 @@
"eg" = (
/obj/machinery/atmospherics/pipe/simple/hidden,
/obj/effect/floor_decal/corner/brown/full,
+/obj/machinery/atmospherics/binary/pump/scrubber/on{
+ dir = 8
+ },
/turf/simulated/floor/tiled/dark,
/area/shuttle/cyclops_shuttle)
"eo" = (
-/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor,
-/turf/simulated/floor,
+/obj/effect/map_effect/window_spawner/full/shuttle{
+ spawn_firedoor = 1;
+ spawn_grille = 1;
+ color = "#4c4324";
+ frame_color = "#4c4324"
+ },
+/turf/simulated/floor/plating,
/area/shuttle/cyclops_shuttle)
"ex" = (
/obj/structure/ore_box,
@@ -589,7 +603,7 @@
/obj/effect/floor_decal/industrial/warning{
dir = 8
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hephmining_ship/cyclops/cyclops_hangar)
"eG" = (
/obj/structure/railing/mapped{
@@ -599,7 +613,7 @@
/obj/structure/bed/handrail{
pixel_y = -8
},
-/turf/simulated/floor/tiled/dark/full/airless,
+/turf/simulated/floor/tiled/dark/full,
/area/shuttle/cyclops_shuttle)
"eM" = (
/turf/simulated/wall/shuttle/space_ship{
@@ -625,17 +639,10 @@
/turf/template_noop,
/area/space)
"fa" = (
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/machinery/atmospherics/unary/engine{
- dir = 1
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/fuel,
+/turf/simulated/wall/shuttle/space_ship{
+ color = "#4c4324"
},
-/obj/structure/window/reinforced{
- dir = 1
- },
-/obj/effect/landmark/entry_point/north{
- name = "aft, engines"
- },
-/turf/simulated/floor,
/area/shuttle/cyclops_shuttle)
"fb" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -687,7 +694,7 @@
/obj/structure/window/reinforced{
dir = 4
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hephmining_ship/cyclops/cyclops_hangar)
"fz" = (
/obj/structure/bed/stool/bar/padded/orange,
@@ -720,9 +727,7 @@
},
/obj/effect/floor_decal/industrial/hatch/yellow,
/obj/machinery/door/airlock/external{
- frequency = 1380;
icon_state = "door_locked";
- id_tag = "cyclops_shuttle_in";
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden{
@@ -772,7 +777,7 @@
/obj/effect/floor_decal/industrial/warning{
dir = 10
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hephmining_ship/cyclops/cyclops_hangar)
"gm" = (
/obj/machinery/light/small,
@@ -786,12 +791,17 @@
/turf/simulated/floor/tiled/dark/full,
/area/hephmining_ship/cyclops/cyclops_hangar)
"gn" = (
-/obj/machinery/atmospherics/portables_connector{
- dir = 8;
- layer = 2.8
+/obj/machinery/computer/general_air_control/large_tank_control{
+ name = "carbon dioxide supply"
+ },
+/obj/machinery/light{
+ dir = 4;
+ status = 2
+ },
+/obj/effect/map_effect/marker/large_tank{
+ name = "cyclops_tank_port";
+ master_tag = "cyclops_tank_port"
},
-/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
-/obj/effect/floor_decal/industrial/outline/yellow,
/turf/simulated/floor/tiled/dark,
/area/hephmining_ship/cyclops/cyclops_port_thrust)
"gs" = (
@@ -844,7 +854,7 @@
/obj/structure/window/reinforced{
dir = 4
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hephmining_ship/cyclops/cyclops_hangar)
"gV" = (
/obj/structure/lattice/catwalk,
@@ -975,7 +985,7 @@
req_access = list(216);
dir = 4
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hephmining_ship/cyclops/cyclops_hangar)
"iR" = (
/obj/effect/floor_decal/corner/orange/full{
@@ -1004,7 +1014,7 @@
dir = 9
},
/obj/machinery/floodlight,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hephmining_ship/cyclops/cyclops_hangar)
"iX" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
@@ -1038,6 +1048,9 @@
/obj/effect/floor_decal/corner/brown{
dir = 10
},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 9
+ },
/turf/simulated/floor/tiled/dark,
/area/shuttle/cyclops_shuttle)
"jD" = (
@@ -1127,11 +1140,16 @@
/turf/simulated/floor/tiled/dark,
/area/hephmining_ship/cyclops)
"kV" = (
-/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
-/obj/machinery/atmospherics/portables_connector{
- dir = 4
+/obj/machinery/light{
+ dir = 8
+ },
+/obj/machinery/computer/general_air_control/large_tank_control{
+ name = "carbon dioxide supply"
+ },
+/obj/effect/map_effect/marker/large_tank{
+ name = "cyclops_tank_star";
+ master_tag = "cyclops_tank_star"
},
-/obj/effect/floor_decal/industrial/outline/yellow,
/turf/simulated/floor/tiled/dark,
/area/hephmining_ship/cyclops/cyclops_starboard_thrust)
"kY" = (
@@ -1287,7 +1305,7 @@
"mO" = (
/obj/structure/lattice/catwalk/indoor,
/obj/item/hullbeacon/red,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/shuttle/cyclops_shuttle)
"mX" = (
/obj/structure/table/standard,
@@ -1354,12 +1372,10 @@
/turf/simulated/floor/tiled/dark/full,
/area/hephmining_ship/cyclops/cyclops_engineering)
"ne" = (
-/obj/machinery/atmospherics/pipe/manifold4w/hidden,
-/obj/machinery/meter,
-/obj/effect/floor_decal/industrial/warning{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/visible/fuel{
+ dir = 6
},
-/turf/simulated/floor/tiled/dark,
+/turf/simulated/floor/tiled/dark/full,
/area/hephmining_ship/cyclops/cyclops_port_thrust)
"nf" = (
/obj/structure/table/standard,
@@ -1380,12 +1396,24 @@
/turf/simulated/floor/tiled/dark,
/area/hephmining_ship/cyclops)
"np" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/red,
-/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor,
+/obj/effect/map_effect/window_spawner/full/shuttle{
+ spawn_firedoor = 1;
+ spawn_grille = 1;
+ color = "#4c4324";
+ frame_color = "#4c4324"
+ },
/obj/effect/landmark/entry_point/south{
name = "fore, bridge"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
+/area/shuttle/cyclops_shuttle)
+"nJ" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 6
+ },
+/turf/simulated/wall/shuttle/space_ship{
+ color = "#4c4324"
+ },
/area/shuttle/cyclops_shuttle)
"nK" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -1458,6 +1486,7 @@
/turf/simulated/floor/wood,
/area/hephmining_ship/cyclops/cyclops_captain)
"oH" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled/dark,
/area/shuttle/cyclops_shuttle)
"oS" = (
@@ -1502,22 +1531,26 @@
/obj/effect/floor_decal/corner/orange{
dir = 9
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hephmining_ship/cyclops/cyclops_hangar)
"pi" = (
-/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor,
+/obj/effect/map_effect/window_spawner/full/shuttle{
+ spawn_firedoor = 1;
+ spawn_grille = 1;
+ color = "#4c4324";
+ frame_color = "#4c4324"
+ },
/obj/effect/landmark/entry_point/west{
name = "starboard, crew compartment"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/shuttle/cyclops_shuttle)
"pl" = (
-/obj/machinery/atmospherics/unary/engine,
-/obj/structure/window/reinforced,
-/obj/effect/landmark/entry_point/aft{
- name = "aft, port engine"
+/obj/machinery/atmospherics/binary/pump/fuel{
+ dir = 8;
+ name = "Fuel Tank to Thrusters"
},
-/turf/simulated/floor,
+/turf/simulated/floor/tiled/dark/full,
/area/hephmining_ship/cyclops/cyclops_port_thrust)
"pv" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -1593,11 +1626,20 @@
/turf/simulated/floor/tiled/dark,
/area/hephmining_ship/cyclops/cyclops_hangar)
"pL" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 5
- },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled/dark/full,
/area/shuttle/cyclops_shuttle)
+"pU" = (
+/obj/machinery/atmospherics/pipe/manifold/visible/fuel{
+ dir = 8
+ },
+/obj/machinery/meter,
+/obj/machinery/alarm/west{
+ req_one_access = null;
+ req_access = list(216)
+ },
+/turf/simulated/floor/tiled/dark,
+/area/hephmining_ship/cyclops/cyclops_port_thrust)
"pW" = (
/obj/structure/cable/green{
icon_state = "1-4"
@@ -1614,9 +1656,6 @@
/turf/simulated/floor/tiled/dark/full,
/area/hephmining_ship/cyclops/cyclops_hangar)
"qg" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
- dir = 10
- },
/obj/effect/floor_decal/industrial/hatch/yellow,
/obj/machinery/light/small/emergency{
dir = 4
@@ -1698,9 +1737,7 @@
dir = 9
},
/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/machinery/light/small/emergency{
- dir = 8
- },
+/obj/structure/extinguisher_cabinet/west,
/turf/simulated/floor/tiled/dark,
/area/shuttle/cyclops_shuttle)
"qJ" = (
@@ -1747,21 +1784,19 @@
/turf/simulated/floor/tiled/dark,
/area/hephmining_ship/cyclops/cyclops_hangar)
"rr" = (
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/machinery/atmospherics/unary/engine{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 10
},
-/obj/structure/window/reinforced{
- dir = 1
+/turf/simulated/wall/shuttle/space_ship{
+ color = "#4c4324"
},
-/turf/simulated/floor,
/area/shuttle/cyclops_shuttle)
"rv" = (
/obj/machinery/conveyor{
id = "heph_3";
layer = 2.9
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hephmining_ship/cyclops/cyclops_hangar)
"rD" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -1828,7 +1863,6 @@
/area/hephmining_ship/cyclops/cyclops_bridge)
"sj" = (
/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
-/obj/effect/floor_decal/industrial/outline/yellow,
/turf/simulated/floor/tiled/dark,
/area/hephmining_ship/cyclops/cyclops_port_thrust)
"sl" = (
@@ -1852,17 +1886,16 @@
/obj/structure/cable/green{
icon_state = "2-4"
},
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 1
- },
-/obj/structure/extinguisher_cabinet{
- pixel_x = -57
- },
/turf/simulated/floor/tiled/dark/full,
/area/shuttle/cyclops_shuttle)
"sF" = (
-/turf/simulated/floor/tiled/dark/full/airless,
-/area/shuttle/cyclops_shuttle)
+/obj/machinery/atmospherics/pipe/manifold/visible/fuel{
+ dir = 8
+ },
+/turf/simulated/wall/shuttle/space_ship{
+ color = "#4c4324"
+ },
+/area/hephmining_ship/cyclops/cyclops_port_thrust)
"sI" = (
/obj/structure/plasticflaps/airtight,
/obj/machinery/door/airlock/hatch{
@@ -1909,6 +1942,10 @@
/obj/effect/floor_decal/industrial/outline/yellow,
/turf/simulated/floor/tiled/dark,
/area/hephmining_ship/cyclops/cyclops_engineering)
+"td" = (
+/obj/machinery/atmospherics/unary/engine,
+/turf/simulated/floor/plating,
+/area/hephmining_ship/cyclops/cyclops_port_thrust)
"tn" = (
/obj/effect/floor_decal/corner/grey/diagonal,
/obj/machinery/firealarm/south,
@@ -1946,9 +1983,7 @@
"tT" = (
/obj/effect/floor_decal/industrial/hatch/yellow,
/obj/machinery/door/airlock/external{
- frequency = 1380;
icon_state = "door_locked";
- id_tag = "cyclops_shuttle_in";
dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden,
@@ -1967,14 +2002,12 @@
dir = 1
},
/obj/structure/lattice/catwalk/indoor,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/shuttle/cyclops_shuttle)
"ui" = (
/obj/effect/floor_decal/industrial/hatch/yellow,
/obj/machinery/door/airlock/external{
- frequency = 1380;
icon_state = "door_locked";
- id_tag = "cyclops_shuttle_out";
dir = 4
},
/obj/effect/map_effect/marker/airlock/shuttle{
@@ -2017,21 +2050,24 @@
/turf/simulated/floor/tiled/dark/full,
/area/hephmining_ship/cyclops/cyclops_starboard_thrust)
"ux" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 9
- },
-/obj/machinery/light{
+/obj/machinery/light/small{
dir = 4
},
-/obj/machinery/alarm/east{
- req_access = list(216);
- req_one_access = null
- },
-/obj/effect/floor_decal/industrial/warning{
+/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/machinery/atmospherics/portables_connector/fuel{
dir = 1
},
/turf/simulated/floor/tiled/dark,
/area/hephmining_ship/cyclops/cyclops_starboard_thrust)
+"uy" = (
+/obj/machinery/atmospherics/pipe/manifold/visible/fuel{
+ dir = 4
+ },
+/turf/simulated/wall/shuttle/space_ship{
+ color = "#4c4324"
+ },
+/area/hephmining_ship/cyclops/cyclops_starboard_thrust)
"uB" = (
/obj/structure/lattice/catwalk,
/obj/structure/railing/mapped{
@@ -2040,6 +2076,10 @@
/obj/item/hullbeacon/red,
/turf/simulated/floor/airless,
/area/space)
+"uC" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/turf/simulated/floor/tiled/dark/full,
+/area/shuttle/cyclops_shuttle)
"uG" = (
/obj/machinery/atmospherics/portables_connector{
dir = 1
@@ -2050,6 +2090,10 @@
},
/turf/simulated/floor/tiled/dark,
/area/hephmining_ship/cyclops/cyclops_engineering)
+"uL" = (
+/obj/effect/floor_decal/industrial/warning,
+/turf/simulated/floor/plating,
+/area/hephmining_ship/cyclops/cyclops_hangar)
"uM" = (
/turf/simulated/floor/tiled/dark/full,
/area/hephmining_ship/cyclops/cyclops_barracks)
@@ -2073,7 +2117,7 @@
/obj/effect/floor_decal/industrial/warning{
dir = 1
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hephmining_ship/cyclops/cyclops_hangar)
"uT" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -2132,7 +2176,7 @@
layer = 2.9
},
/obj/structure/plasticflaps/mining,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hephmining_ship/cyclops/cyclops_hangar)
"vk" = (
/obj/structure/cable/green{
@@ -2147,11 +2191,11 @@
/turf/simulated/floor/tiled/dark/full,
/area/hephmining_ship/cyclops)
"vl" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
- name = "Emegency Venting"
+/obj/machinery/atmospherics/pipe/manifold/visible/fuel,
+/turf/simulated/wall/shuttle/space_ship{
+ color = "#4c4324"
},
-/turf/simulated/floor/tiled/dark/full/airless,
-/area/shuttle/cyclops_shuttle)
+/area/hephmining_ship/cyclops/cyclops_port_thrust)
"vs" = (
/obj/effect/floor_decal/corner/orange{
dir = 5
@@ -2206,7 +2250,7 @@
/obj/machinery/light{
dir = 8
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hephmining_ship/cyclops/cyclops_hangar)
"we" = (
/obj/effect/floor_decal/spline/fancy/wood{
@@ -2231,14 +2275,14 @@
/obj/effect/floor_decal/industrial/warning{
dir = 6
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hephmining_ship/cyclops/cyclops_hangar)
"wk" = (
/obj/machinery/mineral/stacking_machine{
id = "stacking_2"
},
/obj/effect/floor_decal/industrial/warning/full,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hephmining_ship/cyclops/cyclops_hangar)
"ws" = (
/obj/effect/floor_decal/industrial/hatch/yellow,
@@ -2289,13 +2333,13 @@
/obj/structure/bed/handrail{
dir = 8
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/shuttle/cyclops_shuttle)
"wL" = (
/obj/effect/floor_decal/industrial/warning{
dir = 10
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hephmining_ship/cyclops/cyclops_hangar)
"wO" = (
/obj/structure/table/standard,
@@ -2364,7 +2408,7 @@
/area/hephmining_ship/cyclops/cyclops_engineering)
"xU" = (
/obj/structure/lattice/catwalk/indoor,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/shuttle/cyclops_shuttle)
"yb" = (
/obj/effect/floor_decal/corner/orange/full{
@@ -2450,9 +2494,6 @@
pixel_y = 7
},
/obj/machinery/cell_charger,
-/obj/machinery/light/small/emergency{
- dir = 4
- },
/obj/machinery/power/apc/east{
req_access = list(216)
},
@@ -2530,18 +2571,15 @@
/turf/simulated/floor/tiled/dark/full,
/area/hephmining_ship/cyclops/cyclops_engineering)
"yW" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 4
- },
-/turf/simulated/floor/tiled/dark/full,
+/obj/machinery/computer/ship/engines,
+/turf/simulated/floor/tiled/dark,
/area/hephmining_ship/cyclops/cyclops_port_thrust)
"yX" = (
-/obj/machinery/atmospherics/unary/engine,
-/obj/structure/window/reinforced,
-/obj/effect/landmark/entry_point/aft{
- name = "aft, starboard engine"
+/obj/machinery/atmospherics/binary/pump/fuel{
+ dir = 4;
+ name = "Fuel Tank to Thrusters"
},
-/turf/simulated/floor,
+/turf/simulated/floor/tiled/dark/full,
/area/hephmining_ship/cyclops/cyclops_starboard_thrust)
"yY" = (
/obj/machinery/door/firedoor,
@@ -2580,6 +2618,9 @@
dir = 8
},
/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/machinery/light/small/emergency{
+ dir = 1
+ },
/turf/simulated/floor/tiled/dark,
/area/shuttle/cyclops_shuttle)
"zi" = (
@@ -2592,7 +2633,7 @@
/turf/simulated/floor/tiled/dark/full,
/area/hephmining_ship/cyclops)
"zn" = (
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hephmining_ship/cyclops/cyclops_hangar)
"zx" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -2624,7 +2665,7 @@
dir = 4
},
/obj/effect/floor_decal/industrial/outline/yellow,
-/turf/simulated/floor/tiled/dark/full/airless,
+/turf/simulated/floor/tiled/dark/full,
/area/shuttle/cyclops_shuttle)
"zX" = (
/obj/effect/floor_decal/corner/orange{
@@ -2654,9 +2695,11 @@
/turf/template_noop,
/area/space)
"Ai" = (
-/obj/structure/window/reinforced,
-/obj/machinery/atmospherics/unary/engine,
-/turf/simulated/floor,
+/obj/effect/map_effect/window_spawner/full/borosilicate/reinforced/firedoor,
+/obj/machinery/atmospherics/pipe/simple/visible/universal{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
/area/hephmining_ship/cyclops/cyclops_port_thrust)
"Al" = (
/obj/effect/floor_decal/corner/grey/diagonal,
@@ -2874,6 +2917,12 @@
/obj/effect/floor_decal/industrial/outline/yellow,
/turf/simulated/floor/tiled/dark,
/area/hephmining_ship/cyclops/cyclops_hangar)
+"Bw" = (
+/obj/machinery/atmospherics/pipe/manifold/visible/fuel,
+/turf/simulated/wall/shuttle/space_ship{
+ color = "#4c4324"
+ },
+/area/hephmining_ship/cyclops/cyclops_starboard_thrust)
"BA" = (
/obj/effect/floor_decal/corner/orange/full{
dir = 8
@@ -2895,7 +2944,7 @@
/obj/structure/window/reinforced{
dir = 4
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hephmining_ship/cyclops/cyclops_hangar)
"BC" = (
/obj/machinery/atmospherics/pipe/simple/hidden/red{
@@ -2927,11 +2976,10 @@
/turf/simulated/floor/tiled/dark,
/area/hephmining_ship/cyclops/cyclops_hangar)
"BP" = (
-/obj/machinery/light/small{
- dir = 4
- },
-/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/machinery/atmospherics/portables_connector/fuel{
+ dir = 8
+ },
/turf/simulated/floor/tiled/dark,
/area/hephmining_ship/cyclops/cyclops_starboard_thrust)
"BV" = (
@@ -2995,11 +3043,26 @@
/turf/simulated/floor/tiled/dark,
/area/hephmining_ship/cyclops)
"Ch" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 9
+/obj/effect/floor_decal/industrial/warning/full,
+/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+ dir = 8
},
-/turf/simulated/floor/tiled/dark/full,
-/area/hephmining_ship/cyclops/cyclops_starboard_thrust)
+/obj/effect/map_effect/marker/airlock/shuttle{
+ master_tag = "airlock_shuttle_cyclops";
+ name = "airlock_shuttle_cyclops";
+ req_one_access = list(216);
+ shuttle_tag = "Cyclops Shuttle";
+ cycle_to_external_air = 1
+ },
+/obj/effect/map_effect/marker_helper/airlock/out,
+/obj/machinery/light/small/emergency{
+ dir = 1
+ },
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/tiled/dark,
+/area/shuttle/cyclops_shuttle)
"Ck" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
@@ -3021,8 +3084,8 @@
/turf/simulated/floor/tiled/dark,
/area/hephmining_ship/cyclops/cyclops_bridge)
"CB" = (
-/obj/machinery/atmospherics/pipe/manifold4w/hidden/fuel,
-/turf/simulated/floor/tiled/dark,
+/obj/machinery/atmospherics/binary/pump/fuel,
+/turf/simulated/floor/tiled/dark/full,
/area/shuttle/cyclops_shuttle)
"CE" = (
/turf/template_noop,
@@ -3075,10 +3138,12 @@
/turf/simulated/floor/tiled/dark/full,
/area/hephmining_ship/cyclops/cyclops_engineering)
"Dc" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 5
+/obj/machinery/light/small{
+ dir = 8
},
-/obj/effect/floor_decal/industrial/warning{
+/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/machinery/atmospherics/portables_connector/fuel{
dir = 1
},
/turf/simulated/floor/tiled/dark,
@@ -3351,18 +3416,27 @@
},
/area/hephmining_ship/cyclops/cyclops_captain)
"FZ" = (
-/obj/machinery/atmospherics/unary/engine,
-/obj/structure/window/reinforced,
-/turf/simulated/floor,
+/obj/machinery/atmospherics/unary/vent_pump/siphon/atmos{
+ dir = 8
+ },
+/obj/effect/map_effect/marker/large_tank{
+ name = "cyclops_tank_port";
+ master_tag = "cyclops_tank_port"
+ },
+/turf/simulated/floor/reinforced/carbon_dioxide,
/area/hephmining_ship/cyclops/cyclops_port_thrust)
"Ga" = (
-/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor,
-/turf/simulated/floor,
+/obj/effect/map_effect/window_spawner/full/shuttle{
+ spawn_firedoor = 1;
+ spawn_grille = 1;
+ color = "#4c4324";
+ frame_color = "#4c4324"
+ },
+/turf/simulated/floor/plating,
/area/hephmining_ship/cyclops/cyclops/bathroom)
"Gd" = (
-/obj/machinery/atmospherics/binary/pump/high_power{
- dir = 1;
- layer = 2.8
+/obj/machinery/atmospherics/pipe/simple/visible/fuel{
+ dir = 9
},
/turf/simulated/floor/tiled/dark/full,
/area/hephmining_ship/cyclops/cyclops_port_thrust)
@@ -3411,11 +3485,12 @@
/turf/simulated/floor/tiled/dark,
/area/hephmining_ship/cyclops/cyclops_engineering)
"GF" = (
-/obj/structure/bed/handrail{
- dir = 1
+/obj/machinery/atmospherics/unary/engine,
+/obj/effect/landmark/entry_point/aft{
+ name = "aft, port engine"
},
-/turf/simulated/floor/tiled/dark/full/airless,
-/area/shuttle/cyclops_shuttle)
+/turf/simulated/floor/plating,
+/area/hephmining_ship/cyclops/cyclops_port_thrust)
"GG" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
@@ -3448,10 +3523,14 @@
/turf/simulated/floor/tiled/dark,
/area/hephmining_ship/cyclops/cyclops_engineering)
"GU" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden,
-/obj/effect/floor_decal/industrial/warning{
- dir = 1
+/obj/machinery/alarm/east{
+ req_access = list(216);
+ req_one_access = null
},
+/obj/machinery/atmospherics/pipe/manifold/visible/fuel{
+ dir = 4
+ },
+/obj/machinery/meter,
/turf/simulated/floor/tiled/dark,
/area/hephmining_ship/cyclops/cyclops_starboard_thrust)
"Hc" = (
@@ -3658,12 +3737,10 @@
/turf/simulated/floor/tiled/dark,
/area/hephmining_ship/cyclops/cyclops_barracks)
"Jb" = (
-/obj/machinery/atmospherics/pipe/manifold4w/hidden,
-/obj/machinery/meter,
-/obj/effect/floor_decal/industrial/warning{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/visible/fuel{
+ dir = 10
},
-/turf/simulated/floor/tiled/dark,
+/turf/simulated/floor/tiled/dark/full,
/area/hephmining_ship/cyclops/cyclops_starboard_thrust)
"Je" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -3695,14 +3772,19 @@
dir = 9
},
/obj/structure/plasticflaps/mining,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hephmining_ship/cyclops/cyclops_hangar)
"Jq" = (
-/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor,
+/obj/effect/map_effect/window_spawner/full/shuttle{
+ spawn_firedoor = 1;
+ spawn_grille = 1;
+ color = "#4c4324";
+ frame_color = "#4c4324"
+ },
/obj/machinery/door/blast/shutters/open{
id = "cyclops_bridge_lockdown"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hephmining_ship/cyclops/cyclops_bridge)
"Jv" = (
/obj/effect/floor_decal/spline/fancy/wood/corner{
@@ -3726,6 +3808,9 @@
/obj/effect/shuttle_landmark/cyclops_shuttle/hangar{
dir = 8
},
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
/turf/simulated/floor/tiled/dark,
/area/hephmining_ship/cyclops/cyclops_hangar)
"JC" = (
@@ -3857,7 +3942,7 @@
},
/obj/structure/lattice/catwalk/indoor,
/obj/item/hullbeacon/red,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/shuttle/cyclops_shuttle)
"Ko" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
@@ -3951,11 +4036,9 @@
/turf/simulated/floor/tiled/dark/full,
/area/hephmining_ship/cyclops/cyclops_hangar)
"Ly" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 5
- },
-/turf/simulated/floor/tiled/dark/full,
-/area/hephmining_ship/cyclops/cyclops_port_thrust)
+/obj/machinery/atmospherics/unary/engine,
+/turf/simulated/floor/plating,
+/area/hephmining_ship/cyclops/cyclops_starboard_thrust)
"LR" = (
/obj/effect/floor_decal/corner/orange/full{
dir = 1
@@ -3981,9 +4064,8 @@
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
dir = 4
},
-/obj/machinery/embedded_controller/radio/airlock/docking_port_multi{
- layer = 3.3;
- pixel_y = 27
+/obj/machinery/embedded_controller/radio/airlock/docking_port{
+ pixel_y = 28
},
/obj/effect/map_effect/marker/airlock/shuttle{
master_tag = "airlock_shuttle_cyclops";
@@ -4060,16 +4142,14 @@
},
/area/hephmining_ship/cyclops/cyclops_vault)
"MD" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 10
- },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/tiled/dark,
/area/shuttle/cyclops_shuttle)
"MV" = (
/obj/effect/floor_decal/industrial/warning{
dir = 4
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hephmining_ship/cyclops/cyclops_hangar)
"Na" = (
/obj/effect/floor_decal/corner/orange{
@@ -4187,10 +4267,11 @@
/turf/simulated/floor/tiled/dark,
/area/hephmining_ship/cyclops/cyclops_hangar)
"Ob" = (
-/obj/machinery/computer/ship/engines{
- dir = 4
+/obj/machinery/atmospherics/unary/engine,
+/obj/effect/landmark/entry_point/aft{
+ name = "aft, starboard engine"
},
-/turf/simulated/floor/tiled/dark,
+/turf/simulated/floor/plating,
/area/hephmining_ship/cyclops/cyclops_starboard_thrust)
"Oh" = (
/obj/machinery/portable_atmospherics/canister/empty{
@@ -4214,7 +4295,7 @@
dir = 1
},
/obj/effect/floor_decal/industrial/outline/yellow,
-/turf/simulated/floor/tiled/dark/full/airless,
+/turf/simulated/floor/tiled/dark/full,
/area/shuttle/cyclops_shuttle)
"Oy" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -4299,14 +4380,30 @@
/turf/simulated/floor/tiled/dark,
/area/hephmining_ship/cyclops/cyclops_port_thrust)
"PK" = (
-/obj/machinery/atmospherics/unary/engine,
-/obj/structure/window/reinforced,
-/turf/space,
+/obj/machinery/light{
+ dir = 8
+ },
+/obj/machinery/atmospherics/unary/vent_pump/siphon/atmos{
+ dir = 4
+ },
+/obj/effect/map_effect/marker/large_tank{
+ name = "cyclops_tank_star";
+ master_tag = "cyclops_tank_star"
+ },
+/turf/simulated/floor/reinforced/carbon_dioxide,
/area/hephmining_ship/cyclops/cyclops_starboard_thrust)
"PM" = (
/obj/machinery/atmospherics/pipe/simple/hidden/universal,
/turf/simulated/floor/tiled/dark/full,
/area/hephmining_ship/cyclops/cyclops_engineering)
+"PP" = (
+/obj/machinery/atmospherics/pipe/simple/visible/fuel{
+ dir = 9
+ },
+/turf/simulated/wall/shuttle/space_ship{
+ color = "#4c4324"
+ },
+/area/hephmining_ship/cyclops/cyclops_port_thrust)
"PQ" = (
/obj/structure/lattice/catwalk,
/obj/structure/railing/mapped{
@@ -4317,15 +4414,6 @@
},
/turf/template_noop,
/area/space)
-"PT" = (
-/obj/effect/floor_decal/corner/orange{
- dir = 6
- },
-/obj/structure/cable/green{
- icon_state = "4-8"
- },
-/turf/simulated/floor/tiled/dark,
-/area/hephmining_ship/cyclops/cyclops_hangar)
"PW" = (
/obj/machinery/hologram/holopad/long_range,
/turf/simulated/floor/tiled/dark/full,
@@ -4342,12 +4430,15 @@
/turf/space,
/area/space)
"QM" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden,
-/obj/effect/floor_decal/industrial/warning{
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/machinery/atmospherics/unary/engine{
dir = 1
},
-/turf/simulated/floor/tiled/dark,
-/area/hephmining_ship/cyclops/cyclops_port_thrust)
+/obj/effect/landmark/entry_point/north{
+ name = "aft, engines"
+ },
+/turf/simulated/floor/plating,
+/area/shuttle/cyclops_shuttle)
"QN" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -4371,9 +4462,6 @@
/turf/simulated/floor/tiled/dark,
/area/hephmining_ship/cyclops)
"Rg" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
- dir = 6
- },
/obj/effect/floor_decal/industrial/hatch/yellow,
/obj/machinery/atmospherics/portables_connector{
dir = 1
@@ -4386,10 +4474,13 @@
dir = 10
},
/obj/machinery/embedded_controller/radio/simple_docking_controller{
- frequency = 1380;
- id_tag = "cyclops_shuttle_dock";
- pixel_y = -28
+ id_tag = "airlock_cyclops_hangar";
+ pixel_y = -28;
+ dir = 1;
+ name = "Cyclops Shuttle docking port controller";
+ frequency = 1380
},
+/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
/turf/simulated/floor/tiled/dark,
/area/hephmining_ship/cyclops/cyclops_hangar)
"RO" = (
@@ -4397,7 +4488,7 @@
id = "processing_2"
},
/obj/effect/floor_decal/industrial/warning/full,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hephmining_ship/cyclops/cyclops_hangar)
"RZ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -4441,10 +4532,9 @@
/turf/simulated/floor/tiled/dark/full,
/area/hephmining_ship/cyclops/cyclops_engineering)
"Sv" = (
-/obj/machinery/light/small{
- dir = 8
+/obj/machinery/atmospherics/portables_connector/fuel{
+ dir = 4
},
-/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
/obj/effect/floor_decal/industrial/outline/yellow,
/turf/simulated/floor/tiled/dark,
/area/hephmining_ship/cyclops/cyclops_port_thrust)
@@ -4453,7 +4543,7 @@
dir = 5
},
/obj/machinery/floodlight,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hephmining_ship/cyclops/cyclops_hangar)
"SF" = (
/obj/structure/closet/walllocker/medical/secure{
@@ -4477,9 +4567,8 @@
/turf/simulated/floor/tiled/dark,
/area/hephmining_ship/cyclops)
"SG" = (
-/obj/machinery/atmospherics/binary/pump/high_power{
- dir = 1;
- layer = 2.8
+/obj/machinery/atmospherics/pipe/simple/visible/fuel{
+ dir = 5
},
/turf/simulated/floor/tiled/dark/full,
/area/hephmining_ship/cyclops/cyclops_starboard_thrust)
@@ -4639,6 +4728,13 @@
},
/turf/simulated/floor/carpet,
/area/hephmining_ship/cyclops/cyclops_captain)
+"Tw" = (
+/obj/effect/floor_decal/corner/orange{
+ dir = 6
+ },
+/obj/structure/undies_wardrobe,
+/turf/simulated/floor/tiled/dark,
+/area/hephmining_ship/cyclops/cyclops_barracks)
"Ty" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -4684,12 +4780,16 @@
/area/hephmining_ship/cyclops/cyclops_vault)
"TG" = (
/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
-/obj/effect/floor_decal/industrial/outline/yellow,
/turf/simulated/floor/tiled/dark,
/area/hephmining_ship/cyclops/cyclops_starboard_thrust)
"TP" = (
-/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor,
-/turf/simulated/floor,
+/obj/effect/map_effect/window_spawner/full/shuttle{
+ spawn_firedoor = 1;
+ spawn_grille = 1;
+ color = "#4c4324";
+ frame_color = "#4c4324"
+ },
+/turf/simulated/floor/plating,
/area/hephmining_ship/cyclops/cyclops_barracks)
"Ue" = (
/obj/effect/floor_decal/spline/fancy/wood{
@@ -4742,7 +4842,7 @@
id = "heph_2";
layer = 2.9
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hephmining_ship/cyclops/cyclops_hangar)
"Ut" = (
/obj/machinery/portable_atmospherics/canister/oxygen,
@@ -4822,7 +4922,7 @@
/obj/structure/window/reinforced{
dir = 4
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hephmining_ship/cyclops/cyclops_hangar)
"VH" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -4870,11 +4970,16 @@
/turf/simulated/floor/tiled/white,
/area/hephmining_ship/cyclops/cyclops_kitchen)
"WI" = (
-/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor,
+/obj/effect/map_effect/window_spawner/full/shuttle{
+ spawn_firedoor = 1;
+ spawn_grille = 1;
+ color = "#4c4324";
+ frame_color = "#4c4324"
+ },
/obj/effect/landmark/entry_point/starboard{
name = "starboard, crew quarters"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hephmining_ship/cyclops/cyclops_barracks)
"WP" = (
/obj/effect/map_effect/window_spawner/full/reinforced/polarized/firedoor{
@@ -4883,20 +4988,17 @@
/turf/simulated/floor/tiled/dark,
/area/hephmining_ship/cyclops/cyclops_captain)
"WR" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 9
+/obj/machinery/atmospherics/unary/outlet_injector{
+ dir = 8
},
-/obj/machinery/light{
- dir = 4
+/obj/effect/map_effect/marker/large_tank{
+ name = "cyclops_tank_port";
+ master_tag = "cyclops_tank_port"
},
-/obj/machinery/alarm/east{
- req_one_access = null;
- req_access = list(216)
+/obj/machinery/air_sensor{
+ pixel_y = 18
},
-/obj/effect/floor_decal/industrial/warning{
- dir = 1
- },
-/turf/simulated/floor/tiled/dark,
+/turf/simulated/floor/reinforced/carbon_dioxide,
/area/hephmining_ship/cyclops/cyclops_port_thrust)
"Xb" = (
/obj/effect/floor_decal/corner/orange{
@@ -4922,10 +5024,11 @@
/turf/simulated/floor/tiled/freezer,
/area/hephmining_ship/cyclops/cyclops/bathroom)
"Xu" = (
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/structure/bed/stool/chair/shuttle{
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/obj/machinery/atmospherics/portables_connector/scrubber{
dir = 4
},
+/obj/machinery/portable_atmospherics/canister/empty,
/turf/simulated/floor/tiled/dark,
/area/shuttle/cyclops_shuttle)
"Xw" = (
@@ -4933,7 +5036,7 @@
dir = 8
},
/obj/item/clothing/head/cone,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/hephmining_ship/cyclops/cyclops_hangar)
"XE" = (
/obj/effect/floor_decal/corner/orange{
@@ -4988,9 +5091,8 @@
/turf/simulated/floor/tiled/dark,
/area/hephmining_ship/cyclops/cyclops_hangar)
"Yh" = (
-/obj/machinery/atmospherics/binary/pump/fuel{
- dir = 8;
- name = "Fuel Tank to Thrusters"
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/universal,
/obj/effect/floor_decal/corner/brown/full{
@@ -5000,9 +5102,12 @@
/turf/simulated/floor/tiled/dark,
/area/shuttle/cyclops_shuttle)
"Yj" = (
-/obj/effect/floor_decal/industrial/warning,
-/turf/simulated/floor,
-/area/hephmining_ship/cyclops/cyclops_hangar)
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/machinery/atmospherics/unary/engine{
+ dir = 1
+ },
+/turf/simulated/floor/plating,
+/area/shuttle/cyclops_shuttle)
"Yo" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
@@ -5076,8 +5181,13 @@
/turf/simulated/floor/tiled/dark,
/area/hephmining_ship/cyclops)
"Zg" = (
-/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor,
-/turf/simulated/floor,
+/obj/effect/map_effect/window_spawner/full/shuttle{
+ spawn_firedoor = 1;
+ spawn_grille = 1;
+ color = "#4c4324";
+ frame_color = "#4c4324"
+ },
+/turf/simulated/floor/plating,
/area/hephmining_ship/cyclops/cyclops_engineering)
"Zi" = (
/obj/effect/floor_decal/corner/brown{
@@ -5089,8 +5199,13 @@
/turf/simulated/floor/tiled/dark,
/area/shuttle/cyclops_shuttle)
"Zn" = (
-/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor,
-/turf/simulated/floor,
+/obj/effect/map_effect/window_spawner/full/shuttle{
+ spawn_firedoor = 1;
+ spawn_grille = 1;
+ color = "#4c4324";
+ frame_color = "#4c4324"
+ },
+/turf/simulated/floor/plating,
/area/hephmining_ship/cyclops/cyclops_kitchen)
"Zp" = (
/obj/effect/floor_decal/corner/orange{
@@ -5154,7 +5269,6 @@
/area/hephmining_ship/cyclops)
"ZH" = (
/obj/machinery/computer/ship/helm,
-/obj/machinery/atmospherics/pipe/simple/hidden/red,
/obj/effect/floor_decal/industrial/outline/yellow,
/turf/simulated/floor/tiled/dark/full,
/area/shuttle/cyclops_shuttle)
@@ -5170,9 +5284,11 @@
/turf/simulated/floor/tiled/dark,
/area/hephmining_ship/cyclops/cyclops/bathroom)
"ZJ" = (
-/obj/machinery/atmospherics/unary/engine,
-/obj/structure/window/reinforced,
-/turf/simulated/floor,
+/obj/effect/map_effect/window_spawner/full/borosilicate/reinforced/firedoor,
+/obj/machinery/atmospherics/pipe/simple/visible/universal{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
/area/hephmining_ship/cyclops/cyclops_starboard_thrust)
"ZV" = (
/obj/structure/bed/padded,
@@ -34309,8 +34425,8 @@ CE
CE
CE
CE
-CE
-CE
+eM
+eM
eM
eM
eM
@@ -34566,11 +34682,11 @@ CE
CE
CE
CE
-CE
-CE
+Ly
+dn
PK
co
-Ob
+eM
kV
cU
eM
@@ -34823,11 +34939,11 @@ CE
CE
CE
CE
-CE
-CE
+Ly
+Bw
ZJ
-GU
-ur
+ZJ
+eM
cl
wt
eM
@@ -34848,7 +34964,7 @@ mA
AY
ch
mY
-mY
+Tw
YK
Tu
qo
@@ -35080,12 +35196,12 @@ CE
CE
CE
CE
-CE
-CE
+Ob
+Bw
yX
Jb
SG
-Ch
+ur
wE
eM
ee
@@ -35337,9 +35453,9 @@ CE
CE
CE
CE
-CE
-CE
-ZJ
+Ly
+uy
+GU
ux
BP
TG
@@ -35349,8 +35465,8 @@ zL
fi
uT
DO
-fi
Kq
+fi
uT
DO
fi
@@ -35594,8 +35710,8 @@ CE
CE
CE
CE
-CE
-CE
+eM
+eM
eM
eM
eM
@@ -35607,7 +35723,7 @@ BM
pG
AR
JB
-PT
+BM
pG
AR
BM
@@ -36120,13 +36236,13 @@ zn
zn
wI
gw
-BH
+Ch
BH
BC
bc
zn
zn
-Yj
+uL
vs
Ry
Qd
@@ -36381,9 +36497,9 @@ LW
pE
gw
gw
-mA
+gw
zn
-Yj
+uL
Je
Mx
Qd
@@ -36628,7 +36744,7 @@ CE
Iy
Kn
dH
-sF
+Pc
ra
gw
eo
@@ -36640,7 +36756,7 @@ gw
Xu
gw
gw
-Yj
+gw
Je
ex
Qd
@@ -36896,7 +37012,7 @@ Zi
bm
eg
Rg
-rr
+nJ
Yj
Je
ex
@@ -37142,19 +37258,19 @@ CE
Hc
ua
Or
-vl
+Pc
np
ZH
au
sD
sl
-di
+uC
pL
oH
jm
CB
fa
-Yj
+QM
Je
YZ
Qd
@@ -37399,13 +37515,13 @@ CE
Iy
ua
eG
-GF
+by
gw
gw
ap
yw
NG
-Pc
+di
MD
sb
Yh
@@ -37656,7 +37772,7 @@ CE
Iy
Kn
zW
-sF
+Pc
ws
gw
eo
@@ -37668,7 +37784,7 @@ Mk
xG
gw
gw
-Yj
+gw
HM
Pv
Qd
@@ -37923,9 +38039,9 @@ pi
eo
eo
gw
-mA
+gw
zn
-Yj
+uL
fb
tO
Qd
@@ -38421,8 +38537,8 @@ CE
CE
CE
CE
-CE
-CE
+aY
+aY
aY
aY
aY
@@ -38678,9 +38794,9 @@ CE
CE
CE
CE
-CE
-CE
-FZ
+td
+sF
+pU
Dc
Sv
sj
@@ -38935,12 +39051,12 @@ CE
CE
CE
CE
-CE
-CE
+GF
+vl
pl
ne
Gd
-Ly
+Bg
Pz
aY
DK
@@ -39192,11 +39308,11 @@ CE
CE
CE
CE
-CE
-CE
+td
+vl
Ai
-QM
-Bg
+Ai
+aY
yW
aH
aY
@@ -39449,11 +39565,11 @@ CE
CE
CE
CE
-CE
-CE
+td
+PP
FZ
WR
-dn
+aY
gn
EY
aY
@@ -39706,8 +39822,8 @@ CE
CE
CE
CE
-CE
-CE
+aY
+aY
aY
aY
aY
diff --git a/maps/away/ships/heph/cyclops/cyclops_mining_ship.dm b/maps/away/ships/heph/cyclops/cyclops_mining_ship.dm
index 24cd8db4224..3153105566d 100644
--- a/maps/away/ships/heph/cyclops/cyclops_mining_ship.dm
+++ b/maps/away/ships/heph/cyclops/cyclops_mining_ship.dm
@@ -121,7 +121,7 @@
/obj/effect/shuttle_landmark/cyclops_shuttle/hangar
name = "Cyclops Shuttle Hangar"
landmark_tag = "nav_hangar_cyclops"
- docking_controller = "airlock_shuttle_cyclops"
+ docking_controller = "airlock_cyclops_hangar"
base_area = /area/hephmining_ship/cyclops
base_turf = /turf/simulated/floor/plating
movable_flags = MOVABLE_FLAG_EFFECTMOVE
diff --git a/maps/away/ships/konyang/kasf_ship/kasf_ship.dmm b/maps/away/ships/konyang/kasf_ship/kasf_ship.dmm
index c2c626a5eb0..7589b94535a 100644
--- a/maps/away/ships/konyang/kasf_ship/kasf_ship.dmm
+++ b/maps/away/ships/konyang/kasf_ship/kasf_ship.dmm
@@ -43,7 +43,7 @@
dir = 8
},
/obj/structure/lattice/catwalk/indoor,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/portthrust)
"ap" = (
/turf/simulated/wall/shuttle/space_ship/mercenary,
@@ -114,7 +114,7 @@
shuttle_tag = "KASF Shuttle"
},
/obj/structure/lattice/catwalk/indoor,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/shuttle/kasf_shuttle)
"aM" = (
/obj/effect/floor_decal/industrial/warning{
@@ -192,7 +192,7 @@
/obj/machinery/portable_atmospherics/powered/pump/filled{
start_pressure = 10000
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/hangar)
"by" = (
/obj/machinery/atmospherics/pipe/manifold4w/hidden,
@@ -236,7 +236,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/lattice/catwalk/indoor/grate,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/starboardthrust)
"bG" = (
/obj/effect/floor_decal/industrial/warning{
@@ -304,7 +304,7 @@
start_pressure = 10000
},
/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/hangar)
"cb" = (
/obj/machinery/atmospherics/unary/engine{
@@ -326,7 +326,7 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/forehall)
"cf" = (
/obj/effect/floor_decal/corner_wide/yellow{
@@ -391,11 +391,16 @@
/turf/simulated/floor/tiled/full,
/area/ship/kasf_corvette/armory)
"cA" = (
-/obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
+/obj/effect/map_effect/window_spawner/full/shuttle{
+ spawn_firedoor = 1;
+ spawn_grille = 1;
+ color = "#5F78A0";
+ frame_color = "#5F78A0"
+ },
/obj/machinery/door/blast/regular/open{
id = "kasf_shuttle_shutters"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/shuttle/kasf_shuttle)
"cB" = (
/obj/effect/floor_decal/corner_wide/dark_blue{
@@ -504,7 +509,12 @@
/turf/simulated/floor/carpet/rubber,
/area/ship/kasf_corvette/atmos)
"dj" = (
-/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor,
+/obj/effect/map_effect/window_spawner/full/shuttle{
+ color = "#5b5b5b";
+ frame_color = "#5b5b5b";
+ spawn_firedoor = 1;
+ spawn_grille = 1
+ },
/obj/effect/landmark/entry_point/port{
name = "port, captain's office"
},
@@ -598,7 +608,7 @@
dir = 4
},
/obj/structure/lattice/catwalk/indoor,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/mainhall)
"dP" = (
/obj/effect/floor_decal/corner_wide/dark_blue{
@@ -655,7 +665,7 @@
dir = 8
},
/obj/structure/lattice/catwalk/indoor/grate/dark,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/engie)
"ec" = (
/obj/effect/floor_decal/industrial/hatch/yellow,
@@ -675,7 +685,12 @@
/turf/simulated/wall/shuttle/space_ship/mercenary,
/area/ship/kasf_corvette/cryo)
"em" = (
-/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor,
+/obj/effect/map_effect/window_spawner/full/shuttle{
+ color = "#5b5b5b";
+ frame_color = "#5b5b5b";
+ spawn_firedoor = 1;
+ spawn_grille = 1
+ },
/obj/machinery/door/blast/regular/open{
id = "kasf_captains_shutters"
},
@@ -808,7 +823,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/lattice/catwalk/indoor/grate,
/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/portthrust)
"fe" = (
/obj/structure/cryofeed/pipes{
@@ -841,7 +856,7 @@
icon_state = "4-8"
},
/obj/structure/lattice/catwalk/indoor/grate/dark,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/atmos)
"fi" = (
/obj/structure/cable{
@@ -853,7 +868,12 @@
/turf/simulated/floor/tiled/dark,
/area/ship/kasf_corvette/engie)
"fu" = (
-/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor,
+/obj/effect/map_effect/window_spawner/full/shuttle{
+ color = "#5b5b5b";
+ frame_color = "#5b5b5b";
+ spawn_firedoor = 1;
+ spawn_grille = 1
+ },
/obj/machinery/door/blast/regular/open{
id = "kasf_rec_shutters"
},
@@ -937,7 +957,7 @@
},
/obj/machinery/atmospherics/unary/vent_pump/high_volume,
/obj/effect/floor_decal/industrial/warning,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/mainhall)
"fL" = (
/obj/structure/table/wood,
@@ -1089,7 +1109,7 @@
dir = 4
},
/obj/structure/lattice/catwalk/indoor/grate/dark,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/armory)
"gv" = (
/obj/machinery/appliance/cooker/fryer,
@@ -1156,7 +1176,7 @@
/obj/structure/sign/poster{
pixel_x = -32
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/starboardthrust)
"gP" = (
/obj/structure/lattice/catwalk/indoor/grate,
@@ -1165,7 +1185,7 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/starboardthrust)
"gU" = (
/obj/effect/floor_decal/corner_wide/dark_blue{
@@ -1272,7 +1292,7 @@
dir = 9
},
/obj/structure/lattice/catwalk/indoor,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/starboardwep)
"hG" = (
/obj/effect/floor_decal/corner_wide/dark_blue{
@@ -1334,7 +1354,7 @@
"hT" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/blood/drip/oil,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/hangar)
"hX" = (
/obj/effect/floor_decal/corner_wide/dark_blue{
@@ -1367,7 +1387,7 @@
dir = 4
},
/obj/structure/lattice/catwalk/indoor,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/starboardthrust)
"il" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -1425,7 +1445,7 @@
dir = 1
},
/obj/structure/lattice/catwalk/indoor,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/atmos)
"iv" = (
/turf/simulated/wall/shuttle/space_ship/mercenary,
@@ -1560,7 +1580,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/lattice/catwalk/indoor/grate,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/starboardthrust)
"jq" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on,
@@ -1716,7 +1736,7 @@
dir = 8
},
/obj/structure/lattice/catwalk/indoor,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/mainhall)
"kP" = (
/obj/effect/floor_decal/corner_wide/dark_blue/full,
@@ -2131,7 +2151,7 @@
/obj/structure/railing/mapped{
dir = 8
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/portthrust)
"mZ" = (
/turf/simulated/floor/tiled,
@@ -2174,10 +2194,6 @@
},
/turf/simulated/floor/tiled/white,
/area/ship/kasf_corvette/medbay)
-"nl" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/black,
-/turf/simulated/wall/shuttle/space_ship/mercenary,
-/area/shuttle/kasf_shuttle)
"nn" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -2301,7 +2317,7 @@
/obj/structure/railing/mapped{
dir = 4
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/starboardthrust)
"nP" = (
/obj/structure/cable{
@@ -2311,9 +2327,8 @@
/obj/effect/floor_decal/industrial/hatch/yellow,
/obj/machinery/door/airlock/external,
/obj/machinery/access_button{
- dir = 4;
- pixel_x = -22;
- pixel_y = -22
+ pixel_x = -26;
+ pixel_y = -4
},
/obj/effect/map_effect/marker_helper/airlock/exterior,
/obj/effect/map_effect/marker/airlock/shuttle{
@@ -2323,6 +2338,9 @@
req_one_access = list(218);
shuttle_tag = "KASF Shuttle"
},
+/obj/effect/landmark/entry_point/north{
+ name = "aft, airlock"
+ },
/turf/simulated/floor/tiled/dark/full,
/area/shuttle/kasf_shuttle)
"nQ" = (
@@ -2357,7 +2375,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/mainhall)
"ob" = (
/obj/machinery/door/firedoor/noid,
@@ -2567,7 +2585,7 @@
icon_state = "1-2"
},
/obj/structure/lattice/catwalk/indoor,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/atmos)
"pD" = (
/obj/effect/floor_decal/industrial/warning{
@@ -2659,7 +2677,7 @@
/obj/effect/floor_decal/industrial/warning{
dir = 1
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/mainhall)
"qk" = (
/obj/machinery/light/small/emergency{
@@ -2672,7 +2690,7 @@
},
/obj/machinery/atmospherics/unary/vent_pump/high_volume,
/obj/effect/floor_decal/industrial/warning,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/mainhall)
"ql" = (
/obj/effect/floor_decal/industrial/warning/corner{
@@ -2692,7 +2710,7 @@
/area/ship/kasf_corvette/hangar)
"qn" = (
/obj/item/clothing/head/cone,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/hangar)
"qo" = (
/obj/structure/cable{
@@ -2701,7 +2719,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/lattice/catwalk/indoor,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/atmos)
"qp" = (
/obj/machinery/portable_atmospherics/powered/scrubber,
@@ -2835,7 +2853,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/lattice/catwalk/indoor/grate,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/portthrust)
"qT" = (
/obj/effect/floor_decal/corner_wide/green{
@@ -2947,7 +2965,7 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/porthangarfoyer)
"rx" = (
/obj/effect/floor_decal/corner/red/diagonal,
@@ -2975,7 +2993,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/porthangarfoyer)
"rB" = (
/obj/structure/dispenser/oxygen,
@@ -3004,7 +3022,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/engie)
"rI" = (
/obj/effect/floor_decal/industrial/warning{
@@ -3023,7 +3041,12 @@
/turf/simulated/floor/tiled/dark/full,
/area/ship/kasf_corvette/hangar)
"rP" = (
-/obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
+/obj/effect/map_effect/window_spawner/full/shuttle{
+ spawn_firedoor = 1;
+ spawn_grille = 1;
+ color = "#5F78A0";
+ frame_color = "#5F78A0"
+ },
/obj/machinery/door/blast/regular/open{
id = "kasf_shuttle_shutters";
dir = 4
@@ -3035,7 +3058,7 @@
/obj/machinery/atmospherics/pipe/manifold/hidden{
dir = 4
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/starboardthrust)
"rR" = (
/obj/effect/shuttle_landmark/kasf_corvette/nav2,
@@ -3049,7 +3072,7 @@
dir = 4
},
/obj/structure/lattice/catwalk/indoor,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/portthrust)
"rU" = (
/obj/machinery/door/firedoor/noid,
@@ -3137,8 +3160,8 @@
/turf/simulated/floor/wood,
/area/ship/kasf_corvette/mess)
"sF" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/black{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/hidden/black{
+ dir = 5
},
/turf/simulated/wall/shuttle/space_ship/mercenary,
/area/shuttle/kasf_shuttle)
@@ -3446,7 +3469,7 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/starboardhangarfoyer)
"uo" = (
/obj/machinery/airlock_sensor{
@@ -3463,7 +3486,7 @@
/obj/effect/floor_decal/industrial/warning{
dir = 1
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/mainhall)
"uy" = (
/obj/structure/bed/padded,
@@ -3479,7 +3502,6 @@
/turf/simulated/floor/tiled/dark,
/area/ship/kasf_corvette/dorm)
"uA" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/black,
/obj/machinery/atmospherics/pipe/simple/hidden/aux{
dir = 8
},
@@ -3542,7 +3564,7 @@
/obj/machinery/atmospherics/pipe/simple/visible/universal,
/obj/machinery/meter,
/obj/structure/lattice/catwalk/indoor/grate/dark,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/atmos)
"uS" = (
/turf/simulated/floor/tiled/full,
@@ -3646,7 +3668,7 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/mainhall)
"vE" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
@@ -3715,7 +3737,7 @@
dir = 8
},
/obj/structure/lattice/catwalk/indoor,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/portwep)
"vP" = (
/obj/structure/cable{
@@ -3732,7 +3754,7 @@
shuttle_tag = "KASF Shuttle"
},
/obj/structure/lattice/catwalk/indoor,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/shuttle/kasf_shuttle)
"vV" = (
/obj/machinery/light{
@@ -3899,7 +3921,7 @@
/turf/simulated/floor/tiled/dark/full,
/area/ship/kasf_corvette/cic)
"xn" = (
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/hangar)
"xq" = (
/obj/structure/lattice/catwalk/indoor/grate,
@@ -3909,7 +3931,7 @@
/obj/machinery/power/terminal{
dir = 4
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/engie)
"xs" = (
/obj/effect/floor_decal/spline/plain/beige{
@@ -4002,7 +4024,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/starboardhangarfoyer)
"xX" = (
/obj/structure/table/stone/marble,
@@ -4036,7 +4058,7 @@
dir = 10
},
/obj/structure/lattice/catwalk/indoor/grate/dark,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/cic)
"yd" = (
/obj/machinery/pipedispenser,
@@ -4152,7 +4174,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/lattice/catwalk/indoor/grate/dark,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/cic)
"ys" = (
/obj/effect/floor_decal/corner_wide/dark_blue{
@@ -4299,7 +4321,7 @@
/obj/machinery/atmospherics/pipe/manifold/hidden{
dir = 8
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/portthrust)
"zg" = (
/obj/structure/table/standard,
@@ -4343,7 +4365,7 @@
/obj/structure/railing/mapped{
dir = 4
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/starboardthrust)
"zn" = (
/obj/effect/floor_decal/corner_wide/yellow{
@@ -4407,7 +4429,7 @@
/area/ship/kasf_corvette/starboardthrust)
"zF" = (
/obj/structure/lattice/catwalk/indoor/grate/dark,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/cic)
"zH" = (
/obj/machinery/atmospherics/unary/engine,
@@ -4482,7 +4504,7 @@
d2 = 4;
icon_state = "2-4"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/engie)
"zZ" = (
/obj/effect/floor_decal/spline/fancy/wood{
@@ -4543,14 +4565,14 @@
dir = 4
},
/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/portthrust)
"Aw" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
/obj/structure/lattice/catwalk/indoor,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/starboardwep)
"Ax" = (
/obj/effect/floor_decal/industrial/hatch/yellow,
@@ -4655,7 +4677,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/mainhall)
"Bb" = (
/obj/structure/lattice/catwalk/indoor/grate,
@@ -4671,7 +4693,7 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/mainhall)
"Bd" = (
/obj/effect/floor_decal/industrial/warning{
@@ -4694,7 +4716,7 @@
/obj/structure/railing/mapped{
dir = 8
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/portthrust)
"Bi" = (
/obj/effect/landmark/entry_point/fore{
@@ -4712,7 +4734,7 @@
"Bm" = (
/obj/machinery/floodlight,
/obj/effect/decal/cleanable/cobweb2,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/hangar)
"Bo" = (
/obj/structure/cable{
@@ -4750,7 +4772,7 @@
"Bs" = (
/obj/item/clothing/head/cone,
/obj/effect/decal/cleanable/generic,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/hangar)
"Bt" = (
/obj/structure/cable{
@@ -4759,7 +4781,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/lattice/catwalk/indoor,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/portwep)
"Bv" = (
/obj/machinery/door/airlock/glass{
@@ -4862,7 +4884,7 @@
dir = 5
},
/obj/structure/lattice/catwalk/indoor,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/portwep)
"BX" = (
/obj/effect/floor_decal/corner_wide/green{
@@ -4949,7 +4971,7 @@
/obj/machinery/alarm/west{
req_one_access = list(218)
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/mainhall)
"Cw" = (
/obj/machinery/atmospherics/binary/pump/high_power{
@@ -5029,7 +5051,7 @@
pixel_y = 2
},
/obj/item/clothing/head/cone,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/hangar)
"Dh" = (
/obj/effect/floor_decal/corner_wide/dark_blue{
@@ -5081,7 +5103,7 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/mainhall)
"Ds" = (
/obj/structure/sign/nosmoking_1{
@@ -5228,7 +5250,7 @@
/area/ship/kasf_corvette/portwep)
"Ed" = (
/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/hangar)
"Ej" = (
/obj/machinery/door/airlock/glass{
@@ -5307,7 +5329,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/lattice/catwalk/indoor,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/portwep)
"Et" = (
/obj/effect/map_effect/marker/airlock{
@@ -5321,7 +5343,7 @@
/obj/effect/floor_decal/industrial/warning{
dir = 1
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/mainhall)
"Ey" = (
/obj/effect/floor_decal/corner/orange/full{
@@ -5372,7 +5394,7 @@
},
/obj/machinery/atmospherics/pipe/manifold4w/hidden,
/obj/structure/lattice/catwalk/indoor,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/mainhall)
"EV" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -5382,7 +5404,7 @@
dir = 4
},
/obj/structure/lattice/catwalk/indoor/grate/dark,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/armory)
"EY" = (
/obj/structure/table/steel,
@@ -5596,8 +5618,8 @@
/turf/simulated/floor/tiled/dark,
/area/ship/kasf_corvette/dorm)
"FO" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/black{
- dir = 4
+/obj/machinery/atmospherics/pipe/simple/hidden/black{
+ dir = 9
},
/turf/simulated/wall/shuttle/space_ship/mercenary,
/area/shuttle/kasf_shuttle)
@@ -5673,7 +5695,7 @@
},
/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/forehall)
"Gd" = (
/obj/structure/lattice/catwalk,
@@ -5713,7 +5735,7 @@
/area/ship/kasf_corvette/forehall)
"Gq" = (
/obj/effect/decal/cleanable/blood/drip/oil,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/hangar)
"Gr" = (
/obj/structure/viewport,
@@ -5763,7 +5785,7 @@
dir = 4
},
/obj/structure/lattice/catwalk/indoor/grate,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/starboardthrust)
"GL" = (
/obj/effect/map_effect/marker/airlock/docking{
@@ -5792,7 +5814,7 @@
},
/obj/structure/lattice/catwalk/indoor,
/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/atmos)
"GY" = (
/obj/effect/floor_decal/spline/plain/beige{
@@ -6002,7 +6024,7 @@
},
/obj/machinery/atmospherics/unary/vent_pump/high_volume,
/obj/effect/floor_decal/industrial/warning,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/mainhall)
"Ie" = (
/obj/machinery/vending/engineering{
@@ -6081,7 +6103,7 @@
/obj/effect/floor_decal/industrial/warning{
dir = 1
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/mainhall)
"Iq" = (
/obj/effect/floor_decal/industrial/warning/corner{
@@ -6189,7 +6211,7 @@
target_pressure = 250;
dir = 4
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/shuttle/kasf_shuttle)
"IR" = (
/obj/effect/floor_decal/corner/green/diagonal,
@@ -6204,7 +6226,7 @@
icon_state = "4-8"
},
/obj/structure/lattice/catwalk/indoor/grate/dark,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/atmos)
"IW" = (
/obj/structure/closet/secure_closet/guncabinet{
@@ -6361,7 +6383,7 @@
dir = 6
},
/obj/structure/lattice/catwalk/indoor/grate/dark,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/cic)
"JO" = (
/obj/machinery/door/firedoor/noid,
@@ -6439,7 +6461,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/mainhall)
"KH" = (
/obj/structure/cable{
@@ -6537,7 +6559,7 @@
dir = 9
},
/obj/structure/lattice/catwalk/indoor,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/portwep)
"KX" = (
/obj/effect/floor_decal/corner_wide/dark_blue{
@@ -6595,7 +6617,7 @@
},
/obj/machinery/atmospherics/pipe/manifold4w/hidden,
/obj/structure/lattice/catwalk/indoor,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/mainhall)
"Lq" = (
/obj/structure/sign/nosmoking_2{
@@ -6607,7 +6629,7 @@
/turf/simulated/floor/tiled/dark/full,
/area/ship/kasf_corvette/hangar)
"Lv" = (
-/obj/machinery/power/smes/buildable/horizon_shuttle,
+/obj/machinery/power/smes/buildable/third_party_shuttle,
/obj/machinery/light{
dir = 4
},
@@ -6651,7 +6673,7 @@
dir = 10
},
/obj/structure/lattice/catwalk/indoor,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/atmos)
"LG" = (
/obj/machinery/atmospherics/portables_connector{
@@ -6669,7 +6691,6 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/effect/shuttle_landmark/kasf_shuttle/hangar,
/obj/effect/floor_decal/industrial/warning{
dir = 1
},
@@ -6885,7 +6906,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/shuttle/kasf_shuttle)
"MY" = (
/obj/machinery/door/airlock/multi_tile/glass{
@@ -6959,7 +6980,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/mainhall)
"Ns" = (
/obj/effect/floor_decal/industrial/outline/yellow,
@@ -7088,7 +7109,7 @@
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/structure/lattice/catwalk/indoor/grate/dark,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/armory)
"Of" = (
/obj/effect/floor_decal/corner_wide/dark_blue{
@@ -7181,7 +7202,12 @@
/turf/simulated/floor/tiled/dark/full,
/area/ship/kasf_corvette/armory)
"OS" = (
-/obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
+/obj/effect/map_effect/window_spawner/full/shuttle{
+ spawn_firedoor = 1;
+ spawn_grille = 1;
+ color = "#5F78A0";
+ frame_color = "#5F78A0"
+ },
/obj/effect/landmark/entry_point/south{
name = "fore, cockpit"
},
@@ -7348,7 +7374,7 @@
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/structure/lattice/catwalk/indoor/grate/dark,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/armory)
"PE" = (
/obj/effect/floor_decal/corner_wide/yellow/full{
@@ -7366,7 +7392,7 @@
/obj/machinery/atmospherics/pipe/manifold/hidden{
dir = 4
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/mainhall)
"PR" = (
/obj/effect/floor_decal/corner_wide/dark_blue{
@@ -7605,28 +7631,13 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/structure/lattice/catwalk/indoor,
-/obj/structure/bed/handrail{
- dir = 8
- },
-/obj/effect/landmark/entry_point/north{
- name = "aft, airlock"
- },
/obj/machinery/airlock_sensor/airlock_exterior{
- dir = 4;
- pixel_y = -1;
- pixel_x = -21
+ pixel_y = 27;
+ pixel_x = -37
},
-/obj/effect/map_effect/marker_helper/airlock/exterior,
-/obj/effect/map_effect/marker/airlock/shuttle{
- cycle_to_external_air = 1;
- master_tag = "airlock_kasf_shuttle";
- name = "airlock_kasf_shuttle";
- req_one_access = list(218);
- shuttle_tag = "KASF Shuttle"
- },
-/turf/simulated/floor,
-/area/shuttle/kasf_shuttle)
+/obj/effect/shuttle_landmark/kasf_shuttle/hangar,
+/turf/simulated/floor/plating,
+/area/ship/kasf_corvette/hangar)
"Rd" = (
/obj/structure/railing/mapped{
dir = 8
@@ -7856,7 +7867,7 @@
/obj/structure/sign/poster{
pixel_x = 32
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/portthrust)
"So" = (
/obj/effect/floor_decal/corner/orange{
@@ -7876,7 +7887,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/mainhall)
"Sv" = (
/obj/machinery/atmospherics/binary/passive_gate/on{
@@ -7981,7 +7992,7 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/mainhall)
"Tb" = (
/obj/structure/grille,
@@ -8071,7 +8082,7 @@
dir = 8
},
/obj/structure/lattice/catwalk/indoor/grate,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/portthrust)
"TL" = (
/obj/effect/decal/cleanable/blood/drip/oil,
@@ -8094,7 +8105,7 @@
dir = 4
},
/obj/structure/lattice/catwalk/indoor/grate/dark,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/engie)
"TO" = (
/obj/machinery/atmospherics/pipe/simple/hidden/black{
@@ -8154,7 +8165,7 @@
dir = 4;
id = "reactor_lockdown"
},
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/engie)
"Uo" = (
/obj/effect/floor_decal/corner_wide/dark_blue{
@@ -8209,7 +8220,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/mainhall)
"UT" = (
/obj/effect/floor_decal/industrial/warning{
@@ -8276,7 +8287,7 @@
dir = 8
},
/obj/structure/lattice/catwalk/indoor,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/starboardwep)
"VC" = (
/turf/simulated/floor/reinforced/airless,
@@ -8354,7 +8365,7 @@
/obj/structure/lattice/catwalk/indoor/grate,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/shuttle/kasf_shuttle)
"VP" = (
/obj/effect/floor_decal/industrial/warning{
@@ -8746,7 +8757,7 @@
},
/obj/machinery/atmospherics/unary/vent_pump/high_volume,
/obj/effect/floor_decal/industrial/warning,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/mainhall)
"XW" = (
/obj/effect/floor_decal/industrial/hatch/yellow,
@@ -8774,7 +8785,7 @@
icon_state = "1-8"
},
/obj/structure/lattice/catwalk/indoor/grate/dark,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/engie)
"Yn" = (
/obj/structure/window/reinforced{
@@ -8784,7 +8795,7 @@
dir = 8
},
/obj/structure/lattice/catwalk/indoor,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/starboardthrust)
"Yo" = (
/obj/structure/table/rack,
@@ -8823,7 +8834,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/lattice/catwalk/indoor,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/starboardwep)
"Yy" = (
/obj/machinery/atmospherics/pipe/manifold/hidden,
@@ -8878,7 +8889,7 @@
/area/ship/kasf_corvette/cic)
"YM" = (
/obj/machinery/floodlight,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/hangar)
"YN" = (
/obj/structure/cable{
@@ -8991,7 +9002,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/lattice/catwalk/indoor/grate/dark,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/cic)
"Zk" = (
/obj/effect/floor_decal/spline/fancy/wood{
@@ -9057,7 +9068,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/lattice/catwalk/indoor,
-/turf/simulated/floor,
+/turf/simulated/floor/plating,
/area/ship/kasf_corvette/starboardwep)
"ZB" = (
/obj/structure/cable{
@@ -41906,9 +41917,9 @@ NT
ym
TO
FO
-nl
+mH
uA
-cb
+xn
XL
BN
CW
@@ -42165,7 +42176,7 @@ Uw
Re
hL
Zv
-mH
+xn
vE
cr
Qi
@@ -42679,7 +42690,7 @@ ai
DJ
gc
Zv
-mH
+xn
KU
fA
yq
@@ -42934,9 +42945,9 @@ Sh
Jc
Jj
sF
-nl
+mH
uA
-IH
+xn
LT
BN
CW
diff --git a/maps/away/ships/pra/headmaster/headmaster_ship.dmm b/maps/away/ships/pra/headmaster/headmaster_ship.dmm
index deb2a0c841d..deed9b6f03d 100644
--- a/maps/away/ships/pra/headmaster/headmaster_ship.dmm
+++ b/maps/away/ships/pra/headmaster/headmaster_ship.dmm
@@ -1259,31 +1259,16 @@
},
/area/headmaster_ship/hangar)
"dn" = (
-/obj/effect/landmark/entry_point/aft{
- name = "aft, airlock"
- },
-/obj/structure/bed/handrail{
- dir = 8
- },
-/obj/structure/lattice/catwalk/indoor,
/obj/structure/cable{
icon_state = "1-2"
},
/obj/machinery/airlock_sensor/airlock_exterior{
- pixel_x = -21;
- pixel_y = 8;
- dir = 4
- },
-/obj/effect/map_effect/marker_helper/airlock/exterior,
-/obj/effect/map_effect/marker/airlock/shuttle{
- cycle_to_external_air = 1;
- master_tag = "headmaster_shuttle";
- name = "headmaster_shuttle";
- req_one_access = list(209);
- shuttle_tag = "Orbital Fleet Shuttle"
+ pixel_x = -35;
+ pixel_y = -21;
+ dir = 1
},
/turf/simulated/floor,
-/area/shuttle/headmaster_shuttle)
+/area/headmaster_ship/hangar)
"dp" = (
/obj/structure/bed/handrail{
dir = 4
@@ -1888,12 +1873,8 @@
},
/area/headmaster_ship/barracks)
"fq" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden{
- dir = 4;
- icon_state = "map"
- },
-/turf/simulated/wall/shuttle/raider,
-/area/shuttle/headmaster_shuttle)
+/turf/simulated/floor/plating/cooled,
+/area/headmaster_ship/hangar)
"fu" = (
/obj/effect/floor_decal/corner/dark_blue{
dir = 9
@@ -3017,16 +2998,11 @@
},
/area/headmaster_ship/barracks)
"iW" = (
-/obj/effect/decal/cleanable/generic{
- layer = 2.81
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 5
},
-/obj/effect/decal/cleanable/liquid_fuel,
-/obj/effect/decal/cleanable/liquid_fuel,
-/obj/effect/floor_decal/industrial/warning{
- dir = 4
- },
-/turf/simulated/floor/plating/cooled,
-/area/headmaster_ship/hangar)
+/turf/simulated/wall/shuttle/raider,
+/area/shuttle/headmaster_shuttle)
"iY" = (
/obj/structure/table/standard,
/obj/item/storage/firstaid/regular{
@@ -3148,10 +3124,6 @@
/turf/simulated/floor/carpet/rubber,
/area/headmaster_ship/cic)
"jv" = (
-/obj/structure/cable{
- icon_state = "1-2";
- dir = 1
- },
/obj/structure/lattice/catwalk/indoor,
/obj/structure/cable{
icon_state = "1-2"
@@ -3160,9 +3132,9 @@
dir = 1
},
/obj/machinery/access_button{
- pixel_x = -22;
- dir = 4;
- pixel_y = 30
+ pixel_x = -26;
+ dir = 1;
+ pixel_y = 10
},
/obj/machinery/door/airlock/external,
/obj/effect/map_effect/marker_helper/airlock/exterior,
@@ -3173,6 +3145,9 @@
req_one_access = list(209);
shuttle_tag = "Orbital Fleet Shuttle"
},
+/obj/effect/landmark/entry_point/aft{
+ name = "aft, airlock"
+ },
/turf/simulated/floor,
/area/shuttle/headmaster_shuttle)
"jw" = (
@@ -3314,7 +3289,7 @@
/area/headmaster_ship/medbay)
"jU" = (
/obj/machinery/atmospherics/pipe/manifold/hidden{
- dir = 8;
+ dir = 1;
icon_state = "map"
},
/turf/simulated/wall/shuttle/raider,
@@ -6677,12 +6652,11 @@
},
/area/headmaster_ship/dock)
"Mb" = (
-/obj/effect/decal/cleanable/blood/oil,
-/obj/effect/floor_decal/industrial/warning{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 9
},
-/turf/simulated/floor/plating/cooled,
-/area/headmaster_ship/hangar)
+/turf/simulated/wall/shuttle/raider,
+/area/shuttle/headmaster_shuttle)
"Mc" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/tiled/dark{
@@ -37117,7 +37091,7 @@ Bz
ub
gg
bK
-Mb
+hg
RS
hA
Jn
@@ -37372,9 +37346,9 @@ nq
oh
Bz
gg
-hg
-Jn
-Jn
+fq
+IO
+Mb
Jn
kS
TF
@@ -37629,7 +37603,7 @@ Jv
oh
Bz
dY
-Rm
+fq
jU
Pb
dp
@@ -38143,8 +38117,8 @@ in
oh
Bz
uh
-IO
fq
+jU
sn
mF
aj
@@ -38400,9 +38374,9 @@ mj
oh
Bz
Bx
-FU
-Jn
-Jn
+fq
+Rm
+iW
Jn
kS
ly
@@ -38659,7 +38633,7 @@ Bz
dq
kw
Lc
-iW
+FU
EC
aN
Jn
diff --git a/maps/away/ships/scc/scc_scout_ship.dmm b/maps/away/ships/scc/scc_scout_ship.dmm
index 345697effe5..4e06ca71685 100644
--- a/maps/away/ships/scc/scc_scout_ship.dmm
+++ b/maps/away/ships/scc/scc_scout_ship.dmm
@@ -7601,6 +7601,12 @@
},
/turf/simulated/floor/tiled/dark,
/area/ship/scc_scout_ship/bridge)
+"VT" = (
+/obj/effect/landmark{
+ name = "carpspawn"
+ },
+/turf/template_noop,
+/area/space)
"VU" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -25718,7 +25724,7 @@ Xj
Xj
Xj
Xj
-Xj
+VT
Xj
Xj
Xj
@@ -27467,7 +27473,7 @@ Xj
Xj
Xj
Xj
-Xj
+VT
Xj
Xj
Xj
@@ -32068,7 +32074,7 @@ Xj
Xj
Xj
Xj
-Xj
+VT
Xj
Xj
Xj
@@ -41825,7 +41831,7 @@ Xj
Xj
Xj
Xj
-Xj
+VT
Xj
Xj
Xj
@@ -41945,7 +41951,7 @@ Xj
Xj
Xj
Xj
-Xj
+VT
Xj
Xj
Xj
@@ -52118,7 +52124,7 @@ Xj
Xj
Xj
Xj
-Xj
+VT
Xj
Xj
Xj
@@ -54530,7 +54536,7 @@ Xj
Xj
Xj
Xj
-Xj
+VT
Xj
Xj
Xj
@@ -59358,7 +59364,7 @@ Xj
Xj
Xj
Xj
-Xj
+VT
Xj
Xj
Xj
diff --git a/maps/away/ships/sol_pirate/sfa_patrol_ship.dmm b/maps/away/ships/sol_pirate/sfa_patrol_ship.dmm
index 406636b2345..fd78ef1e870 100644
--- a/maps/away/ships/sol_pirate/sfa_patrol_ship.dmm
+++ b/maps/away/ships/sol_pirate/sfa_patrol_ship.dmm
@@ -116,7 +116,7 @@
frame_color = "#6C7364"
},
/obj/machinery/door/blast/regular/open{
- id = "elyran_shuttle_shutters"
+ id = "sfa_shuttle_shutters"
},
/turf/simulated/floor/tiled/full,
/area/shuttle/sfa_shuttle)
@@ -381,7 +381,7 @@
/turf/simulated/floor/tiled/dark,
/area/ship/sfa_patrol_ship/SFA_Armory)
"aIR" = (
-/obj/structure/inflatable,
+/obj/structure/inflatable/wall,
/turf/simulated/floor/tiled/dark,
/area/ship/sfa_patrol_ship)
"aJd" = (
@@ -445,7 +445,7 @@
/obj/effect/landmark/entry_point/port{
name = "port, workshop"
},
-/obj/structure/inflatable,
+/obj/structure/inflatable/wall,
/turf/simulated/floor/airless,
/area/ship/sfa_patrol_ship/SFA_Armory)
"aVv" = (
@@ -619,6 +619,12 @@
/obj/effect/floor_decal/corner/dark_blue{
dir = 6
},
+/obj/machinery/button/remote/blast_door{
+ dir = 4;
+ pixel_x = 19;
+ name = "Bridge Blast Door";
+ id = "sfa bridge blast"
+ },
/turf/simulated/floor/tiled/dark,
/area/ship/sfa_patrol_ship/Bridge)
"brS" = (
@@ -910,7 +916,7 @@
frame_color = "#6C7364"
},
/obj/machinery/door/blast/regular/open{
- id = "elyran_shuttle_shutters";
+ id = "sfa_shuttle_shutters";
dir = 4
},
/turf/simulated/floor/plating,
@@ -974,9 +980,6 @@
dir = 4
},
/obj/structure/lattice/catwalk/indoor/grate/gunmetal,
-/obj/effect/shuttle_landmark/sfa_shuttle/hangar{
- dir = 1
- },
/obj/structure/cable/green{
icon_state = "4-8"
},
@@ -1311,7 +1314,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/structure/inflatable,
+/obj/structure/inflatable/wall,
/turf/simulated/floor/tiled/dark,
/area/ship/sfa_patrol_ship/hangar)
"ebV" = (
@@ -1459,7 +1462,7 @@
/area/space)
"euO" = (
/obj/effect/decal/cleanable/dirt,
-/obj/structure/inflatable,
+/obj/structure/inflatable/wall,
/turf/simulated/floor/plating,
/area/ship/sfa_patrol_ship/Brig)
"ews" = (
@@ -1484,11 +1487,10 @@
/turf/simulated/floor/holofloor/wood,
/area/ship/sfa_patrol_ship/Quarters)
"eyV" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden{
- dir = 8;
- icon_state = "map"
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 5
},
-/turf/simulated/wall/shuttle/raider,
+/turf/simulated/wall,
/area/shuttle/sfa_shuttle)
"eBj" = (
/obj/structure/closet/crate/medical,
@@ -1610,7 +1612,7 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/structure/inflatable,
+/obj/structure/inflatable/wall,
/turf/simulated/floor/airless,
/area/ship/sfa_patrol_ship)
"eVI" = (
@@ -1761,7 +1763,7 @@
/turf/simulated/floor/tiled/dark,
/area/ship/sfa_patrol_ship/custodialammo)
"foE" = (
-/obj/structure/inflatable,
+/obj/structure/inflatable/wall,
/turf/simulated/floor/tiled/white/airless,
/area/ship/sfa_patrol_ship/head)
"fpk" = (
@@ -2012,12 +2014,12 @@
/turf/space/dynamic,
/area/ship/sfa_patrol_ship/destroyedrec)
"gfP" = (
-/obj/structure/inflatable,
+/obj/structure/inflatable/wall,
/turf/simulated/floor/tiled/dark,
/area/ship/sfa_patrol_ship/SFA_Armory)
"gjk" = (
/obj/effect/decal/cleanable/dirt,
-/obj/structure/inflatable,
+/obj/structure/inflatable/wall,
/turf/simulated/floor/airless,
/area/ship/sfa_patrol_ship)
"gka" = (
@@ -2051,7 +2053,7 @@
name = "fore, cockpit"
},
/obj/machinery/door/blast/regular/open{
- id = "elyran_shuttle_shutters";
+ id = "sfa_shuttle_shutters";
dir = 4
},
/turf/simulated/floor/plating,
@@ -2275,7 +2277,7 @@
/turf/simulated/floor/tiled/dark/full,
/area/ship/sfa_patrol_ship/SFA_Armory)
"gJf" = (
-/obj/structure/inflatable,
+/obj/structure/inflatable/wall,
/turf/simulated/floor/tiled/white,
/area/ship/sfa_patrol_ship/head)
"gLL" = (
@@ -3072,7 +3074,7 @@
/area/ship/sfa_patrol_ship/destroyedammo)
"jrB" = (
/obj/structure/lattice,
-/obj/structure/inflatable,
+/obj/structure/inflatable/wall,
/turf/space/dynamic,
/area/ship/sfa_patrol_ship/docking)
"jsy" = (
@@ -3264,18 +3266,26 @@
dir = 1
},
/obj/machinery/access_button{
- pixel_x = -22;
- dir = 4;
- pixel_y = 30
+ pixel_x = 37;
+ dir = 1;
+ pixel_y = 7
},
/obj/machinery/door/airlock/external,
/obj/effect/map_effect/marker_helper/airlock/exterior,
/obj/effect/map_effect/marker/airlock/shuttle{
cycle_to_external_air = 1;
- master_tag = "airlock_elyran_shuttle";
- name = "airlock_elyran_shuttle";
- req_one_access = list(207);
- shuttle_tag = "Elyran Naval Shuttle"
+ master_tag = "airlock_sfa_shuttle";
+ name = "airlock_sfa_shuttle";
+ req_one_access = list(203);
+ shuttle_tag = "SFA Shuttle"
+ },
+/obj/machinery/airlock_sensor/airlock_exterior{
+ pixel_x = 26;
+ pixel_y = 8;
+ dir = 1
+ },
+/obj/effect/landmark/entry_point/aft{
+ name = "aft, airlock"
},
/turf/simulated/floor/plating,
/area/shuttle/sfa_shuttle)
@@ -3452,7 +3462,7 @@
/turf/simulated/floor/tiled/white,
/area/ship/sfa_patrol_ship/head)
"kAt" = (
-/obj/structure/inflatable,
+/obj/structure/inflatable/wall,
/turf/simulated/floor/tiled/white/airless,
/area/ship/sfa_patrol_ship/destroyedmedbay)
"kCw" = (
@@ -3541,7 +3551,7 @@
start_pressure = 1500
},
/obj/effect/floor_decal/industrial/outline/blue,
-/obj/machinery/light/colored/decayed{
+/obj/machinery/light{
dir = 1
},
/turf/simulated/floor/carpet/rubber,
@@ -3899,7 +3909,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/black{
dir = 8
},
-/obj/structure/inflatable,
+/obj/structure/inflatable/wall,
/turf/simulated/floor/plating,
/area/shuttle/sfa_shuttle)
"mfq" = (
@@ -4487,7 +4497,7 @@
/area/ship/sfa_patrol_ship/SFA_Armory)
"nQA" = (
/obj/structure/lattice,
-/obj/structure/inflatable,
+/obj/structure/inflatable/wall,
/turf/simulated/floor/tiled/dark/airless,
/area/ship/sfa_patrol_ship/destroyedrec)
"nQD" = (
@@ -4526,6 +4536,12 @@
"nTk" = (
/turf/simulated/wall/shuttle/raider,
/area/ship/sfa_patrol_ship/destroyedmedbay)
+"nYj" = (
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 9
+ },
+/turf/simulated/wall/shuttle/raider,
+/area/shuttle/sfa_shuttle)
"oaR" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
@@ -4765,6 +4781,9 @@
/obj/structure/cable/green{
icon_state = "2-8"
},
+/obj/structure/cable/green{
+ icon_state = "0-8"
+ },
/turf/simulated/floor/plating,
/area/ship/sfa_patrol_ship/hangar)
"pdZ" = (
@@ -5073,7 +5092,7 @@
"qcx" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/blood/drip/oil,
-/obj/structure/inflatable,
+/obj/structure/inflatable/wall,
/turf/simulated/floor/airless,
/area/ship/sfa_patrol_ship)
"qcH" = (
@@ -5133,7 +5152,7 @@
/turf/simulated/floor/carpet/art,
/area/ship/sfa_patrol_ship/Officer)
"qfX" = (
-/obj/structure/inflatable,
+/obj/structure/inflatable/wall,
/obj/item/tape/engineering,
/turf/simulated/floor/tiled/dark,
/area/ship/sfa_patrol_ship/SFA_Armory)
@@ -5149,11 +5168,6 @@
/obj/structure/cable/green{
icon_state = "0-4"
},
-/obj/machinery/light{
- dir = 1;
- inserted_light = /obj/item/light/tube/colored/blue;
- icon_state = "tube_empty"
- },
/obj/effect/floor_decal/industrial/outline/yellow,
/turf/simulated/floor/plating,
/area/shuttle/sfa_shuttle)
@@ -5163,7 +5177,7 @@
/area/ship/sfa_patrol_ship/TreasureRoom)
"qjY" = (
/obj/machinery/atmospherics/pipe/manifold/hidden{
- dir = 4;
+ dir = 1;
icon_state = "map"
},
/turf/simulated/wall/shuttle/raider,
@@ -5349,6 +5363,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
/turf/simulated/floor/tiled/dark,
/area/ship/sfa_patrol_ship/Engineering)
"qYI" = (
@@ -5394,7 +5411,7 @@
/area/ship/sfa_patrol_ship)
"rbn" = (
/obj/structure/lattice,
-/obj/structure/inflatable,
+/obj/structure/inflatable/wall,
/turf/space/dynamic,
/area/ship/sfa_patrol_ship/head)
"rcS" = (
@@ -5899,7 +5916,7 @@
/turf/simulated/wall/shuttle/raider,
/area/ship/sfa_patrol_ship/destroyedammo)
"sPe" = (
-/obj/structure/inflatable,
+/obj/structure/inflatable/wall,
/turf/simulated/floor/tiled/dark/full/airless,
/area/ship/sfa_patrol_ship/SFA_Armory)
"sQX" = (
@@ -6058,17 +6075,9 @@
/area/ship/sfa_patrol_ship/Suit_Storage)
"tIr" = (
/obj/structure/table/steel,
-/obj/machinery/embedded_controller/radio/docking_port_multi{
- pixel_x = 24;
- id_tag = "sfa_shuttle";
- frequency = 1380;
- child_names_txt = "SFA Shuttle Airlock";
- child_tags_txt = "sfa_shuttle";
- dir = 8
- },
/obj/machinery/button/remote/blast_door{
pixel_x = -5;
- id = "elyran_shuttle_shutters";
+ id = "sfa_shuttle_shutters";
name = "Shuttle Safety Shutters"
},
/turf/simulated/floor/tiled/dark/full,
@@ -6201,7 +6210,7 @@
/turf/simulated/floor/plating,
/area/ship/sfa_patrol_ship/Engine2)
"ucv" = (
-/obj/structure/inflatable,
+/obj/structure/inflatable/wall,
/turf/simulated/floor/airless,
/area/ship/sfa_patrol_ship/docking)
"ufa" = (
@@ -6523,7 +6532,7 @@
/turf/simulated/floor/reinforced/airless,
/area/ship/sfa_patrol_ship/destroyedammo)
"vEW" = (
-/obj/structure/inflatable,
+/obj/structure/inflatable/wall,
/turf/simulated/floor/tiled/white,
/area/ship/sfa_patrol_ship/destroyedmedbay)
"vGd" = (
@@ -6593,7 +6602,7 @@
/turf/simulated/floor/carpet/art,
/area/ship/sfa_patrol_ship/Officer)
"wfl" = (
-/obj/structure/inflatable,
+/obj/structure/inflatable/wall,
/turf/simulated/floor/tiled/dark,
/area/ship/sfa_patrol_ship/hangar)
"wfy" = (
@@ -6827,13 +6836,12 @@
/area/ship/sfa_patrol_ship/destroyedrec)
"wTY" = (
/obj/machinery/atmospherics/pipe/simple/hidden,
-/obj/machinery/embedded_controller/radio/docking_port_multi{
- pixel_x = 24;
- id_tag = "sfa_shuttle";
+/obj/machinery/embedded_controller/radio/simple_docking_controller{
+ id_tag = "sfa_shuttle_dock";
+ dir = 8;
+ name = "SFA Shuttle docking port controller";
frequency = 1380;
- child_names_txt = "SFA Shuttle Airlock";
- child_tags_txt = "sfa_shuttle";
- dir = 8
+ pixel_x = 26
},
/turf/simulated/floor/tiled/dark,
/area/ship/sfa_patrol_ship/hangar)
@@ -7100,31 +7108,17 @@
/turf/simulated/wall/shuttle/raider,
/area/ship/sfa_patrol_ship/SFA_Armory)
"xPX" = (
-/obj/effect/landmark/entry_point/aft{
- name = "aft, airlock"
- },
/obj/structure/bed/handrail{
dir = 8
},
-/obj/structure/lattice/catwalk/indoor,
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/machinery/airlock_sensor/airlock_exterior{
- pixel_x = -21;
- pixel_y = 8;
- dir = 4
- },
-/obj/effect/map_effect/marker_helper/airlock/exterior,
-/obj/effect/map_effect/marker/airlock/shuttle{
- cycle_to_external_air = 1;
- master_tag = "airlock_sfa_shuttle";
- name = "airlock_sfa_shuttle";
- req_one_access = list(203);
- shuttle_tag = "SFA Shuttle"
+/obj/effect/shuttle_landmark/sfa_shuttle/hangar{
+ dir = 1
},
/turf/simulated/floor/plating,
-/area/shuttle/sfa_shuttle)
+/area/ship/sfa_patrol_ship/hangar)
"xRe" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -44057,7 +44051,7 @@ mLa
mET
rDU
eoS
-rDU
+iZb
nSb
gCs
gxJ
@@ -44312,9 +44306,9 @@ uAK
pFv
mLa
wha
-iZb
-ikP
-ikP
+rDU
+gtO
+nYj
ikP
mfb
qil
@@ -44569,8 +44563,8 @@ sey
aEm
mLa
wha
-aSJ
-eyV
+rDU
+qjY
lQk
hjW
sfX
@@ -45083,7 +45077,7 @@ hyd
uqX
mLa
rOk
-gtO
+rDU
qjY
rLR
lGR
@@ -45340,9 +45334,9 @@ eXO
iOh
cUD
hRm
-pIa
-ikP
-gxJ
+rDU
+aSJ
+eyV
ikP
sxp
kMb
@@ -45599,7 +45593,7 @@ viZ
puC
rDU
anS
-anS
+pIa
fJS
llg
ikP