diff --git a/html/changelogs/furrycactus-cyclopstweaks.yml b/html/changelogs/furrycactus-cyclopstweaks.yml new file mode 100644 index 00000000000..62961244909 --- /dev/null +++ b/html/changelogs/furrycactus-cyclopstweaks.yml @@ -0,0 +1,58 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: Furrycactus + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Updated airlock markers on the Hephaestus Cyclops ship, and added two small EVA docking platforms." diff --git a/maps/away/ships/heph/cyclops/cyclops.dmm b/maps/away/ships/heph/cyclops/cyclops.dmm index 16ecba9bcaf..fa6c953b088 100644 --- a/maps/away/ships/heph/cyclops/cyclops.dmm +++ b/maps/away/ships/heph/cyclops/cyclops.dmm @@ -25,22 +25,17 @@ /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 4 }, -/obj/effect/map_effect/marker/airlock{ - frequency = 1004; - master_tag = "airlock_cyclops_starboard"; - name = "airlock_cyclops_starboard" - }, /obj/effect/floor_decal/industrial/warning, /obj/machinery/airlock_sensor{ dir = 1; pixel_y = -20 }, +/obj/effect/map_effect/marker/airlock/heph_cyclops/starboard{ + req_one_access = list(216) + }, /turf/simulated/floor/tiled/dark/full, /area/hephmining_ship/cyclops/cyclops_hangar) "ap" = ( -/obj/machinery/computer/ship/sensors{ - dir = 8 - }, /obj/effect/floor_decal/corner/brown/full{ dir = 1 }, @@ -48,6 +43,9 @@ /obj/machinery/light/small/emergency{ dir = 1 }, +/obj/machinery/computer/ship/sensors/terminal{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/shuttle/cyclops_shuttle) "au" = ( @@ -57,7 +55,7 @@ /obj/effect/floor_decal/corner/brown{ dir = 5 }, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/outline/operations, /turf/simulated/floor/tiled/dark, /area/shuttle/cyclops_shuttle) "ax" = ( @@ -117,13 +115,6 @@ /obj/effect/floor_decal/industrial/warning{ dir = 10 }, -/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/exterior, /obj/structure/bed/handrail{ dir = 8 @@ -132,6 +123,9 @@ pixel_x = 24; pixel_y = 6 }, +/obj/effect/map_effect/marker/airlock/shuttle/cyclops_shuttle/shuttle{ + req_one_access = list(216) + }, /turf/simulated/floor/plating, /area/shuttle/cyclops_shuttle) "bd" = ( @@ -143,7 +137,7 @@ /obj/effect/floor_decal/corner/orange{ dir = 6 }, -/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/industrial/hatch/engineering, /turf/simulated/floor/tiled/dark, /area/hephmining_ship/cyclops/cyclops_engineering) "bj" = ( @@ -194,20 +188,17 @@ /turf/simulated/floor/tiled/dark/full, /area/shuttle/cyclops_shuttle) "bC" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 8; - frequency = 1380 - }, /obj/machinery/embedded_controller/radio/airlock/docking_port{ pixel_y = 28 }, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/effect/map_effect/marker/airlock/docking{ - landmark_tag = "nav_cyclops_2"; - master_tag = "airlock_cyclops_dock"; - name = "airlock_cyclops_dock" +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + frequency = 1380 + }, +/obj/effect/map_effect/marker/airlock/heph_cyclops/port{ + req_one_access = list(216) }, /turf/simulated/floor/tiled/dark/full, /area/hephmining_ship/cyclops/cyclops_engineering) @@ -221,6 +212,12 @@ }, /turf/simulated/floor/tiled/dark/full, /area/hephmining_ship/cyclops/cyclops_hangar) +"bT" = ( +/obj/effect/map_effect/map_helper/ruler_tiles_3{ + dir = 4 + }, +/turf/template_noop, +/area/space) "ce" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -244,9 +241,8 @@ /turf/simulated/floor/tiled/dark, /area/hephmining_ship/cyclops/cyclops_barracks) "cl" = ( -/obj/machinery/computer/ship/engines{ - dir = 1 - }, +/obj/machinery/computer/ship/engines/terminal, +/obj/effect/floor_decal/industrial/outline/engineering, /turf/simulated/floor/tiled/dark, /area/hephmining_ship/cyclops/cyclops_starboard_thrust) "co" = ( @@ -276,8 +272,8 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/hatch_door/operations, +/turf/simulated/floor/tiled/dark/full, /area/hephmining_ship/cyclops/cyclops/bathroom) "cv" = ( /obj/machinery/door/airlock/external{ @@ -286,12 +282,13 @@ /obj/effect/floor_decal/industrial/warning{ dir = 6 }, -/obj/effect/map_effect/marker/airlock/docking{ - landmark_tag = "nav_cyclops_2"; - master_tag = "airlock_cyclops_dock"; - name = "airlock_cyclops_dock" - }, /obj/effect/map_effect/marker_helper/airlock/exterior, +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 + }, +/obj/effect/map_effect/marker/airlock/heph_cyclops/port{ + req_one_access = list(216) + }, /turf/simulated/floor/tiled/dark/full, /area/hephmining_ship/cyclops/cyclops_engineering) "cN" = ( @@ -313,15 +310,16 @@ /obj/machinery/door/airlock/external{ dir = 4 }, -/obj/effect/map_effect/marker/airlock{ - frequency = 1004; - master_tag = "airlock_cyclops_starboard"; - name = "airlock_cyclops_starboard" - }, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/effect/floor_decal/industrial/warning{ dir = 10 }, +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 + }, +/obj/effect/map_effect/marker/airlock/heph_cyclops/starboard{ + req_one_access = list(216) + }, /turf/simulated/floor/tiled/dark/full, /area/hephmining_ship/cyclops/cyclops_hangar) "cU" = ( @@ -402,7 +400,7 @@ dir = 4 }, /obj/structure/railing/mapped, -/turf/template_noop, +/turf/space/dynamic, /area/space) "dD" = ( /obj/machinery/mineral/processing_unit_console{ @@ -454,7 +452,7 @@ /obj/structure/railing/mapped{ dir = 8 }, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/outline/operations, /turf/simulated/floor/tiled/dark/full, /area/shuttle/cyclops_shuttle) "dN" = ( @@ -470,13 +468,6 @@ id_tag = "cyclops_shuttle_out"; dir = 4 }, -/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/exterior, /obj/machinery/access_button{ pixel_x = -5; @@ -485,7 +476,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/red{ dir = 6 }, -/turf/simulated/floor/tiled/dark, +/obj/effect/map_effect/marker/airlock/shuttle/cyclops_shuttle/shuttle{ + req_one_access = list(216) + }, +/turf/simulated/floor/tiled/dark/full, /area/shuttle/cyclops_shuttle) "dO" = ( /obj/effect/floor_decal/spline/fancy/wood{ @@ -504,11 +498,11 @@ req_access = list(216) }, /obj/machinery/door/firedoor, -/obj/effect/floor_decal/industrial/hatch/yellow, /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/hatch_door/operations, +/turf/simulated/floor/tiled/dark/full, /area/hephmining_ship/cyclops) "ec" = ( /obj/machinery/door/airlock/mining{ @@ -523,7 +517,9 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/industrial/hatch_door/operations{ + dir = 1 + }, /turf/simulated/floor/tiled/dark/full, /area/hephmining_ship/cyclops/cyclops_captain) "ee" = ( @@ -573,7 +569,7 @@ /obj/effect/floor_decal/corner/orange{ dir = 10 }, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/outline/operations, /turf/simulated/floor/tiled/dark, /area/hephmining_ship/cyclops/cyclops_hangar) "eA" = ( @@ -582,17 +578,18 @@ dir = 8 }, /obj/structure/railing/mapped, -/turf/template_noop, +/turf/space/dynamic, /area/space) "eB" = ( -/obj/effect/map_effect/marker/airlock{ - frequency = 1004; - master_tag = "airlock_cyclops_starboard"; - name = "airlock_cyclops_starboard" - }, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, +/obj/effect/map_effect/marker/airlock/heph_cyclops/starboard{ + req_one_access = list(216) + }, +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 4 + }, /turf/simulated/floor/tiled/dark/full, /area/hephmining_ship/cyclops/cyclops_hangar) "eF" = ( @@ -605,10 +602,10 @@ /obj/structure/railing/mapped{ dir = 1 }, -/obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/bed/handrail{ pixel_y = -8 }, +/obj/effect/floor_decal/industrial/outline/operations, /turf/simulated/floor/tiled/dark/full, /area/shuttle/cyclops_shuttle) "eM" = ( @@ -632,7 +629,7 @@ "eZ" = ( /obj/structure/lattice/catwalk, /obj/structure/railing/mapped, -/turf/template_noop, +/turf/space/dynamic, /area/space) "fa" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/fuel, @@ -663,15 +660,16 @@ pixel_x = 5; pixel_y = 28 }, -/obj/effect/map_effect/marker/airlock{ - frequency = 1004; - master_tag = "airlock_cyclops_starboard"; - name = "airlock_cyclops_starboard" - }, /obj/effect/map_effect/marker_helper/airlock/interior, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 + }, +/obj/effect/map_effect/marker/airlock/heph_cyclops/starboard{ + req_one_access = list(216) + }, /turf/simulated/floor/tiled/dark/full, /area/hephmining_ship/cyclops/cyclops_hangar) "fi" = ( @@ -729,19 +727,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 10 }, -/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/interior, /obj/machinery/access_button{ pixel_x = 5; pixel_y = 28 }, -/turf/simulated/floor/tiled/dark, +/obj/effect/map_effect/marker/airlock/shuttle/cyclops_shuttle/shuttle{ + req_one_access = list(216) + }, +/turf/simulated/floor/tiled/dark/full, /area/shuttle/cyclops_shuttle) "fV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ @@ -778,18 +772,13 @@ "gm" = ( /obj/machinery/light/small, /obj/machinery/atmospherics/pipe/manifold/hidden, -/obj/effect/map_effect/marker/airlock{ - frequency = 1004; - master_tag = "airlock_cyclops_starboard"; - name = "airlock_cyclops_starboard" - }, /obj/effect/floor_decal/industrial/warning, +/obj/effect/map_effect/marker/airlock/heph_cyclops/starboard{ + req_one_access = list(216) + }, /turf/simulated/floor/tiled/dark/full, /area/hephmining_ship/cyclops/cyclops_hangar) "gn" = ( -/obj/machinery/computer/general_air_control/large_tank_control{ - name = "carbon dioxide supply" - }, /obj/machinery/light{ dir = 4; status = 2 @@ -798,6 +787,10 @@ name = "cyclops_tank_port"; master_tag = "cyclops_tank_port" }, +/obj/machinery/computer/general_air_control/large_tank_control/terminal{ + name = "carbon dioxide supply" + }, +/obj/effect/floor_decal/industrial/outline/engineering, /turf/simulated/floor/tiled/dark, /area/hephmining_ship/cyclops/cyclops_port_thrust) "gs" = ( @@ -851,13 +844,6 @@ }, /turf/simulated/floor/plating, /area/hephmining_ship/cyclops/cyclops_hangar) -"gV" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/mapped{ - dir = 4 - }, -/turf/template_noop, -/area/space) "gZ" = ( /turf/simulated/wall/shuttle/space_ship{ color = "#4c4324" @@ -926,6 +912,13 @@ /obj/effect/floor_decal/corner/orange, /turf/simulated/floor/tiled/dark, /area/hephmining_ship/cyclops/cyclops_bridge) +"if" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing/mapped{ + dir = 8 + }, +/turf/space/dynamic, +/area/space) "il" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -962,8 +955,8 @@ /obj/effect/floor_decal/corner/orange/full{ dir = 8 }, -/obj/structure/closet/crate, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/power/portgen/basic/advanced, +/obj/effect/floor_decal/industrial/outline/firefighting_closet, /turf/simulated/floor/tiled/dark, /area/hephmining_ship/cyclops) "iL" = ( @@ -980,7 +973,10 @@ req_access = list(216); dir = 4 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/hatch_door/operations{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/full, /area/hephmining_ship/cyclops/cyclops_hangar) "iR" = ( /obj/effect/floor_decal/corner/orange/full{ @@ -1033,7 +1029,7 @@ /obj/structure/bed/stool/chair/shuttle{ dir = 8 }, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/outline/operations, /turf/simulated/floor/tiled/dark, /area/shuttle/cyclops_shuttle) "jm" = ( @@ -1053,7 +1049,7 @@ dir = 9 }, /obj/structure/dispenser/phoron, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/outline/engineering, /turf/simulated/floor/tiled/dark, /area/hephmining_ship/cyclops/cyclops_engineering) "jF" = ( @@ -1075,7 +1071,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/industrial/hatch/engineering, /turf/simulated/floor/tiled/dark, /area/shuttle/cyclops_shuttle) "kd" = ( @@ -1086,15 +1082,16 @@ pixel_x = -5; pixel_y = 28 }, -/obj/effect/map_effect/marker/airlock{ - frequency = 1004; - master_tag = "airlock_cyclops_starboard"; - name = "airlock_cyclops_starboard" - }, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/effect/floor_decal/industrial/warning{ dir = 9 }, +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 + }, +/obj/effect/map_effect/marker/airlock/heph_cyclops/starboard{ + req_one_access = list(216) + }, /turf/simulated/floor/tiled/dark/full, /area/hephmining_ship/cyclops/cyclops_hangar) "kD" = ( @@ -1113,6 +1110,16 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled/dark/full, /area/hephmining_ship/cyclops/cyclops_bridge) +"kO" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing/mapped{ + dir = 4 + }, +/obj/effect/shuttle_landmark/cyclops/nav6{ + dir = 1 + }, +/turf/space/dynamic, +/area/space) "kT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -1138,13 +1145,14 @@ /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/machinery/computer/general_air_control/large_tank_control/terminal{ + name = "carbon dioxide supply" + }, +/obj/effect/floor_decal/industrial/outline/engineering, /turf/simulated/floor/tiled/dark, /area/hephmining_ship/cyclops/cyclops_starboard_thrust) "kY" = ( @@ -1160,11 +1168,13 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/effect/floor_decal/industrial/hatch/yellow, /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/hatch_door/operations{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/full, /area/hephmining_ship/cyclops/cyclops_captain) "lu" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -1206,7 +1216,7 @@ /obj/effect/floor_decal/corner/brown{ dir = 6 }, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/outline/operations, /turf/simulated/floor/tiled/dark, /area/shuttle/cyclops_shuttle) "lV" = ( @@ -1237,9 +1247,6 @@ /turf/simulated/floor/tiled/dark, /area/hephmining_ship/cyclops/cyclops_hangar) "mb" = ( -/obj/effect/shuttle_landmark/cyclops/nav2{ - dir = 8 - }, /obj/machinery/access_button{ pixel_x = -5; pixel_y = 28 @@ -1250,12 +1257,13 @@ /obj/effect/floor_decal/industrial/warning{ dir = 5 }, -/obj/effect/map_effect/marker/airlock/docking{ - landmark_tag = "nav_cyclops_2"; - master_tag = "airlock_cyclops_dock"; - name = "airlock_cyclops_dock" - }, /obj/effect/map_effect/marker_helper/airlock/exterior, +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 + }, +/obj/effect/map_effect/marker/airlock/heph_cyclops/port{ + req_one_access = list(216) + }, /turf/simulated/floor/tiled/dark/full, /area/hephmining_ship/cyclops/cyclops_engineering) "mn" = ( @@ -1348,9 +1356,6 @@ /turf/simulated/floor/tiled/white, /area/hephmining_ship/cyclops/cyclops_kitchen) "nc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 6 - }, /obj/machinery/access_button{ pixel_x = -5; pixel_y = 28 @@ -1361,12 +1366,13 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/effect/map_effect/marker/airlock/docking{ - landmark_tag = "nav_cyclops_2"; - master_tag = "airlock_cyclops_dock"; - name = "airlock_cyclops_dock" - }, /obj/effect/map_effect/marker_helper/airlock/interior, +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 + }, +/obj/effect/map_effect/marker/airlock/heph_cyclops/port{ + req_one_access = list(216) + }, /turf/simulated/floor/tiled/dark/full, /area/hephmining_ship/cyclops/cyclops_engineering) "ne" = ( @@ -1405,6 +1411,12 @@ }, /turf/simulated/floor/plating, /area/shuttle/cyclops_shuttle) +"nr" = ( +/obj/structure/railing/mapped{ + dir = 4 + }, +/turf/template_noop, +/area/space) "nJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 6 @@ -1442,11 +1454,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, -/obj/effect/floor_decal/industrial/hatch/yellow, /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/hatch_door/operations, +/turf/simulated/floor/tiled/dark/full, /area/hephmining_ship/cyclops/cyclops_bridge) "on" = ( /obj/machinery/atmospherics/pipe/manifold/visible/red{ @@ -1503,8 +1515,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, -/obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/hatch_door/operations, +/turf/simulated/floor/tiled/dark/full, /area/hephmining_ship/cyclops) "pc" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -1513,11 +1525,14 @@ /obj/effect/floor_decal/corner/orange{ dir = 9 }, -/obj/structure/closet/crate, -/obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/light{ dir = 8 }, +/obj/item/stack/material/uranium/full, +/obj/structure/closet/crate/rad{ + name = "emergency fuel crate" + }, +/obj/effect/floor_decal/industrial/outline/firefighting_closet, /turf/simulated/floor/tiled/dark, /area/hephmining_ship/cyclops) "pf" = ( @@ -1587,17 +1602,13 @@ /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 4 }, -/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/machinery/airlock_sensor{ dir = 1; pixel_y = -20 }, +/obj/effect/map_effect/marker/airlock/shuttle/cyclops_shuttle/shuttle{ + req_one_access = list(216) + }, /turf/simulated/floor/tiled/dark, /area/shuttle/cyclops_shuttle) "pG" = ( @@ -1614,11 +1625,11 @@ /obj/effect/floor_decal/corner/orange{ dir = 9 }, -/obj/effect/floor_decal/industrial/loading/yellow, -/obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/sign/vacuum{ pixel_x = -32 }, +/obj/effect/floor_decal/industrial/loading/operations, +/obj/effect/floor_decal/industrial/outline/operations, /turf/simulated/floor/tiled/dark, /area/hephmining_ship/cyclops/cyclops_hangar) "pL" = ( @@ -1652,7 +1663,6 @@ /turf/simulated/floor/tiled/dark/full, /area/hephmining_ship/cyclops/cyclops_hangar) "qg" = ( -/obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/light/small/emergency{ dir = 4 }, @@ -1663,6 +1673,7 @@ /obj/machinery/atmospherics/pipe/tank/air{ dir = 1 }, +/obj/effect/floor_decal/industrial/hatch/engineering, /turf/simulated/floor/tiled/dark, /area/shuttle/cyclops_shuttle) "qn" = ( @@ -1725,15 +1736,23 @@ }, /turf/simulated/floor/tiled/dark, /area/hephmining_ship/cyclops/cyclops/bathroom) -"qH" = ( -/obj/machinery/computer/ship/engines{ +"qF" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing/mapped, +/obj/effect/shuttle_landmark/cyclops/nav8{ dir = 4 }, +/turf/space/dynamic, +/area/space) +"qH" = ( /obj/effect/floor_decal/corner/brown{ dir = 9 }, /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/extinguisher_cabinet/west, +/obj/machinery/computer/ship/engines/terminal{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/shuttle/cyclops_shuttle) "qJ" = ( @@ -1754,8 +1773,8 @@ req_access = list(216) }, /obj/machinery/door/firedoor, -/obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/hatch_door/operations, +/turf/simulated/floor/tiled/dark/full, /area/hephmining_ship/cyclops) "qU" = ( /turf/simulated/floor/tiled/dark/full, @@ -1858,6 +1877,7 @@ /area/hephmining_ship/cyclops/cyclops_bridge) "sj" = ( /obj/machinery/portable_atmospherics/canister/carbon_dioxide, +/obj/effect/floor_decal/industrial/outline/engineering, /turf/simulated/floor/tiled/dark, /area/hephmining_ship/cyclops/cyclops_port_thrust) "sl" = ( @@ -1898,7 +1918,10 @@ req_access = list(216); dir = 4 }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/hatch_door/engineering{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/full, /area/hephmining_ship/cyclops/cyclops_engineering) "sJ" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -1916,7 +1939,7 @@ /obj/structure/railing/mapped{ dir = 4 }, -/turf/template_noop, +/turf/space/dynamic, /area/space) "sP" = ( /obj/structure/dispenser/oxygen, @@ -1934,13 +1957,20 @@ /obj/effect/floor_decal/corner/orange{ dir = 9 }, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/outline/engineering, /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) +"tj" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing/mapped{ + dir = 4 + }, +/turf/space/dynamic, +/area/space) "tn" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/machinery/firealarm/south, @@ -1960,19 +1990,19 @@ /turf/simulated/floor/tiled/dark, /area/hephmining_ship/cyclops/cyclops_hangar) "tP" = ( -/obj/machinery/computer/ship/engines{ - dir = 1 - }, /obj/effect/floor_decal/corner/orange/full{ dir = 4 }, +/obj/machinery/computer/ship/engines/terminal{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/hephmining_ship/cyclops/cyclops_bridge) "tR" = ( -/obj/machinery/computer/ship/sensors{ +/obj/effect/floor_decal/corner/orange/full, +/obj/machinery/computer/ship/sensors/terminal{ dir = 1 }, -/obj/effect/floor_decal/corner/orange/full, /turf/simulated/floor/tiled/dark, /area/hephmining_ship/cyclops/cyclops_bridge) "tT" = ( @@ -1982,15 +2012,11 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden, -/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/interior, -/turf/simulated/floor/tiled/dark, +/obj/effect/map_effect/marker/airlock/shuttle/cyclops_shuttle/shuttle{ + req_one_access = list(216) + }, +/turf/simulated/floor/tiled/dark/full, /area/shuttle/cyclops_shuttle) "ua" = ( /obj/effect/floor_decal/industrial/warning{ @@ -2005,18 +2031,14 @@ icon_state = "door_locked"; dir = 4 }, -/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/exterior, /obj/machinery/atmospherics/pipe/manifold/hidden/red{ dir = 8 }, -/turf/simulated/floor/tiled/dark, +/obj/effect/map_effect/marker/airlock/shuttle/cyclops_shuttle/shuttle{ + req_one_access = list(216) + }, +/turf/simulated/floor/tiled/dark/full, /area/shuttle/cyclops_shuttle) "uj" = ( /obj/effect/floor_decal/corner/orange{ @@ -2049,10 +2071,10 @@ dir = 4 }, /obj/machinery/portable_atmospherics/canister/carbon_dioxide, -/obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/atmospherics/portables_connector/fuel{ dir = 1 }, +/obj/effect/floor_decal/industrial/outline/engineering, /turf/simulated/floor/tiled/dark, /area/hephmining_ship/cyclops/cyclops_starboard_thrust) "uy" = ( @@ -2343,6 +2365,16 @@ /obj/item/stamp/hephaestus, /turf/simulated/floor/wood, /area/hephmining_ship/cyclops/cyclops_captain) +"wT" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing/mapped{ + dir = 4 + }, +/obj/effect/shuttle_landmark/cyclops/nav9{ + dir = 1 + }, +/turf/space/dynamic, +/area/space) "wU" = ( /obj/machinery/meter, /obj/machinery/atmospherics/pipe/simple/hidden/red{ @@ -2384,7 +2416,7 @@ /obj/machinery/door/window{ dir = 8 }, -/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/industrial/hatch/engineering, /turf/simulated/floor/tiled/dark, /area/shuttle/cyclops_shuttle) "xJ" = ( @@ -2517,18 +2549,18 @@ /turf/simulated/floor/tiled/dark, /area/hephmining_ship/cyclops/cyclops/bathroom) "yC" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume, /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ pixel_y = 28 }, -/obj/effect/map_effect/marker/airlock{ - frequency = 1004; - master_tag = "airlock_cyclops_starboard"; - name = "airlock_cyclops_starboard" - }, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, +/obj/effect/map_effect/marker/airlock/heph_cyclops/starboard{ + req_one_access = list(216) + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 + }, /turf/simulated/floor/tiled/dark/full, /area/hephmining_ship/cyclops/cyclops_hangar) "yD" = ( @@ -2564,7 +2596,8 @@ /turf/simulated/floor/tiled/dark/full, /area/hephmining_ship/cyclops/cyclops_engineering) "yW" = ( -/obj/machinery/computer/ship/engines, +/obj/machinery/computer/ship/engines/terminal, +/obj/effect/floor_decal/industrial/outline/engineering, /turf/simulated/floor/tiled/dark, /area/hephmining_ship/cyclops/cyclops_port_thrust) "yX" = ( @@ -2576,7 +2609,6 @@ /area/hephmining_ship/cyclops/cyclops_starboard_thrust) "yY" = ( /obj/machinery/door/firedoor, -/obj/effect/floor_decal/industrial/hatch/yellow, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -2591,7 +2623,10 @@ req_access = list(216); dir = 4 }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/hatch_door/engineering{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/full, /area/hephmining_ship/cyclops/cyclops_engineering) "yZ" = ( /obj/machinery/atmospherics/pipe/tank{ @@ -2600,13 +2635,10 @@ /obj/effect/floor_decal/corner/orange{ dir = 6 }, -/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/industrial/outline/engineering, /turf/simulated/floor/tiled/dark, /area/hephmining_ship/cyclops/cyclops_engineering) "ze" = ( -/obj/machinery/computer/shuttle_control/explore/cyclops_shuttle{ - dir = 4 - }, /obj/effect/floor_decal/corner/brown/full{ dir = 8 }, @@ -2614,6 +2646,9 @@ /obj/machinery/light/small/emergency{ dir = 1 }, +/obj/machinery/computer/shuttle_control/explore/terminal/cyclops_shuttle{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/shuttle/cyclops_shuttle) "zi" = ( @@ -2657,7 +2692,7 @@ /obj/structure/railing/mapped{ dir = 4 }, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/outline/operations, /turf/simulated/floor/tiled/dark/full, /area/shuttle/cyclops_shuttle) "zX" = ( @@ -2685,7 +2720,7 @@ /area/hephmining_ship/cyclops) "Ag" = ( /obj/structure/lattice/catwalk, -/turf/template_noop, +/turf/space/dynamic, /area/space) "Ai" = ( /obj/effect/map_effect/window_spawner/full/borosilicate/reinforced/firedoor, @@ -2727,8 +2762,10 @@ /obj/machinery/door/airlock/multi_tile/glass{ dir = 1 }, -/obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/hatch_door/service{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/full, /area/hephmining_ship/cyclops/cyclops_kitchen) "Ay" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -2748,17 +2785,20 @@ /turf/simulated/floor/tiled/dark, /area/hephmining_ship/cyclops/cyclops_hangar) "AF" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden, /obj/machinery/door/airlock/external{ dir = 4 }, /obj/effect/floor_decal/industrial/warning, -/obj/effect/map_effect/marker/airlock/docking{ - landmark_tag = "nav_cyclops_2"; - master_tag = "airlock_cyclops_dock"; - name = "airlock_cyclops_dock" - }, /obj/effect/map_effect/marker_helper/airlock/interior, +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/effect/map_effect/marker/airlock/heph_cyclops/port{ + req_one_access = list(216) + }, /turf/simulated/floor/tiled/dark/full, /area/hephmining_ship/cyclops/cyclops_engineering) "AH" = ( @@ -2867,7 +2907,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/outline/engineering, /turf/simulated/floor/tiled/dark, /area/hephmining_ship/cyclops/cyclops_engineering) "Bg" = ( @@ -2900,14 +2940,22 @@ }, /turf/simulated/floor/tiled/dark, /area/hephmining_ship/cyclops/cyclops_hangar) +"Bn" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing/mapped{ + dir = 8 + }, +/obj/effect/shuttle_landmark/cyclops/nav10, +/turf/space/dynamic, +/area/space) "Br" = ( -/obj/effect/floor_decal/industrial/loading/yellow, /obj/machinery/conveyor_switch/oneway{ id = "heph_1"; pixel_x = 11; pixel_y = -5 }, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/outline/operations, +/obj/effect/floor_decal/industrial/loading/operations, /turf/simulated/floor/tiled/dark, /area/hephmining_ship/cyclops/cyclops_hangar) "Bw" = ( @@ -2952,14 +3000,10 @@ /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 8 }, -/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/effect/map_effect/marker/airlock/shuttle/cyclops_shuttle/shuttle{ + req_one_access = list(216) + }, /turf/simulated/floor/tiled/dark, /area/shuttle/cyclops_shuttle) "BM" = ( @@ -2969,10 +3013,10 @@ /turf/simulated/floor/tiled/dark, /area/hephmining_ship/cyclops/cyclops_hangar) "BP" = ( -/obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/atmospherics/portables_connector/fuel{ dir = 8 }, +/obj/effect/floor_decal/industrial/outline/engineering, /turf/simulated/floor/tiled/dark, /area/hephmining_ship/cyclops/cyclops_starboard_thrust) "BV" = ( @@ -3031,8 +3075,8 @@ /obj/effect/floor_decal/corner/orange{ dir = 9 }, -/obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/door/firedoor, +/obj/effect/floor_decal/industrial/hatch_door/operations, /turf/simulated/floor/tiled/dark, /area/hephmining_ship/cyclops) "Ch" = ( @@ -3040,13 +3084,6 @@ /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 8 }, -/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 @@ -3054,6 +3091,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/effect/map_effect/marker/airlock/shuttle/cyclops_shuttle/shuttle{ + req_one_access = list(216) + }, /turf/simulated/floor/tiled/dark, /area/shuttle/cyclops_shuttle) "Ck" = ( @@ -3080,6 +3120,14 @@ /obj/machinery/atmospherics/binary/pump/fuel, /turf/simulated/floor/tiled/dark/full, /area/shuttle/cyclops_shuttle) +"CD" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing/mapped{ + dir = 8 + }, +/obj/effect/shuttle_landmark/cyclops/nav7, +/turf/space/dynamic, +/area/space) "CE" = ( /turf/template_noop, /area/space) @@ -3099,13 +3147,6 @@ /obj/machinery/autolathe, /turf/simulated/floor/tiled/dark, /area/hephmining_ship/cyclops) -"CU" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/mapped{ - dir = 1 - }, -/turf/template_noop, -/area/space) "CV" = ( /obj/effect/floor_decal/corner/orange{ dir = 10 @@ -3123,10 +3164,11 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/effect/map_effect/marker/airlock/docking{ - landmark_tag = "nav_cyclops_2"; - master_tag = "airlock_cyclops_dock"; - name = "airlock_cyclops_dock" +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + frequency = 1380 + }, +/obj/effect/map_effect/marker/airlock/heph_cyclops/port{ + req_one_access = list(216) }, /turf/simulated/floor/tiled/dark/full, /area/hephmining_ship/cyclops/cyclops_engineering) @@ -3135,27 +3177,22 @@ dir = 8 }, /obj/machinery/portable_atmospherics/canister/carbon_dioxide, -/obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/atmospherics/portables_connector/fuel{ dir = 1 }, +/obj/effect/floor_decal/industrial/outline/engineering, /turf/simulated/floor/tiled/dark, /area/hephmining_ship/cyclops/cyclops_port_thrust) "Dt" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 8; - frequency = 1380 - }, /obj/effect/floor_decal/industrial/warning, -/obj/effect/map_effect/marker/airlock/docking{ - landmark_tag = "nav_cyclops_2"; - master_tag = "airlock_cyclops_dock"; - name = "airlock_cyclops_dock" - }, /obj/machinery/airlock_sensor{ dir = 1; pixel_y = -20 }, +/obj/machinery/atmospherics/pipe/manifold/hidden, +/obj/effect/map_effect/marker/airlock/heph_cyclops/port{ + req_one_access = list(216) + }, /turf/simulated/floor/tiled/dark/full, /area/hephmining_ship/cyclops/cyclops_engineering) "DJ" = ( @@ -3203,13 +3240,14 @@ /obj/machinery/door/airlock/external{ dir = 4 }, -/obj/effect/map_effect/marker/airlock{ - frequency = 1004; - master_tag = "airlock_cyclops_starboard"; - name = "airlock_cyclops_starboard" - }, /obj/effect/map_effect/marker_helper/airlock/interior, /obj/effect/floor_decal/industrial/warning, +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 + }, +/obj/effect/map_effect/marker/airlock/heph_cyclops/starboard{ + req_one_access = list(216) + }, /turf/simulated/floor/tiled/dark/full, /area/hephmining_ship/cyclops/cyclops_hangar) "DW" = ( @@ -3248,16 +3286,14 @@ id_tag = "freight_ship_sensor"; pixel_y = 26 }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/effect/map_effect/marker/airlock/docking{ - landmark_tag = "nav_cyclops_2"; - master_tag = "airlock_cyclops_dock"; - name = "airlock_cyclops_dock" +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + frequency = 1380 + }, +/obj/effect/map_effect/marker/airlock/heph_cyclops/port{ + req_one_access = list(216) }, /turf/simulated/floor/tiled/dark/full, /area/hephmining_ship/cyclops/cyclops_engineering) @@ -3273,11 +3309,13 @@ req_access = list(216); dir = 4 }, -/obj/effect/floor_decal/industrial/hatch/yellow, /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/hatch_door/operations{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/full, /area/hephmining_ship/cyclops/cyclops/bathroom) "EI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -3383,7 +3421,7 @@ /obj/structure/railing/mapped{ dir = 1 }, -/turf/template_noop, +/turf/space/dynamic, /area/space) "Fk" = ( /obj/effect/floor_decal/corner/orange{ @@ -3439,8 +3477,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/hatch_door/operations{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/full, /area/hephmining_ship/cyclops/cyclops_barracks) "Gs" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -3455,7 +3495,7 @@ /obj/structure/railing/mapped{ dir = 8 }, -/turf/template_noop, +/turf/space/dynamic, /area/space) "Gz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -3464,11 +3504,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/industrial/hatch/yellow, /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/hatch_door/service{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/full, /area/hephmining_ship/cyclops/cyclops_kitchen) "GB" = ( /obj/effect/floor_decal/corner/orange{ @@ -3511,7 +3553,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/outline/engineering, /turf/simulated/floor/tiled/dark, /area/hephmining_ship/cyclops/cyclops_engineering) "GU" = ( @@ -3576,11 +3618,11 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/industrial/hatch/yellow, /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/hatch_door/engineering, +/turf/simulated/floor/tiled/dark/full, /area/hephmining_ship/cyclops/cyclops_starboard_thrust) "HM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -3625,7 +3667,7 @@ /area/hephmining_ship/cyclops/cyclops/bathroom) "Ik" = ( /obj/effect/floor_decal/corner/orange/full, -/obj/machinery/computer/ship/navigation{ +/obj/machinery/computer/ship/navigation/terminal{ dir = 4 }, /turf/simulated/floor/tiled/dark, @@ -3672,8 +3714,8 @@ /obj/effect/floor_decal/corner/orange{ dir = 9 }, -/obj/effect/floor_decal/industrial/loading/yellow, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/outline/operations, +/obj/effect/floor_decal/industrial/loading/operations, /turf/simulated/floor/tiled/dark, /area/hephmining_ship/cyclops/cyclops_hangar) "IN" = ( @@ -3812,11 +3854,11 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, -/obj/effect/floor_decal/industrial/hatch/yellow, /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/hatch_door/engineering, +/turf/simulated/floor/tiled/dark/full, /area/hephmining_ship/cyclops/cyclops_port_thrust) "JE" = ( /obj/structure/bed/stool/bar/padded/orange, @@ -3863,7 +3905,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/industrial/hatch/engineering, /turf/simulated/floor/tiled/dark, /area/hephmining_ship/cyclops/cyclops_engineering) "JN" = ( @@ -3879,11 +3921,13 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/effect/floor_decal/industrial/hatch/yellow, /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/hatch_door/operations{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/full, /area/hephmining_ship/cyclops/cyclops_barracks) "JQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -3906,13 +3950,13 @@ /turf/simulated/floor/tiled/dark, /area/hephmining_ship/cyclops/cyclops_engineering) "JU" = ( -/obj/effect/floor_decal/industrial/loading/yellow, /obj/machinery/conveyor_switch/oneway{ id = "heph_2"; pixel_x = 11; pixel_y = -5 }, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/outline/operations, +/obj/effect/floor_decal/industrial/loading/operations, /turf/simulated/floor/tiled/dark, /area/hephmining_ship/cyclops/cyclops_hangar) "JV" = ( @@ -3975,15 +4019,21 @@ }, /turf/simulated/floor/tiled/dark, /area/hephmining_ship/cyclops/cyclops_engineering) -"KP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 +"KL" = ( +/obj/structure/lattice/catwalk, +/obj/effect/shuttle_landmark/cyclops/nav2{ + dir = 8 + }, +/obj/structure/railing/mapped{ + dir = 1 }, +/turf/space/dynamic, +/area/space) +"KP" = ( /obj/effect/floor_decal/industrial/warning, -/obj/effect/map_effect/marker/airlock/docking{ - landmark_tag = "nav_cyclops_2"; - master_tag = "airlock_cyclops_dock"; - name = "airlock_cyclops_dock" +/obj/machinery/atmospherics/pipe/manifold/hidden, +/obj/effect/map_effect/marker/airlock/heph_cyclops/port{ + req_one_access = list(216) }, /turf/simulated/floor/tiled/dark/full, /area/hephmining_ship/cyclops/cyclops_engineering) @@ -4040,13 +4090,6 @@ /obj/effect/floor_decal/industrial/outline/emergency_closet, /turf/simulated/floor/tiled/dark, /area/hephmining_ship/cyclops/cyclops_bridge) -"LV" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/mapped{ - dir = 8 - }, -/turf/template_noop, -/area/space) "LW" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -4058,12 +4101,8 @@ /obj/machinery/embedded_controller/radio/airlock/docking_port{ pixel_y = 28 }, -/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/airlock/shuttle/cyclops_shuttle/shuttle{ + req_one_access = list(216) }, /turf/simulated/floor/tiled/dark, /area/shuttle/cyclops_shuttle) @@ -4075,10 +4114,10 @@ /obj/effect/floor_decal/corner/brown/full{ dir = 4 }, -/obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/bed/stool/chair/shuttle{ dir = 8 }, +/obj/effect/floor_decal/industrial/outline/operations, /turf/simulated/floor/tiled/dark, /area/shuttle/cyclops_shuttle) "Mm" = ( @@ -4121,10 +4160,10 @@ /obj/effect/floor_decal/corner/orange{ dir = 10 }, -/obj/effect/floor_decal/industrial/outline/yellow, /obj/effect/floor_decal/corner/orange{ dir = 10 }, +/obj/effect/floor_decal/industrial/outline/operations, /turf/simulated/floor/tiled/dark, /area/hephmining_ship/cyclops/cyclops_hangar) "MB" = ( @@ -4222,7 +4261,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/full, /area/hephmining_ship/cyclops/cyclops_vault) "ND" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -4273,17 +4315,17 @@ /obj/effect/floor_decal/corner/orange{ dir = 6 }, -/obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/light{ dir = 4 }, +/obj/effect/floor_decal/industrial/outline/engineering, /turf/simulated/floor/tiled/dark, /area/hephmining_ship/cyclops/cyclops_engineering) "Or" = ( /obj/structure/railing/mapped{ dir = 1 }, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/outline/operations, /turf/simulated/floor/tiled/dark/full, /area/shuttle/cyclops_shuttle) "Oy" = ( @@ -4343,6 +4385,13 @@ }, /turf/simulated/floor/tiled/dark, /area/hephmining_ship/cyclops/cyclops_starboard_thrust) +"Pg" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing/mapped{ + dir = 1 + }, +/turf/space/dynamic, +/area/space) "Pp" = ( /turf/simulated/floor/tiled/dark, /area/hephmining_ship/cyclops/cyclops_hangar) @@ -4393,16 +4442,6 @@ color = "#4c4324" }, /area/hephmining_ship/cyclops/cyclops_port_thrust) -"PQ" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/mapped{ - dir = 1 - }, -/obj/structure/railing/mapped{ - dir = 8 - }, -/turf/template_noop, -/area/space) "PW" = ( /obj/machinery/hologram/holopad/long_range, /turf/simulated/floor/tiled/dark/full, @@ -4451,11 +4490,11 @@ /turf/simulated/floor/tiled/dark, /area/hephmining_ship/cyclops) "Rg" = ( -/obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/atmospherics/portables_connector{ dir = 1 }, /obj/machinery/portable_atmospherics/canister/air/airlock, +/obj/effect/floor_decal/industrial/hatch/engineering, /turf/simulated/floor/tiled/dark, /area/shuttle/cyclops_shuttle) "Ry" = ( @@ -4488,18 +4527,17 @@ "Sf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/door/firedoor, /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/effect/floor_decal/industrial/hatch_door/operations, /turf/simulated/floor/tiled/dark/full, /area/hephmining_ship/cyclops) "Sh" = ( -/obj/effect/floor_decal/industrial/loading/yellow, /obj/structure/closet/crate, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/loading/operations, +/obj/effect/floor_decal/industrial/outline/operations, /turf/simulated/floor/tiled/dark, /area/hephmining_ship/cyclops/cyclops_hangar) "Sm" = ( @@ -4524,7 +4562,7 @@ /obj/machinery/atmospherics/portables_connector/fuel{ dir = 4 }, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/outline/engineering, /turf/simulated/floor/tiled/dark, /area/hephmining_ship/cyclops/cyclops_port_thrust) "SD" = ( @@ -4742,8 +4780,8 @@ d2 = 8; icon_state = "0-8" }, -/obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/portable_atmospherics/canister/phoron_scarce, +/obj/effect/floor_decal/industrial/outline/engineering, /turf/simulated/floor/tiled/dark, /area/hephmining_ship/cyclops/cyclops_engineering) "TC" = ( @@ -4774,6 +4812,7 @@ /area/hephmining_ship/cyclops/cyclops_vault) "TG" = ( /obj/machinery/portable_atmospherics/canister/carbon_dioxide, +/obj/effect/floor_decal/industrial/outline/engineering, /turf/simulated/floor/tiled/dark, /area/hephmining_ship/cyclops/cyclops_starboard_thrust) "TP" = ( @@ -4807,7 +4846,7 @@ /obj/effect/floor_decal/corner/orange{ dir = 9 }, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/outline/engineering, /turf/simulated/floor/tiled/dark, /area/hephmining_ship/cyclops/cyclops_engineering) "Ul" = ( @@ -4876,12 +4915,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/effect/floor_decal/industrial/outline/yellow, /obj/effect/floor_decal/corner/orange{ dir = 9 }, -/obj/effect/floor_decal/industrial/outline/yellow, /obj/item/reagent_containers/glass/bucket, +/obj/effect/floor_decal/industrial/outline/engineering, /turf/simulated/floor/tiled/dark, /area/hephmining_ship/cyclops/cyclops_engineering) "Vz" = ( @@ -4897,14 +4935,15 @@ /area/hephmining_ship/cyclops/cyclops_hangar) "VC" = ( /obj/machinery/door/airlock/hatch{ - name = "Atmospherics" + name = "Atmospherics"; + req_one_access = list(216) }, /obj/machinery/door/firedoor, -/obj/effect/floor_decal/industrial/hatch/yellow, /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/hatch_door/operations, +/turf/simulated/floor/tiled/dark/full, /area/hephmining_ship/cyclops) "VE" = ( /obj/machinery/conveyor{ @@ -4925,6 +4964,7 @@ /obj/effect/floor_decal/corner/orange{ dir = 6 }, +/obj/effect/floor_decal/industrial/hatch/engineering, /turf/simulated/floor/tiled/dark, /area/hephmining_ship/cyclops/cyclops_engineering) "VI" = ( @@ -4944,6 +4984,10 @@ /obj/effect/floor_decal/industrial/warning/full, /turf/simulated/floor/tiled/dark, /area/hephmining_ship/cyclops/cyclops_hangar) +"Wb" = ( +/obj/effect/map_effect/map_helper/ruler_tiles_3, +/turf/template_noop, +/area/space) "Ws" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8; @@ -5016,11 +5060,11 @@ /turf/simulated/floor/tiled/freezer, /area/hephmining_ship/cyclops/cyclops/bathroom) "Xu" = ( -/obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/atmospherics/portables_connector/scrubber{ dir = 4 }, /obj/machinery/portable_atmospherics/canister/empty, +/obj/effect/floor_decal/industrial/hatch/engineering, /turf/simulated/floor/tiled/dark, /area/shuttle/cyclops_shuttle) "Xw" = ( @@ -5090,7 +5134,6 @@ /obj/effect/floor_decal/corner/brown/full{ dir = 4 }, -/obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/shuttle/cyclops_shuttle) "Yj" = ( @@ -5146,12 +5189,12 @@ }, /area/hephmining_ship/cyclops/cyclops_engineering) "YY" = ( -/obj/machinery/computer/ship/helm{ - dir = 1 - }, /obj/effect/floor_decal/corner/orange{ dir = 10 }, +/obj/machinery/computer/ship/helm/terminal{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/hephmining_ship/cyclops/cyclops_bridge) "YZ" = ( @@ -5168,8 +5211,8 @@ /obj/effect/floor_decal/corner/orange{ dir = 6 }, -/obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/door/firedoor, +/obj/effect/floor_decal/industrial/hatch_door/operations, /turf/simulated/floor/tiled/dark, /area/hephmining_ship/cyclops) "Zg" = ( @@ -5231,10 +5274,11 @@ /area/hephmining_ship/cyclops/cyclops_engineering) "ZB" = ( /obj/effect/floor_decal/industrial/warning, -/obj/effect/map_effect/marker/airlock/docking{ - landmark_tag = "nav_cyclops_2"; - master_tag = "airlock_cyclops_dock"; - name = "airlock_cyclops_dock" +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9 + }, +/obj/effect/map_effect/marker/airlock/heph_cyclops/port{ + req_one_access = list(216) }, /turf/simulated/floor/tiled/dark/full, /area/hephmining_ship/cyclops/cyclops_engineering) @@ -5260,8 +5304,8 @@ /turf/simulated/floor/tiled/dark, /area/hephmining_ship/cyclops) "ZH" = ( -/obj/machinery/computer/ship/helm, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/computer/ship/helm/terminal, /turf/simulated/floor/tiled/dark/full, /area/shuttle/cyclops_shuttle) "ZI" = ( @@ -29010,7 +29054,7 @@ CE CE CE CE -CE +YE CE CE CE @@ -29782,10 +29826,13 @@ CE CE CE CE +bT CE CE +bT CE CE +bT CE CE CE @@ -29827,16 +29874,13 @@ CE CE CE CE +bT CE CE +bT CE CE -CE -CE -CE -CE -CE -CE +bT CE CE CE @@ -30057,6 +30101,7 @@ CE CE CE CE +Wb CE CE CE @@ -30077,8 +30122,7 @@ CE CE CE CE -CE -CE +Wb CE CE CE @@ -30304,6 +30348,7 @@ CE CE CE CE +Wb CE CE CE @@ -30341,8 +30386,7 @@ CE CE CE CE -CE -CE +Wb CE CE CE @@ -30828,6 +30872,7 @@ CE CE CE CE +Wb CE CE CE @@ -30848,8 +30893,7 @@ CE CE CE CE -CE -CE +Wb CE CE CE @@ -31075,6 +31119,7 @@ CE CE CE CE +Wb CE CE CE @@ -31112,8 +31157,7 @@ CE CE CE CE -CE -CE +Wb CE CE CE @@ -31580,8 +31624,6 @@ CE CE CE CE -YE -CE CE CE CE @@ -31601,6 +31643,7 @@ CE CE CE CE +Wb CE CE CE @@ -31621,6 +31664,7 @@ CE CE CE CE +Wb CE CE CE @@ -31846,6 +31890,7 @@ CE CE CE CE +Wb CE CE CE @@ -31883,8 +31928,7 @@ CE CE CE CE -CE -CE +Wb CE CE CE @@ -32115,24 +32159,24 @@ CE CE CE CE +bT CE CE +bT CE CE +bT CE +Pg +qF CE +bT CE CE +bT CE CE -CE -CE -CE -CE -CE -CE -CE -CE +bT CE CE CE @@ -32360,45 +32404,45 @@ CE CE CE CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE +Bn +if +if +if +if +if +if +if +if +if +if +if +if +if +if +if +if +if +if +if +Ag +Ag +if +if +if +if +if +if +if +if +if +if +if +if +if +if +if +if +if CE CE CE @@ -32616,46 +32660,46 @@ CE CE CE CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -PQ +nr +tj +tj +tj +tj +tj +tj +tj +tj +tj +tj +tj +tj +tj +tj +tj +tj +tj +tj +Ag NW Ag Ag NW -eA -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE +Ag +tj +tj +tj +tj +tj +tj +tj +tj +tj +tj +tj +tj +tj +tj +wT CE CE CE @@ -32892,7 +32936,7 @@ CE CE CE CE -CU +Pg mA kd cP @@ -33131,6 +33175,7 @@ CE CE CE CE +Wb CE CE CE @@ -33148,8 +33193,7 @@ CE CE CE CE -CE -CU +Pg cW eB af @@ -33169,7 +33213,7 @@ CE CE CE CE -CE +Wb CE CE CE @@ -33406,7 +33450,7 @@ CE CE CE CE -CU +Pg cW yC gm @@ -33663,19 +33707,19 @@ CE CE CE CE -CU +Pg mA ff DV mA NW -LV -LV -LV -LV -LV -LV -LV +if +if +if +if +if +if +if Gx CE CE @@ -33902,6 +33946,7 @@ CE CE CE CE +Wb CE CE CE @@ -33919,8 +33964,7 @@ CE CE CE CE -CE -CU +Pg mA Bk cX @@ -33940,7 +33984,7 @@ CE CE CE CE -CE +Wb CE CE CE @@ -34163,20 +34207,20 @@ CE CE CE BZ -LV -LV -LV -LV -LV -LV -LV -LV -LV -LV -LV -LV -LV -LV +if +if +if +if +if +if +if +if +if +if +if +if +if +if NW mA gf @@ -34673,7 +34717,7 @@ CE CE CE CE -CE +Wb Ly dn PK @@ -34711,7 +34755,7 @@ CE CE CE CE -CE +Wb CE CE CE @@ -34964,9 +35008,9 @@ ce yb AY NW -LV -LV -LV +if +if +if eA CE CE @@ -35179,13 +35223,13 @@ CE CE CE CE +bT CE CE +bT CE CE -CE -CE -CE +bT CE CE Ob @@ -35227,13 +35271,13 @@ AO Ag Gx CE +bT CE CE +bT CE CE -CE -CE -CE +bT CE CE CE @@ -38520,13 +38564,13 @@ CE CE CE CE +bT CE CE +bT CE CE -CE -CE -CE +bT CE CE aY @@ -38568,13 +38612,13 @@ FP oS eZ CE +bT CE CE +bT CE CE -CE -CE -CE +bT CE CE CE @@ -39042,7 +39086,7 @@ CE CE CE CE -CE +Wb GF vl pl @@ -39080,7 +39124,7 @@ VI yt FP eZ -CE +Wb CE CE CE @@ -39813,7 +39857,7 @@ CE CE CE CE -CE +Wb aY aY aY @@ -39847,11 +39891,11 @@ Ig Ig Ig NW -gV -gV -gV +tj +tj +tj sM -CE +Wb CE CE CE @@ -40074,20 +40118,20 @@ CE CE CE uB -gV -gV -gV -gV -gV +tj +tj +tj +tj +tj NW gZ mN gZ NW -gV -gV -gV -gV +tj +tj +tj +tj NW Zg Ev @@ -40102,7 +40146,7 @@ Ga Ga Ig Ag -gV +tj sM CE CE @@ -40336,7 +40380,7 @@ CE CE CE CE -CU +Pg gZ gZ gZ @@ -40345,19 +40389,19 @@ CE CE CE CE -CU +Pg Zg bC Dt gZ NW -gV -gV -gV -gV -gV -gV -gV +tj +tj +tj +tj +tj +tj +tj sM CE CE @@ -40584,7 +40628,7 @@ CE CE CE CE -CE +Wb CE CE CE @@ -40594,15 +40638,15 @@ CE CE CE Ff -gV -gV -gV +tj +tj +tj dr CE CE CE CE -CU +Pg Zg CX ZB @@ -40622,7 +40666,7 @@ CE CE CE CE -CE +Wb CE CE CE @@ -40859,7 +40903,7 @@ CE CE CE CE -CU +Pg gZ mb cv @@ -41098,45 +41142,45 @@ CE CE CE CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE +CD +if +if +if +if +if +if +if +if +if +if +if +if +if +if +if +if +if +Ag +NW +Ag +Ag +NW +Ag +if +if +if +if +if +if +if +if +if +if +if +if +if +if +if CE CE CE @@ -41355,45 +41399,45 @@ CE CE CE CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE +tj +tj +tj +tj +tj +tj +tj +tj +tj +tj +tj +tj +tj +tj +tj +tj +tj +tj +tj +tj +Ag +Ag +tj +tj +tj +tj +tj +tj +tj +tj +tj +tj +tj +tj +tj +tj +tj +tj +kO CE CE CE @@ -41624,24 +41668,24 @@ CE CE CE CE +bT CE CE +bT CE CE +bT CE +KL +eZ CE +bT CE CE +bT CE CE -CE -CE -CE -CE -CE -CE -CE -CE +bT CE CE CE @@ -41869,6 +41913,7 @@ CE CE CE CE +Wb CE CE CE @@ -41906,8 +41951,7 @@ CE CE CE CE -CE -CE +Wb CE CE CE @@ -42136,6 +42180,7 @@ CE CE CE CE +Wb CE CE CE @@ -42156,8 +42201,7 @@ CE CE CE CE -CE -CE +Wb CE CE CE @@ -42640,6 +42684,7 @@ CE CE CE CE +Wb CE CE CE @@ -42677,8 +42722,7 @@ CE CE CE CE -CE -CE +Wb CE CE CE @@ -42907,6 +42951,7 @@ CE CE CE CE +Wb CE CE CE @@ -42927,8 +42972,7 @@ CE CE CE CE -CE -CE +Wb CE CE CE @@ -43411,6 +43455,7 @@ CE CE CE CE +Wb CE CE CE @@ -43448,6 +43493,7 @@ CE CE CE CE +Wb CE CE CE @@ -43458,8 +43504,6 @@ CE CE CE CE -YE -CE CE CE CE @@ -43678,6 +43722,7 @@ CE CE CE CE +Wb CE CE CE @@ -43698,8 +43743,7 @@ CE CE CE CE -CE -CE +Wb CE CE CE @@ -43917,10 +43961,13 @@ CE CE CE CE +bT CE CE +bT CE CE +bT CE CE CE @@ -43962,16 +44009,13 @@ CE CE CE CE +bT CE CE +bT CE CE -CE -CE -CE -CE -CE -CE +bT CE CE CE @@ -44486,7 +44530,7 @@ CE CE CE CE -CE +YE CE CE CE diff --git a/maps/away/ships/heph/cyclops/cyclops_mining_ship.dm b/maps/away/ships/heph/cyclops/cyclops_mining_ship.dm index 0cc59ae599b..1acfd6af55a 100644 --- a/maps/away/ships/heph/cyclops/cyclops_mining_ship.dm +++ b/maps/away/ships/heph/cyclops/cyclops_mining_ship.dm @@ -43,6 +43,11 @@ "nav_cyclops_3", "nav_cyclops_4", "nav_cyclops_5", + "nav_cyclops_6", + "nav_cyclops_7", + "nav_cyclops_8", + "nav_cyclops_9", + "nav_cyclops_10", ) invisible_until_ghostrole_spawn = TRUE @@ -62,9 +67,8 @@ base_area = /area/space /obj/effect/shuttle_landmark/cyclops/nav2 - name = "Cyclops Mining Vessel - Port Airlock" + name = "Cyclops Mining Vessel - Port EVA Docking" landmark_tag = "nav_cyclops_2" - docking_controller = "airlock_cyclops_dock" base_turf = /turf/space/dynamic base_area = /area/space @@ -86,6 +90,36 @@ base_turf = /turf/space/dynamic base_area = /area/space +/obj/effect/shuttle_landmark/cyclops/nav6 + name = "Cyclops Mining Vessel - Port Fore EVA Docking" + landmark_tag = "nav_cyclops_6" + base_turf = /turf/space/dynamic + base_area = /area/space + +/obj/effect/shuttle_landmark/cyclops/nav7 + name = "Cyclops Mining Vessel - Port Aft EVA Docking" + landmark_tag = "nav_cyclops_7" + base_turf = /turf/space/dynamic + base_area = /area/space + +/obj/effect/shuttle_landmark/cyclops/nav8 + name = "Cyclops Mining Vessel - Starboard EVA Docking" + landmark_tag = "nav_cyclops_8" + base_turf = /turf/space/dynamic + base_area = /area/space + +/obj/effect/shuttle_landmark/cyclops/nav9 + name = "Cyclops Mining Vessel - Starboard Fore EVA Docking" + landmark_tag = "nav_cyclops_9" + base_turf = /turf/space/dynamic + base_area = /area/space + +/obj/effect/shuttle_landmark/cyclops/nav10 + name = "Cyclops Mining Vessel - Starboard Aft EVA Docking" + landmark_tag = "nav_cyclops_10" + base_turf = /turf/space/dynamic + base_area = /area/space + //shuttle stuff /obj/effect/overmap/visitable/ship/landable/cyclops_shuttle name = "Cyclops Shuttle" @@ -102,7 +136,7 @@ fore_dir = NORTH vessel_size = SHIP_SIZE_TINY -/obj/machinery/computer/shuttle_control/explore/cyclops_shuttle +/obj/machinery/computer/shuttle_control/explore/terminal/cyclops_shuttle name = "shuttle control console" shuttle_tag = "Cyclops Shuttle" @@ -130,3 +164,21 @@ name = "In transit" landmark_tag = "nav_transit_cyclops_shuttle" base_turf = /turf/space/transit/north + +// airlocks + +/obj/effect/map_effect/marker/airlock/heph_cyclops/port + name = "Port Airlock" + master_tag = "airlock_cyclops_port" + +/obj/effect/map_effect/marker/airlock/heph_cyclops/starboard + name = "Starboard Airlock" + master_tag = "airlock_cyclops_starboard" + +// shuttle airlock + +/obj/effect/map_effect/marker/airlock/shuttle/cyclops_shuttle/shuttle + name = "Cyclops Shuttle" + shuttle_tag = "Cyclops Shuttle" + master_tag = "airlock_shuttle_cyclops" + cycle_to_external_air = TRUE