From abaf214221cf653b3c3ba5252244aaf9d61de80d Mon Sep 17 00:00:00 2001 From: Overteh Date: Thu, 12 Sep 2024 20:09:24 +0800 Subject: [PATCH 1/7] Gecko slight rework --- .../shuttles/nanotrasen/nanotrasen_gecko.dmm | 1322 ++++++++--------- 1 file changed, 600 insertions(+), 722 deletions(-) diff --git a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_gecko.dmm b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_gecko.dmm index 6865b0294aea..2069b8572cf7 100644 --- a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_gecko.dmm +++ b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_gecko.dmm @@ -1,27 +1,17 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "ah" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/structure/cable{ - icon_state = "1-4" - }, -/obj/structure/catwalk/over/plated_catwalk, -/obj/machinery/atmospherics/components/unary/portables_connector{ - dir = 8 + icon_state = "6-8" }, -/obj/machinery/portable_atmospherics/canister/oxygen, /turf/open/floor/plating, /area/ship/engineering/engine) "an" = ( +/obj/machinery/door/airlock/external/glass{ + name = "External Hull Access" + }, +/obj/effect/turf_decal/industrial/warning/fulltile, /turf/open/floor/plating/airless, -/area/ship/external) +/area/ship/storage) "aq" = ( /obj/effect/turf_decal/siding/yellow{ dir = 6 @@ -42,11 +32,10 @@ /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/maintenance/port) "aD" = ( -/obj/machinery/door/poddoor{ - id = "gecko_shuttle"; - dir = 4 - }, /obj/structure/window/reinforced/fulltile/shuttle, +/obj/machinery/door/poddoor/shutters{ + id = "gecko_shuttle" + }, /turf/open/floor/plating, /area/ship/maintenance/central) "aK" = ( @@ -56,12 +45,10 @@ /obj/structure/cable{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/trimline/transparent/white/filled/warning{ dir = 4 }, -/obj/structure/catwalk/over/plated_catwalk, /turf/open/floor/plating, /area/ship/engineering/engine) "aM" = ( @@ -101,7 +88,6 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel/patterned, /area/ship/storage) "bo" = ( @@ -109,13 +95,10 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/catwalk/over/plated_catwalk, -/obj/structure/cable{ - icon_state = "1-8" - }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 1 }, +/obj/structure/catwalk/over/plated_catwalk, /turf/open/floor/plating, /area/ship/hallway/central) "bs" = ( @@ -143,9 +126,6 @@ /turf/open/floor/plasteel, /area/ship/hallway/fore) "bB" = ( -/obj/machinery/door/poddoor/shutters{ - id = "gecko_starboard" - }, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, /obj/machinery/power/shieldwallgen/atmos/roundstart{ @@ -153,6 +133,9 @@ id = "gecko_starboard_field" }, /obj/effect/turf_decal/industrial/warning/fulltile, +/obj/machinery/door/poddoor{ + id = "gecko_starboard" + }, /turf/open/floor/plasteel/tech/grid, /area/ship/cargo/starboard) "bH" = ( @@ -160,17 +143,11 @@ /area/ship/storage) "bK" = ( /obj/item/tank/jetpack/carbondioxide, -/obj/machinery/suit_storage_unit/inherit, /obj/item/clothing/suit/space/hardsuit/mining, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4, -/obj/effect/turf_decal/techfloor{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/transparent/white/filled/warning{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/central) +/obj/machinery/suit_storage_unit/inherit, +/obj/machinery/atmospherics/pipe/layer_manifold, +/turf/open/floor/plasteel/patterned, +/area/ship/storage) "bL" = ( /obj/structure/table/reinforced, /obj/structure/sign/poster/retro/random{ @@ -191,36 +168,32 @@ /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) "bQ" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/auto_name/directional/south{ - dir = 1; - pixel_y = 33 +/obj/machinery/light_switch{ + pixel_y = 23; + pixel_x = -12 }, +/obj/machinery/power/apc/auto_name/directional/north, /turf/open/floor/plasteel/patterned, /area/ship/storage) "bU" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/firealarm/directional/west, -/obj/structure/closet/crate{ - name = "emergency space suit crate" +/obj/effect/spawner/lootdrop/ration, +/obj/effect/spawner/lootdrop/ration, +/obj/effect/spawner/lootdrop/ration, +/obj/effect/spawner/lootdrop/ration, +/obj/item/reagent_containers/food/snacks/canned/beans, +/obj/item/reagent_containers/food/snacks/canned/beans, +/obj/item/reagent_containers/food/snacks/canned/beans, +/obj/item/reagent_containers/food/snacks/canned/beans, +/obj/structure/closet/crate, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 2 }, -/obj/item/tank/internals/oxygen/red, -/obj/item/tank/internals/oxygen/red, -/obj/item/tank/internals/oxygen/red, -/obj/item/clothing/head/helmet/space/eva, -/obj/item/clothing/mask/breath, -/obj/item/clothing/suit/space/eva, -/obj/item/clothing/head/helmet/space/eva, -/obj/item/clothing/mask/breath, -/obj/item/clothing/mask/breath, -/obj/item/clothing/suit/space/eva, -/obj/item/clothing/head/helmet/space/eva, -/obj/item/clothing/suit/space/eva, /turf/open/floor/plasteel/patterned, /area/ship/storage) "bV" = ( @@ -249,9 +222,6 @@ }, /area/ship/maintenance/starboard) "cv" = ( -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, /obj/machinery/igniter/incinerator_atmos, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -342,6 +312,8 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel/tech/techmaint, /area/ship/cargo/starboard) "dd" = ( @@ -368,29 +340,21 @@ /turf/open/floor/plating, /area/ship/maintenance/starboard) "dl" = ( -/obj/structure/closet/secure_closet{ - icon_state = "cap"; - name = "\proper captain's locker"; - req_access_txt = "20"; - anchored = 1 - }, -/obj/item/clothing/head/caphat/nt, /obj/item/stock_parts/cell/gun, /obj/item/gun/energy/laser, /obj/item/clothing/shoes/laceup, -/obj/item/clothing/head/caphat/parade, /obj/item/clothing/glasses/sunglasses, -/obj/item/clothing/suit/armor/vest/capcarapace, /obj/item/megaphone/command, /obj/item/binoculars, /obj/item/kitchen/knife/combat, -/obj/item/clothing/suit/armor/vest/capcarapace, -/obj/item/clothing/head/caphat/parade, -/obj/item/clothing/head/nanotrasen/captain/peaked, -/obj/item/clothing/under/nanotrasen/captain, -/obj/item/clothing/under/nanotrasen/captain/skirt, -/obj/item/clothing/suit/armor/nanotrasen/captain, /obj/machinery/newscaster/directional/north, +/obj/item/clothing/under/nanotrasen/captain/skirt, +/obj/item/clothing/under/nanotrasen/captain, +/obj/structure/closet/secure_closet{ + icon_state = "cap"; + name = "\proper captain's locker"; + req_access_txt = "20" + }, /turf/open/floor/plasteel/tech, /area/ship/crew/dorm/dormfive) "dp" = ( @@ -409,13 +373,12 @@ /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/crew/toilet) "dV" = ( -/obj/structure/sign/poster/official/nanotrasen_logo, +/obj/structure/sign/nanotrasen, /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/maintenance/port) "dX" = ( /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, -/obj/structure/catwalk/over/plated_catwalk, /obj/structure/cable{ icon_state = "1-8" }, @@ -425,21 +388,23 @@ /obj/structure/cable{ icon_state = "2-8" }, +/obj/structure/catwalk/over/plated_catwalk, /turf/open/floor/plating, /area/ship/hallway/fore) "dZ" = ( /obj/machinery/atmospherics/pipe/simple/dark{ dir = 4 }, -/obj/structure/catwalk/over/plated_catwalk, /obj/machinery/light/floor, /turf/open/floor/plating, /area/ship/engineering/engine) "ef" = ( /obj/machinery/light/directional/south, -/obj/structure/grille, /obj/structure/cable{ - icon_state = "0-8" + icon_state = "0-9" + }, +/obj/structure/cable{ + icon_state = "1-9" }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -452,28 +417,23 @@ /turf/open/floor/plasteel, /area/ship/hallway/aft) "el" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/bodycontainer/morgue, -/turf/open/floor/plasteel/patterned/cargo_one, -/area/ship/medical/surgery) +/obj/structure/railing, +/turf/open/floor/plasteel/dark, +/area/ship/engineering/engine) "et" = ( -/obj/effect/turf_decal/siding/white{ - dir = 4 +/obj/effect/turf_decal/industrial/warning/fulltile, +/obj/machinery/door/firedoor/border_only{ + dir = 1 }, -/obj/effect/turf_decal/siding/white{ +/obj/machinery/door/firedoor/border_only, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/structure/cable{ - icon_state = "2-4" +/obj/machinery/door/airlock/external/glass{ + name = "Interior Hull Access" }, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer4, -/turf/open/floor/plasteel/patterned/grid, -/area/ship/hallway/central) +/turf/open/floor/plasteel/patterned, +/area/ship/storage) "eu" = ( /obj/structure/cable{ icon_state = "2-8" @@ -499,14 +459,16 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, +/obj/structure/railing{ + dir = 8 + }, /obj/effect/turf_decal/siding/yellow{ - dir = 1 + dir = 9 }, -/obj/effect/turf_decal/siding/yellow, -/obj/structure/catwalk/over/plated_catwalk, /obj/machinery/light/floor, -/obj/structure/railing{ - dir = 8 +/obj/machinery/computer/atmos_control/tank/toxin_tank{ + dir = 4; + sensors = list("gecko_tox_sensor"="Plasma Tank") }, /turf/open/floor/plasteel/tech/techmaint, /area/ship/engineering/engine) @@ -520,14 +482,7 @@ /turf/open/floor/plasteel/tech, /area/ship/maintenance/central) "eC" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8 - }, -/obj/structure/catwalk/over/plated_catwalk, /turf/open/floor/plating, /area/ship/engineering/engine) "eD" = ( @@ -557,11 +512,6 @@ /area/ship/external) "eQ" = ( /obj/item/radio/intercom/directional/south, -/obj/structure/catwalk/over/plated_catwalk, -/obj/machinery/atmospherics/components/unary/portables_connector/layer2{ - dir = 1 - }, -/obj/machinery/portable_atmospherics/canister/air, /turf/open/floor/plating, /area/ship/engineering/engine) "fb" = ( @@ -612,6 +562,11 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel/patterned, /area/ship/cargo/starboard) "fK" = ( @@ -662,14 +617,13 @@ /turf/open/floor/plasteel/grimy, /area/ship/crew) "ge" = ( -/obj/structure/sign/poster/official/nanotrasen_logo, -/turf/closed/wall/mineral/titanium/nodiagonal, +/obj/structure/sign/nanotrasen, +/turf/closed/wall/mineral/titanium, /area/ship/bridge) "gg" = ( -/obj/machinery/atmospherics/pipe/simple/purple/hidden{ +/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 9 }, -/obj/structure/catwalk/over/plated_catwalk, /turf/open/floor/plating, /area/ship/engineering/engine) "gh" = ( @@ -689,22 +643,13 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/structure/grille, -/obj/effect/spawner/structure/window/reinforced, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/ship/bridge) "gB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8 +/obj/structure/cable{ + icon_state = "4-10" }, -/obj/structure/catwalk/over/plated_catwalk, /turf/open/floor/plating, /area/ship/engineering/engine) "gE" = ( @@ -729,20 +674,10 @@ /turf/open/floor/plasteel/patterned, /area/ship/cargo/starboard) "gN" = ( -/obj/item/tank/jetpack/carbondioxide, -/obj/machinery/suit_storage_unit/inherit, -/obj/item/clothing/suit/space/hardsuit/engine, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ - dir = 6 - }, -/obj/effect/turf_decal/techfloor{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/transparent/white/filled/warning{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/central) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/ship/storage) "gQ" = ( /obj/item/radio/intercom/directional/west, /obj/machinery/light_switch{ @@ -753,9 +688,14 @@ /turf/open/floor/plasteel/tech, /area/ship/maintenance/central) "gS" = ( -/obj/structure/sign/poster/official/nanotrasen_logo, -/turf/closed/wall/mineral/titanium, -/area/ship/bridge) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/turf/open/floor/plasteel/patterned/cargo_one, +/area/ship/medical/surgery) "hb" = ( /obj/effect/turf_decal/industrial/fire{ dir = 8 @@ -763,7 +703,7 @@ /obj/machinery/atmospherics/components/binary/pump{ dir = 8 }, -/obj/structure/catwalk/over/plated_catwalk, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/ship/engineering/engine) "hn" = ( @@ -812,7 +752,6 @@ /obj/machinery/atmospherics/pipe/simple/dark{ dir = 9 }, -/obj/structure/catwalk/over/plated_catwalk, /turf/open/floor/plating, /area/ship/engineering/engine) "if" = ( @@ -824,38 +763,24 @@ /turf/open/floor/plasteel/grimy, /area/ship/crew) "ih" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ - dir = 10 - }, -/obj/effect/turf_decal/techfloor{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/transparent/white/filled/warning{ - dir = 8 - }, -/obj/machinery/power/apc/auto_name/directional/south{ - dir = 4; - pixel_y = 0; - pixel_x = 26 - }, -/obj/machinery/power/terminal{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "0-8" +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 }, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/central) +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/ship/storage) "in" = ( -/obj/structure/catwalk/over/plated_catwalk, /obj/machinery/light/small/directional/north, /obj/structure/cable{ icon_state = "2-4" }, +/obj/machinery/power/ship_gravity, +/obj/structure/cable{ + icon_state = "0-2" + }, /turf/open/floor/plating, /area/ship/engineering/engine) "is" = ( -/obj/structure/grille, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/ship/bridge) @@ -884,6 +809,7 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt/dust, +/obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/plating, /area/ship/maintenance/starboard) "iQ" = ( @@ -984,21 +910,31 @@ /turf/open/floor/plasteel/tech, /area/ship/crew/dorm/dormfive) "jK" = ( -/obj/effect/turf_decal/industrial/hatch/yellow, -/obj/machinery/atmospherics/components/unary/portables_connector{ +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + icon_state = "rwindow"; dir = 4 }, -/obj/machinery/portable_atmospherics/canister/toxins, -/turf/open/floor/plating, +/obj/effect/turf_decal/atmos/plasma, +/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxin_input{ + dir = 4 + }, +/obj/machinery/air_sensor/atmos/toxin_tank{ + id_tag = "gecko_tox_sensor"; + pixel_x = 3; + pixel_y = 8 + }, +/turf/open/floor/engine/plasma, /area/ship/engineering/engine) "jO" = ( -/obj/structure/window/reinforced/fulltile/shuttle, -/obj/structure/grille, /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/door/poddoor{ - id = "gecko_shuttle" +/obj/structure/window/reinforced/fulltile/shuttle, +/obj/machinery/door/poddoor/shutters{ + id = "gecko_shuttle" }, /turf/open/floor/plating, /area/ship/medical/surgery) @@ -1018,12 +954,8 @@ /area/ship/medical/surgery) "kq" = ( /turf/closed/wall/mineral/titanium, -/area/ship/cargo/starboard) +/area/ship/maintenance/starboard) "ks" = ( -/obj/machinery/atmospherics/pipe/manifold/purple{ - dir = 4 - }, -/obj/structure/catwalk/over/plated_catwalk, /obj/machinery/light/floor, /turf/open/floor/plating, /area/ship/engineering/engine) @@ -1052,19 +984,9 @@ /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo/starboard) "lS" = ( -/obj/structure/sign/poster/official/nanotrasen_logo, -/turf/closed/wall/mineral/titanium/nodiagonal, +/obj/structure/sign/nanotrasen, +/turf/closed/wall/mineral/titanium, /area/ship/medical/surgery) -"lW" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 8 - }, -/obj/structure/catwalk/over/plated_catwalk, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/turf/open/floor/plating, -/area/ship/engineering/engine) "lY" = ( /obj/docking_port/stationary{ dwidth = 10; @@ -1078,12 +1000,8 @@ icon_state = "2-8" }, /obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/cyan{ - dir = 5 + icon_state = "1-5" }, -/obj/structure/catwalk/over/plated_catwalk, /turf/open/floor/plating, /area/ship/engineering/engine) "mb" = ( @@ -1117,23 +1035,11 @@ /turf/open/floor/plastic, /area/ship/crew/toilet) "mL" = ( -/obj/structure/closet/emcloset, -/obj/item/tank/internals/plasmaman/full, -/obj/effect/decal/cleanable/dirt, -/obj/structure/sign/warning/gasmask{ - pixel_x = 32 - }, -/obj/effect/turf_decal/techfloor{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/transparent/white/filled/warning{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ - dir = 10 - }, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/central) +/turf/open/floor/plasteel/patterned, +/area/ship/storage) "mM" = ( /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable{ @@ -1163,11 +1069,15 @@ /turf/open/floor/plating, /area/ship/engineering/engine) "mX" = ( -/obj/structure/catwalk/over/plated_catwalk, /obj/structure/cable{ icon_state = "1-8" }, -/turf/open/floor/plating, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/stairs/left{ + dir = 8 + }, /area/ship/engineering/engine) "nc" = ( /obj/structure/cable{ @@ -1192,13 +1102,25 @@ /turf/open/floor/plasteel/tech, /area/ship/crew/dorm/dormfive) "nq" = ( -/obj/effect/turf_decal/industrial/outline/yellow, -/obj/machinery/atmospherics/components/unary/portables_connector/layer4{ +/obj/effect/turf_decal/techfloor{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/transparent/white/filled/warning{ dir = 8 }, -/obj/machinery/portable_atmospherics/canister/air, -/turf/open/floor/plasteel/tech/grid, -/area/ship/hallway/central) +/obj/machinery/light/small/directional/east, +/obj/machinery/advanced_airlock_controller{ + pixel_x = 0; + pixel_y = 26 + }, +/obj/structure/sign/warning/gasmask{ + pixel_x = 32 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ + dir = 10 + }, +/turf/open/floor/plasteel/dark, +/area/ship/storage) "nH" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -1241,10 +1163,8 @@ /area/ship/engineering/engine) "on" = ( /obj/effect/decal/fakelattice, -/obj/machinery/button/ignition{ - dir = 4; - pixel_x = 10; - pixel_y = 6 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 }, /obj/machinery/button/ignition{ dir = 4; @@ -1252,9 +1172,6 @@ pixel_y = 6; id = "atmos_incinerator_igniter" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/engineering/engine) "ov" = ( @@ -1263,33 +1180,25 @@ /turf/open/floor/plasteel, /area/ship/hallway/aft) "oy" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 1 +/obj/effect/turf_decal/siding/white{ + dir = 8 }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ - dir = 6 +/obj/effect/turf_decal/siding/white{ + dir = 4 }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/hallway/central) +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{ + dir = 1 + }, +/turf/open/floor/plasteel/patterned/grid, +/area/ship/storage) "oJ" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/crew/dorm/dormfive) "oM" = ( -/obj/machinery/light_switch{ - dir = 1; - pixel_x = 5; - pixel_y = -25 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 }, -/obj/item/reagent_containers/food/snacks/canned/beans, -/obj/item/reagent_containers/food/snacks/canned/beans, -/obj/item/reagent_containers/food/snacks/canned/beans, -/obj/item/reagent_containers/food/snacks/canned/beans, -/obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/ration, -/obj/effect/spawner/lootdrop/ration, -/obj/effect/spawner/lootdrop/ration, -/obj/effect/spawner/lootdrop/ration, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /turf/open/floor/plasteel/patterned, /area/ship/storage) "oR" = ( @@ -1306,23 +1215,17 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/effect/turf_decal/siding/yellow{ - dir = 1 - }, -/obj/effect/turf_decal/siding/yellow, -/obj/structure/catwalk/over/plated_catwalk, -/obj/structure/catwalk/over/plated_catwalk, -/turf/open/floor/plasteel/tech/techmaint, +/turf/open/floor/plating, /area/ship/engineering/engine) "oW" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/passive_vent{ +/obj/machinery/atmospherics/components/unary/outlet_injector/on{ dir = 4 }, /turf/open/floor/engine/hull/reinforced, @@ -1366,7 +1269,6 @@ /obj/machinery/atmospherics/pipe/simple/dark{ dir = 4 }, -/obj/structure/catwalk/over/plated_catwalk, /turf/open/floor/plating, /area/ship/engineering/engine) "pK" = ( @@ -1397,7 +1299,6 @@ /area/ship/bridge) "pQ" = ( /obj/machinery/atmospherics/components/trinary/mixer/flipped, -/obj/structure/catwalk/over/plated_catwalk, /turf/open/floor/plating, /area/ship/engineering/engine) "pW" = ( @@ -1418,10 +1319,10 @@ "qb" = ( /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, -/obj/structure/catwalk/over/plated_catwalk, /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/catwalk/over/plated_catwalk, /turf/open/floor/plating, /area/ship/hallway/fore) "qc" = ( @@ -1448,9 +1349,8 @@ /turf/open/floor/plating, /area/ship/maintenance/port) "qu" = ( -/obj/structure/grille, /obj/structure/window/reinforced/fulltile/shuttle, -/obj/machinery/door/poddoor{ +/obj/machinery/door/poddoor/shutters{ id = "gecko_shuttle" }, /turf/open/floor/plating, @@ -1487,14 +1387,14 @@ /turf/open/floor/plating, /area/ship/maintenance/port) "qL" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, /turf/open/floor/plasteel/patterned, /area/ship/medical/surgery) "qO" = ( /turf/closed/wall/mineral/titanium, -/area/ship/hallway/central) +/area/ship/storage) "rd" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -1539,7 +1439,7 @@ /turf/open/floor/plasteel/grimy, /area/ship/crew) "rC" = ( -/obj/structure/sign/poster/official/nanotrasen_logo, +/obj/structure/sign/nanotrasen, /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/engineering/engine) "rD" = ( @@ -1564,18 +1464,15 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/fore) "rU" = ( -/obj/effect/turf_decal/industrial/warning/fulltile, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/door/airlock/external/glass{ - name = "External Hull Access" +/obj/effect/turf_decal/industrial/warning{ + dir = 1 }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/hallway/central) +/turf/open/floor/plasteel/patterned/grid, +/area/ship/storage) "sg" = ( /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/medical/surgery) "ss" = ( -/obj/structure/catwalk/over/plated_catwalk, /obj/machinery/button/door{ dir = 1; id = "gecko_thrusters"; @@ -1584,11 +1481,13 @@ pixel_y = -24; sync_doors = 0 }, +/obj/machinery/atmospherics/components/unary/portables_connector{ + dir = 8 + }, /turf/open/floor/plating, /area/ship/engineering/engine) "st" = ( /obj/effect/turf_decal/industrial/outline/yellow, -/obj/structure/catwalk/over/plated_catwalk, /obj/machinery/atmospherics/components/binary/pump/layer4{ dir = 8; name = "waste to enviroment" @@ -1605,7 +1504,7 @@ /area/ship/engineering/engine) "sS" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/sign/poster/official/nanotrasen_logo, +/obj/structure/sign/nanotrasen, /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/maintenance/port) "sY" = ( @@ -1615,19 +1514,15 @@ /turf/open/floor/plasteel/tech, /area/ship/maintenance/central) "td" = ( -/obj/machinery/airalarm/directional/west{ - dir = 4; - pixel_x = -30 - }, +/obj/structure/sign/nanotrasen, /turf/closed/wall/mineral/titanium/nodiagonal, -/area/ship/engineering/engine) +/area/ship/crew/dorm/dormfive) "te" = ( -/obj/machinery/door/poddoor{ - dir = 4; - id = "gecko_bridge" - }, -/obj/structure/window/reinforced/fulltile/shuttle, /obj/structure/window/reinforced/fulltile/shuttle, +/obj/machinery/door/poddoor/shutters{ + id = "gecko_bridge"; + dir = 4 + }, /turf/open/floor/plating, /area/ship/bridge) "tB" = ( @@ -1638,8 +1533,7 @@ /obj/machinery/atmospherics/pipe/simple/dark{ dir = 4 }, -/obj/structure/catwalk/over/plated_catwalk, -/obj/machinery/portable_atmospherics/canister, +/obj/machinery/portable_atmospherics/canister/toxins, /turf/open/floor/plating, /area/ship/engineering/engine) "tN" = ( @@ -1738,16 +1632,11 @@ /turf/open/floor/plating, /area/ship/maintenance/starboard) "vi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold4w/cyan, -/obj/structure/catwalk/over/plated_catwalk, /obj/machinery/light/floor, +/obj/structure/cable{ + icon_state = "2-10" + }, /turf/open/floor/plating, /area/ship/engineering/engine) "vl" = ( @@ -1762,16 +1651,25 @@ /turf/open/floor/plasteel/tech, /area/ship/maintenance/central) "vo" = ( -/obj/structure/sign/warning, -/turf/closed/wall/mineral/titanium/nodiagonal, -/area/ship/hallway/central) +/obj/effect/turf_decal/techfloor{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/transparent/white/filled/warning{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ + dir = 6 + }, +/obj/structure/tank_dispenser/oxygen, +/turf/open/floor/plasteel/dark, +/area/ship/storage) "vv" = ( /obj/effect/turf_decal/industrial/fire{ dir = 8 }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/passive_vent/layer4{ +/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer4{ dir = 4 }, /turf/open/floor/engine/hull/reinforced, @@ -1817,15 +1715,13 @@ /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/crew/dorm/dormfive) "wh" = ( -/obj/structure/sign/poster/official/nanotrasen_logo, +/obj/structure/sign/nanotrasen, /turf/closed/wall/mineral/titanium, /area/ship/engineering/engine) "ws" = ( /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/catwalk/over/plated_catwalk, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/ship/engineering/engine) @@ -1833,17 +1729,14 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/catwalk/over/plated_catwalk, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/structure/displaycase/trophy{ - contents = "/obj/item/reagent_containers/food/snacks/pizzaslice/arnold" - }, -/turf/open/floor/plasteel, +/obj/structure/catwalk/over/plated_catwalk, +/turf/open/floor/plating, /area/ship/hallway/fore) "wy" = ( /obj/structure/cable{ @@ -1858,18 +1751,27 @@ /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/maintenance/starboard) "wD" = ( -/obj/machinery/atmospherics/components/unary/tank/toxins{ - dir = 4 +/obj/structure/window/reinforced{ + dir = 8 }, -/obj/effect/turf_decal/industrial/hatch/yellow, -/turf/open/floor/plating, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/effect/turf_decal/atmos/oxygen, +/obj/machinery/air_sensor/atmos/oxygen_tank{ + id_tag = "gecko_o2_sensor"; + pixel_x = 8; + pixel_y = 4 + }, +/turf/open/floor/engine/o2, /area/ship/engineering/engine) "wR" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 + dir = 6 }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/medical/surgery) @@ -1877,26 +1779,19 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/catwalk/over/plated_catwalk, +/obj/machinery/igniter/incinerator_atmos, /turf/open/floor/plating, /area/ship/engineering/engine) "wW" = ( -/obj/structure/catwalk/over/plated_catwalk, /obj/machinery/atmospherics/components/binary/pump/layer2, /turf/open/floor/plating, /area/ship/engineering/engine) "wY" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/light/floor, +/obj/structure/railing, +/turf/open/floor/plasteel/stairs/right{ dir = 8 }, -/obj/structure/catwalk/over/plated_catwalk, -/obj/machinery/light/floor, -/turf/open/floor/plating, /area/ship/engineering/engine) "xd" = ( /obj/effect/spawner/lootdrop/maintenance, @@ -1921,20 +1816,20 @@ /obj/effect/turf_decal/industrial/fire{ dir = 8 }, -/obj/structure/catwalk/over/plated_catwalk, /obj/machinery/light/floor, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, /turf/open/floor/plating, /area/ship/engineering/engine) "xm" = ( -/obj/structure/grille, /obj/structure/cable{ - icon_state = "0-8" + icon_state = "0-2" }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/ship/engineering/engine) "xJ" = ( -/obj/structure/grille, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/ship/medical/surgery) @@ -1942,7 +1837,9 @@ /obj/machinery/atmospherics/pipe/simple/dark{ dir = 10 }, -/obj/structure/catwalk/over/plated_catwalk, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, /turf/open/floor/plating, /area/ship/engineering/engine) "yd" = ( @@ -1981,8 +1878,6 @@ /obj/machinery/atmospherics/pipe/simple/dark{ dir = 10 }, -/obj/structure/catwalk/over/plated_catwalk, -/obj/structure/catwalk/over/plated_catwalk, /turf/open/floor/plating, /area/ship/engineering/engine) "yw" = ( @@ -2051,13 +1946,13 @@ /obj/structure/railing{ dir = 10 }, -/obj/machinery/computer/atmos_control/incinerator{ - dir = 4; - sensors = list("gecko_burn_sensor"="Combustion Chamber") - }, /obj/effect/turf_decal/siding/yellow{ dir = 10 }, +/obj/machinery/computer/atmos_control/tank/oxygen_tank{ + dir = 4; + sensors = list("gecko_o2_sensor"="Oxygen Tank") + }, /turf/open/floor/plasteel/tech/techmaint, /area/ship/engineering/engine) "ze" = ( @@ -2075,10 +1970,9 @@ /turf/open/floor/plasteel/patterned, /area/ship/medical/surgery) "zl" = ( -/obj/machinery/atmospherics/pipe/manifold/purple{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/purple/hidden{ + dir = 4 }, -/obj/structure/catwalk/over/plated_catwalk, /turf/open/floor/plating, /area/ship/engineering/engine) "zn" = ( @@ -2103,11 +1997,11 @@ /obj/effect/turf_decal/trimline/transparent/white/filled/warning{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 }, /turf/open/floor/plasteel, /area/ship/cargo/starboard) @@ -2131,21 +2025,18 @@ /turf/open/floor/plastic, /area/ship/crew/toilet) "zZ" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 6 - }, -/obj/structure/catwalk/over/plated_catwalk, +/obj/machinery/igniter/incinerator_atmos, /turf/open/floor/plating, /area/ship/engineering/engine) "As" = ( -/obj/machinery/door/poddoor{ - dir = 4; - id = "gecko_thrusters" - }, /obj/machinery/atmospherics/pipe/simple/dark{ dir = 4 }, /obj/effect/spawner/structure/window/plasma/reinforced, +/obj/machinery/door/poddoor/shutters{ + id = "gecko_shuttle"; + dir = 4 + }, /turf/open/floor/plating, /area/ship/engineering/engine) "Au" = ( @@ -2158,8 +2049,7 @@ "AA" = ( /obj/effect/turf_decal/industrial/hatch/yellow, /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/catwalk/over/plated_catwalk, -/obj/machinery/portable_atmospherics/canister, +/obj/machinery/portable_atmospherics/canister/air, /turf/open/floor/plating, /area/ship/engineering/engine) "AB" = ( @@ -2188,9 +2078,8 @@ /turf/open/floor/plasteel/patterned, /area/ship/medical/surgery) "AI" = ( -/obj/structure/catwalk/over/plated_catwalk, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 2 }, /turf/open/floor/plating, /area/ship/engineering/engine) @@ -2200,6 +2089,12 @@ }, /obj/effect/decal/cleanable/glass, /obj/effect/decal/cleanable/greenglow, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo/starboard) "AN" = ( @@ -2218,31 +2113,49 @@ /turf/open/floor/plasteel/dark, /area/ship/bridge) "Ba" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/structure/railing{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 +/obj/effect/turf_decal/trimline/opaque/yellow/line{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 8 +/obj/machinery/computer/monitor{ + dir = 1 }, -/obj/structure/catwalk/over/plated_catwalk, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/turf/open/floor/plating, +/obj/structure/cable{ + icon_state = "0-1" + }, +/turf/open/floor/plasteel/dark, /area/ship/engineering/engine) "Bi" = ( +/obj/item/clothing/suit/space/eva, +/obj/item/clothing/head/helmet/space/eva, +/obj/item/clothing/suit/space/eva, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/item/clothing/head/helmet/space/eva, +/obj/item/clothing/suit/space/eva, +/obj/item/clothing/mask/breath, +/obj/item/clothing/head/helmet/space/eva, +/obj/item/tank/internals/oxygen/red, +/obj/item/tank/internals/oxygen/red, +/obj/item/tank/internals/oxygen/red, +/obj/structure/closet/crate{ + name = "emergency space suit crate" + }, +/obj/machinery/firealarm/directional/north, /turf/open/floor/plasteel/patterned, /area/ship/storage) "BB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/simple{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/effect/spawner/structure/window/plasma/reinforced, +/obj/structure/cable{ + icon_state = "0-8" }, -/turf/closed/wall/mineral/titanium/nodiagonal, -/area/ship/medical/surgery) +/turf/open/floor/engine, +/area/ship/engineering/engine) "BF" = ( /obj/machinery/cryopod{ dir = 4 @@ -2277,22 +2190,17 @@ "BP" = ( /obj/effect/turf_decal/dept/cargo, /obj/effect/decal/cleanable/glass, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/patterned, /area/ship/cargo/starboard) "BU" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4, -/obj/effect/turf_decal/techfloor{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/transparent/white/filled/warning{ - dir = 8 - }, -/obj/machinery/advanced_airlock_controller{ - pixel_x = 32; - interior_pressure = 101 - }, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/central) +/obj/machinery/suit_storage_unit/inherit, +/obj/item/clothing/suit/space/hardsuit/engine, +/obj/item/tank/jetpack/carbondioxide, +/turf/open/floor/plasteel/patterned, +/area/ship/storage) "BV" = ( /obj/effect/turf_decal/industrial/warning{ dir = 1 @@ -2339,7 +2247,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/structure/catwalk/over/plated_catwalk, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/plating, /area/ship/engineering/engine) "Cn" = ( @@ -2397,10 +2307,10 @@ /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) "CF" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 - }, /obj/effect/spawner/structure/window/plasma/reinforced, +/obj/structure/cable{ + icon_state = "0-8" + }, /turf/open/floor/engine, /area/ship/engineering/engine) "CI" = ( @@ -2431,14 +2341,12 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/catwalk/over/plated_catwalk, /obj/structure/cable{ icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, +/obj/structure/catwalk/over/plated_catwalk, /turf/open/floor/plating, /area/ship/hallway/aft) "CU" = ( @@ -2456,18 +2364,28 @@ /turf/open/floor/plasteel, /area/ship/hallway/central) "Dp" = ( -/obj/structure/grille, -/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/siding/white, +/obj/effect/turf_decal/siding/white{ + dir = 1 + }, +/obj/structure/catwalk/over/plated_catwalk, +/obj/structure/catwalk/over/plated_catwalk, /turf/open/floor/plating, -/area/ship/cargo/starboard) +/area/ship/hallway/aft) "Du" = ( /obj/item/radio/intercom/wideband/directional/west, /turf/open/floor/plasteel/tech, /area/ship/maintenance/central) "DQ" = ( -/obj/machinery/door/poddoor/shutters{ - id = "gecko_starboard" - }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -2476,6 +2394,9 @@ id = "gecko_starboard_field" }, /obj/effect/turf_decal/industrial/warning/fulltile, +/obj/machinery/door/poddoor{ + id = "gecko_starboard" + }, /turf/open/floor/plasteel/tech/grid, /area/ship/cargo/starboard) "DT" = ( @@ -2500,19 +2421,14 @@ /turf/open/floor/plasteel/tech/techmaint, /area/ship/engineering/engine) "Ed" = ( -/obj/machinery/door/airlock/external/glass{ - name = "External Hull Access" - }, /obj/effect/turf_decal/industrial/warning/fulltile, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "1-2" +/obj/machinery/door/airlock/maintenance{ + name = "Storage Bay"; + req_access_txt = "10" }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/hallway/central) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/plasteel/patterned, +/area/ship/storage) "Ek" = ( /obj/effect/turf_decal/industrial/warning{ dir = 1 @@ -2520,11 +2436,9 @@ /turf/open/floor/plasteel/patterned, /area/ship/cargo/starboard) "En" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plating, -/area/ship/maintenance/starboard) +/obj/structure/sign/warning, +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/ship/storage) "Ew" = ( /obj/effect/turf_decal/borderfloor, /obj/machinery/status_display/shuttle{ @@ -2615,7 +2529,6 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/catwalk/over/plated_catwalk, /turf/open/floor/plating, /area/ship/engineering/engine) "Gd" = ( @@ -2650,16 +2563,17 @@ /turf/open/floor/plasteel/grimy, /area/ship/crew) "Gt" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable{ - icon_state = "2-4" +/obj/structure/window/reinforced{ + icon_state = "rwindow"; + dir = 4 }, -/obj/machinery/atmospherics/components/unary/tank/oxygen{ - dir = 8 +/obj/structure/window/reinforced{ + dir = 1 }, -/obj/structure/catwalk/over/plated_catwalk, -/obj/effect/turf_decal/industrial/hatch/yellow, -/turf/open/floor/plating, +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/oxygen_output{ + dir = 4 + }, +/turf/open/floor/engine/o2, /area/ship/engineering/engine) "Gu" = ( /obj/machinery/computer/rdconsole{ @@ -2669,29 +2583,31 @@ /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) "GB" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/catwalk/over/plated_catwalk, -/obj/machinery/power/ship_gravity, -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/turf/open/floor/plating, -/area/ship/engineering/engine) +/obj/structure/sign/nanotrasen, +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/ship/maintenance/starboard) "GE" = ( /obj/effect/turf_decal/industrial/warning, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel/patterned, /area/ship/medical/surgery) "GM" = ( -/obj/effect/turf_decal/industrial/hatch/yellow, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/cobweb, /obj/machinery/light/small/directional/north, -/obj/machinery/atmospherics/components/unary/tank/toxins{ +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + icon_state = "rwindow"; dir = 4 }, -/turf/open/floor/plating, +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/toxin_output{ + dir = 4 + }, +/turf/open/floor/engine/plasma, /area/ship/engineering/engine) "GN" = ( /obj/structure/cable{ @@ -2700,6 +2616,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 }, +/obj/item/clothing/suit/space/hardsuit, /turf/open/floor/plasteel/tech, /area/ship/crew/dorm/dormfive) "GQ" = ( @@ -2777,8 +2694,7 @@ /turf/open/floor/plasteel/tech/techmaint, /area/ship/cargo/starboard) "Ha" = ( -/obj/machinery/light/small/directional/east, -/obj/machinery/rnd/production/circuit_imprinter, +/obj/machinery/rnd/production/circuit_imprinter/department/engi, /turf/open/floor/plasteel/patterned, /area/ship/storage) "Hc" = ( @@ -2801,10 +2717,7 @@ /turf/open/floor/plasteel/tech/techmaint, /area/ship/crew) "Hg" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 5 - }, -/obj/structure/catwalk/over/plated_catwalk, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, /turf/open/floor/plating, /area/ship/engineering/engine) "Hx" = ( @@ -2825,9 +2738,6 @@ /obj/structure/cable{ icon_state = "2-8" }, -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/effect/turf_decal/trimline/transparent/white/filled/warning, /turf/open/floor/plating, /area/ship/maintenance/starboard) @@ -2848,11 +2758,15 @@ /obj/structure/cable{ icon_state = "1-4" }, -/obj/structure/catwalk/over/plated_catwalk, +/obj/structure/cable{ + icon_state = "1-5" + }, /turf/open/floor/plating, /area/ship/engineering/engine) "Ij" = ( -/obj/structure/catwalk/over/plated_catwalk, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, /turf/open/floor/plating, /area/ship/engineering/engine) "Im" = ( @@ -2865,7 +2779,6 @@ sync_doors = 0 }, /obj/structure/railing, -/obj/structure/catwalk/over/plated_catwalk, /turf/open/floor/plating, /area/ship/engineering/engine) "In" = ( @@ -2874,7 +2787,6 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt/dust, -/obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/plating, /area/ship/maintenance/starboard) "Is" = ( @@ -2884,15 +2796,24 @@ /turf/open/floor/plasteel, /area/ship/hallway/aft) "Iu" = ( -/obj/effect/turf_decal/industrial/hatch/yellow, -/obj/structure/catwalk/over/plated_catwalk, -/turf/open/floor/plating, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + icon_state = "rwindow"; + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/oxygen_input{ + dir = 4 + }, +/turf/open/floor/engine/o2, /area/ship/engineering/engine) "Iv" = ( /obj/effect/spawner/structure/window/plasma/reinforced, -/obj/machinery/door/poddoor{ - dir = 4; - id = "gecko_thrusters" +/obj/machinery/door/poddoor/shutters{ + id = "gecko_shuttle"; + dir = 4 }, /turf/open/floor/plating, /area/ship/engineering/engine) @@ -2934,15 +2855,16 @@ /turf/open/floor/plating, /area/ship/maintenance/port) "Jj" = ( +/obj/effect/turf_decal/industrial/warning, /obj/effect/turf_decal/siding/white{ - dir = 4 + dir = 8 }, /obj/effect/turf_decal/siding/white{ - dir = 8 + dir = 4 }, -/obj/machinery/atmospherics/components/binary/pump/layer4, +/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4, /turf/open/floor/plasteel/patterned/grid, -/area/ship/hallway/central) +/area/ship/storage) "Jk" = ( /obj/effect/turf_decal/industrial/outline/yellow, /obj/effect/decal/cleanable/dirt, @@ -2984,12 +2906,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/structure/catwalk/over/plated_catwalk, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 }, /turf/open/floor/plating, /area/ship/engineering/engine) @@ -3022,39 +2940,24 @@ /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/hallway/fore) "KM" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8 - }, -/obj/structure/catwalk/over/plated_catwalk, /turf/open/floor/plating, /area/ship/engineering/engine) "KQ" = ( -/obj/effect/turf_decal/industrial/fire{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/components/binary/pump{ dir = 4 }, -/obj/structure/catwalk/over/plated_catwalk, /turf/open/floor/plating, /area/ship/engineering/engine) "KS" = ( -/obj/effect/turf_decal/siding/white{ - dir = 4 - }, -/obj/effect/turf_decal/siding/white{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 }, -/obj/effect/turf_decal/industrial/warning, -/obj/structure/cable{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4, -/turf/open/floor/plasteel/patterned/grid, -/area/ship/hallway/central) +/turf/open/floor/plasteel/patterned, +/area/ship/storage) "KU" = ( -/obj/structure/catwalk/over/plated_catwalk, /obj/structure/closet{ anchored = 1; icon_door = "eng_tool"; @@ -3068,10 +2971,10 @@ pixel_y = 5 }, /obj/effect/turf_decal/industrial/outline/yellow, -/turf/open/floor/plating, +/turf/open/floor/plasteel/dark, /area/ship/engineering/engine) "KX" = ( -/obj/structure/sign/poster/official/nanotrasen_logo, +/obj/structure/sign/nanotrasen, /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/crew/toilet) "Lq" = ( @@ -3106,11 +3009,6 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/catwalk/over/plated_catwalk, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, /turf/open/floor/plating, /area/ship/engineering/engine) "LK" = ( @@ -3124,14 +3022,13 @@ /area/ship/crew) "LL" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/sign/poster/official/nanotrasen_logo, +/obj/structure/sign/nanotrasen, /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/maintenance/starboard) "LY" = ( /obj/structure/cable{ icon_state = "4-8" }, -/obj/effect/spawner/lootdrop/grille_or_trash, /obj/effect/decal/cleanable/dirt/dust, /obj/structure/sign/warning/electricshock{ pixel_y = 32 @@ -3147,18 +3044,18 @@ /turf/open/floor/plasteel/tech, /area/ship/bridge) "Mf" = ( -/obj/item/tank/jetpack/carbondioxide, -/obj/machinery/suit_storage_unit/inherit, -/obj/item/clothing/suit/space/hardsuit/engine, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/techfloor{ dir = 8 }, /obj/effect/turf_decal/trimline/transparent/white/filled/warning{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, +/obj/item/tank/internals/plasmaman/full, +/obj/item/tank/internals/plasmaman/full, +/obj/structure/closet/emcloset, /turf/open/floor/plasteel/dark, -/area/ship/hallway/central) +/area/ship/storage) "Ml" = ( /obj/effect/turf_decal/industrial/fire{ dir = 8 @@ -3166,7 +3063,6 @@ /obj/machinery/atmospherics/components/binary/pump{ dir = 4 }, -/obj/structure/catwalk/over/plated_catwalk, /turf/open/floor/plating, /area/ship/engineering/engine) "Mn" = ( @@ -3231,15 +3127,15 @@ /turf/open/floor/plasteel/patterned, /area/ship/medical/surgery) "NC" = ( -/obj/machinery/door/poddoor/shutters{ - id = "gecko_starboard" - }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/industrial/warning/fulltile, +/obj/machinery/door/poddoor{ + id = "gecko_starboard" + }, /turf/open/floor/plasteel/tech/grid, /area/ship/cargo/starboard) "NJ" = ( -/obj/structure/sign/poster/official/nanotrasen_logo, +/obj/structure/sign/nanotrasen, /turf/closed/wall/mineral/titanium, /area/ship/maintenance/starboard) "NP" = ( @@ -3250,9 +3146,8 @@ "Oe" = ( /obj/machinery/light/directional/north, /obj/effect/turf_decal/industrial/outline/yellow, -/obj/structure/catwalk/over/plated_catwalk, /obj/machinery/vending/tool, -/turf/open/floor/plating, +/turf/open/floor/plasteel/dark, /area/ship/engineering/engine) "Ov" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -3287,8 +3182,6 @@ /turf/open/floor/engine/hull/reinforced, /area/ship/external) "Pc" = ( -/obj/structure/grille, -/obj/structure/grille, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/ship/cargo/starboard) @@ -3338,9 +3231,22 @@ /turf/open/floor/plating, /area/ship/maintenance/starboard) "Pn" = ( -/obj/structure/catwalk/over/plated_catwalk, /obj/item/radio/intercom/directional/north, -/turf/open/floor/plating, +/obj/structure/table/reinforced{ + color = "#c1b6a5" + }, +/obj/machinery/jukebox/boombox{ + pixel_y = 5 + }, +/obj/item/book/manual/wiki/engineering{ + pixel_x = -3; + pixel_y = -8 + }, +/obj/item/newspaper{ + pixel_x = 6; + pixel_y = -3 + }, +/turf/open/floor/plasteel/dark, /area/ship/engineering/engine) "Pr" = ( /obj/structure/sign/warning/fire, @@ -3356,7 +3262,7 @@ /turf/open/floor/plasteel/tech, /area/ship/maintenance/central) "PF" = ( -/obj/structure/sign/poster/official/nanotrasen_logo, +/obj/structure/sign/nanotrasen, /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/cargo/starboard) "PG" = ( @@ -3365,7 +3271,6 @@ /turf/open/floor/plasteel/tech, /area/ship/crew/dorm/dormfive) "PQ" = ( -/obj/structure/tank_dispenser/oxygen, /obj/structure/sign/warning/vacuum/external{ pixel_x = 32 }, @@ -3375,9 +3280,9 @@ /obj/effect/turf_decal/trimline/transparent/white/filled/warning{ dir = 8 }, -/obj/machinery/light/directional/east, +/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4, /turf/open/floor/plasteel/dark, -/area/ship/hallway/central) +/area/ship/storage) "PV" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -3395,6 +3300,8 @@ /obj/machinery/door/airlock/medical/glass{ req_access_txt = "5" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel/tech/techmaint, /area/ship/medical/surgery) "Qp" = ( @@ -3437,12 +3344,9 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/trimline/transparent/white/filled/warning{ dir = 4 }, -/obj/structure/catwalk/over/plated_catwalk, /turf/open/floor/plating, /area/ship/engineering/engine) "QC" = ( @@ -3457,6 +3361,8 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/aft) "QD" = ( @@ -3464,32 +3370,21 @@ /obj/machinery/atmospherics/pipe/simple/dark{ dir = 1 }, -/obj/structure/catwalk/over/plated_catwalk, -/obj/structure/catwalk/over/plated_catwalk, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /turf/open/floor/plating, /area/ship/engineering/engine) "QY" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2"; + pixel_y = 1 }, -/obj/structure/grille, /obj/structure/cable{ - icon_state = "0-8" + icon_state = "1-2" }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/ship/engineering/engine) "QZ" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Storage Bay"; - req_access_txt = "10" - }, /obj/structure/cable{ icon_state = "1-2" }, @@ -3502,11 +3397,22 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/machinery/door/airlock/maintenance{ + name = "Storage Bay"; + req_access_txt = "10" + }, /turf/open/floor/plasteel/tech/techmaint, /area/ship/storage) "Rc" = ( /obj/machinery/light/directional/north, /obj/item/banner/cargo, +/obj/machinery/firealarm/directional/north{ + pixel_y = 29 + }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable{ + icon_state = "0-8" + }, /turf/open/floor/plasteel/patterned, /area/ship/cargo/starboard) "Rh" = ( @@ -3522,15 +3428,19 @@ /obj/effect/turf_decal/industrial/warning{ dir = 4 }, -/obj/structure/catwalk/over/plated_catwalk, /turf/open/floor/plasteel/tech/techmaint, /area/ship/engineering/engine) "Rk" = ( -/obj/structure/catwalk/over/plated_catwalk, /obj/machinery/status_display/shuttle{ pixel_y = 32 }, -/turf/open/floor/plating, +/obj/effect/turf_decal/trimline/opaque/yellow/warning{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/plasteel/dark, /area/ship/engineering/engine) "Ru" = ( /obj/machinery/light/small/directional/south, @@ -3594,12 +3504,10 @@ }, /obj/effect/turf_decal/siding/yellow, /obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/airalarm/directional/south, /turf/open/floor/plasteel/tech/techmaint, /area/ship/engineering/engine) "Sv" = ( -/obj/structure/disposalpipe/segment{ - dir = 9 - }, /obj/machinery/power/generator{ dir = 4 }, @@ -3624,9 +3532,6 @@ /turf/open/floor/plating, /area/ship/maintenance/port) "Sy" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/effect/spawner/lootdrop/grille_or_trash, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, @@ -3648,14 +3553,9 @@ /turf/open/floor/plasteel/dark, /area/ship/bridge) "SQ" = ( -/obj/effect/turf_decal/industrial/fire{ +/obj/machinery/atmospherics/components/binary/pump/layer2{ dir = 8 }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 4 - }, -/obj/structure/catwalk/over/plated_catwalk, /turf/open/floor/plating, /area/ship/engineering/engine) "SV" = ( @@ -3684,7 +3584,10 @@ /obj/effect/turf_decal/industrial/fire{ dir = 8 }, -/obj/structure/catwalk/over/plated_catwalk, +/obj/machinery/atmospherics/components/unary/portables_connector/layer2{ + dir = 4 + }, +/obj/machinery/portable_atmospherics/canister, /turf/open/floor/plating, /area/ship/engineering/engine) "Tc" = ( @@ -3704,7 +3607,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/structure/catwalk/over/plated_catwalk, /turf/open/floor/plasteel/tech/techmaint, /area/ship/engineering/engine) "Tg" = ( @@ -3733,37 +3635,33 @@ /turf/open/floor/engine/hull/reinforced, /area/ship/external) "Ts" = ( -/turf/closed/wall/mineral/titanium/nodiagonal, -/area/ship/hallway/central) -"TA" = ( -/obj/effect/turf_decal/siding/white{ - dir = 4 - }, -/obj/effect/turf_decal/siding/white{ +/obj/machinery/light/directional/south, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ +/turf/open/floor/plasteel/patterned, +/area/ship/storage) +"TA" = ( +/obj/effect/turf_decal/industrial/warning{ dir = 1 }, -/turf/open/floor/plasteel/patterned/grid, -/area/ship/hallway/central) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/plasteel/patterned, +/area/ship/storage) "TK" = ( -/obj/structure/sign/poster/official/nanotrasen_logo, +/obj/structure/sign/nanotrasen, /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/storage) "Ug" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/engineering/engine) "Uj" = ( -/obj/structure/sign/poster/official/nanotrasen_logo, -/turf/closed/wall/mineral/titanium/nodiagonal, +/obj/structure/sign/nanotrasen, +/turf/closed/wall/mineral/titanium, /area/ship/maintenance/central) "Ux" = ( -/obj/structure/sign/poster/official/nanotrasen_logo, -/turf/closed/wall/mineral/titanium/nodiagonal, +/obj/structure/sign/nanotrasen, +/turf/closed/wall/mineral/titanium, /area/ship/crew/dorm/dormfive) "UB" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -3787,20 +3685,19 @@ /obj/effect/decal/cleanable/glass, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo/starboard) -"UI" = ( -/obj/machinery/door/poddoor/shutters{ - id = "gecko_starboard" - }, +"UI" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/industrial/warning/fulltile, +/obj/machinery/door/poddoor{ + id = "gecko_starboard" + }, /turf/open/floor/plasteel/tech/grid, /area/ship/cargo/starboard) "UP" = ( /obj/machinery/atmospherics/pipe/simple/dark{ dir = 1 }, -/obj/structure/catwalk/over/plated_catwalk, /turf/open/floor/plating, /area/ship/engineering/engine) "UR" = ( @@ -3829,13 +3726,10 @@ /turf/open/floor/plating, /area/ship/maintenance/port) "Vl" = ( -/obj/structure/sign/poster/official/nanotrasen_logo, +/obj/structure/sign/nanotrasen, /turf/closed/wall/mineral/titanium, /area/ship/maintenance/port) "Vm" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, /obj/effect/turf_decal/siding/white{ dir = 4 }, @@ -3845,18 +3739,16 @@ /obj/effect/turf_decal/industrial/warning{ dir = 1 }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/aft) "Vq" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/cargo/starboard) "Vr" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, /turf/open/floor/plasteel, /area/ship/cargo/starboard) "Vz" = ( @@ -3900,8 +3792,7 @@ "VK" = ( /obj/effect/turf_decal/industrial/hatch/yellow, /obj/machinery/light/small/directional/south, -/obj/structure/catwalk/over/plated_catwalk, -/obj/machinery/portable_atmospherics/canister, +/obj/machinery/portable_atmospherics/canister/oxygen, /turf/open/floor/plating, /area/ship/engineering/engine) "VN" = ( @@ -3938,10 +3829,10 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/structure/catwalk/over/plated_catwalk, /obj/structure/cable{ icon_state = "1-8" }, +/obj/structure/catwalk/over/plated_catwalk, /turf/open/floor/plating, /area/ship/hallway/aft) "Wb" = ( @@ -3977,6 +3868,7 @@ /obj/machinery/light/directional/north, /obj/item/storage/belt/utility/chief/full, /obj/item/storage/photo_album/CE, +/obj/item/circuitboard/machine/circuit_imprinter, /turf/open/floor/plasteel/tech, /area/ship/maintenance/central) "WJ" = ( @@ -3985,11 +3877,15 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/item/kirbyplants/random, /obj/effect/turf_decal/borderfloor, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -20; + pixel_y = 11 + }, /turf/open/floor/plasteel, /area/ship/hallway/fore) "WN" = ( /obj/machinery/atmospherics/components/binary/circulator, -/obj/structure/disposalpipe/segment, /turf/open/floor/engine, /area/ship/engineering/engine) "WR" = ( @@ -4037,24 +3933,17 @@ /area/ship/bridge) "Xh" = ( /obj/structure/railing, -/obj/structure/catwalk/over/plated_catwalk, /turf/open/floor/plating, /area/ship/engineering/engine) "Xr" = ( +/obj/item/clothing/suit/space/hardsuit/mining, /obj/item/tank/jetpack/carbondioxide, /obj/machinery/suit_storage_unit/inherit, -/obj/item/clothing/suit/space/hardsuit/mining, -/obj/effect/turf_decal/techfloor{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/transparent/white/filled/warning{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 5 }, -/turf/open/floor/plasteel/dark, -/area/ship/hallway/central) +/turf/open/floor/plasteel/patterned, +/area/ship/storage) "Xs" = ( /obj/effect/turf_decal/industrial/warning{ dir = 1 @@ -4064,11 +3953,11 @@ /turf/open/floor/engine/hull, /area/ship/external) "Xv" = ( -/obj/machinery/door/poddoor{ +/obj/structure/window/reinforced/fulltile/shuttle, +/obj/machinery/door/poddoor/shutters{ id = "gecko_shuttle"; dir = 4 }, -/obj/structure/window/reinforced/fulltile/shuttle, /turf/open/floor/plating, /area/ship/crew/dorm/dormfive) "XA" = ( @@ -4082,13 +3971,6 @@ /turf/open/floor/plasteel/tech/techmaint, /area/ship/engineering/engine) "XN" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/catwalk/over/plated_catwalk, /obj/structure/closet/secure_closet{ anchored = 1; icon_state = "eng_secure"; @@ -4104,13 +3986,15 @@ /obj/item/clothing/gloves/color/yellow, /obj/item/storage/belt/utility/full/engi, /obj/effect/turf_decal/industrial/outline/yellow, -/turf/open/floor/plating, +/obj/structure/sign/warning/incident{ + pixel_y = 0; + pixel_x = 32 + }, +/turf/open/floor/plasteel/dark, /area/ship/engineering/engine) "XS" = ( -/obj/structure/catwalk/over/plated_catwalk, -/obj/structure/catwalk/over/plated_catwalk, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 + dir = 9 }, /turf/open/floor/plating, /area/ship/engineering/engine) @@ -4121,14 +4005,8 @@ /obj/effect/turf_decal/siding/white{ dir = 8 }, -/obj/effect/turf_decal/industrial/warning{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 }, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/central) @@ -4165,7 +4043,9 @@ /turf/open/floor/plasteel/patterned, /area/ship/medical/surgery) "YC" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 2 + }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/medical/surgery) "YG" = ( @@ -4183,32 +4063,23 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, /turf/open/floor/plasteel/patterned, /area/ship/storage) "YR" = ( -/obj/machinery/door/poddoor{ - id = "gecko_bridge"; - dir = 4 - }, -/obj/structure/window/reinforced/fulltile/shuttle, -/turf/open/floor/plating, -/area/ship/bridge) -"Zb" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/components/unary/tank/oxygen{ - dir = 8 - }, -/obj/structure/catwalk/over/plated_catwalk, -/obj/effect/turf_decal/industrial/hatch/yellow, -/turf/open/floor/plating, +/turf/open/floor/plasteel/dark, /area/ship/engineering/engine) +"Zb" = ( +/obj/item/clothing/suit/space/hardsuit/engine, +/obj/item/tank/jetpack/carbondioxide, +/obj/machinery/suit_storage_unit/inherit, +/turf/open/floor/plasteel/patterned, +/area/ship/storage) "Ze" = ( /obj/machinery/door/airlock/maintenance_hatch, /obj/structure/cable{ @@ -4222,13 +4093,18 @@ /turf/open/floor/plating, /area/ship/maintenance/starboard) "Zl" = ( -/obj/machinery/door/poddoor{ - dir = 4; - id = "gecko_bridge" +/obj/effect/turf_decal/box/corners{ + dir = 1 }, -/obj/structure/window/reinforced/fulltile/shuttle, -/turf/open/floor/plating, -/area/ship/bridge) +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/plasteel/patterned/cargo_one, +/area/ship/cargo/starboard) "Zn" = ( /obj/machinery/power/smes/shuttle/precharged{ dir = 4 @@ -4269,28 +4145,28 @@ /turf/open/floor/plasteel, /area/ship/hallway/aft) "ZB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/effect/turf_decal/trimline/opaque/yellow/warning{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/railing/corner{ dir = 8 }, -/obj/structure/catwalk/over/plated_catwalk, -/turf/open/floor/plating, +/turf/open/floor/plasteel/dark, /area/ship/engineering/engine) "ZM" = ( -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable{ - icon_state = "0-8" - }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, -/area/ship/cargo/starboard) +/area/ship/maintenance/starboard) "ZS" = ( -/obj/structure/disposalpipe/trunk, -/obj/machinery/disposal/bin, -/obj/effect/turf_decal/industrial/hatch/yellow, +/obj/machinery/computer/atmos_control/incinerator{ + dir = 4; + sensors = list("gecko_burn_sensor"="Combustion Chamber") + }, +/obj/effect/turf_decal/industrial/outline/yellow, /turf/open/floor/plating, /area/ship/engineering/engine) "ZX" = ( @@ -4301,12 +4177,14 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/crew) "ZY" = ( -/obj/machinery/firealarm/directional/north, /obj/item/banner/cargo, /obj/machinery/light_switch{ pixel_x = 11; pixel_y = 23 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/patterned, /area/ship/cargo/starboard) @@ -4398,7 +4276,7 @@ VK hn cK CF -cK +BB on GM jK @@ -4426,8 +4304,8 @@ Sv uz st KQ -SQ -KQ +Iz +Gt Iu Ug hu @@ -4442,17 +4320,17 @@ hu hu Ug ok -Ij +SQ dZ -Ij -Ij +KM +KM Ml xl hb XS zl ks -gg +KQ ss Ug hu @@ -4472,13 +4350,13 @@ yc UP UP hX -GB +Cj yp QD pQ Hg -Ij -Ij +gg +KM Ug bV xh @@ -4494,15 +4372,15 @@ Ug pW wW AI -Ij -Ij -Ij +KM +KM +KM Cj -Ij -XS -Ij -lW -wW +KM +KM +KM +KM +KM eQ Ug wB @@ -4520,13 +4398,13 @@ tB in JV ws -wV +ws aK oT QA LH wV -Ba +LH Ig wB wB @@ -4544,12 +4422,12 @@ UV qp mX wY -Ij +KM Xh Lr ez zc -Ij +KM zZ vi lZ @@ -4569,12 +4447,12 @@ Jc tB Rk ZB -Ij +Ba Xh XA Tf PV -Ij +KM KM gB eC @@ -4593,18 +4471,18 @@ tB Th tB Pn -ZB -Ij +YR +el Im eu hT PV -Ij -Gt +KM +KM ah -Zb +KM wB -En +dk wB mM dk @@ -4643,13 +4521,13 @@ CU rD pe pe -BB +pe pe Ug DT Rh aq -td +Ug Jk Vr AN @@ -4668,7 +4546,7 @@ dV pe pe SK -el +SK fj Ug Ug @@ -4680,7 +4558,7 @@ zM ms Vq Vq -PF +GB hu hu hu @@ -4701,7 +4579,7 @@ EE ej yX EK -Cc +Zl zv Lw DQ @@ -4718,7 +4596,7 @@ hu jO cG sg -sg +gS GE Qc Vm @@ -4747,7 +4625,7 @@ Tg cE tN Sj -bb +Dp ov uv ZY @@ -4876,8 +4754,8 @@ Mw Iy Vq Pc -Dp -Dp +Pc +Pc Vq Vq PF @@ -4888,14 +4766,14 @@ hu (24,1,1) = {" hu hu -Ts -Ts +qO +En vo Mf gN bK Xr -Ts +bH Da UR fP @@ -4939,13 +4817,13 @@ hu hu hu qO -Ts +bH nq PQ ih BU mL -Ts +bH Ia UR KA @@ -4964,13 +4842,13 @@ hu hu hu hu +qO +bH +bH +bH +Zb Ts -Ts -Ts -Ts -Ts -Ts -Ts +bH KH Cn KH @@ -5178,7 +5056,7 @@ oJ oJ oJ oJ -Ux +td hu hu hu @@ -5445,10 +5323,10 @@ hu hu hu hu -gS -YR +ge +te +te te -Zl ge hu hu From 4337ffa8946c20cfe6f64c5cd2f4aa288e6a22f2 Mon Sep 17 00:00:00 2001 From: Overteh Date: Fri, 13 Sep 2024 15:19:33 +0800 Subject: [PATCH 2/7] Small fixes and wiring --- .../shuttles/nanotrasen/nanotrasen_gecko.dmm | 658 ++++++++---------- 1 file changed, 295 insertions(+), 363 deletions(-) diff --git a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_gecko.dmm b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_gecko.dmm index 2069b8572cf7..de573239009b 100644 --- a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_gecko.dmm +++ b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_gecko.dmm @@ -3,6 +3,15 @@ /obj/structure/cable{ icon_state = "6-8" }, +/obj/structure/cable{ + icon_state = "4-6" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, /turf/open/floor/plating, /area/ship/engineering/engine) "an" = ( @@ -12,6 +21,15 @@ /obj/effect/turf_decal/industrial/warning/fulltile, /turf/open/floor/plating/airless, /area/ship/storage) +"ao" = ( +/obj/structure/cable{ + icon_state = "5-9" + }, +/obj/structure/cable{ + icon_state = "4-9" + }, +/turf/open/floor/plasteel/patterned/cargo_one, +/area/ship/medical/surgery) "aq" = ( /obj/effect/turf_decal/siding/yellow{ dir = 6 @@ -34,7 +52,8 @@ "aD" = ( /obj/structure/window/reinforced/fulltile/shuttle, /obj/machinery/door/poddoor/shutters{ - id = "gecko_shuttle" + id = "gecko_shuttle"; + dir = 4 }, /turf/open/floor/plating, /area/ship/maintenance/central) @@ -52,6 +71,15 @@ /turf/open/floor/plating, /area/ship/engineering/engine) "aM" = ( +/obj/structure/cable{ + icon_state = "5-6" + }, +/obj/structure/cable{ + icon_state = "1-6" + }, +/obj/structure/cable{ + icon_state = "4-9" + }, /turf/open/floor/plasteel/patterned, /area/ship/medical/surgery) "aS" = ( @@ -85,34 +113,25 @@ /turf/open/floor/plating, /area/ship/hallway/aft) "bk" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, /turf/open/floor/plasteel/patterned, /area/ship/storage) "bo" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/structure/catwalk/over/plated_catwalk, /turf/open/floor/plating, -/area/ship/hallway/central) +/area/ship/hallway/aft) "bs" = ( /obj/effect/turf_decal/industrial/warning{ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/obj/structure/closet/crate/freezer, -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/structure/cable{ - icon_state = "1-4" + icon_state = "4-10" }, +/obj/structure/closet/crate/freezer, /turf/open/floor/plasteel/patterned, /area/ship/medical/surgery) "bw" = ( @@ -124,7 +143,7 @@ dir = 1 }, /turf/open/floor/plasteel, -/area/ship/hallway/fore) +/area/ship/hallway/aft) "bB" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -170,14 +189,10 @@ "bQ" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable{ - icon_state = "0-2" - }, /obj/machinery/light_switch{ pixel_y = 23; pixel_x = -12 }, -/obj/machinery/power/apc/auto_name/directional/north, /turf/open/floor/plasteel/patterned, /area/ship/storage) "bU" = ( @@ -202,9 +217,6 @@ /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/maintenance/starboard) "ch" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, @@ -265,21 +277,18 @@ dir = 1 }, /obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "1-4" + icon_state = "8-9" }, -/obj/item/storage/belt/medical, -/obj/item/storage/backpack/messenger/med, -/obj/item/storage/backpack/medic, -/obj/item/storage/firstaid/medical, -/obj/structure/closet/secure_closet/medical1, -/obj/item/clothing/accessory/armband/medblue, -/obj/item/clothing/head/beret/med, +/obj/item/clothing/under/plasmaman/medical/skirt, /obj/item/clothing/suit/hooded/wintercoat/medical, /obj/item/clothing/under/plasmaman/medical, -/obj/item/clothing/under/plasmaman/medical/skirt, +/obj/item/clothing/head/beret/med, +/obj/item/clothing/accessory/armband/medblue, +/obj/item/storage/firstaid/medical, +/obj/item/storage/backpack/medic, +/obj/item/storage/backpack/messenger/med, +/obj/structure/closet/secure_closet/medical1, +/obj/item/storage/belt/medical, /turf/open/floor/plasteel/patterned, /area/ship/medical/surgery) "cK" = ( @@ -296,8 +305,6 @@ /obj/effect/turf_decal/techfloor{ dir = 6 }, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/south, /turf/open/floor/plasteel/tech/grid, /area/ship/crew) "cX" = ( @@ -327,13 +334,13 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/structure/cable{ - icon_state = "1-8" - }, /turf/open/floor/plasteel/tech, /area/ship/bridge) "df" = ( /obj/effect/decal/cleanable/dirt, +/obj/structure/cable{ + icon_state = "2-5" + }, /turf/open/floor/plasteel/patterned, /area/ship/medical/surgery) "dk" = ( @@ -367,8 +374,12 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable{ + icon_state = "0-4" + }, /turf/open/floor/plating, -/area/ship/maintenance/port) +/area/ship/engineering/engine) "du" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/crew/toilet) @@ -377,20 +388,11 @@ /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/maintenance/port) "dX" = ( -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, /obj/structure/cable{ - icon_state = "1-8" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "2-8" + icon_state = "2-4" }, -/obj/structure/catwalk/over/plated_catwalk, /turf/open/floor/plating, -/area/ship/hallway/fore) +/area/ship/engineering/engine) "dZ" = ( /obj/machinery/atmospherics/pipe/simple/dark{ dir = 4 @@ -403,9 +405,6 @@ /obj/structure/cable{ icon_state = "0-9" }, -/obj/structure/cable{ - icon_state = "1-9" - }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/ship/engineering/engine) @@ -517,6 +516,9 @@ "fb" = ( /obj/machinery/light/directional/south, /obj/item/banner/medical, +/obj/structure/cable{ + icon_state = "5-9" + }, /turf/open/floor/plasteel/patterned, /area/ship/medical/surgery) "fh" = ( @@ -562,9 +564,6 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/structure/cable{ - icon_state = "2-4" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel/patterned, @@ -574,8 +573,12 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable{ + icon_state = "0-2" + }, /turf/open/floor/plasteel/stairs, -/area/ship/maintenance/port) +/area/ship/maintenance/starboard) "fP" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 @@ -584,9 +587,8 @@ dir = 1 }, /obj/effect/turf_decal/borderfloor, -/obj/machinery/airalarm/directional/south, /turf/open/floor/plasteel, -/area/ship/hallway/central) +/area/ship/hallway/aft) "fS" = ( /obj/effect/turf_decal/siding/yellow, /obj/effect/turf_decal/siding/yellow{ @@ -634,16 +636,13 @@ /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo/starboard) "gw" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, +/obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/ship/bridge) "gB" = ( @@ -706,10 +705,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/ship/engineering/engine) -"hn" = ( -/obj/effect/decal/fakelattice, -/turf/closed/wall/mineral/titanium/nodiagonal, -/area/ship/engineering/engine) "hs" = ( /obj/machinery/door/airlock/command{ name = "Communications"; @@ -731,11 +726,21 @@ /obj/structure/cable{ icon_state = "2-8" }, -/obj/machinery/light/small/directional/north, +/obj/machinery/light/small/directional/north{ + pixel_x = 11; + pixel_y = 28 + }, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable{ + icon_state = "2-4" + }, /turf/open/floor/plating, -/area/ship/maintenance/port) +/area/ship/medical/surgery) "hT" = ( /obj/effect/decal/fakelattice, /obj/machinery/power/smes/engineering, @@ -774,10 +779,6 @@ /obj/structure/cable{ icon_state = "2-4" }, -/obj/machinery/power/ship_gravity, -/obj/structure/cable{ - icon_state = "0-2" - }, /turf/open/floor/plating, /area/ship/engineering/engine) "is" = ( @@ -823,10 +824,16 @@ /turf/open/floor/plasteel/tech, /area/ship/bridge) "iT" = ( -/obj/effect/spawner/lootdrop/grille_or_trash, /obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plating, -/area/ship/maintenance/port) +/area/ship/crew/toilet) "jc" = ( /obj/structure/table/reinforced, /obj/effect/spawner/lootdrop/ration, @@ -848,9 +855,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/structure/cable{ - icon_state = "1-8" - }, /turf/open/floor/plasteel/patterned/grid, /area/ship/crew) "jn" = ( @@ -879,23 +883,26 @@ }, /obj/effect/turf_decal/borderfloor, /turf/open/floor/plasteel, -/area/ship/hallway/fore) +/area/ship/hallway/aft) "jx" = ( /obj/effect/turf_decal/industrial/warning{ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/obj/structure/table/glass, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "8-9" }, /obj/structure/cable{ - icon_state = "1-4" + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "1-10" }, +/obj/item/storage/backpack/duffelbag/med/surgery, /obj/item/defibrillator/compact/loaded{ pixel_y = 10 }, -/obj/item/storage/backpack/duffelbag/med/surgery, +/obj/structure/table/glass, /turf/open/floor/plasteel/patterned, /area/ship/medical/surgery) "jC" = ( @@ -930,12 +937,12 @@ /area/ship/engineering/engine) "jO" = ( /obj/structure/cable{ - icon_state = "0-2" + icon_state = "0-6" }, -/obj/structure/window/reinforced/fulltile/shuttle, /obj/machinery/door/poddoor/shutters{ id = "gecko_shuttle" }, +/obj/structure/window/reinforced/fulltile/shuttle, /turf/open/floor/plating, /area/ship/medical/surgery) "ko" = ( @@ -985,7 +992,7 @@ /area/ship/cargo/starboard) "lS" = ( /obj/structure/sign/nanotrasen, -/turf/closed/wall/mineral/titanium, +/turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/medical/surgery) "lY" = ( /obj/docking_port/stationary{ @@ -1041,15 +1048,12 @@ /turf/open/floor/plasteel/patterned, /area/ship/storage) "mM" = ( -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable{ - icon_state = "0-8" - }, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/light_switch{ pixel_x = 11; pixel_y = 23 }, +/obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/plating, /area/ship/maintenance/starboard) "mN" = ( @@ -1080,12 +1084,6 @@ }, /area/ship/engineering/engine) "nc" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/machinery/door/airlock/command{ dir = 1; req_access_txt = "20" @@ -1140,7 +1138,10 @@ }, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ - icon_state = "1-4" + icon_state = "4-6" + }, +/obj/structure/cable{ + icon_state = "5-6" }, /obj/machinery/vending/medical, /turf/open/floor/plasteel/patterned, @@ -1162,7 +1163,6 @@ /turf/open/floor/plating, /area/ship/engineering/engine) "on" = ( -/obj/effect/decal/fakelattice, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, @@ -1255,12 +1255,11 @@ /area/ship/crew/toilet) "pu" = ( /obj/machinery/vending/coffee, -/obj/machinery/airalarm/directional/west, /obj/effect/turf_decal/borderfloor{ dir = 1 }, /turf/open/floor/plasteel, -/area/ship/hallway/fore) +/area/ship/hallway/aft) "pD" = ( /obj/effect/turf_decal/industrial/fire{ dir = 8 @@ -1279,9 +1278,6 @@ /obj/effect/turf_decal/siding/white{ dir = 1 }, -/obj/structure/cable{ - icon_state = "4-8" - }, /turf/open/floor/plasteel/patterned/grid, /area/ship/crew) "pO" = ( @@ -1319,12 +1315,9 @@ "qb" = ( /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/structure/catwalk/over/plated_catwalk, /turf/open/floor/plating, -/area/ship/hallway/fore) +/area/ship/hallway/aft) "qc" = ( /obj/effect/turf_decal/industrial/warning/fulltile, /turf/closed/wall/mineral/titanium/nodiagonal, @@ -1356,15 +1349,6 @@ /turf/open/floor/plating, /area/ship/crew) "qv" = ( -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "1-8" - }, /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, /obj/machinery/light/floor, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ @@ -1402,16 +1386,13 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/effect/turf_decal/siding/white, /obj/effect/turf_decal/siding/white{ dir = 1 }, /obj/structure/catwalk/over/plated_catwalk, /turf/open/floor/plating, -/area/ship/hallway/fore) +/area/ship/hallway/aft) "re" = ( /turf/open/floor/plasteel/tech, /area/ship/bridge) @@ -1429,6 +1410,7 @@ /obj/effect/turf_decal/industrial/fire{ dir = 8 }, +/obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/ship/maintenance/starboard) "ro" = ( @@ -1445,8 +1427,12 @@ "rD" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable{ + icon_state = "0-8" + }, /turf/open/floor/plating, -/area/ship/maintenance/port) +/area/ship/crew/dorm/dormfive) "rF" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/siding/white{ @@ -1458,11 +1444,8 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/structure/cable{ - icon_state = "1-2" - }, /turf/open/floor/plasteel/patterned/grid, -/area/ship/hallway/fore) +/area/ship/hallway/aft) "rU" = ( /obj/effect/turf_decal/industrial/warning{ dir = 1 @@ -1549,20 +1532,20 @@ /area/ship/cargo/starboard) "tV" = ( /obj/structure/cable{ - icon_state = "0-4" + icon_state = "0-8" }, -/obj/machinery/power/apc/auto_name/directional/south, -/turf/open/floor/plasteel/tech, -/area/ship/maintenance/central) +/obj/machinery/door/poddoor/shutters{ + id = "gecko_shuttle" + }, +/obj/structure/window/reinforced/fulltile/shuttle, +/turf/open/floor/plating, +/area/ship/medical/surgery) "ud" = ( /obj/effect/turf_decal/industrial/warning/fulltile, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/machinery/door/airlock/command{ name = "Bridge"; req_access_txt = "56" @@ -1570,9 +1553,6 @@ /turf/open/floor/plasteel/tech, /area/ship/maintenance/central) "ue" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 }, @@ -1586,7 +1566,7 @@ dir = 1 }, /turf/open/floor/plasteel/patterned/grid, -/area/ship/hallway/fore) +/area/ship/hallway/aft) "ui" = ( /obj/machinery/power/terminal{ dir = 8 @@ -1621,7 +1601,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel/patterned/grid, -/area/ship/hallway/fore) +/area/ship/hallway/aft) "uP" = ( /obj/structure/cable{ icon_state = "1-8" @@ -1710,14 +1690,22 @@ }, /turf/open/floor/engine/hull, /area/ship/external) -"vX" = ( -/obj/effect/turf_decal/industrial/hatch/yellow, -/turf/closed/wall/mineral/titanium/nodiagonal, -/area/ship/crew/dorm/dormfive) "wh" = ( /obj/structure/sign/nanotrasen, /turf/closed/wall/mineral/titanium, /area/ship/engineering/engine) +"wj" = ( +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2"; + pixel_y = 1 + }, +/obj/machinery/door/poddoor/shutters{ + id = "gecko_shuttle" + }, +/obj/structure/window/reinforced/fulltile/shuttle, +/turf/open/floor/plating, +/area/ship/medical/surgery) "ws" = ( /obj/structure/cable{ icon_state = "1-2" @@ -1726,9 +1714,6 @@ /turf/open/floor/plating, /area/ship/engineering/engine) "wv" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, @@ -1737,7 +1722,7 @@ }, /obj/structure/catwalk/over/plated_catwalk, /turf/open/floor/plating, -/area/ship/hallway/fore) +/area/ship/hallway/aft) "wy" = ( /obj/structure/cable{ icon_state = "0-4" @@ -1777,9 +1762,9 @@ /area/ship/medical/surgery) "wV" = ( /obj/structure/cable{ - icon_state = "1-2" + icon_state = "0-8" }, -/obj/machinery/igniter/incinerator_atmos, +/obj/machinery/power/ship_gravity, /turf/open/floor/plating, /area/ship/engineering/engine) "wW" = ( @@ -1794,11 +1779,14 @@ }, /area/ship/engineering/engine) "xd" = ( -/obj/effect/spawner/lootdrop/maintenance, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable{ + icon_state = "0-8" + }, /turf/open/floor/plating, -/area/ship/maintenance/port) +/area/ship/maintenance/central) "xh" = ( /obj/structure/cable{ icon_state = "0-4" @@ -1824,7 +1812,7 @@ /area/ship/engineering/engine) "xm" = ( /obj/structure/cable{ - icon_state = "0-2" + icon_state = "0-8" }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -1843,32 +1831,16 @@ /turf/open/floor/plating, /area/ship/engineering/engine) "yd" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, +/obj/effect/gibspawner/human, /obj/structure/cable{ - icon_state = "2-8" + icon_state = "2-5" }, -/obj/effect/turf_decal/siding/white, -/obj/effect/turf_decal/siding/white{ - dir = 1 - }, -/obj/structure/catwalk/over/plated_catwalk, -/turf/open/floor/plating, -/area/ship/hallway/fore) +/turf/open/floor/plasteel/patterned/cargo_one, +/area/ship/medical/surgery) "ye" = ( /obj/effect/turf_decal/siding/wideplating{ dir = 4 }, -/obj/structure/cable{ - icon_state = "2-4" - }, /turf/open/floor/plasteel/tech/grid, /area/ship/crew) "yj" = ( @@ -1891,9 +1863,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/structure/cable{ - icon_state = "4-8" - }, /turf/open/floor/plasteel/patterned/grid, /area/ship/crew) "yG" = ( @@ -1960,13 +1929,10 @@ /obj/effect/turf_decal/industrial/warning{ dir = 1 }, -/obj/machinery/computer/operating, /obj/structure/cable{ - icon_state = "2-8" - }, -/obj/structure/cable{ - icon_state = "1-8" + icon_state = "9-10" }, +/obj/machinery/computer/operating, /turf/open/floor/plasteel/patterned, /area/ship/medical/surgery) "zl" = ( @@ -2025,7 +1991,13 @@ /turf/open/floor/plastic, /area/ship/crew/toilet) "zZ" = ( -/obj/machinery/igniter/incinerator_atmos, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable{ + icon_state = "2-4" + }, /turf/open/floor/plating, /area/ship/engineering/engine) "As" = ( @@ -2075,6 +2047,9 @@ /obj/structure/cable{ icon_state = "2-4" }, +/obj/structure/cable{ + icon_state = "1-5" + }, /turf/open/floor/plasteel/patterned, /area/ship/medical/surgery) "AI" = ( @@ -2190,9 +2165,6 @@ "BP" = ( /obj/effect/turf_decal/dept/cargo, /obj/effect/decal/cleanable/glass, -/obj/structure/cable{ - icon_state = "4-8" - }, /turf/open/floor/plasteel/patterned, /area/ship/cargo/starboard) "BU" = ( @@ -2205,13 +2177,16 @@ /obj/effect/turf_decal/industrial/warning{ dir = 1 }, -/obj/machinery/iv_drip, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "4-10" }, /obj/structure/cable{ - icon_state = "1-4" + icon_state = "8-10" }, +/obj/structure/cable{ + icon_state = "8-9" + }, +/obj/machinery/iv_drip, /turf/open/floor/plasteel/patterned, /area/ship/medical/surgery) "Cc" = ( @@ -2229,12 +2204,6 @@ /turf/open/floor/engine/hull/reinforced, /area/ship/external) "Ch" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 9 }, @@ -2263,12 +2232,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/machinery/door/firedoor, /turf/open/floor/plasteel/tech/techmaint, -/area/ship/hallway/fore) +/area/ship/hallway/aft) "Ct" = ( /obj/effect/turf_decal/siding/white{ dir = 4 @@ -2292,9 +2258,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/structure/cable{ - icon_state = "4-8" - }, /turf/open/floor/plasteel/patterned/grid, /area/ship/crew) "CE" = ( @@ -2321,9 +2284,6 @@ /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) "CQ" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, /obj/structure/cable{ icon_state = "1-8" }, @@ -2335,6 +2295,7 @@ /obj/effect/turf_decal/trimline/transparent/white/filled/warning{ dir = 1 }, +/obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/plating, /area/ship/maintenance/starboard) "CT" = ( @@ -2362,7 +2323,7 @@ }, /obj/machinery/newscaster/directional/west, /turf/open/floor/plasteel, -/area/ship/hallway/central) +/area/ship/hallway/aft) "Dp" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -2400,10 +2361,6 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/cargo/starboard) "DT" = ( -/obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/cable{ - icon_state = "0-8" - }, /obj/structure/cable{ icon_state = "2-8" }, @@ -2460,7 +2417,7 @@ }, /obj/effect/turf_decal/borderfloor, /turf/open/floor/plasteel, -/area/ship/hallway/central) +/area/ship/hallway/aft) "EE" = ( /obj/structure/cable{ icon_state = "4-8" @@ -2520,7 +2477,7 @@ /area/ship/bridge) "FO" = ( /obj/structure/cable{ - icon_state = "1-2" + icon_state = "2-10" }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/medical/surgery) @@ -2610,19 +2567,12 @@ /turf/open/floor/engine/plasma, /area/ship/engineering/engine) "GN" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/item/clothing/suit/space/hardsuit, /turf/open/floor/plasteel/tech, -/area/ship/crew/dorm/dormfive) -"GQ" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, +/area/ship/crew/dorm/dormfive) +"GQ" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 }, @@ -2665,9 +2615,6 @@ req_access_txt = "56" }, /obj/effect/turf_decal/industrial/warning/fulltile, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, @@ -2710,9 +2657,6 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/effect/decal/cleanable/oil/slippery, /turf/open/floor/plasteel/tech/techmaint, /area/ship/crew) @@ -2752,7 +2696,7 @@ dir = 1 }, /turf/open/floor/plasteel, -/area/ship/hallway/central) +/area/ship/hallway/aft) "Ig" = ( /obj/machinery/light/small/directional/south, /obj/structure/cable{ @@ -2833,9 +2777,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/effect/turf_decal/siding/white, /obj/effect/turf_decal/siding/white{ dir = 1 @@ -2851,7 +2792,13 @@ /obj/effect/turf_decal/trimline/transparent/white/filled/warning{ dir = 1 }, -/obj/machinery/light/small/directional/south, +/obj/machinery/light/small/directional/south{ + pixel_x = 10; + pixel_y = -28 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plating, /area/ship/maintenance/port) "Jj" = ( @@ -2896,12 +2843,12 @@ dir = 4 }, /turf/open/floor/plasteel/patterned/grid, -/area/ship/hallway/fore) +/area/ship/hallway/aft) "Jz" = ( /obj/effect/turf_decal/borderfloor, /obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/plasteel, -/area/ship/hallway/fore) +/area/ship/hallway/aft) "JV" = ( /obj/structure/cable{ icon_state = "1-2" @@ -2935,10 +2882,17 @@ }, /obj/effect/turf_decal/borderfloor, /turf/open/floor/plasteel, -/area/ship/hallway/central) +/area/ship/hallway/aft) "KH" = ( -/turf/closed/wall/mineral/titanium/nodiagonal, -/area/ship/hallway/fore) +/obj/structure/cable{ + icon_state = "0-10" + }, +/obj/machinery/door/poddoor/shutters{ + id = "gecko_shuttle" + }, +/obj/structure/window/reinforced/fulltile/shuttle, +/turf/open/floor/plating, +/area/ship/medical/surgery) "KM" = ( /turf/open/floor/plating, /area/ship/engineering/engine) @@ -2978,9 +2932,6 @@ /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/crew/toilet) "Lq" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 6 }, @@ -3033,12 +2984,22 @@ /obj/structure/sign/warning/electricshock{ pixel_y = 32 }, +/obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/ship/maintenance/starboard) "LZ" = ( -/obj/effect/turf_decal/borderfloor, -/turf/open/floor/plasteel, -/area/ship/hallway/fore) +/obj/structure/cable{ + icon_state = "4-6" + }, +/obj/structure/cable{ + icon_state = "0-6" + }, +/obj/machinery/door/poddoor/shutters{ + id = "gecko_shuttle" + }, +/obj/structure/window/reinforced/fulltile/shuttle, +/turf/open/floor/plating, +/area/ship/medical/surgery) "Mc" = ( /obj/machinery/firealarm/directional/north, /turf/open/floor/plasteel/tech, @@ -3074,14 +3035,6 @@ /obj/effect/turf_decal/borderfloor{ dir = 1 }, -/obj/structure/cable{ - icon_state = "0-2" - }, -/obj/machinery/power/apc/auto_name/directional/south{ - dir = 8; - pixel_y = 0; - pixel_x = -30 - }, /turf/open/floor/plasteel/dark, /area/ship/bridge) "Mw" = ( @@ -3095,9 +3048,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/machinery/door/firedoor, /turf/open/floor/plasteel/tech/techmaint, /area/ship/hallway/aft) @@ -3107,10 +3057,15 @@ dir = 1 }, /turf/open/floor/plasteel, -/area/ship/hallway/fore) +/area/ship/hallway/aft) "Nu" = ( /obj/machinery/firealarm/directional/east, /obj/effect/turf_decal/borderfloor, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 20; + pixel_y = 11 + }, /turf/open/floor/plasteel, /area/ship/hallway/aft) "Nz" = ( @@ -3118,12 +3073,6 @@ dir = 1 }, /obj/structure/table/optable, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "1-4" - }, /turf/open/floor/plasteel/patterned, /area/ship/medical/surgery) "NC" = ( @@ -3373,21 +3322,10 @@ /turf/open/floor/plating, /area/ship/engineering/engine) "QY" = ( -/obj/structure/cable{ - d2 = 2; - icon_state = "0-2"; - pixel_y = 1 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/space_heater, /turf/open/floor/plating, -/area/ship/engineering/engine) +/area/ship/maintenance/starboard) "QZ" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/industrial/warning/fulltile, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -3405,14 +3343,10 @@ /area/ship/storage) "Rc" = ( /obj/machinery/light/directional/north, -/obj/item/banner/cargo, /obj/machinery/firealarm/directional/north{ pixel_y = 29 }, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable{ - icon_state = "0-8" - }, +/obj/item/banner/cargo, /turf/open/floor/plasteel/patterned, /area/ship/cargo/starboard) "Rh" = ( @@ -3485,7 +3419,7 @@ }, /obj/effect/turf_decal/borderfloor, /turf/open/floor/plasteel, -/area/ship/hallway/fore) +/area/ship/hallway/aft) "Sj" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 @@ -3527,17 +3461,26 @@ /turf/open/floor/plastic, /area/ship/crew/toilet) "Sx" = ( -/obj/machinery/space_heater, /obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable{ + icon_state = "0-8" + }, /turf/open/floor/plating, -/area/ship/maintenance/port) +/area/ship/bridge) "Sy" = ( -/obj/effect/spawner/lootdrop/grille_or_trash, /obj/effect/decal/cleanable/dirt/dust, +/obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/plating, /area/ship/maintenance/starboard) "SE" = ( /obj/effect/decal/cleanable/dirt, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "2-10" + }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/medical/surgery) "SK" = ( @@ -3567,7 +3510,7 @@ dir = 1 }, /turf/open/floor/plasteel, -/area/ship/hallway/fore) +/area/ship/hallway/aft) "Ta" = ( /obj/effect/turf_decal/siding/yellow{ dir = 4 @@ -3575,9 +3518,6 @@ /obj/effect/turf_decal/siding/yellow{ dir = 8 }, -/obj/structure/cable{ - icon_state = "2-8" - }, /turf/open/floor/plasteel/tech, /area/ship/maintenance/central) "Tb" = ( @@ -3614,8 +3554,15 @@ /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/medical/surgery) "Th" = ( +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plating, -/area/ship/maintenance/port) +/area/ship/crew) "Tl" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 @@ -3674,9 +3621,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/structure/cable{ - icon_state = "1-2" - }, /turf/open/floor/plasteel/patterned/grid, /area/ship/crew) "UD" = ( @@ -3701,30 +3645,25 @@ /turf/open/floor/plating, /area/ship/engineering/engine) "UR" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "5-6" }, -/obj/effect/turf_decal/siding/white, -/obj/effect/turf_decal/siding/white{ - dir = 1 +/obj/structure/cable{ + icon_state = "6-8" }, -/obj/structure/catwalk/over/plated_catwalk, -/turf/open/floor/plating, -/area/ship/hallway/central) +/turf/open/floor/plasteel/patterned/cargo_one, +/area/ship/medical/surgery) "UV" = ( /obj/structure/cable{ icon_state = "2-4" }, -/obj/effect/spawner/lootdrop/grille_or_trash, /obj/effect/decal/cleanable/cobweb, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable{ + icon_state = "0-4" + }, /turf/open/floor/plating, -/area/ship/maintenance/port) +/area/ship/cargo/starboard) "Vl" = ( /obj/structure/sign/nanotrasen, /turf/closed/wall/mineral/titanium, @@ -3787,6 +3726,9 @@ dir = 1; pixel_y = -16 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plating, /area/ship/maintenance/port) "VK" = ( @@ -3796,16 +3738,11 @@ /turf/open/floor/plating, /area/ship/engineering/engine) "VN" = ( -/obj/machinery/power/apc/auto_name/directional/south{ - dir = 8; - pixel_y = 0; - pixel_x = -30 - }, /obj/structure/cable{ - icon_state = "0-4" + icon_state = "8-9" }, -/turf/open/floor/plasteel/tech, -/area/ship/crew/dorm/dormfive) +/turf/open/floor/plasteel/patterned/cargo_one, +/area/ship/medical/surgery) "VO" = ( /obj/machinery/airalarm/directional/south, /turf/open/floor/plasteel/tech, @@ -3820,9 +3757,6 @@ /turf/open/floor/engine/airless, /area/ship/engineering/engine) "VU" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, @@ -3844,9 +3778,15 @@ /area/ship/maintenance/central) "Wo" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/effect/spawner/lootdrop/grille_or_trash, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plating, -/area/ship/maintenance/port) +/area/ship/storage) "WF" = ( /obj/structure/closet/secure_closet{ anchored = 1; @@ -3872,8 +3812,6 @@ /turf/open/floor/plasteel/tech, /area/ship/maintenance/central) "WJ" = ( -/obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/cable, /obj/effect/decal/cleanable/dirt/dust, /obj/item/kirbyplants/random, /obj/effect/turf_decal/borderfloor, @@ -3883,7 +3821,7 @@ pixel_y = 11 }, /turf/open/floor/plasteel, -/area/ship/hallway/fore) +/area/ship/hallway/aft) "WN" = ( /obj/machinery/atmospherics/components/binary/circulator, /turf/open/floor/engine, @@ -3897,7 +3835,7 @@ dir = 1 }, /turf/open/floor/plasteel, -/area/ship/hallway/fore) +/area/ship/hallway/aft) "WS" = ( /obj/machinery/rnd/server, /obj/machinery/airalarm/directional/south, @@ -3906,10 +3844,6 @@ /area/ship/bridge) "WT" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/machinery/power/apc/auto_name/directional/south, /obj/machinery/light_switch{ dir = 1; pixel_x = 11; @@ -4009,7 +3943,7 @@ dir = 8 }, /turf/open/floor/plasteel/patterned/grid, -/area/ship/hallway/central) +/area/ship/hallway/aft) "Yf" = ( /obj/machinery/door/airlock/engineering{ dir = 4; @@ -4052,17 +3986,17 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/effect/spawner/lootdrop/maintenance, /obj/effect/decal/cleanable/dirt/dust, /obj/structure/sign/warning/electricshock{ pixel_y = -32 }, -/turf/open/floor/plating, -/area/ship/maintenance/port) -"YQ" = ( +/obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable{ - icon_state = "1-2" + icon_state = "0-4" }, +/turf/open/floor/plating, +/area/ship/hallway/fore) +"YQ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 10 }, @@ -4159,6 +4093,7 @@ "ZM" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt/dust, +/obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/plating, /area/ship/maintenance/starboard) "ZS" = ( @@ -4182,9 +4117,6 @@ pixel_x = 11; pixel_y = 23 }, -/obj/structure/cable{ - icon_state = "4-8" - }, /turf/open/floor/plasteel/patterned, /area/ship/cargo/starboard) @@ -4244,7 +4176,7 @@ hu hu hu hu -Ug +oj Ug As Ug @@ -4256,7 +4188,7 @@ nH Ug Iv Ug -Ug +oj hu hu hu @@ -4269,11 +4201,11 @@ hu hu hu wh -oj +Ug AA tH VK -hn +Ug cK CF BB @@ -4281,7 +4213,7 @@ on GM jK wD -oj +Ug oj hu hu @@ -4397,13 +4329,13 @@ tB tB in JV -ws +zZ ws aK oT QA LH -wV +LH LH Ig wB @@ -4422,13 +4354,13 @@ UV qp mX wY -KM +wV Xh Lr ez zc KM -zZ +KM vi lZ Ze @@ -4478,14 +4410,14 @@ eu hT PV KM -KM +dX ah KM wB dk wB mM -dk +QY wB "} (13,1,1) = {" @@ -4504,7 +4436,7 @@ hT Sl Ug xm -QY +xm ef wB Sy @@ -4593,9 +4525,9 @@ hu hu hu hu -jO +KH cG -sg +ao gS GE Qc @@ -4620,7 +4552,7 @@ hu hu jO bs -sg +UR Tg cE tN @@ -4668,10 +4600,10 @@ hu hu hu hu -jO +wj jx sg -sg +VN fb pe HK @@ -4693,9 +4625,9 @@ hu hu hu hu -jO +LZ Nz -Tg +yd SE AG ko @@ -4718,9 +4650,9 @@ hu hu hu hu -jO +tV ze -FO +sg FO WT pe @@ -4775,7 +4707,7 @@ bK Xr bH Da -UR +IK fP jC BF @@ -4825,7 +4757,7 @@ BU mL bH Ia -UR +IK KA jC Gm @@ -4849,9 +4781,9 @@ bH Zb Ts bH -KH +Iy Cn -KH +Iy jC Pi Cv @@ -4875,7 +4807,7 @@ bU oM bH pu -yd +IK WJ jC if @@ -4900,7 +4832,7 @@ bk YQ QZ ue -dX +qb rF Hc UB @@ -4926,7 +4858,7 @@ oZ bH bw rd -LZ +Zv jC Ko jc @@ -5072,14 +5004,14 @@ hu yj zn Ov -tV +kZ yj Mc ch re -vX +oJ jG -VN +RS pX oJ hu From 31d683bdbbcb1375a8361d14823ab63afcf74991 Mon Sep 17 00:00:00 2001 From: Overteh Date: Fri, 13 Sep 2024 16:32:43 +0800 Subject: [PATCH 3/7] Atmospherics and zones --- .../shuttles/nanotrasen/nanotrasen_gecko.dmm | 810 +++++++++++------- 1 file changed, 490 insertions(+), 320 deletions(-) diff --git a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_gecko.dmm b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_gecko.dmm index de573239009b..963ee50f7e04 100644 --- a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_gecko.dmm +++ b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_gecko.dmm @@ -20,7 +20,9 @@ }, /obj/effect/turf_decal/industrial/warning/fulltile, /turf/open/floor/plating/airless, -/area/ship/storage) +/area/ship/storage{ + name = "Storage And Science Bay" + }) "ao" = ( /obj/structure/cable{ icon_state = "5-9" @@ -56,7 +58,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/ship/maintenance/central) +/area/ship/engineering/communications) "aK" = ( /obj/structure/cable{ icon_state = "1-4" @@ -64,7 +66,6 @@ /obj/structure/cable{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/trimline/transparent/white/filled/warning{ dir = 4 }, @@ -94,7 +95,7 @@ dir = 1 }, /turf/open/floor/plasteel/tech, -/area/ship/maintenance/central) +/area/ship/engineering/communications) "bb" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -111,10 +112,12 @@ }, /obj/structure/catwalk/over/plated_catwalk, /turf/open/floor/plating, -/area/ship/hallway/aft) +/area/ship/hallway/central) "bk" = ( /turf/open/floor/plasteel/patterned, -/area/ship/storage) +/area/ship/storage{ + name = "Storage And Science Bay" + }) "bo" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ @@ -122,7 +125,7 @@ }, /obj/structure/catwalk/over/plated_catwalk, /turf/open/floor/plating, -/area/ship/hallway/aft) +/area/ship/hallway/central) "bs" = ( /obj/effect/turf_decal/industrial/warning{ dir = 1 @@ -143,7 +146,7 @@ dir = 1 }, /turf/open/floor/plasteel, -/area/ship/hallway/aft) +/area/ship/hallway/central) "bB" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -159,14 +162,18 @@ /area/ship/cargo/starboard) "bH" = ( /turf/closed/wall/mineral/titanium/nodiagonal, -/area/ship/storage) +/area/ship/storage{ + name = "Storage And Science Bay" + }) "bK" = ( /obj/item/tank/jetpack/carbondioxide, /obj/item/clothing/suit/space/hardsuit/mining, /obj/machinery/suit_storage_unit/inherit, /obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/plasteel/patterned, -/area/ship/storage) +/area/ship/storage{ + name = "Storage And Science Bay" + }) "bL" = ( /obj/structure/table/reinforced, /obj/structure/sign/poster/retro/random{ @@ -194,7 +201,9 @@ pixel_x = -12 }, /turf/open/floor/plasteel/patterned, -/area/ship/storage) +/area/ship/storage{ + name = "Storage And Science Bay" + }) "bU" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/spawner/lootdrop/ration, @@ -210,7 +219,9 @@ dir = 2 }, /turf/open/floor/plasteel/patterned, -/area/ship/storage) +/area/ship/storage{ + name = "Storage And Science Bay" + }) "bV" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -271,7 +282,7 @@ pixel_y = -8 }, /turf/closed/wall/mineral/titanium/nodiagonal, -/area/ship/crew/dorm/dormfive) +/area/ship/crew/dorm/captain) "cG" = ( /obj/effect/turf_decal/industrial/warning{ dir = 1 @@ -363,20 +374,20 @@ req_access_txt = "20" }, /turf/open/floor/plasteel/tech, -/area/ship/crew/dorm/dormfive) +/area/ship/crew/dorm/captain) "dp" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, /area/ship/maintenance/starboard) "dq" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable{ - icon_state = "0-4" + icon_state = "4-6" + }, +/obj/structure/cable{ + icon_state = "0-2" }, /turf/open/floor/plating, /area/ship/engineering/engine) @@ -414,7 +425,7 @@ /obj/effect/turf_decal/borderfloor, /obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/plasteel, -/area/ship/hallway/aft) +/area/ship/hallway/central) "el" = ( /obj/structure/railing, /turf/open/floor/plasteel/dark, @@ -432,7 +443,9 @@ name = "Interior Hull Access" }, /turf/open/floor/plasteel/patterned, -/area/ship/storage) +/area/ship/storage{ + name = "Storage And Science Bay" + }) "eu" = ( /obj/structure/cable{ icon_state = "2-8" @@ -452,9 +465,6 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, @@ -465,10 +475,6 @@ dir = 9 }, /obj/machinery/light/floor, -/obj/machinery/computer/atmos_control/tank/toxin_tank{ - dir = 4; - sensors = list("gecko_tox_sensor"="Plasma Tank") - }, /turf/open/floor/plasteel/tech/techmaint, /area/ship/engineering/engine) "eA" = ( @@ -479,9 +485,13 @@ pixel_x = 2 }, /turf/open/floor/plasteel/tech, -/area/ship/maintenance/central) +/area/ship/engineering/communications) "eC" = ( /obj/effect/decal/cleanable/dirt, +/obj/machinery/computer/atmos_control/tank/nitrogen_tank{ + dir = 1; + sensors = list("gecko_n2_sensor"="Nitrogen Tank") + }, /turf/open/floor/plating, /area/ship/engineering/engine) "eD" = ( @@ -510,7 +520,9 @@ /turf/open/floor/engine/hull, /area/ship/external) "eQ" = ( -/obj/item/radio/intercom/directional/south, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ + dir = 10 + }, /turf/open/floor/plating, /area/ship/engineering/engine) "fb" = ( @@ -550,12 +562,12 @@ /obj/structure/extinguisher_cabinet/directional/west, /obj/machinery/newscaster/directional/north, /turf/open/floor/plasteel, -/area/ship/hallway/aft) +/area/ship/hallway/central) "fv" = ( /obj/machinery/computer/crew, /obj/machinery/newscaster/directional/north, /turf/open/floor/plasteel/tech, -/area/ship/maintenance/central) +/area/ship/engineering/communications) "fD" = ( /obj/effect/turf_decal/industrial/warning{ dir = 1 @@ -569,13 +581,16 @@ /turf/open/floor/plasteel/patterned, /area/ship/cargo/starboard) "fK" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable{ - icon_state = "0-2" + icon_state = "5-6" + }, +/obj/structure/cable{ + icon_state = "0-10" + }, +/obj/structure/cable{ + icon_state = "5-9" }, /turf/open/floor/plasteel/stairs, /area/ship/maintenance/starboard) @@ -588,7 +603,7 @@ }, /obj/effect/turf_decal/borderfloor, /turf/open/floor/plasteel, -/area/ship/hallway/aft) +/area/ship/hallway/central) "fS" = ( /obj/effect/turf_decal/siding/yellow, /obj/effect/turf_decal/siding/yellow{ @@ -598,7 +613,7 @@ dir = 8 }, /turf/open/floor/plasteel/tech, -/area/ship/maintenance/central) +/area/ship/engineering/communications) "fZ" = ( /obj/effect/turf_decal/siding/yellow/corner, /obj/effect/turf_decal/siding/yellow/corner{ @@ -608,7 +623,7 @@ dir = 1 }, /turf/open/floor/plasteel/tech, -/area/ship/maintenance/central) +/area/ship/engineering/communications) "ga" = ( /obj/structure/bed, /obj/item/bedsheet/dorms, @@ -623,10 +638,13 @@ /turf/closed/wall/mineral/titanium, /area/ship/bridge) "gg" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 9 +/obj/structure/window/reinforced{ + dir = 1 }, -/turf/open/floor/plating, +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/oxygen_output{ + dir = 1 + }, +/turf/open/floor/engine/o2, /area/ship/engineering/engine) "gh" = ( /obj/effect/spawner/lootdrop/salvage_50, @@ -649,6 +667,10 @@ /obj/structure/cable{ icon_state = "4-10" }, +/obj/machinery/light/floor, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 9 + }, /turf/open/floor/plating, /area/ship/engineering/engine) "gE" = ( @@ -656,7 +678,7 @@ /obj/structure/curtain/cloth, /obj/item/bedsheet/ce, /turf/open/floor/plasteel/tech, -/area/ship/maintenance/central) +/area/ship/engineering/communications) "gF" = ( /obj/effect/turf_decal/industrial/warning, /obj/effect/decal/cleanable/dirt, @@ -676,7 +698,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/ship/storage) +/area/ship/storage{ + name = "Storage And Science Bay" + }) "gQ" = ( /obj/item/radio/intercom/directional/west, /obj/machinery/light_switch{ @@ -685,7 +709,7 @@ pixel_y = -25 }, /turf/open/floor/plasteel/tech, -/area/ship/maintenance/central) +/area/ship/engineering/communications) "gS" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 10 @@ -718,26 +742,25 @@ dir = 1 }, /turf/open/floor/plasteel/tech/techmaint, -/area/ship/maintenance/central) +/area/ship/engineering/communications) "hu" = ( /turf/template_noop, /area/template_noop) "hL" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable{ - icon_state = "2-8" + icon_state = "2-4" }, -/obj/machinery/light/small/directional/north{ - pixel_x = 11; - pixel_y = 28 +/obj/structure/cable{ + icon_state = "6-8" }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable{ - icon_state = "0-2" + icon_state = "4-10" }, -/obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable{ - icon_state = "2-4" + icon_state = "0-10" }, /turf/open/floor/plating, /area/ship/medical/surgery) @@ -773,7 +796,9 @@ }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/ship/storage) +/area/ship/storage{ + name = "Storage And Science Bay" + }) "in" = ( /obj/machinery/light/small/directional/north, /obj/structure/cable{ @@ -827,10 +852,13 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable{ - icon_state = "0-8" + icon_state = "8-10" }, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "4-10" + }, +/obj/structure/cable{ + icon_state = "0-6" }, /turf/open/floor/plating, /area/ship/crew/toilet) @@ -883,7 +911,7 @@ }, /obj/effect/turf_decal/borderfloor, /turf/open/floor/plasteel, -/area/ship/hallway/aft) +/area/ship/hallway/central) "jx" = ( /obj/effect/turf_decal/industrial/warning{ dir = 1 @@ -915,23 +943,28 @@ }, /obj/machinery/vending/boozeomat/all_access, /turf/open/floor/plasteel/tech, -/area/ship/crew/dorm/dormfive) -"jK" = ( -/obj/structure/window/reinforced{ - dir = 8 +/area/ship/crew/dorm/captain) +"jJ" = ( +/obj/machinery/air_sensor/atmos/oxygen_tank{ + id_tag = "gecko_o2_sensor"; + pixel_x = -1; + pixel_y = 4 }, /obj/structure/window/reinforced{ - icon_state = "rwindow"; dir = 4 }, -/obj/effect/turf_decal/atmos/plasma, +/obj/structure/window/reinforced, +/turf/open/floor/engine/o2, +/area/ship/engineering/engine) +"jK" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxin_input{ dir = 4 }, -/obj/machinery/air_sensor/atmos/toxin_tank{ - id_tag = "gecko_tox_sensor"; - pixel_x = 3; - pixel_y = 8 +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 }, /turf/open/floor/engine/plasma, /area/ship/engineering/engine) @@ -963,7 +996,10 @@ /turf/closed/wall/mineral/titanium, /area/ship/maintenance/starboard) "ks" = ( -/obj/machinery/light/floor, +/obj/machinery/atmospherics/components/unary/portables_connector/layer4, +/obj/machinery/atmospherics/pipe/simple/green/hidden/layer4{ + dir = 4 + }, /turf/open/floor/plating, /area/ship/engineering/engine) "kM" = ( @@ -975,10 +1011,12 @@ /obj/machinery/rnd/production/protolathe/department/engineering, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/patterned, -/area/ship/storage) +/area/ship/storage{ + name = "Storage And Science Bay" + }) "kZ" = ( /turf/open/floor/plasteel/tech, -/area/ship/maintenance/central) +/area/ship/engineering/communications) "lb" = ( /obj/structure/bed, /obj/item/bedsheet/dorms, @@ -1046,7 +1084,9 @@ dir = 8 }, /turf/open/floor/plasteel/patterned, -/area/ship/storage) +/area/ship/storage{ + name = "Storage And Science Bay" + }) "mM" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/light_switch{ @@ -1064,12 +1104,9 @@ /obj/effect/turf_decal/borderfloor, /obj/machinery/light/directional/south, /turf/open/floor/plasteel, -/area/ship/hallway/aft) +/area/ship/hallway/central) "mS" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/components/unary/tank/air{ - dir = 4 - }, /turf/open/floor/plating, /area/ship/engineering/engine) "mX" = ( @@ -1098,7 +1135,7 @@ }, /obj/effect/turf_decal/industrial/warning/fulltile, /turf/open/floor/plasteel/tech, -/area/ship/crew/dorm/dormfive) +/area/ship/crew/dorm/captain) "nq" = ( /obj/effect/turf_decal/techfloor{ dir = 4 @@ -1118,7 +1155,9 @@ dir = 10 }, /turf/open/floor/plasteel/dark, -/area/ship/storage) +/area/ship/storage{ + name = "Storage And Science Bay" + }) "nH" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -1130,7 +1169,7 @@ dir = 9 }, /turf/open/floor/plasteel/tech, -/area/ship/crew/dorm/dormfive) +/area/ship/crew/dorm/captain) "oi" = ( /obj/machinery/light/directional/west, /obj/effect/turf_decal/industrial/warning{ @@ -1150,9 +1189,6 @@ /turf/closed/wall/mineral/titanium, /area/ship/engineering/engine) "ok" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 4 - }, /obj/machinery/button/door{ id = "gecko_thrusters"; name = "Thruster Blast Door Control"; @@ -1178,7 +1214,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/borderfloor, /turf/open/floor/plasteel, -/area/ship/hallway/aft) +/area/ship/hallway/central) "oy" = ( /obj/effect/turf_decal/siding/white{ dir = 8 @@ -1190,17 +1226,21 @@ dir = 1 }, /turf/open/floor/plasteel/patterned/grid, -/area/ship/storage) +/area/ship/storage{ + name = "Storage And Science Bay" + }) "oJ" = ( /turf/closed/wall/mineral/titanium/nodiagonal, -/area/ship/crew/dorm/dormfive) +/area/ship/crew/dorm/captain) "oM" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /turf/open/floor/plasteel/patterned, -/area/ship/storage) +/area/ship/storage{ + name = "Storage And Science Bay" + }) "oR" = ( /obj/effect/turf_decal/industrial/warning{ dir = 1 @@ -1215,9 +1255,6 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, @@ -1235,7 +1272,9 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/airalarm/directional/south, /turf/open/floor/plasteel/patterned, -/area/ship/storage) +/area/ship/storage{ + name = "Storage And Science Bay" + }) "pe" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/medical/surgery) @@ -1259,7 +1298,7 @@ dir = 1 }, /turf/open/floor/plasteel, -/area/ship/hallway/aft) +/area/ship/hallway/central) "pD" = ( /obj/effect/turf_decal/industrial/fire{ dir = 8 @@ -1294,14 +1333,13 @@ /turf/open/floor/plasteel/tech, /area/ship/bridge) "pQ" = ( -/obj/machinery/atmospherics/components/trinary/mixer/flipped, +/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{ + dir = 8 + }, /turf/open/floor/plating, /area/ship/engineering/engine) "pW" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/layer2, -/obj/machinery/portable_atmospherics/canister/air{ - anchored = 1 - }, +/obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/plating, /area/ship/engineering/engine) "pX" = ( @@ -1311,34 +1349,35 @@ /obj/machinery/light/small/directional/west, /obj/machinery/vending/cigarette/beach, /turf/open/floor/plasteel/tech, -/area/ship/crew/dorm/dormfive) +/area/ship/crew/dorm/captain) "qb" = ( /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, /obj/structure/catwalk/over/plated_catwalk, /turf/open/floor/plating, -/area/ship/hallway/aft) +/area/ship/hallway/central) "qc" = ( /obj/effect/turf_decal/industrial/warning/fulltile, /turf/closed/wall/mineral/titanium/nodiagonal, -/area/ship/storage) +/area/ship/storage{ + name = "Storage And Science Bay" + }) "qn" = ( /obj/structure/curtain/bounty, /obj/structure/bed, /obj/item/bedsheet/captain, /obj/machinery/light/directional/north, /turf/open/floor/plasteel/tech, -/area/ship/crew/dorm/dormfive) +/area/ship/crew/dorm/captain) "qp" = ( -/obj/machinery/door/airlock/maintenance_hatch, -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/effect/turf_decal/industrial/warning/fulltile, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/structure/cable{ + icon_state = "2-5" + }, /turf/open/floor/plating, /area/ship/maintenance/port) "qu" = ( @@ -1357,17 +1396,17 @@ /turf/open/floor/plasteel/tech, /area/ship/bridge) "qB" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/trimline/transparent/white/filled/warning, /obj/structure/cable{ - icon_state = "2-4" + icon_state = "1-4" }, /obj/structure/cable{ - icon_state = "2-8" + icon_state = "1-5" }, /obj/structure/cable{ - icon_state = "1-2" + icon_state = "8-9" }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/trimline/transparent/white/filled/warning, /turf/open/floor/plating, /area/ship/maintenance/port) "qL" = ( @@ -1378,7 +1417,9 @@ /area/ship/medical/surgery) "qO" = ( /turf/closed/wall/mineral/titanium, -/area/ship/storage) +/area/ship/storage{ + name = "Storage And Science Bay" + }) "rd" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -1392,7 +1433,7 @@ }, /obj/structure/catwalk/over/plated_catwalk, /turf/open/floor/plating, -/area/ship/hallway/aft) +/area/ship/hallway/central) "re" = ( /turf/open/floor/plasteel/tech, /area/ship/bridge) @@ -1431,8 +1472,11 @@ /obj/structure/cable{ icon_state = "0-8" }, +/obj/structure/cable{ + icon_state = "8-10" + }, /turf/open/floor/plating, -/area/ship/crew/dorm/dormfive) +/area/ship/crew/dorm/captain) "rF" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/siding/white{ @@ -1445,29 +1489,25 @@ dir = 1 }, /turf/open/floor/plasteel/patterned/grid, -/area/ship/hallway/aft) +/area/ship/hallway/central) "rU" = ( /obj/effect/turf_decal/industrial/warning{ dir = 1 }, /turf/open/floor/plasteel/patterned/grid, -/area/ship/storage) +/area/ship/storage{ + name = "Storage And Science Bay" + }) "sg" = ( /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/medical/surgery) "ss" = ( -/obj/machinery/button/door{ - dir = 1; - id = "gecko_thrusters"; - name = "Thruster Blast Door Control"; - pixel_x = -6; - pixel_y = -24; - sync_doors = 0 - }, -/obj/machinery/atmospherics/components/unary/portables_connector{ - dir = 8 +/obj/effect/turf_decal/atmos/oxygen, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 1 }, -/turf/open/floor/plating, +/turf/open/floor/engine/o2, /area/ship/engineering/engine) "st" = ( /obj/effect/turf_decal/industrial/outline/yellow, @@ -1495,11 +1535,11 @@ /obj/item/clothing/suit/space/hardsuit/engine/elite, /obj/machinery/suit_storage_unit/inherit, /turf/open/floor/plasteel/tech, -/area/ship/maintenance/central) +/area/ship/engineering/communications) "td" = ( /obj/structure/sign/nanotrasen, /turf/closed/wall/mineral/titanium/nodiagonal, -/area/ship/crew/dorm/dormfive) +/area/ship/crew/dorm/captain) "te" = ( /obj/structure/window/reinforced/fulltile/shuttle, /obj/machinery/door/poddoor/shutters{ @@ -1551,7 +1591,7 @@ req_access_txt = "56" }, /turf/open/floor/plasteel/tech, -/area/ship/maintenance/central) +/area/ship/engineering/communications) "ue" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 @@ -1566,7 +1606,7 @@ dir = 1 }, /turf/open/floor/plasteel/patterned/grid, -/area/ship/hallway/aft) +/area/ship/hallway/central) "ui" = ( /obj/machinery/power/terminal{ dir = 8 @@ -1601,7 +1641,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel/patterned/grid, -/area/ship/hallway/aft) +/area/ship/hallway/central) "uP" = ( /obj/structure/cable{ icon_state = "1-8" @@ -1613,10 +1653,13 @@ /area/ship/maintenance/starboard) "vi" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/floor, /obj/structure/cable{ icon_state = "2-10" }, +/obj/machinery/atmospherics/components/trinary/mixer/airmix/flipped/inverse{ + dir = 8; + target_pressure = 101 + }, /turf/open/floor/plating, /area/ship/engineering/engine) "vl" = ( @@ -1629,7 +1672,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel/tech, -/area/ship/maintenance/central) +/area/ship/engineering/communications) "vo" = ( /obj/effect/turf_decal/techfloor{ dir = 8 @@ -1642,7 +1685,9 @@ }, /obj/structure/tank_dispenser/oxygen, /turf/open/floor/plasteel/dark, -/area/ship/storage) +/area/ship/storage{ + name = "Storage And Science Bay" + }) "vv" = ( /obj/effect/turf_decal/industrial/fire{ dir = 8 @@ -1675,11 +1720,11 @@ }, /obj/machinery/airalarm/directional/east, /turf/open/floor/plasteel, -/area/ship/hallway/aft) +/area/ship/hallway/central) "vJ" = ( /obj/machinery/firealarm/directional/south, /turf/open/floor/plasteel/tech, -/area/ship/maintenance/central) +/area/ship/engineering/communications) "vL" = ( /obj/effect/decal/cleanable/glass, /turf/open/floor/plasteel/patterned, @@ -1707,10 +1752,10 @@ /turf/open/floor/plating, /area/ship/medical/surgery) "ws" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/machinery/computer/atmos_control/tank/oxygen_tank{ + dir = 1; + sensors = list("gecko_o2_sensor"="Oxygen Tank") }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/ship/engineering/engine) "wv" = ( @@ -1722,7 +1767,7 @@ }, /obj/structure/catwalk/over/plated_catwalk, /turf/open/floor/plating, -/area/ship/hallway/aft) +/area/ship/hallway/central) "wy" = ( /obj/structure/cable{ icon_state = "0-4" @@ -1737,19 +1782,19 @@ /area/ship/maintenance/starboard) "wD" = ( /obj/structure/window/reinforced{ - dir = 8 + dir = 4 }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 +/obj/machinery/air_sensor/atmos/toxin_tank{ + id_tag = "gecko_tox_sensor"; + pixel_x = 3; + pixel_y = 8 }, -/obj/effect/turf_decal/atmos/oxygen, -/obj/machinery/air_sensor/atmos/oxygen_tank{ - id_tag = "gecko_o2_sensor"; - pixel_x = 8; - pixel_y = 4 +/obj/effect/turf_decal/atmos/plasma, +/obj/structure/window/reinforced{ + dir = 8 }, -/turf/open/floor/engine/o2, +/obj/structure/window/reinforced, +/turf/open/floor/engine/plasma, /area/ship/engineering/engine) "wR" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -1768,11 +1813,10 @@ /turf/open/floor/plating, /area/ship/engineering/engine) "wW" = ( -/obj/machinery/atmospherics/components/binary/pump/layer2, +/obj/machinery/door/airlock/maintenance_hatch, /turf/open/floor/plating, /area/ship/engineering/engine) "wY" = ( -/obj/machinery/light/floor, /obj/structure/railing, /turf/open/floor/plasteel/stairs/right{ dir = 8 @@ -1785,8 +1829,11 @@ /obj/structure/cable{ icon_state = "0-8" }, +/obj/structure/cable{ + icon_state = "2-10" + }, /turf/open/floor/plating, -/area/ship/maintenance/central) +/area/ship/engineering/communications) "xh" = ( /obj/structure/cable{ icon_state = "0-4" @@ -1822,11 +1869,8 @@ /turf/open/floor/plating, /area/ship/medical/surgery) "yc" = ( -/obj/machinery/atmospherics/pipe/simple/dark{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 +/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ + dir = 8 }, /turf/open/floor/plating, /area/ship/engineering/engine) @@ -1845,13 +1889,29 @@ /area/ship/crew) "yj" = ( /turf/closed/wall/mineral/titanium/nodiagonal, -/area/ship/maintenance/central) +/area/ship/engineering/communications) "yp" = ( /obj/machinery/atmospherics/pipe/simple/dark{ dir = 10 }, /turf/open/floor/plating, /area/ship/engineering/engine) +"ys" = ( +/obj/structure/window/reinforced{ + icon_state = "rwindow"; + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nitrogen_input{ + dir = 1; + piping_layer = 4; + pixel_x = 5; + pixel_y = 0 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/open/floor/engine/n2, +/area/ship/engineering/engine) "yw" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 @@ -1918,10 +1978,6 @@ /obj/effect/turf_decal/siding/yellow{ dir = 10 }, -/obj/machinery/computer/atmos_control/tank/oxygen_tank{ - dir = 4; - sensors = list("gecko_o2_sensor"="Oxygen Tank") - }, /turf/open/floor/plasteel/tech/techmaint, /area/ship/engineering/engine) "ze" = ( @@ -1937,8 +1993,9 @@ /area/ship/medical/surgery) "zl" = ( /obj/machinery/atmospherics/pipe/simple/purple/hidden{ - dir = 4 + dir = 9 }, +/obj/machinery/light/floor, /turf/open/floor/plating, /area/ship/engineering/engine) "zn" = ( @@ -1947,7 +2004,7 @@ }, /obj/machinery/light/directional/north, /turf/open/floor/plasteel/tech, -/area/ship/maintenance/central) +/area/ship/engineering/communications) "zv" = ( /obj/effect/turf_decal/box/corners{ dir = 8 @@ -1958,7 +2015,7 @@ "zE" = ( /obj/item/pet_carrier, /turf/open/floor/plasteel/tech, -/area/ship/crew/dorm/dormfive) +/area/ship/crew/dorm/captain) "zM" = ( /obj/effect/turf_decal/trimline/transparent/white/filled/warning{ dir = 4 @@ -1994,7 +2051,6 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable{ icon_state = "2-4" }, @@ -2017,7 +2073,7 @@ req_access_txt = "56" }, /turf/open/floor/plasteel/tech, -/area/ship/maintenance/central) +/area/ship/engineering/communications) "AA" = ( /obj/effect/turf_decal/industrial/hatch/yellow, /obj/effect/decal/cleanable/dirt/dust, @@ -2053,8 +2109,11 @@ /turf/open/floor/plasteel/patterned, /area/ship/medical/surgery) "AI" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 2 +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/layer_manifold{ + dir = 4 }, /turf/open/floor/plating, /area/ship/engineering/engine) @@ -2120,7 +2179,9 @@ }, /obj/machinery/firealarm/directional/north, /turf/open/floor/plasteel/patterned, -/area/ship/storage) +/area/ship/storage{ + name = "Storage And Science Bay" + }) "BB" = ( /obj/machinery/atmospherics/pipe/simple{ dir = 8 @@ -2172,7 +2233,9 @@ /obj/item/clothing/suit/space/hardsuit/engine, /obj/item/tank/jetpack/carbondioxide, /turf/open/floor/plasteel/patterned, -/area/ship/storage) +/area/ship/storage{ + name = "Storage And Science Bay" + }) "BV" = ( /obj/effect/turf_decal/industrial/warning{ dir = 1 @@ -2211,7 +2274,7 @@ dir = 1 }, /turf/open/floor/plasteel/tech, -/area/ship/crew/dorm/dormfive) +/area/ship/crew/dorm/captain) "Cj" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -2234,7 +2297,7 @@ }, /obj/machinery/door/firedoor, /turf/open/floor/plasteel/tech/techmaint, -/area/ship/hallway/aft) +/area/ship/hallway/central) "Ct" = ( /obj/effect/turf_decal/siding/white{ dir = 4 @@ -2249,7 +2312,7 @@ icon_state = "1-2" }, /turf/open/floor/plasteel/patterned/grid, -/area/ship/hallway/aft) +/area/ship/hallway/central) "Cv" = ( /obj/effect/turf_decal/siding/white, /obj/effect/turf_decal/siding/white{ @@ -2309,7 +2372,7 @@ /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, /obj/structure/catwalk/over/plated_catwalk, /turf/open/floor/plating, -/area/ship/hallway/aft) +/area/ship/hallway/central) "CU" = ( /turf/closed/wall/mineral/titanium, /area/ship/maintenance/port) @@ -2323,7 +2386,7 @@ }, /obj/machinery/newscaster/directional/west, /turf/open/floor/plasteel, -/area/ship/hallway/aft) +/area/ship/hallway/central) "Dp" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -2341,11 +2404,11 @@ /obj/structure/catwalk/over/plated_catwalk, /obj/structure/catwalk/over/plated_catwalk, /turf/open/floor/plating, -/area/ship/hallway/aft) +/area/ship/hallway/central) "Du" = ( /obj/item/radio/intercom/wideband/directional/west, /turf/open/floor/plasteel/tech, -/area/ship/maintenance/central) +/area/ship/engineering/communications) "DQ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -2385,7 +2448,9 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel/patterned, -/area/ship/storage) +/area/ship/storage{ + name = "Storage And Science Bay" + }) "Ek" = ( /obj/effect/turf_decal/industrial/warning{ dir = 1 @@ -2395,7 +2460,9 @@ "En" = ( /obj/structure/sign/warning, /turf/closed/wall/mineral/titanium/nodiagonal, -/area/ship/storage) +/area/ship/storage{ + name = "Storage And Science Bay" + }) "Ew" = ( /obj/effect/turf_decal/borderfloor, /obj/machinery/status_display/shuttle{ @@ -2417,7 +2484,7 @@ }, /obj/effect/turf_decal/borderfloor, /turf/open/floor/plasteel, -/area/ship/hallway/aft) +/area/ship/hallway/central) "EE" = ( /obj/structure/cable{ icon_state = "4-8" @@ -2437,7 +2504,7 @@ }, /obj/structure/catwalk/over/plated_catwalk, /turf/open/floor/plating, -/area/ship/hallway/aft) +/area/ship/hallway/central) "EK" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/patterned, @@ -2494,7 +2561,7 @@ name = "Bob" }, /turf/open/floor/plasteel/tech, -/area/ship/crew/dorm/dormfive) +/area/ship/crew/dorm/captain) "Gm" = ( /obj/item/clothing/suit/armor/curator, /obj/item/clothing/suit/armor/curator, @@ -2520,17 +2587,16 @@ /turf/open/floor/plasteel/grimy, /area/ship/crew) "Gt" = ( -/obj/structure/window/reinforced{ - icon_state = "rwindow"; - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nitrogen_output{ + dir = 1; + piping_layer = 4; + pixel_x = 5; + pixel_y = 0 }, /obj/structure/window/reinforced{ dir = 1 }, -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/oxygen_output{ - dir = 4 - }, -/turf/open/floor/engine/o2, +/turf/open/floor/engine/n2, /area/ship/engineering/engine) "Gu" = ( /obj/machinery/computer/rdconsole{ @@ -2551,18 +2617,17 @@ /area/ship/medical/surgery) "GM" = ( /obj/machinery/light/small/directional/north, +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/toxin_output{ + dir = 4 + }, /obj/structure/window/reinforced{ - dir = 1 + dir = 4 }, /obj/structure/window/reinforced{ dir = 8 }, /obj/structure/window/reinforced{ - icon_state = "rwindow"; - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/toxin_output{ - dir = 4 + dir = 1 }, /turf/open/floor/engine/plasma, /area/ship/engineering/engine) @@ -2571,7 +2636,7 @@ dir = 1 }, /turf/open/floor/plasteel/tech, -/area/ship/crew/dorm/dormfive) +/area/ship/crew/dorm/captain) "GQ" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 @@ -2607,7 +2672,7 @@ pixel_x = -5 }, /turf/open/floor/plasteel/tech, -/area/ship/crew/dorm/dormfive) +/area/ship/crew/dorm/captain) "GX" = ( /obj/machinery/door/airlock/command{ dir = 4; @@ -2643,7 +2708,9 @@ "Ha" = ( /obj/machinery/rnd/production/circuit_imprinter/department/engi, /turf/open/floor/plasteel/patterned, -/area/ship/storage) +/area/ship/storage{ + name = "Storage And Science Bay" + }) "Hc" = ( /obj/machinery/door/airlock{ name = "Crew Quarters" @@ -2661,7 +2728,12 @@ /turf/open/floor/plasteel/tech/techmaint, /area/ship/crew) "Hg" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/green/hidden/layer4{ + dir = 4 + }, /turf/open/floor/plating, /area/ship/engineering/engine) "Hx" = ( @@ -2676,7 +2748,7 @@ dir = 1 }, /turf/open/floor/plasteel, -/area/ship/hallway/aft) +/area/ship/hallway/central) "HT" = ( /obj/machinery/light/small/directional/north, /obj/structure/cable{ @@ -2696,7 +2768,7 @@ dir = 1 }, /turf/open/floor/plasteel, -/area/ship/hallway/aft) +/area/ship/hallway/central) "Ig" = ( /obj/machinery/light/small/directional/south, /obj/structure/cable{ @@ -2705,14 +2777,24 @@ /obj/structure/cable{ icon_state = "1-5" }, +/obj/machinery/computer/atmos_control/tank/toxin_tank{ + sensors = list("gecko_tox_sensor"="Plasma Tank"); + dir = 1 + }, /turf/open/floor/plating, /area/ship/engineering/engine) "Ij" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 +/obj/machinery/power/terminal{ + dir = 8 + }, +/obj/effect/turf_decal/industrial/fire{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "0-4" }, /turf/open/floor/plating, -/area/ship/engineering/engine) +/area/ship/maintenance/port) "Im" = ( /obj/machinery/button/door{ dir = 8; @@ -2738,20 +2820,23 @@ dir = 1 }, /turf/open/floor/plasteel, -/area/ship/hallway/aft) +/area/ship/hallway/central) "Iu" = ( -/obj/structure/window/reinforced, /obj/structure/window/reinforced{ icon_state = "rwindow"; dir = 4 }, +/obj/structure/window/reinforced, /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/oxygen_input{ - dir = 4 +/obj/effect/turf_decal/atmos/nitrogen, +/obj/machinery/air_sensor/atmos/nitrogen_tank{ + id_tag = "gecko_n2_sensor"; + pixel_x = 5; + pixel_y = 9 }, -/turf/open/floor/engine/o2, +/turf/open/floor/engine/n2, /area/ship/engineering/engine) "Iv" = ( /obj/effect/spawner/structure/window/plasma/reinforced, @@ -2763,13 +2848,30 @@ /area/ship/engineering/engine) "Iy" = ( /turf/closed/wall/mineral/titanium/nodiagonal, -/area/ship/hallway/aft) +/area/ship/hallway/central) "Iz" = ( /obj/machinery/atmospherics/components/unary/portables_connector{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/green/hidden/layer4{ + dir = 6 + }, /turf/open/floor/plating, /area/ship/engineering/engine) +"II" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/oxygen_input{ + dir = 1 + }, +/obj/structure/window/reinforced{ + icon_state = "rwindow"; + dir = 4 + }, +/obj/structure/window/reinforced, +/turf/open/floor/engine/o2, +/area/ship/engineering/engine) "IK" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -2783,11 +2885,8 @@ }, /obj/structure/catwalk/over/plated_catwalk, /turf/open/floor/plating, -/area/ship/hallway/aft) +/area/ship/hallway/central) "Jc" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/trimline/transparent/white/filled/warning{ dir = 1 @@ -2797,7 +2896,10 @@ pixel_y = -28 }, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "8-10" + }, +/obj/structure/cable{ + icon_state = "4-10" }, /turf/open/floor/plating, /area/ship/maintenance/port) @@ -2811,7 +2913,9 @@ }, /obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4, /turf/open/floor/plasteel/patterned/grid, -/area/ship/storage) +/area/ship/storage{ + name = "Storage And Science Bay" + }) "Jk" = ( /obj/effect/turf_decal/industrial/outline/yellow, /obj/effect/decal/cleanable/dirt, @@ -2843,19 +2947,14 @@ dir = 4 }, /turf/open/floor/plasteel/patterned/grid, -/area/ship/hallway/aft) +/area/ship/hallway/central) "Jz" = ( /obj/effect/turf_decal/borderfloor, /obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/plasteel, -/area/ship/hallway/aft) +/area/ship/hallway/central) "JV" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/ship/engineering/engine) "Ki" = ( @@ -2882,7 +2981,7 @@ }, /obj/effect/turf_decal/borderfloor, /turf/open/floor/plasteel, -/area/ship/hallway/aft) +/area/ship/hallway/central) "KH" = ( /obj/structure/cable{ icon_state = "0-10" @@ -2910,7 +3009,9 @@ dir = 10 }, /turf/open/floor/plasteel/patterned, -/area/ship/storage) +/area/ship/storage{ + name = "Storage And Science Bay" + }) "KU" = ( /obj/structure/closet{ anchored = 1; @@ -2956,6 +3057,15 @@ }, /turf/open/floor/plasteel/patterned, /area/ship/cargo/starboard) +"LA" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ + dir = 8 + }, +/turf/open/floor/plating, +/area/ship/engineering/engine) "LH" = ( /obj/structure/cable{ icon_state = "1-2" @@ -3016,7 +3126,9 @@ /obj/item/tank/internals/plasmaman/full, /obj/structure/closet/emcloset, /turf/open/floor/plasteel/dark, -/area/ship/storage) +/area/ship/storage{ + name = "Storage And Science Bay" + }) "Ml" = ( /obj/effect/turf_decal/industrial/fire{ dir = 8 @@ -3050,14 +3162,14 @@ }, /obj/machinery/door/firedoor, /turf/open/floor/plasteel/tech/techmaint, -/area/ship/hallway/aft) +/area/ship/hallway/central) "Nq" = ( /obj/machinery/firealarm/directional/north, /obj/effect/turf_decal/borderfloor{ dir = 1 }, /turf/open/floor/plasteel, -/area/ship/hallway/aft) +/area/ship/hallway/central) "Nu" = ( /obj/machinery/firealarm/directional/east, /obj/effect/turf_decal/borderfloor, @@ -3067,7 +3179,7 @@ pixel_y = 11 }, /turf/open/floor/plasteel, -/area/ship/hallway/aft) +/area/ship/hallway/central) "Nz" = ( /obj/effect/turf_decal/industrial/warning{ dir = 1 @@ -3107,7 +3219,7 @@ dir = 1 }, /turf/open/floor/plasteel/tech, -/area/ship/maintenance/central) +/area/ship/engineering/communications) "Ow" = ( /obj/effect/turf_decal/industrial/warning, /obj/effect/decal/cleanable/dirt, @@ -3142,7 +3254,7 @@ pixel_y = 32 }, /turf/open/floor/plasteel/tech, -/area/ship/maintenance/central) +/area/ship/engineering/communications) "Pg" = ( /obj/machinery/mineral/ore_redemption{ input_dir = 2; @@ -3209,7 +3321,7 @@ /obj/structure/table/glass, /obj/item/lighter/clockwork, /turf/open/floor/plasteel/tech, -/area/ship/maintenance/central) +/area/ship/engineering/communications) "PF" = ( /obj/structure/sign/nanotrasen, /turf/closed/wall/mineral/titanium/nodiagonal, @@ -3218,7 +3330,7 @@ /obj/structure/table/glass, /obj/item/storage/fancy/cigarettes/cigars/havana, /turf/open/floor/plasteel/tech, -/area/ship/crew/dorm/dormfive) +/area/ship/crew/dorm/captain) "PQ" = ( /obj/structure/sign/warning/vacuum/external{ pixel_x = 32 @@ -3231,7 +3343,9 @@ }, /obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4, /turf/open/floor/plasteel/dark, -/area/ship/storage) +/area/ship/storage{ + name = "Storage And Science Bay" + }) "PV" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -3288,7 +3402,7 @@ dir = 6 }, /turf/open/floor/plasteel/tech, -/area/ship/maintenance/central) +/area/ship/engineering/communications) "QA" = ( /obj/structure/cable{ icon_state = "1-2" @@ -3313,12 +3427,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel/patterned/grid, -/area/ship/hallway/aft) +/area/ship/hallway/central) "QD" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/dark{ - dir = 1 - }, +/obj/machinery/atmospherics/components/trinary/mixer/flipped, /turf/open/floor/plating, /area/ship/engineering/engine) "QY" = ( @@ -3340,7 +3452,9 @@ req_access_txt = "10" }, /turf/open/floor/plasteel/tech/techmaint, -/area/ship/storage) +/area/ship/storage{ + name = "Storage And Science Bay" + }) "Rc" = ( /obj/machinery/light/directional/north, /obj/machinery/firealarm/directional/north{ @@ -3391,7 +3505,7 @@ /obj/item/paper_bin, /obj/item/pen/fourcolor, /turf/open/floor/plasteel/tech, -/area/ship/maintenance/central) +/area/ship/engineering/communications) "RN" = ( /obj/effect/turf_decal/borderfloor{ dir = 1 @@ -3403,7 +3517,7 @@ /area/ship/bridge) "RS" = ( /turf/open/floor/plasteel/tech, -/area/ship/crew/dorm/dormfive) +/area/ship/crew/dorm/captain) "Sa" = ( /obj/machinery/light/directional/east, /obj/effect/turf_decal/industrial/warning, @@ -3419,7 +3533,7 @@ }, /obj/effect/turf_decal/borderfloor, /turf/open/floor/plasteel, -/area/ship/hallway/aft) +/area/ship/hallway/central) "Sj" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 @@ -3428,7 +3542,7 @@ dir = 1 }, /turf/open/floor/plasteel, -/area/ship/hallway/aft) +/area/ship/hallway/central) "Sl" = ( /obj/structure/cable/yellow{ icon_state = "0-8" @@ -3464,8 +3578,9 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable{ - icon_state = "0-8" + icon_state = "8-9" }, +/obj/structure/cable, /turf/open/floor/plating, /area/ship/bridge) "Sy" = ( @@ -3496,10 +3611,13 @@ /turf/open/floor/plasteel/dark, /area/ship/bridge) "SQ" = ( -/obj/machinery/atmospherics/components/binary/pump/layer2{ - dir = 8 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/turf/open/floor/plating, +/obj/effect/turf_decal/siding/yellow, +/obj/structure/railing, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/plasteel/tech/techmaint, /area/ship/engineering/engine) "SV" = ( /obj/structure/chair/comfy/shuttle{ @@ -3510,7 +3628,7 @@ dir = 1 }, /turf/open/floor/plasteel, -/area/ship/hallway/aft) +/area/ship/hallway/central) "Ta" = ( /obj/effect/turf_decal/siding/yellow{ dir = 4 @@ -3519,15 +3637,11 @@ dir = 8 }, /turf/open/floor/plasteel/tech, -/area/ship/maintenance/central) +/area/ship/engineering/communications) "Tb" = ( /obj/effect/turf_decal/industrial/fire{ dir = 8 }, -/obj/machinery/atmospherics/components/unary/portables_connector/layer2{ - dir = 4 - }, -/obj/machinery/portable_atmospherics/canister, /turf/open/floor/plating, /area/ship/engineering/engine) "Tc" = ( @@ -3541,12 +3655,12 @@ /obj/machinery/power/terminal{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, /turf/open/floor/plasteel/tech/techmaint, /area/ship/engineering/engine) "Tg" = ( @@ -3556,10 +3670,16 @@ "Th" = ( /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable{ - icon_state = "0-8" + icon_state = "8-9" }, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "4-9" + }, +/obj/structure/cable{ + icon_state = "0-9" + }, +/obj/structure/cable{ + icon_state = "6-8" }, /turf/open/floor/plating, /area/ship/crew) @@ -3575,7 +3695,7 @@ }, /obj/effect/turf_decal/industrial/warning, /turf/open/floor/plasteel/patterned/grid, -/area/ship/hallway/aft) +/area/ship/hallway/central) "Tq" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -3587,29 +3707,35 @@ dir = 8 }, /turf/open/floor/plasteel/patterned, -/area/ship/storage) +/area/ship/storage{ + name = "Storage And Science Bay" + }) "TA" = ( /obj/effect/turf_decal/industrial/warning{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel/patterned, -/area/ship/storage) +/area/ship/storage{ + name = "Storage And Science Bay" + }) "TK" = ( /obj/structure/sign/nanotrasen, /turf/closed/wall/mineral/titanium/nodiagonal, -/area/ship/storage) +/area/ship/storage{ + name = "Storage And Science Bay" + }) "Ug" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/engineering/engine) "Uj" = ( /obj/structure/sign/nanotrasen, /turf/closed/wall/mineral/titanium, -/area/ship/maintenance/central) +/area/ship/engineering/communications) "Ux" = ( /obj/structure/sign/nanotrasen, /turf/closed/wall/mineral/titanium, -/area/ship/crew/dorm/dormfive) +/area/ship/crew/dorm/captain) "UB" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/siding/white{ @@ -3654,13 +3780,16 @@ /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/medical/surgery) "UV" = ( -/obj/structure/cable{ - icon_state = "2-4" - }, /obj/effect/decal/cleanable/cobweb, /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable{ - icon_state = "0-4" + icon_state = "4-6" + }, +/obj/structure/cable{ + icon_state = "0-6" + }, +/obj/structure/cable{ + icon_state = "5-6" }, /turf/open/floor/plating, /area/ship/cargo/starboard) @@ -3683,7 +3812,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel/patterned/grid, -/area/ship/hallway/aft) +/area/ship/hallway/central) "Vq" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/cargo/starboard) @@ -3716,9 +3845,6 @@ /area/ship/bridge) "VC" = ( /obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable{ - icon_state = "0-8" - }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/light_switch{ @@ -3727,7 +3853,19 @@ pixel_y = -16 }, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "8-10" + }, +/obj/structure/cable{ + icon_state = "0-10" + }, +/obj/structure/cable{ + icon_state = "9-10" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/cable{ + icon_state = "5-9" }, /turf/open/floor/plating, /area/ship/maintenance/port) @@ -3746,7 +3884,7 @@ "VO" = ( /obj/machinery/airalarm/directional/south, /turf/open/floor/plasteel/tech, -/area/ship/maintenance/central) +/area/ship/engineering/communications) "VT" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/incinerator_input{ dir = 4 @@ -3768,25 +3906,37 @@ }, /obj/structure/catwalk/over/plated_catwalk, /turf/open/floor/plating, -/area/ship/hallway/aft) +/area/ship/hallway/central) "Wb" = ( /obj/structure/chair/comfy/shuttle, /obj/machinery/computer/helm/viewscreen/directional/north{ pixel_y = 18 }, /turf/open/floor/plasteel/tech, -/area/ship/maintenance/central) +/area/ship/engineering/communications) "Wo" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable{ - icon_state = "0-8" + icon_state = "6-8" }, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "0-2" + }, +/obj/structure/cable{ + icon_state = "4-10" + }, +/turf/open/floor/plating, +/area/ship/storage{ + name = "Storage And Science Bay" + }) +"WB" = ( +/obj/machinery/atmospherics/components/unary/portables_connector, +/obj/machinery/atmospherics/pipe/simple/green/hidden/layer4{ + dir = 4 }, /turf/open/floor/plating, -/area/ship/storage) +/area/ship/engineering/engine) "WF" = ( /obj/structure/closet/secure_closet{ anchored = 1; @@ -3810,7 +3960,7 @@ /obj/item/storage/photo_album/CE, /obj/item/circuitboard/machine/circuit_imprinter, /turf/open/floor/plasteel/tech, -/area/ship/maintenance/central) +/area/ship/engineering/communications) "WJ" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/item/kirbyplants/random, @@ -3821,7 +3971,7 @@ pixel_y = 11 }, /turf/open/floor/plasteel, -/area/ship/hallway/aft) +/area/ship/hallway/central) "WN" = ( /obj/machinery/atmospherics/components/binary/circulator, /turf/open/floor/engine, @@ -3835,7 +3985,7 @@ dir = 1 }, /turf/open/floor/plasteel, -/area/ship/hallway/aft) +/area/ship/hallway/central) "WS" = ( /obj/machinery/rnd/server, /obj/machinery/airalarm/directional/south, @@ -3877,7 +4027,9 @@ dir = 5 }, /turf/open/floor/plasteel/patterned, -/area/ship/storage) +/area/ship/storage{ + name = "Storage And Science Bay" + }) "Xs" = ( /obj/effect/turf_decal/industrial/warning{ dir = 1 @@ -3893,7 +4045,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/ship/crew/dorm/dormfive) +/area/ship/crew/dorm/captain) "XA" = ( /obj/structure/cable{ icon_state = "4-8" @@ -3930,6 +4082,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 }, +/obj/machinery/atmospherics/pipe/simple/purple/hidden{ + dir = 6 + }, /turf/open/floor/plating, /area/ship/engineering/engine) "XY" = ( @@ -3943,7 +4098,7 @@ dir = 8 }, /turf/open/floor/plasteel/patterned/grid, -/area/ship/hallway/aft) +/area/ship/hallway/central) "Yf" = ( /obj/machinery/door/airlock/engineering{ dir = 4; @@ -3983,19 +4138,25 @@ /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/medical/surgery) "YG" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/effect/decal/cleanable/dirt/dust, /obj/structure/sign/warning/electricshock{ pixel_y = -32 }, /obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable{ + icon_state = "5-9" + }, +/obj/structure/cable{ + icon_state = "1-6" + }, /obj/structure/cable{ icon_state = "0-4" }, +/obj/structure/cable{ + icon_state = "8-9" + }, /turf/open/floor/plating, -/area/ship/hallway/fore) +/area/ship/hallway/central) "YQ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 10 @@ -4004,7 +4165,9 @@ dir = 10 }, /turf/open/floor/plasteel/patterned, -/area/ship/storage) +/area/ship/storage{ + name = "Storage And Science Bay" + }) "YR" = ( /turf/open/floor/plasteel/dark, /area/ship/engineering/engine) @@ -4013,7 +4176,9 @@ /obj/item/tank/jetpack/carbondioxide, /obj/machinery/suit_storage_unit/inherit, /turf/open/floor/plasteel/patterned, -/area/ship/storage) +/area/ship/storage{ + name = "Storage And Science Bay" + }) "Ze" = ( /obj/machinery/door/airlock/maintenance_hatch, /obj/structure/cable{ @@ -4062,12 +4227,16 @@ /obj/machinery/power/terminal{ dir = 8 }, -/obj/structure/cable{ - icon_state = "0-4" - }, /obj/effect/turf_decal/industrial/fire{ dir = 8 }, +/obj/machinery/light/small/directional/north{ + pixel_x = 11; + pixel_y = 28 + }, +/obj/structure/cable{ + icon_state = "0-6" + }, /turf/open/floor/plating, /area/ship/maintenance/port) "Zu" = ( @@ -4077,7 +4246,7 @@ "Zv" = ( /obj/effect/turf_decal/borderfloor, /turf/open/floor/plasteel, -/area/ship/hallway/aft) +/area/ship/hallway/central) "ZB" = ( /obj/effect/turf_decal/trimline/opaque/yellow/warning{ dir = 8 @@ -4088,6 +4257,7 @@ /obj/structure/railing/corner{ dir = 8 }, +/obj/machinery/light/floor, /turf/open/floor/plasteel/dark, /area/ship/engineering/engine) "ZM" = ( @@ -4252,7 +4422,7 @@ hu hu Ug ok -SQ +KM dZ KM KM @@ -4262,7 +4432,7 @@ hb XS zl ks -KQ +ys ss Ug hu @@ -4276,9 +4446,9 @@ wy xh Ki Ug -Iz -Ij -yc +KM +KM +yp UP UP hX @@ -4288,7 +4458,7 @@ QD pQ Hg gg -KM +jJ Ug bV xh @@ -4301,19 +4471,19 @@ Zn jn tB Ug -pW -wW -AI -KM KM +wW KM -Cj KM KM KM +Cj KM KM -eQ +yc +WB +II +Ug Ug wB Pk @@ -4323,20 +4493,20 @@ wB (9,1,1) = {" tB Zo -Zo +Ij tB tB tB in -JV +LH zZ -ws +LH aK oT QA LH -LH -LH +LA +AI Ig wB wB @@ -4360,7 +4530,7 @@ Lr ez zc KM -KM +eQ vi lZ Ze @@ -4383,9 +4553,9 @@ Ba Xh XA Tf -PV -KM -KM +SQ +JV +pW gB eC wB @@ -4412,7 +4582,7 @@ PV KM dX ah -KM +ws wB dk wB From 9e63f3c558474b2b9d5467ef521585397870a6cf Mon Sep 17 00:00:00 2001 From: Overteh Date: Sat, 14 Sep 2024 17:53:16 +0800 Subject: [PATCH 4/7] Door stuck --- .../shuttles/nanotrasen/nanotrasen_gecko.dmm | 274 ++++++++---------- 1 file changed, 114 insertions(+), 160 deletions(-) diff --git a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_gecko.dmm b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_gecko.dmm index 963ee50f7e04..e9ef96ed3098 100644 --- a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_gecko.dmm +++ b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_gecko.dmm @@ -186,11 +186,6 @@ pixel_x = -8; pixel_y = 5 }, -/obj/item/spacecash/bundle/c1000, -/obj/item/spacecash/bundle/c1000, -/obj/item/spacecash/bundle/c1000, -/obj/item/spacecash/bundle/c1000, -/obj/item/spacecash/bundle/c100, /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) "bQ" = ( @@ -266,7 +261,7 @@ }, /obj/machinery/door/poddoor{ dir = 4; - id = "gecko_thrusters" + id = "gecko_starboard_thrusters" }, /turf/open/floor/plating, /area/ship/maintenance/starboard) @@ -412,7 +407,6 @@ /turf/open/floor/plating, /area/ship/engineering/engine) "ef" = ( -/obj/machinery/light/directional/south, /obj/structure/cable{ icon_state = "0-9" }, @@ -468,13 +462,14 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/structure/railing{ +/obj/machinery/light/floor, +/obj/effect/turf_decal/siding/yellow/end{ dir = 8 }, -/obj/effect/turf_decal/siding/yellow{ +/obj/structure/railing{ dir = 9 }, -/obj/machinery/light/floor, +/obj/structure/railing, /turf/open/floor/plasteel/tech/techmaint, /area/ship/engineering/engine) "eA" = ( @@ -765,7 +760,6 @@ /turf/open/floor/plating, /area/ship/medical/surgery) "hT" = ( -/obj/effect/decal/fakelattice, /obj/machinery/power/smes/engineering, /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -804,6 +798,9 @@ /obj/structure/cable{ icon_state = "2-4" }, +/obj/structure/cable{ + icon_state = "2-8" + }, /turf/open/floor/plating, /area/ship/engineering/engine) "is" = ( @@ -826,7 +823,6 @@ /turf/open/floor/engine/airless, /area/ship/engineering/engine) "iJ" = ( -/obj/effect/spawner/lootdrop/salvage_50, /obj/structure/ore_box, /turf/open/floor/plasteel/patterned, /area/ship/cargo/starboard) @@ -900,7 +896,7 @@ }, /obj/machinery/door/poddoor{ dir = 4; - id = "gecko_thrusters" + id = "gecko_port_thrusters" }, /turf/open/floor/plating, /area/ship/maintenance/port) @@ -1004,7 +1000,9 @@ /area/ship/engineering/engine) "kM" = ( /obj/effect/turf_decal/borderfloor, -/obj/machinery/holopad/emergency/command, +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/ship/bridge) "kS" = ( @@ -1030,7 +1028,7 @@ /area/ship/cargo/starboard) "lS" = ( /obj/structure/sign/nanotrasen, -/turf/closed/wall/mineral/titanium/nodiagonal, +/turf/closed/wall/mineral/titanium, /area/ship/medical/surgery) "lY" = ( /obj/docking_port/stationary{ @@ -1058,7 +1056,6 @@ /obj/effect/turf_decal/trimline/transparent/white/filled/warning{ dir = 4 }, -/obj/machinery/computer/helm/viewscreen/directional/south, /obj/structure/table/reinforced, /obj/item/storage/toolbox/mechanical{ pixel_y = -5 @@ -1188,28 +1185,6 @@ "oj" = ( /turf/closed/wall/mineral/titanium, /area/ship/engineering/engine) -"ok" = ( -/obj/machinery/button/door{ - id = "gecko_thrusters"; - name = "Thruster Blast Door Control"; - pixel_x = -6; - pixel_y = 24; - sync_doors = 0 - }, -/turf/open/floor/plating, -/area/ship/engineering/engine) -"on" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/button/ignition{ - dir = 4; - pixel_x = 10; - pixel_y = 6; - id = "atmos_incinerator_igniter" - }, -/turf/closed/wall/mineral/titanium/nodiagonal, -/area/ship/engineering/engine) "ov" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/borderfloor, @@ -1356,12 +1331,6 @@ /obj/structure/catwalk/over/plated_catwalk, /turf/open/floor/plating, /area/ship/hallway/central) -"qc" = ( -/obj/effect/turf_decal/industrial/warning/fulltile, -/turf/closed/wall/mineral/titanium/nodiagonal, -/area/ship/storage{ - name = "Storage And Science Bay" - }) "qn" = ( /obj/structure/curtain/bounty, /obj/structure/bed, @@ -1378,6 +1347,7 @@ /obj/structure/cable{ icon_state = "2-5" }, +/obj/machinery/door/airlock/maintenance_hatch, /turf/open/floor/plating, /area/ship/maintenance/port) "qu" = ( @@ -1452,6 +1422,18 @@ dir = 8 }, /obj/effect/spawner/lootdrop/maintenance, +/obj/machinery/button/door{ + id = "gecko_starboard_thrusters"; + name = "Thruster Blast Door Control"; + pixel_x = 0; + pixel_y = -22; + sync_doors = 0; + dir = 1 + }, +/obj/machinery/light/small/directional/south{ + pixel_x = 11; + pixel_y = -28 + }, /turf/open/floor/plating, /area/ship/maintenance/starboard) "ro" = ( @@ -1515,6 +1497,20 @@ dir = 8; name = "waste to enviroment" }, +/obj/machinery/button/ignition{ + dir = 4; + pixel_x = -22; + pixel_y = 6; + id = "atmos_incinerator_igniter" + }, +/obj/machinery/button/door{ + dir = 4; + id = "gecko_engine_vent"; + name = "Combustion Chamber Blast Door Control"; + pixel_x = -23; + pixel_y = -7; + sync_doors = 0 + }, /turf/open/floor/plating, /area/ship/engineering/engine) "sL" = ( @@ -1646,7 +1642,6 @@ /obj/structure/cable{ icon_state = "1-8" }, -/obj/machinery/light/small/directional/south, /obj/effect/spawner/lootdrop/maintenance, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, @@ -1756,6 +1751,7 @@ dir = 1; sensors = list("gecko_o2_sensor"="Oxygen Tank") }, +/obj/machinery/light/directional/south, /turf/open/floor/plating, /area/ship/engineering/engine) "wv" = ( @@ -1806,14 +1802,11 @@ /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/medical/surgery) "wV" = ( -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/machinery/power/ship_gravity, -/turf/open/floor/plating, -/area/ship/engineering/engine) -"wW" = ( -/obj/machinery/door/airlock/maintenance_hatch, +/obj/structure/rack, +/obj/effect/spawner/lootdrop/salvage, +/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/ship/engineering/engine) "wY" = ( @@ -1952,33 +1945,15 @@ /obj/effect/decal/cleanable/greenglow, /turf/open/floor/plasteel/patterned, /area/ship/cargo/starboard) -"yX" = ( -/obj/machinery/button/shieldwallgen{ - id = "gecko_starboard_field"; - pixel_x = -6; - pixel_y = -8 - }, -/obj/machinery/button/door{ - id = "gecko_starboard"; - name = "External Shutter Control"; - pixel_x = 4; - pixel_y = -6; - sync_doors = 0 - }, -/turf/closed/wall/mineral/titanium/nodiagonal, -/area/ship/cargo/starboard) "zc" = ( /obj/structure/cable/yellow{ icon_state = "1-4" }, /obj/effect/turf_decal/siding/yellow, -/obj/structure/railing{ - dir = 10 - }, -/obj/effect/turf_decal/siding/yellow{ - dir = 10 +/obj/structure/railing, +/turf/open/floor/plasteel/stairs{ + dir = 8 }, -/turf/open/floor/plasteel/tech/techmaint, /area/ship/engineering/engine) "ze" = ( /obj/machinery/light/directional/east, @@ -2047,25 +2022,11 @@ /obj/item/lightreplacer, /turf/open/floor/plastic, /area/ship/crew/toilet) -"zZ" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/turf/open/floor/plating, -/area/ship/engineering/engine) "As" = ( /obj/machinery/atmospherics/pipe/simple/dark{ dir = 4 }, -/obj/effect/spawner/structure/window/plasma/reinforced, -/obj/machinery/door/poddoor/shutters{ - id = "gecko_shuttle"; - dir = 4 - }, -/turf/open/floor/plating, +/turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/engineering/engine) "Au" = ( /obj/machinery/door/airlock/command{ @@ -2132,10 +2093,10 @@ /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo/starboard) "AN" = ( -/obj/item/radio/intercom/directional/south, /obj/effect/turf_decal/industrial/outline/yellow, /obj/effect/spawner/lootdrop/salvage_50, /obj/structure/table/reinforced, +/obj/machinery/computer/helm/viewscreen/directional/south, /turf/open/floor/plasteel, /area/ship/cargo/starboard) "AW" = ( @@ -2203,7 +2164,6 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/crew) "BM" = ( -/obj/machinery/airalarm/directional/north, /obj/effect/turf_decal/trimline/transparent/white/filled/warning{ dir = 4 }, @@ -2221,6 +2181,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/item/storage/bag/ore, /obj/item/clothing/under/rank/cargo/miner, +/obj/machinery/airalarm/directional/north, /turf/open/floor/plasteel, /area/ship/cargo/starboard) "BP" = ( @@ -2358,7 +2319,6 @@ /obj/effect/turf_decal/trimline/transparent/white/filled/warning{ dir = 1 }, -/obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/plating, /area/ship/maintenance/starboard) "CT" = ( @@ -2468,10 +2428,13 @@ /obj/machinery/status_display/shuttle{ pixel_y = -32 }, -/obj/structure/chair/comfy/shuttle{ - dir = 1 - }, /obj/machinery/light/directional/south, +/obj/structure/table/reinforced, +/obj/item/spacecash/bundle/c100, +/obj/item/spacecash/bundle/c1000, +/obj/item/spacecash/bundle/c1000, +/obj/item/spacecash/bundle/c1000, +/obj/item/spacecash/bundle/c1000, /turf/open/floor/plasteel/dark, /area/ship/bridge) "EA" = ( @@ -2525,6 +2488,7 @@ /obj/effect/turf_decal/siding/blue{ dir = 1 }, +/obj/machinery/holopad/emergency/command, /turf/open/floor/plasteel/tech, /area/ship/bridge) "Fu" = ( @@ -2536,12 +2500,12 @@ /turf/open/floor/engine/hull/reinforced, /area/ship/external) "FC" = ( -/obj/machinery/light_switch{ - pixel_x = 5; - pixel_y = -12 +/obj/machinery/power/ship_gravity, +/obj/structure/cable{ + icon_state = "0-4" }, -/turf/closed/wall/mineral/titanium/nodiagonal, -/area/ship/bridge) +/turf/open/floor/plating, +/area/ship/engineering/engine) "FO" = ( /obj/structure/cable{ icon_state = "2-10" @@ -2563,10 +2527,6 @@ /turf/open/floor/plasteel/tech, /area/ship/crew/dorm/captain) "Gm" = ( -/obj/item/clothing/suit/armor/curator, -/obj/item/clothing/suit/armor/curator, -/obj/item/clothing/suit/armor/curator, -/obj/item/clothing/suit/armor/curator, /obj/item/clothing/gloves/fingerless, /obj/item/clothing/gloves/fingerless, /obj/item/clothing/gloves/fingerless, @@ -2584,6 +2544,10 @@ /obj/item/clothing/suit/jacket/letterman_nanotrasen, /obj/item/clothing/suit/jacket/letterman_nanotrasen, /obj/structure/closet, +/obj/item/clothing/under/nanotrasen/affairs, +/obj/item/clothing/under/nanotrasen/affairs, +/obj/item/clothing/under/nanotrasen/affairs, +/obj/item/clothing/under/nanotrasen/affairs, /turf/open/floor/plasteel/grimy, /area/ship/crew) "Gt" = ( @@ -2653,11 +2617,6 @@ /obj/effect/turf_decal/techfloor{ dir = 5 }, -/obj/structure/closet/wall/directional/north, -/obj/item/radio, -/obj/item/radio, -/obj/item/radio, -/obj/item/radio, /turf/open/floor/plasteel/tech/grid, /area/ship/crew) "GT" = ( @@ -2736,12 +2695,6 @@ }, /turf/open/floor/plating, /area/ship/engineering/engine) -"Hx" = ( -/obj/effect/turf_decal/box/corners{ - dir = 8 - }, -/turf/open/floor/plasteel/patterned/cargo_one, -/area/ship/cargo/starboard) "HK" = ( /obj/machinery/light/directional/north, /obj/effect/turf_decal/borderfloor{ @@ -2795,18 +2748,6 @@ }, /turf/open/floor/plating, /area/ship/maintenance/port) -"Im" = ( -/obj/machinery/button/door{ - dir = 8; - id = "gecko_engine_vent"; - name = "Combustion Chamber Blast Door Control"; - pixel_x = 24; - pixel_y = 6; - sync_doors = 0 - }, -/obj/structure/railing, -/turf/open/floor/plating, -/area/ship/engineering/engine) "In" = ( /obj/structure/cable{ icon_state = "1-4" @@ -2839,13 +2780,21 @@ /turf/open/floor/engine/n2, /area/ship/engineering/engine) "Iv" = ( -/obj/effect/spawner/structure/window/plasma/reinforced, -/obj/machinery/door/poddoor/shutters{ - id = "gecko_shuttle"; - dir = 4 +/obj/effect/decal/cleanable/dirt, +/obj/machinery/button/door{ + id = "gecko_starboard"; + name = "External Shutter Control"; + pixel_x = 4; + pixel_y = 24; + sync_doors = 0 }, -/turf/open/floor/plating, -/area/ship/engineering/engine) +/obj/machinery/button/shieldwallgen{ + id = "gecko_starboard_field"; + pixel_x = -5; + pixel_y = 22 + }, +/turf/open/floor/plasteel/patterned, +/area/ship/cargo/starboard) "Iy" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/hallway/central) @@ -2892,7 +2841,6 @@ dir = 1 }, /obj/machinery/light/small/directional/south{ - pixel_x = 10; pixel_y = -28 }, /obj/structure/cable{ @@ -3050,11 +2998,11 @@ }, /area/ship/engineering/engine) "Lw" = ( -/obj/machinery/light/directional/west, /obj/effect/turf_decal/industrial/warning, /obj/structure/cable{ icon_state = "2-4" }, +/obj/machinery/light/directional/west, /turf/open/floor/plasteel/patterned, /area/ship/cargo/starboard) "LA" = ( @@ -3141,12 +3089,13 @@ "Mn" = ( /obj/machinery/light_switch{ dir = 4; - pixel_x = -25; + pixel_x = -22; pixel_y = -5 }, /obj/effect/turf_decal/borderfloor{ dir = 1 }, +/obj/structure/table/reinforced, /turf/open/floor/plasteel/dark, /area/ship/bridge) "Mw" = ( @@ -3195,10 +3144,6 @@ }, /turf/open/floor/plasteel/tech/grid, /area/ship/cargo/starboard) -"NJ" = ( -/obj/structure/sign/nanotrasen, -/turf/closed/wall/mineral/titanium, -/area/ship/maintenance/starboard) "NP" = ( /obj/item/radio/intercom/directional/north, /obj/structure/table/reinforced, @@ -3287,7 +3232,7 @@ }, /obj/machinery/door/poddoor{ dir = 4; - id = "gecko_thrusters" + id = "gecko_starboard_thrusters" }, /turf/open/floor/plating, /area/ship/maintenance/starboard) @@ -3386,7 +3331,6 @@ /obj/effect/turf_decal/box/corners{ dir = 4 }, -/obj/effect/spawner/lootdrop/salvage_50, /obj/structure/rack, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo/starboard) @@ -3581,6 +3525,7 @@ icon_state = "8-9" }, /obj/structure/cable, +/obj/item/flashlight/glowstick/orange, /turf/open/floor/plating, /area/ship/bridge) "Sy" = ( @@ -3794,9 +3739,11 @@ /turf/open/floor/plating, /area/ship/cargo/starboard) "Vl" = ( -/obj/structure/sign/nanotrasen, -/turf/closed/wall/mineral/titanium, -/area/ship/maintenance/port) +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/ship/engineering/engine) "Vm" = ( /obj/effect/turf_decal/siding/white{ dir = 4 @@ -4219,7 +4166,7 @@ }, /obj/machinery/door/poddoor{ dir = 4; - id = "gecko_thrusters" + id = "gecko_port_thrusters" }, /turf/open/floor/plating, /area/ship/maintenance/port) @@ -4237,6 +4184,13 @@ /obj/structure/cable{ icon_state = "0-6" }, +/obj/machinery/button/door{ + id = "gecko_port_thrusters"; + name = "Thruster Blast Door Control"; + pixel_x = 0; + pixel_y = 23; + sync_doors = 0 + }, /turf/open/floor/plating, /area/ship/maintenance/port) "Zu" = ( @@ -4356,7 +4310,7 @@ cv VT nH Ug -Iv +Ug Ug oj hu @@ -4379,7 +4333,7 @@ Ug cK CF BB -on +nH GM jK wD @@ -4421,7 +4375,7 @@ hu hu hu Ug -ok +KM KM dZ KM @@ -4447,7 +4401,7 @@ xh Ki Ug KM -KM +FC yp UP UP @@ -4472,7 +4426,7 @@ jn tB Ug KM -wW +Vl KM KM KM @@ -4499,7 +4453,7 @@ tB tB in LH -zZ +LH LH aK oT @@ -4575,7 +4529,7 @@ tB Pn YR el -Im +Xh eu hT PV @@ -4616,7 +4570,7 @@ dp wB "} (14,1,1) = {" -Vl +dV tB tB CU @@ -4638,7 +4592,7 @@ ZM kq wB wB -NJ +GB "} (15,1,1) = {" hu @@ -4679,8 +4633,8 @@ pe fn EE ej -yX -EK +Vq +Iv Zl zv Lw @@ -4782,7 +4736,7 @@ mN Vq Rc Cc -Hx +zv eE UI Xs @@ -4971,7 +4925,7 @@ hu hu hu hu -qc +bH Bi bU oM @@ -5325,7 +5279,7 @@ hu hu hu hu -FC +rh RN EQ Ew From 225bdf74bd6c440a7db366db1eb59781ec5afbc6 Mon Sep 17 00:00:00 2001 From: Mr_DarkBladeS <48252701+MysticalFaceLesS@users.noreply.github.com> Date: Sat, 14 Sep 2024 13:07:18 +0300 Subject: [PATCH 5/7] Added the ability to create character names in Russian & fix Player Panel --- code/__HELPERS/text.dm | 12 ++++++++++++ code/modules/admin/player_panel.dm | 2 +- mod_celadon/fixes/README.md | 3 +++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/code/__HELPERS/text.dm b/code/__HELPERS/text.dm index a96a735a769c..a7dd47029cad 100644 --- a/code/__HELPERS/text.dm +++ b/code/__HELPERS/text.dm @@ -148,6 +148,18 @@ number_of_alphanumeric++ last_char_group = CHARS_DETECTED + // [CELADON-ADD] Добавляем возможность создания имён персонажей на кирилице. + //А .. Я + if(1040 to 1071) + number_of_alphanumeric++ + last_char_group = CHARS_DETECTED + + //а .. я + if(1072 to 1103) + number_of_alphanumeric++ + last_char_group = CHARS_DETECTED + // [/CELADON-ADD] + //0 .. 9 if(48 to 57) number_of_alphanumeric++ diff --git a/code/modules/admin/player_panel.dm b/code/modules/admin/player_panel.dm index cf834c9f9c5d..31ff7972bac1 100644 --- a/code/modules/admin/player_panel.dm +++ b/code/modules/admin/player_panel.dm @@ -2,7 +2,7 @@ if(!check_rights()) return log_admin("[key_name(usr)] checked the player panel.") - var/dat = "Player Panel" + var/dat = "Player Panel" //javascript, the part that does most of the work~ dat += {" diff --git a/mod_celadon/fixes/README.md b/mod_celadon/fixes/README.md index 1735e73873a8..b33a40250da5 100644 --- a/mod_celadon/fixes/README.md +++ b/mod_celadon/fixes/README.md @@ -60,6 +60,9 @@ ID мода: CELADON_FIXES - REMOVE: `code\game\objects\items\kitchen.dm` - Исправляет спрайт ножа. - REMOVE: `code/modules/vending/_vending.dm` - вынос в родителя переменной + +- ADD: `code\__HELPERS\text.dm` - Добавляем возможность создания имён персонажей на кирилице. +- EDIT: `code\modules\admin\player_panel.dm` - Фикс , исправлено отображение кирилицы на F6.