From 00ace33f977fd7584a94308645a804f8b7a53835 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Sun, 27 Oct 2024 13:05:07 +0100 Subject: [PATCH 01/21] maybe --- _maps/shuttles/inteq/inteq_talos.dmm | 1512 +++++++++++++------------- 1 file changed, 759 insertions(+), 753 deletions(-) diff --git a/_maps/shuttles/inteq/inteq_talos.dmm b/_maps/shuttles/inteq/inteq_talos.dmm index 44715cfbfead..ba0e17d31b97 100644 --- a/_maps/shuttles/inteq/inteq_talos.dmm +++ b/_maps/shuttles/inteq/inteq_talos.dmm @@ -2,7 +2,7 @@ "ab" = ( /obj/structure/sign/number/four, /turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/storage/starboard) +/area/ship/crew/dorm/dormtwo) "ae" = ( /obj/structure/cable{ icon_state = "4-8" @@ -193,9 +193,10 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/central) "aV" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/airless, +/obj/structure/catwalk/over, +/obj/structure/closet/crate, +/obj/effect/spawner/random/maintenance/two, +/turf/open/floor/plating, /area/ship/storage/starboard) "bb" = ( /obj/effect/turf_decal/industrial/warning/fulltile, @@ -276,11 +277,8 @@ /turf/open/floor/plasteel/tech, /area/ship/security/armory) "bK" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/mopbucket, -/obj/item/reagent_containers/glass/bucket, -/turf/open/floor/plating/airless, -/area/ship/storage/port) +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/crew/dorm/dormtwo) "bM" = ( /obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, /obj/machinery/door/poddoor{ @@ -350,11 +348,12 @@ /area/ship/engineering) "ck" = ( /obj/effect/turf_decal/industrial/warning/fulltile, -/obj/machinery/door/airlock/hatch{ +/obj/machinery/door/airlock/maintenance/external{ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating/airless, +/obj/effect/mapping_helpers/airlock/locked, +/turf/open/floor/plating, /area/ship/maintenance/port) "cn" = ( /obj/machinery/light/directional/south, @@ -537,12 +536,13 @@ /area/ship/engineering/engine) "dv" = ( /obj/effect/turf_decal/industrial/warning/fulltile, -/obj/machinery/door/airlock/hatch{ +/obj/machinery/door/airlock/maintenance/external{ dir = 4 }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/airless, +/obj/effect/mapping_helpers/airlock/locked, +/turf/open/floor/plating, /area/ship/maintenance/starboard) "dw" = ( /obj/machinery/power/smes/engineering, @@ -552,12 +552,8 @@ /turf/open/floor/plating, /area/ship/engineering) "dD" = ( -/obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/cable{ - icon_state = "0-2" - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/airless, +/obj/machinery/portable_atmospherics/canister/air, +/turf/open/floor/plating, /area/ship/maintenance/starboard) "dE" = ( /obj/structure/chair/comfy/shuttle{ @@ -591,16 +587,8 @@ /turf/open/floor/plasteel/grimy, /area/ship/crew) "ef" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - dir = 4 - }, -/obj/effect/turf_decal/industrial/warning/fulltile, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/mapping_helpers/airlock/abandoned, -/turf/open/floor/plating/airless, +/obj/effect/spawner/random/salvage_machine, +/turf/open/floor/plating, /area/ship/maintenance/starboard) "ej" = ( /obj/machinery/power/smes/shuttle/precharged{ @@ -793,11 +781,7 @@ /turf/open/floor/plasteel/showroomfloor, /area/ship/crew/toilet) "ff" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/airless, +/turf/closed/wall, /area/ship/maintenance/starboard) "fg" = ( /obj/structure/cable{ @@ -824,9 +808,14 @@ /turf/open/floor/plasteel/patterned, /area/ship/cargo) "fj" = ( -/obj/structure/grille, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/airless, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster/random{ + pixel_y = 32 + }, +/turf/open/floor/plating, /area/ship/maintenance/port) "fo" = ( /obj/machinery/camera/autoname{ @@ -845,8 +834,11 @@ /turf/open/floor/circuit/telecomms/mainframe, /area/ship/engineering/communications) "fr" = ( -/obj/item/cigbutt, -/turf/open/floor/plating/airless, +/obj/structure/catwalk/over, +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/floor/plating, /area/ship/storage/port) "fs" = ( /obj/machinery/porta_turret/ship/inteq{ @@ -855,6 +847,13 @@ }, /turf/closed/wall/mineral/plastitanium, /area/ship/engineering/communications) +"fx" = ( +/obj/structure/catwalk/over, +/obj/structure/cable{ + icon_state = "2-5" + }, +/turf/open/floor/plating, +/area/ship/maintenance/port) "fC" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/opaque/yellow/warning{ @@ -887,14 +886,12 @@ /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/maintenance/starboard) "fN" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/spawner/random/maintenance, -/turf/open/floor/plating/airless, +/obj/structure/catwalk/over, +/turf/open/floor/plating, /area/ship/maintenance/port) "fU" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/spawner/random/maintenance, -/turf/open/floor/plating/airless, +/obj/machinery/door/airlock/maintenance, +/turf/open/floor/plating, /area/ship/storage/port) "fX" = ( /obj/structure/chair/stool{ @@ -946,18 +943,24 @@ /turf/open/floor/plasteel/grimy, /area/ship/crew) "gm" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/spawner/random/maintenance, -/turf/open/floor/plating/airless, +/obj/structure/closet/crate/critter, +/mob/living/simple_animal/hostile/hivebot/mechanic{ + desc = "A very rusty maintenance hivebot. Judging by the wires looping haphazardly from its panels and the Inteq shield spray painted on its chassis, somebody, somehow, has hacked it into complacency."; + environment_smash = 0; + faction = list("neutral"); + name = "Heph" + }, +/turf/open/floor/plating, /area/ship/storage/starboard) "go" = ( +/obj/structure/catwalk/over, +/obj/structure/closet/crate, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "8-9" }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/airless, -/area/ship/maintenance/port) +/obj/effect/spawner/random/maintenance/two, +/turf/open/floor/plating, +/area/ship/maintenance/starboard) "gp" = ( /obj/effect/turf_decal/trimline/opaque/yellow/line, /obj/effect/turf_decal/siding/thinplating, @@ -1132,15 +1135,24 @@ /turf/open/floor/engine/fuel, /area/ship/engineering/engine) "hm" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/airless, +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster/random{ + pixel_y = -32 + }, +/turf/open/floor/plating, /area/ship/storage/starboard) "hw" = ( -/obj/machinery/light/small/directional/west, -/turf/open/floor/plating/airless, +/obj/machinery/door/airlock/maintenance{ + dir = 8; + req_ship_access = 0 + }, +/obj/effect/mapping_helpers/airlock/abandoned, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plating, /area/ship/maintenance/starboard) "hz" = ( -/obj/effect/decal/cleanable/dirt/dust, /obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/bottle/cognac{ pixel_x = 7; @@ -1151,8 +1163,9 @@ pixel_x = -4; pixel_y = 6 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/ship/storage/starboard) +/area/ship/crew/dorm/dormtwo) "hG" = ( /obj/structure/railing{ dir = 6; @@ -1259,11 +1272,11 @@ /turf/open/floor/plating, /area/ship/engineering) "ik" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/item/cigbutt, -/obj/effect/spawner/random/maintenance, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/ship/storage/starboard) "im" = ( /obj/structure/railing{ @@ -1278,7 +1291,7 @@ /turf/open/floor/plasteel/tech, /area/ship/engineering) "iu" = ( -/obj/machinery/door/airlock/hatch{ +/obj/machinery/door/airlock/maintenance_hatch{ dir = 4 }, /obj/effect/turf_decal/industrial/warning/fulltile, @@ -1370,12 +1383,12 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/central) "iO" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable{ - icon_state = "1-8" +/obj/machinery/door/airlock/maintenance{ + dir = 8; + req_ship_access = 0 }, -/obj/item/cigbutt, -/turf/open/floor/plating/airless, +/obj/effect/mapping_helpers/airlock/abandoned, +/turf/open/floor/plating, /area/ship/maintenance/port) "iW" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -1438,9 +1451,12 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) "jj" = ( -/obj/structure/sign/warning/vacuum, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/storage/port) +/obj/structure/cable{ + icon_state = "1-9" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/ship/maintenance/port) "jl" = ( /obj/structure/cable{ icon_state = "4-8" @@ -1463,13 +1479,14 @@ /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) "jt" = ( -/obj/effect/turf_decal/industrial/warning/fulltile, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/door/airlock/maintenance_hatch{ - dir = 4 +/obj/structure/catwalk/over, +/obj/structure/cable{ + icon_state = "5-8" }, -/obj/effect/mapping_helpers/airlock/abandoned, -/turf/open/floor/plating/airless, +/obj/structure/sign/poster/random{ + pixel_y = -32 + }, +/turf/open/floor/plating, /area/ship/storage/port) "jw" = ( /obj/structure/cable{ @@ -1625,34 +1642,43 @@ /obj/effect/mapping_helpers/airlock/locked, /turf/open/floor/plating, /area/ship/engineering) +"kc" = ( +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/ship/maintenance/starboard) "kg" = ( /obj/effect/turf_decal/box/corners, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "kh" = ( +/obj/structure/closet/crate/large, +/obj/machinery/portable_atmospherics/canister/oxygen, /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/closet/crate/secure/loot, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/ship/maintenance/starboard) "ks" = ( +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "1-2" }, -/obj/effect/spawner/random/trash/grille_or_waste, -/turf/open/floor/plating/airless, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plating, /area/ship/maintenance/starboard) "kD" = ( /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) "kJ" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating/airless, -/area/ship/storage/port) +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/plating, +/area/ship/maintenance/port) "kM" = ( /obj/structure/cable{ icon_state = "4-8" @@ -1782,26 +1808,17 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/port) "lI" = ( -/obj/structure/grille, -/turf/open/floor/plating/airless, +/turf/closed/wall, /area/ship/storage/starboard) "lM" = ( /obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer2{ - dir = 4 + icon_state = "6-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/advanced_airlock_controller{ - pixel_y = -24 - }, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 1 +/obj/machinery/light_switch{ + pixel_y = 22 }, -/turf/open/floor/plasteel/tech, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark/airless, /area/ship/storage/port) "lO" = ( /obj/structure/cable{ @@ -1847,12 +1864,10 @@ /turf/open/floor/plasteel/tech, /area/ship/engineering/engine) "mh" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/industrial/warning{ - dir = 4 +/obj/structure/sign/warning/vacuum/external{ + pixel_y = 22 }, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/ship/maintenance/starboard) "mi" = ( /obj/effect/turf_decal/trimline/opaque/yellow/line{ @@ -1954,17 +1969,13 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/central) "mI" = ( -/obj/effect/turf_decal/industrial/warning/fulltile, -/obj/machinery/door/airlock/maintenance_hatch{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, +/obj/structure/closet/firecloset, /obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/airlock/abandoned, -/turf/open/floor/plating/airless, -/area/ship/maintenance/starboard) +/obj/structure/sign/poster/random{ + pixel_y = -32 + }, +/turf/open/floor/plating, +/area/ship/storage/starboard) "mJ" = ( /obj/effect/turf_decal/industrial/warning/fulltile, /obj/machinery/atmospherics/pipe/layer_manifold{ @@ -2119,11 +2130,11 @@ /area/ship/hallway/central) "nD" = ( /obj/structure/cable{ - icon_state = "2-8" + icon_state = "4-10" }, /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/airless, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/plating, /area/ship/storage/port) "nE" = ( /obj/structure/grille, @@ -2131,18 +2142,18 @@ /turf/open/floor/plating, /area/ship/storage) "nF" = ( +/obj/structure/cable{ + icon_state = "6-9" + }, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/trash/grille_or_waste, -/turf/open/floor/plating/airless, -/area/ship/storage/port) +/obj/item/cigbutt, +/turf/open/floor/plating, +/area/ship/storage/starboard) "nH" = ( -/obj/machinery/door/airlock/maintenance_hatch, -/obj/effect/turf_decal/industrial/warning/fulltile, -/obj/structure/cable{ - icon_state = "1-2" +/obj/effect/spawner/random/salvage_machine{ + dir = 8 }, -/obj/effect/mapping_helpers/airlock/abandoned, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/ship/storage/port) "nJ" = ( /obj/effect/turf_decal/trimline/opaque/yellow/line{ @@ -2225,8 +2236,9 @@ /turf/open/floor/plasteel/patterned, /area/ship/cargo) "od" = ( -/obj/structure/sign/warning/vacuum/external, -/turf/closed/wall/mineral/plastitanium/nodiagonal, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/abandoned, +/turf/open/floor/plating, /area/ship/maintenance/port) "og" = ( /turf/closed/wall/mineral/plastitanium, @@ -2334,19 +2346,17 @@ /turf/open/floor/carpet/black, /area/ship/crew/dorm) "oD" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/item/trash/popcorn, -/turf/open/floor/plating/airless, +/obj/structure/catwalk/over, +/obj/structure/rack, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, /area/ship/storage/starboard) "oG" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/structure/closet/cardboard, -/obj/effect/spawner/random/maintenance/three, -/turf/open/floor/plating/airless, +/obj/structure/catwalk/over, +/obj/structure/cable{ + icon_state = "2-6" + }, +/turf/open/floor/plating, /area/ship/maintenance/starboard) "oR" = ( /obj/effect/turf_decal/siding/thinplating/dark{ @@ -2359,10 +2369,9 @@ /turf/open/floor/plasteel/tech, /area/ship/security/armory) "oS" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, -/turf/open/floor/plating/airless, +/obj/structure/catwalk/over, +/obj/structure/closet/crate/secure/loot, +/turf/open/floor/plating, /area/ship/storage/starboard) "oT" = ( /obj/structure/cable{ @@ -2404,17 +2413,23 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/central) "oY" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/airless, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/catwalk/over, +/obj/structure/table, +/obj/effect/spawner/random/clothing/gloves, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/plating, /area/ship/storage/port) "pb" = ( -/obj/effect/decal/cleanable/dirt/dust, /obj/machinery/jukebox/boombox{ pixel_x = -7; pixel_y = -11 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/ship/storage/starboard) +/area/ship/crew/dorm/dormtwo) "pf" = ( /obj/structure/cable{ icon_state = "0-4" @@ -2465,11 +2480,11 @@ /turf/open/floor/plasteel/tech, /area/ship/engineering/engine) "pq" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/portable_atmospherics/canister/bz{ - valve_open = 1 +/obj/structure/cable{ + icon_state = "2-8" }, -/turf/open/floor/plating/airless, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, /area/ship/maintenance/port) "pu" = ( /obj/effect/turf_decal/corner/opaque/yellow{ @@ -2508,9 +2523,12 @@ /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) "pG" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/cobweb, -/turf/open/floor/plating/airless, +/obj/structure/reagent_dispensers/foamtank, +/obj/structure/cable{ + icon_state = "4-6" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, /area/ship/storage/starboard) "pL" = ( /obj/structure/table/reinforced, @@ -2634,10 +2652,10 @@ /turf/open/floor/plasteel/showroomfloor, /area/ship/crew/toilet) "qp" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/cobweb, -/obj/effect/spawner/random/trash/grille_or_waste, -/turf/open/floor/plating/airless, +/obj/structure/closet/crate/large, +/obj/item/mop, +/obj/item/pushbroom, +/turf/open/floor/plating, /area/ship/maintenance/port) "qr" = ( /obj/structure/cable{ @@ -2857,7 +2875,7 @@ "rw" = ( /obj/structure/chair/comfy/grey/directional/north, /turf/open/floor/plating, -/area/ship/storage/starboard) +/area/ship/crew/dorm/dormtwo) "rB" = ( /obj/effect/turf_decal/trimline/opaque/yellow/warning, /turf/open/floor/engine/hull/reinforced, @@ -2878,9 +2896,7 @@ /turf/open/floor/plasteel/dark, /area/ship/security) "rN" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/trash/grille_or_waste, -/turf/open/floor/plating/airless, +/turf/closed/wall/mineral/iron, /area/ship/maintenance/starboard) "rP" = ( /obj/structure/cable{ @@ -2941,20 +2957,21 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/storage) "si" = ( -/obj/structure/sign/warning/vacuum, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/storage/starboard) -"sl" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - dir = 4 - }, -/obj/effect/turf_decal/industrial/warning/fulltile, +/obj/structure/catwalk/over, /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plating, +/area/ship/maintenance/starboard) +"sl" = ( +/mob/living/simple_animal/mouse{ + dir = 4 + }, /obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/airlock/abandoned, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/ship/maintenance/port) "sn" = ( /obj/structure/chair/stool{ @@ -2982,6 +2999,16 @@ }, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/central) +"ss" = ( +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/closet/crate, +/obj/effect/spawner/random/maintenance/two, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/ship/storage/starboard) "su" = ( /obj/effect/turf_decal/industrial/warning{ dir = 4 @@ -3016,23 +3043,16 @@ /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) "sC" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/sign/warning/gasmask{ - pixel_y = -32 - }, -/turf/open/floor/plating/airless, +/obj/effect/decal/cleanable/oil, +/turf/open/floor/plating, /area/ship/maintenance/port) "sD" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/spawner/random/trash/grille_or_waste, -/obj/effect/turf_decal/industrial/warning{ - dir = 4 +/obj/structure/catwalk/over, +/obj/structure/sign/warning/vacuum/external{ + pixel_y = -21 }, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/ship/maintenance/port) "sF" = ( /obj/effect/turf_decal/corner/opaque/yellow{ @@ -3155,15 +3175,20 @@ /turf/open/floor/engine/air, /area/ship/engineering/engine) "tf" = ( +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/cable{ - icon_state = "2-8" + icon_state = "1-2" }, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/ship/storage/port) "ti" = ( -/obj/effect/decal/cleanable/cobweb, -/turf/open/floor/plating/airless, -/area/ship/maintenance/starboard) +/obj/structure/cable{ + icon_state = "2-9" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/ship/storage/port) "tp" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 1 @@ -3206,7 +3231,7 @@ "ts" = ( /obj/structure/sign/number/one, /turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/storage/starboard) +/area/ship/crew/dorm/dormtwo) "tu" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 10 @@ -3252,15 +3277,11 @@ /turf/open/floor/plating, /area/ship/engineering) "tK" = ( -/obj/effect/turf_decal/industrial/warning/fulltile, -/obj/machinery/door/airlock/maintenance_hatch{ - dir = 4 - }, +/obj/effect/spawner/random/structure/grille, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "1-2" }, -/obj/effect/mapping_helpers/airlock/abandoned, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/ship/maintenance/port) "tM" = ( /obj/structure/cable{ @@ -3308,22 +3329,15 @@ /turf/open/floor/plasteel/patterned, /area/ship/cargo) "ub" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - dir = 4 - }, -/obj/effect/turf_decal/industrial/warning/fulltile, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/mapping_helpers/airlock/abandoned, -/turf/open/floor/plating/airless, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, /area/ship/storage/starboard) "uc" = ( /obj/structure/sign/poster/contraband/random{ pixel_y = 32 }, /turf/open/floor/carpet, -/area/ship/storage/starboard) +/area/ship/crew/dorm/dormtwo) "ud" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 1 @@ -3356,10 +3370,15 @@ /turf/open/floor/plasteel/tech, /area/ship/crew/cryo) "uo" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/turf/open/floor/plating/airless, +/obj/machinery/door/airlock/maintenance{ + dir = 8; + req_ship_access = 0 + }, +/obj/effect/mapping_helpers/airlock/abandoned, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plating, /area/ship/storage/port) "up" = ( /obj/effect/turf_decal/industrial/traffic{ @@ -3592,6 +3611,10 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/port) +"wh" = ( +/obj/structure/closet/crate/secure/loot, +/turf/open/floor/plating, +/area/ship/maintenance/port) "wp" = ( /obj/effect/turf_decal/box/corners{ dir = 4 @@ -3701,8 +3724,7 @@ /turf/open/floor/plasteel/patterned, /area/ship/cargo) "wU" = ( -/obj/machinery/light/small/directional/east, -/turf/open/floor/plating/airless, +/turf/closed/wall, /area/ship/storage/port) "wY" = ( /obj/machinery/light/directional/east, @@ -3855,12 +3877,7 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/central) "xG" = ( -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/ship/maintenance/port) "xI" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, @@ -3896,7 +3913,10 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, -/obj/structure/filingcabinet/chestdrawer, +/obj/structure/filingcabinet/chestdrawer{ + dir = 4; + pixel_x = 7 + }, /obj/item/radio/intercom/directional/west{ freerange = 1; freqlock = 1; @@ -4048,10 +4068,13 @@ /turf/open/floor/plating, /area/ship/engineering) "yP" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/structure/catwalk/over, +/obj/structure/closet/crate/engineering, +/obj/item/stack/sheet/plastic/twenty, +/obj/structure/sign/poster/random{ + pixel_x = 32 }, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/ship/maintenance/starboard) "yS" = ( /obj/structure/cable{ @@ -4068,21 +4091,19 @@ /turf/open/floor/plasteel/dark, /area/ship/security) "yU" = ( -/obj/effect/turf_decal/industrial/warning/fulltile, -/obj/machinery/door/airlock/maintenance_hatch{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, +/obj/structure/closet/crate/chem, +/obj/item/reagent_containers/glass/bottle/potass_iodide, /obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/airlock/abandoned, -/turf/open/floor/plating/airless, -/area/ship/maintenance/port) +/turf/open/floor/plating, +/area/ship/storage/port) "zg" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/spawner/random/trash/grille_or_waste, -/turf/open/floor/plating/airless, +/obj/structure/closet/crate, +/obj/effect/spawner/random/maintenance/two, +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster/random{ + pixel_y = 32 + }, +/turf/open/floor/plating, /area/ship/maintenance/port) "zh" = ( /obj/machinery/holopad/emergency/command, @@ -4157,10 +4178,7 @@ /turf/open/floor/plasteel/dark, /area/ship/engineering/communications) "zB" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/closet/crate/trashcart, -/obj/effect/spawner/random/maintenance, -/turf/open/floor/plating/airless, +/turf/closed/wall/mineral/iron, /area/ship/storage/port) "zE" = ( /obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, @@ -4196,10 +4214,15 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) "zL" = ( +/obj/machinery/door/airlock/maintenance{ + dir = 8; + req_ship_access = 0 + }, +/obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/cable{ - icon_state = "2-4" + icon_state = "9-10" }, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/ship/maintenance/port) "zR" = ( /obj/machinery/firealarm/directional/south, @@ -4235,10 +4258,10 @@ /turf/open/floor/plasteel/grimy, /area/ship/crew) "Aa" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/spawner/random/trash/grille_or_waste, -/turf/open/floor/plating/airless, +/obj/structure/catwalk/over, +/obj/structure/mopbucket, +/obj/item/reagent_containers/glass/bucket, +/turf/open/floor/plating, /area/ship/storage/port) "Ag" = ( /obj/structure/chair/stool{ @@ -4372,14 +4395,12 @@ /turf/open/floor/engine/hull/reinforced, /area/ship/cargo) "AL" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/cobweb, -/obj/structure/closet/crate/large, -/obj/item/mop, -/obj/item/pushbroom, -/turf/open/floor/plating/airless, -/area/ship/storage/port) +/obj/structure/catwalk/over, +/obj/structure/sign/poster/random{ + pixel_x = -32 + }, +/turf/open/floor/plating, +/area/ship/maintenance/port) "AO" = ( /obj/machinery/suit_storage_unit/inherit/industrial, /obj/item/clothing/suit/space/hardsuit/engine, @@ -4462,18 +4483,12 @@ /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/crew) "Bz" = ( -/obj/effect/turf_decal/techfloor{ - dir = 1 +/obj/structure/cable{ + icon_state = "1-6" }, /obj/effect/decal/cleanable/dirt, -/obj/structure/sign/poster/official/safety_internals{ - pixel_y = 32 - }, -/obj/machinery/suit_storage_unit/inherit, -/obj/item/clothing/suit/space/inteq, -/obj/item/clothing/head/helmet/space/inteq, -/turf/open/floor/plasteel/tech/grid, -/area/ship/storage/port) +/turf/open/floor/plating, +/area/ship/maintenance/starboard) "BJ" = ( /obj/structure/cable{ icon_state = "4-8" @@ -4498,15 +4513,13 @@ /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) "BN" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/trash/grille_or_waste, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/ship/storage/starboard) "BP" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, -/turf/open/floor/plating/airless, +/obj/structure/closet/crate, +/obj/effect/spawner/random/maintenance/two, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, /area/ship/maintenance/port) "BS" = ( /obj/effect/turf_decal/box/corners{ @@ -4544,6 +4557,12 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/central) +"Ce" = ( +/obj/effect/spawner/random/salvage_machine{ + dir = 1 + }, +/turf/open/floor/plating, +/area/ship/storage/port) "Cp" = ( /obj/effect/spawner/random/vending/cola, /obj/structure/sign/poster/contraband/inteq{ @@ -4606,7 +4625,7 @@ /obj/item/book/random, /obj/item/book/random, /turf/open/floor/plating, -/area/ship/storage/starboard) +/area/ship/crew/dorm/dormtwo) "CK" = ( /obj/effect/turf_decal/industrial/warning{ dir = 8 @@ -4617,9 +4636,9 @@ /turf/open/floor/plasteel/tech, /area/ship/crew/cryo) "CN" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/portable_atmospherics/canister/toxins, -/turf/open/floor/plating/airless, +/obj/structure/closet, +/obj/effect/spawner/random/maintenance/two, +/turf/open/floor/plating, /area/ship/maintenance/port) "CP" = ( /obj/effect/turf_decal/borderfloor, @@ -4783,7 +4802,7 @@ /area/ship/cargo) "DO" = ( /turf/closed/wall/mineral/plastitanium, -/area/ship/storage/starboard) +/area/ship/crew/dorm/dormtwo) "DQ" = ( /obj/effect/turf_decal/borderfloor{ dir = 1 @@ -4828,17 +4847,21 @@ /area/ship/crew/canteen) "Ev" = ( /obj/structure/cable{ - icon_state = "1-8" + icon_state = "4-8" }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/cigbutt, -/turf/open/floor/plating/airless, -/area/ship/maintenance/starboard) +/obj/structure/cable{ + icon_state = "2-6" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/ship/maintenance/port) "Ex" = ( /obj/structure/cable{ - icon_state = "1-4" + icon_state = "1-10" }, -/turf/open/floor/plating/airless, +/obj/effect/decal/cleanable/dirt, +/obj/item/cigbutt, +/turf/open/floor/plating, /area/ship/storage/port) "EC" = ( /obj/structure/window/reinforced/survival_pod, @@ -4921,14 +4944,11 @@ "Ff" = ( /obj/structure/sign/number/nine, /turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/storage/starboard) +/area/ship/crew/dorm/dormtwo) "Fh" = ( -/obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/cable{ - icon_state = "0-2" - }, -/obj/item/cigbutt, -/turf/open/floor/plating/airless, +/obj/structure/closet/crate/secure/loot, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, /area/ship/storage/port) "Fi" = ( /obj/structure/catwalk, @@ -4947,8 +4967,7 @@ /area/ship/external/dark) "Fl" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/ship/maintenance/starboard) "Fm" = ( /obj/structure/cable{ @@ -5015,6 +5034,13 @@ /obj/effect/turf_decal/corner/opaque/yellow, /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) +"Fz" = ( +/obj/structure/catwalk/over, +/obj/structure/cable{ + icon_state = "6-8" + }, +/turf/open/floor/plating, +/area/ship/maintenance/port) "FC" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/opaque/yellow/warning{ @@ -5043,26 +5069,14 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/crew/cryo) "FO" = ( -/obj/structure/closet/emcloset/empty{ - anchored = 1; - can_be_unanchored = 1; - name = "oxygen closet" +/obj/structure/catwalk/over, +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/item/tank/internals/plasmaman/full, -/obj/item/tank/internals/plasmaman/full, -/obj/item/tank/internals/oxygen, -/obj/item/tank/internals/oxygen, -/obj/item/tank/internals/oxygen, -/obj/item/tank/internals/oxygen, -/obj/item/tank/internals/oxygen, -/obj/item/tank/internals/oxygen, -/obj/effect/turf_decal/techfloor{ - dir = 1 +/obj/structure/sign/poster/random{ + pixel_y = 32 }, -/obj/machinery/light/small/directional/east, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/tech/grid, +/turf/open/floor/plating, /area/ship/storage/starboard) "FV" = ( /obj/structure/catwalk/over/plated_catwalk, @@ -5093,7 +5107,7 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/port) "Gl" = ( -/obj/machinery/door/airlock/hatch{ +/obj/machinery/door/airlock/maintenance_hatch{ dir = 4 }, /obj/effect/turf_decal/industrial/warning/fulltile, @@ -5116,10 +5130,16 @@ /turf/open/floor/plasteel/tech, /area/ship/hallway/central) "Gq" = ( -/obj/machinery/light/small/directional/north, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/turf/open/floor/plating/airless, +/obj/structure/closet/emcloset/anchored{ + populate = 0 + }, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/turf/open/floor/plating, /area/ship/maintenance/starboard) "Gr" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/incinerator_input{ @@ -5127,6 +5147,10 @@ }, /turf/open/floor/engine/vacuum, /area/ship/engineering/engine) +"Gs" = ( +/obj/effect/decal/cleanable/oil, +/turf/open/floor/plating, +/area/ship/maintenance/starboard) "Gt" = ( /obj/effect/turf_decal/siding/thinplating/dark, /obj/effect/turf_decal/trimline/opaque/yellow/line{ @@ -5147,17 +5171,12 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/security/armory) "Gu" = ( -/obj/effect/turf_decal/techfloor{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/sign/poster/official/safety_internals{ - pixel_y = 32 +/obj/structure/catwalk/over, +/obj/structure/cable{ + icon_state = "4-6" }, -/obj/machinery/suit_storage_unit/inherit, -/obj/item/clothing/suit/space/inteq, -/obj/item/clothing/head/helmet/space/inteq, -/turf/open/floor/plasteel/tech/grid, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/plating, /area/ship/storage/starboard) "Gv" = ( /obj/effect/turf_decal/industrial/traffic{ @@ -5187,6 +5206,18 @@ }, /turf/open/floor/plasteel/telecomms_floor, /area/ship/storage) +"GA" = ( +/obj/structure/catwalk/over, +/obj/structure/filingcabinet/chestdrawer/wheeled, +/obj/effect/spawner/random/bureaucracy/folder, +/obj/effect/spawner/random/bureaucracy/folder, +/obj/effect/spawner/random/bureaucracy/folder, +/obj/effect/spawner/random/bureaucracy/pen, +/obj/structure/cable{ + icon_state = "2-10" + }, +/turf/open/floor/plating, +/area/ship/storage/port) "GG" = ( /obj/machinery/light/small/directional/west, /obj/structure/cable{ @@ -5208,12 +5239,12 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/port) "GQ" = ( -/obj/structure/cable{ - icon_state = "1-8" +/obj/effect/spawner/random/salvage_machine, +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster/random{ + pixel_y = 32 }, -/obj/effect/decal/cleanable/blood/old, -/obj/effect/spawner/random/trash/grille_or_waste, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/ship/maintenance/starboard) "GR" = ( /obj/structure/bed, @@ -5241,10 +5272,7 @@ /turf/open/floor/plating, /area/ship/engineering) "Hc" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, -/turf/open/floor/plating/airless, +/turf/closed/wall, /area/ship/maintenance/port) "He" = ( /obj/effect/turf_decal/techfloor{ @@ -5267,10 +5295,10 @@ /turf/open/floor/plasteel/dark, /area/ship/security) "Hj" = ( +/obj/structure/table, +/obj/effect/spawner/random/maintenance, /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/robot_debris, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/ship/storage/port) "Hl" = ( /obj/machinery/computer/telecomms/server{ @@ -5285,9 +5313,8 @@ /area/ship/engineering/communications) "Ho" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/spawner/random/trash/grille_or_waste, -/turf/open/floor/plating/airless, +/obj/effect/decal/cleanable/oil, +/turf/open/floor/plating, /area/ship/storage/starboard) "Hp" = ( /obj/structure/cable{ @@ -5367,8 +5394,11 @@ /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "If" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/airless, +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster/random{ + pixel_x = -32 + }, +/turf/open/floor/plating, /area/ship/maintenance/starboard) "Io" = ( /obj/structure/cable/yellow{ @@ -5432,19 +5462,7 @@ /turf/open/floor/plasteel/tech, /area/ship/security/armory) "IB" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/closet/crate/critter, -/mob/living/simple_animal/hostile/hivebot/mechanic{ - desc = "A very rusty maintenance hivebot. Judging by the wires looping haphazardly from its panels and the Inteq shield spray painted on its chassis, somebody, somehow, has hacked it into complacency."; - environment_smash = 0; - faction = list("neutral"); - name = "Heph" - }, -/obj/item/circuitboard/computer/message_monitor, -/obj/item/circuitboard/machine/telecomms/message_server, -/obj/item/circuitboard/machine/pacman, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/ship/maintenance/starboard) "ID" = ( /obj/machinery/door/airlock/public/glass{ @@ -5465,9 +5483,9 @@ /turf/open/floor/plasteel/tech, /area/ship/crew/cryo) "IF" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/firecloset, -/turf/open/floor/plating/airless, +/obj/structure/closet/crate/large, +/obj/machinery/portable_atmospherics/canister/toxins, +/turf/open/floor/plating, /area/ship/maintenance/port) "IJ" = ( /obj/effect/turf_decal/corner/opaque/yellow{ @@ -5522,8 +5540,11 @@ /turf/open/floor/engine/vacuum, /area/ship/engineering/engine) "Jk" = ( -/obj/effect/spawner/random/maintenance, -/turf/open/floor/plating/airless, +/obj/structure/catwalk/over, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plating, /area/ship/maintenance/starboard) "Jo" = ( /obj/structure/cable{ @@ -5571,6 +5592,16 @@ }, /turf/open/floor/plasteel/dark, /area/ship/security) +"Jv" = ( +/obj/structure/closet/crate/science, +/obj/effect/spawner/random/maintenance, +/obj/item/circuitboard/computer/crew, +/obj/structure/cable{ + icon_state = "5-9" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/ship/maintenance/starboard) "Jz" = ( /obj/effect/turf_decal/trimline/opaque/yellow/line, /obj/effect/turf_decal/siding/thinplating, @@ -5590,12 +5621,10 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/port) "JI" = ( -/obj/effect/turf_decal/industrial/warning/fulltile, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/door/airlock/maintenance_hatch, +/obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/abandoned, -/turf/open/floor/plating/airless, -/area/ship/storage/port) +/turf/open/floor/plating, +/area/ship/storage/starboard) "JP" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 1 @@ -5720,15 +5749,10 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/central) "KB" = ( -/obj/machinery/light/small/directional/north, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/cable{ - icon_state = "0-2" - }, -/turf/open/floor/plating/airless, -/area/ship/maintenance/port) +/obj/structure/closet, +/obj/effect/spawner/random/maintenance/two, +/turf/open/floor/plating, +/area/ship/storage/starboard) "KF" = ( /obj/structure/railing, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -5739,19 +5763,9 @@ }, /area/ship/cargo) "KQ" = ( -/obj/effect/turf_decal/industrial/warning/fulltile, -/obj/machinery/door/airlock/hatch{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, -/turf/open/floor/plasteel/tech, -/area/ship/storage/starboard) +/obj/structure/catwalk/over, +/turf/open/floor/plating, +/area/ship/storage/port) "KR" = ( /obj/structure/cable{ icon_state = "1-2" @@ -5767,10 +5781,11 @@ /area/ship/engineering) "KT" = ( /obj/structure/cable{ - icon_state = "1-8" + icon_state = "4-8" }, -/turf/open/floor/plating/airless, -/area/ship/storage/starboard) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/ship/maintenance/starboard) "KY" = ( /obj/effect/turf_decal/borderfloor, /obj/machinery/door/airlock/public/glass{ @@ -5840,13 +5855,13 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/engineering/engine) "LF" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - welded = 1 +/obj/structure/cable{ + icon_state = "4-9" }, -/obj/effect/turf_decal/industrial/warning/fulltile, -/obj/effect/mapping_helpers/airlock/locked, -/turf/open/floor/plating/airless, -/area/ship/maintenance/port) +/obj/machinery/light/dim/directional/south, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark/airless, +/area/ship/storage/port) "LJ" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -5974,20 +5989,11 @@ /turf/open/floor/plasteel/grimy, /area/ship/crew) "Mn" = ( +/obj/structure/catwalk/over, /obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 1 + icon_state = "8-9" }, -/obj/item/radio/intercom/directional/south, -/turf/open/floor/plasteel/tech, +/turf/open/floor/plating, /area/ship/storage/starboard) "Mx" = ( /obj/effect/turf_decal/siding/thinplating/dark{ @@ -6037,10 +6043,15 @@ /turf/open/floor/plasteel/dark, /area/ship/security) "MR" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/closet/crate/secure/loot, -/turf/open/floor/plating/airless, +/obj/effect/spawner/random/decoration/paint{ + pixel_y = 11; + pixel_x = 5 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, /area/ship/storage/port) "MS" = ( /obj/structure/cable{ @@ -6098,20 +6109,19 @@ /turf/open/floor/plasteel/grimy, /area/ship/crew) "Nf" = ( -/obj/structure/cable{ - icon_state = "2-8" - }, -/turf/open/floor/plating/airless, +/turf/closed/wall/rust, /area/ship/storage/starboard) "Ng" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/cobweb, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/ship/storage/starboard) +/area/ship/crew/dorm/dormtwo) "Ni" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/portable_atmospherics/canister/toxins, -/turf/open/floor/plating/airless, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/decal/cleanable/dirt, +/obj/item/cigbutt, +/turf/open/floor/plating, /area/ship/maintenance/starboard) "Nj" = ( /obj/effect/turf_decal/box/corners, @@ -6158,11 +6168,12 @@ /turf/open/floor/plasteel/tech, /area/ship/hallway/central) "NF" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, +/obj/structure/closet/cardboard, +/obj/effect/spawner/random/entertainment/plushie, +/obj/effect/spawner/random/entertainment/plushie, +/obj/effect/spawner/random/entertainment/plushie, /obj/effect/spawner/random/maintenance, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/ship/storage/port) "NK" = ( /turf/open/floor/engine/air, @@ -6306,10 +6317,7 @@ /turf/open/floor/plasteel/dark, /area/ship/security) "OP" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/spawner/random/trash/grille_or_waste, -/turf/open/floor/plating/airless, +/turf/closed/wall/mineral/iron, /area/ship/maintenance/port) "Pf" = ( /obj/structure/catwalk, @@ -6357,12 +6365,9 @@ /turf/open/floor/carpet/black, /area/ship/crew/dorm) "Pt" = ( -/obj/machinery/light/small/directional/west, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt/dust, /obj/effect/spawner/random/maintenance/three, -/obj/structure/closet/crate, -/turf/open/floor/plating/airless, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, /area/ship/storage/starboard) "Py" = ( /obj/structure/cable{ @@ -6507,16 +6512,7 @@ /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) "Qy" = ( -/obj/effect/turf_decal/industrial/warning/fulltile, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/door_assembly/door_assembly_mhatch{ - anchored = 1; - can_be_unanchored = 1; - dir = 4 - }, -/turf/open/floor/plating/airless, +/turf/closed/wall/rust, /area/ship/storage/port) "QC" = ( /obj/structure/chair/stool{ @@ -6561,7 +6557,7 @@ "QS" = ( /obj/structure/sign/number/eight, /turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/storage/starboard) +/area/ship/crew/dorm/dormtwo) "QU" = ( /obj/machinery/airalarm/directional/south, /obj/machinery/atmospherics/components/unary/thermomachine/freezer{ @@ -6575,22 +6571,25 @@ /turf/open/floor/plasteel/tech, /area/ship/engineering/engine) "QV" = ( +/obj/structure/rack, +/obj/effect/spawner/random/maintenance, /obj/structure/cable{ - icon_state = "2-8" - }, -/obj/structure/cable{ - icon_state = "4-8" + icon_state = "5-9" }, -/turf/open/floor/plating/airless, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, /area/ship/storage/starboard) "QW" = ( +/obj/machinery/door/airlock/maintenance{ + dir = 8; + req_ship_access = 0 + }, +/obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/cable{ - icon_state = "2-4" + icon_state = "4-8" }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/airless, -/area/ship/maintenance/starboard) +/turf/open/floor/plating, +/area/ship/maintenance/port) "QZ" = ( /obj/machinery/power/shieldwallgen/atmos/roundstart{ dir = 8; @@ -6633,30 +6632,24 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/central) "Ri" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/trash/grille_or_waste, -/turf/open/floor/plating/airless, -/area/ship/maintenance/port) -"Rp" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/airless, -/area/ship/storage/starboard) -"Rs" = ( -/obj/effect/turf_decal/industrial/warning/fulltile, /obj/structure/cable{ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/obj/structure/door_assembly/door_assembly_mhatch{ - anchored = 1; - can_be_unanchored = 1; - dir = 4 +/turf/open/floor/plating, +/area/ship/maintenance/port) +"Rp" = ( +/obj/structure/catwalk/over, +/obj/structure/sign/poster/random{ + pixel_y = -32 }, -/turf/open/floor/plating/airless, -/area/ship/maintenance/starboard) +/turf/open/floor/plating, +/area/ship/storage/starboard) +"Rs" = ( +/obj/structure/table, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/ship/storage/starboard) "Ry" = ( /obj/structure/cable{ icon_state = "0-4" @@ -6710,27 +6703,25 @@ /turf/open/floor/carpet/black, /area/ship/crew/dorm) "RT" = ( -/turf/open/floor/plating/airless, +/obj/structure/table, +/obj/effect/spawner/random/maintenance, +/obj/structure/sign/poster/random{ + pixel_x = 32 + }, +/turf/open/floor/plating, /area/ship/storage/port) "RV" = ( -/obj/machinery/light/small/directional/north, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/plasma, -/obj/effect/spawner/random/maintenance, +/obj/effect/spawner/random/salvage_machine{ + dir = 8 + }, +/obj/structure/sign/poster/random{ + pixel_x = 32 + }, /turf/open/floor/plating, /area/ship/maintenance/port) "RY" = ( -/obj/effect/turf_decal/industrial/warning/fulltile, -/obj/machinery/door/airlock/hatch{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, -/turf/open/floor/plasteel/tech, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, /area/ship/storage/port) "Si" = ( /obj/effect/turf_decal/trimline/opaque/yellow/line{ @@ -6833,10 +6824,9 @@ /turf/open/floor/plating, /area/ship/engineering/engine) "SH" = ( -/obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/cable, -/turf/open/floor/plating/airless, -/area/ship/storage/starboard) +/obj/structure/closet/firecloset, +/turf/open/floor/plating, +/area/ship/storage/port) "SI" = ( /obj/structure/cable{ icon_state = "2-8" @@ -6935,6 +6925,19 @@ /obj/effect/turf_decal/box/corners, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) +"Ts" = ( +/obj/structure/closet/crate/secure/weapon, +/obj/item/ammo_box/magazine/toy/pistol, +/obj/item/ammo_box/magazine/toy/pistol, +/obj/item/gun/ballistic/automatic/toy/pistol{ + spawn_no_ammo = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster/random{ + pixel_y = -32 + }, +/turf/open/floor/plating, +/area/ship/maintenance/port) "TA" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/plasteel/grimy, @@ -6957,21 +6960,18 @@ /area/ship/engineering/engine) "TE" = ( /obj/structure/cable{ - icon_state = "1-8" + icon_state = "5-8" }, +/obj/effect/decal/cleanable/oil, +/turf/open/floor/plating, +/area/ship/storage/port) +"TH" = ( /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plating/airless, -/area/ship/storage/port) -"TH" = ( -/obj/effect/turf_decal/industrial/warning/fulltile, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/door/airlock/maintenance_hatch, -/obj/effect/mapping_helpers/airlock/abandoned, -/turf/open/floor/plating/airless, -/area/ship/maintenance/starboard) +/obj/effect/decal/cleanable/oil, +/turf/open/floor/plating, +/area/ship/storage/starboard) "TK" = ( /obj/structure/window/reinforced{ dir = 4 @@ -7005,12 +7005,14 @@ "TN" = ( /obj/structure/falsewall/plastitanium, /turf/open/floor/plating, -/area/ship/storage/starboard) +/area/ship/crew/dorm/dormtwo) "TO" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/vomit/old, -/turf/open/floor/plating/airless, -/area/ship/storage/starboard) +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/table, +/obj/effect/spawner/random/maintenance, +/obj/structure/cable, +/turf/open/floor/plating, +/area/ship/maintenance/port) "TS" = ( /obj/structure/cable{ icon_state = "4-8" @@ -7039,9 +7041,14 @@ /turf/open/floor/plasteel/grimy, /area/ship/crew) "Ub" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/crate/secure/loot, -/turf/open/floor/plating/airless, +/obj/machinery/door/airlock/maintenance{ + dir = 8; + req_ship_access = 0 + }, +/obj/structure/cable{ + icon_state = "6-8" + }, +/turf/open/floor/plating, /area/ship/storage/starboard) "Uc" = ( /obj/structure/cable{ @@ -7125,28 +7132,27 @@ /turf/open/floor/plasteel/grimy, /area/ship/crew) "Uq" = ( +/obj/structure/catwalk/over, /obj/structure/cable{ icon_state = "4-8" }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/advanced_airlock_controller{ - pixel_y = -24 - }, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 1 +/obj/machinery/light/small/directional/south, +/obj/machinery/light_switch{ + dir = 1; + pixel_y = -19; + pixel_x = -8 }, -/turf/open/floor/plasteel/tech, +/turf/open/floor/plating, /area/ship/storage/starboard) "Uy" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/spawner/random/trash/grille_or_waste, -/turf/open/floor/plating/airless, +/obj/machinery/door/airlock/maintenance{ + dir = 8; + req_ship_access = 0 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plating, /area/ship/storage/port) "UD" = ( /turf/closed/wall/mineral/plastitanium, @@ -7205,9 +7211,8 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/port) "UQ" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/reagent_dispensers/watertank, -/turf/open/floor/plating/airless, +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/plating, /area/ship/storage/port) "Ve" = ( /obj/effect/turf_decal/siding/thinplating/dark{ @@ -7259,20 +7264,24 @@ /turf/open/floor/plasteel/tech, /area/ship/engineering/engine) "Vp" = ( -/obj/machinery/light/small/directional/south, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/airless, -/area/ship/storage/port) +/obj/structure/cable{ + icon_state = "4-10" + }, +/obj/structure/cable{ + icon_state = "9-10" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/ship/storage/starboard) "Vr" = ( /obj/item/trash/boritos, /turf/open/floor/plasteel/grimy, /area/ship/crew) "Vs" = ( /obj/structure/cable{ - icon_state = "1-2" + icon_state = "1-4" }, -/obj/structure/grille, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/ship/maintenance/port) "Vz" = ( /obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, @@ -7351,8 +7360,11 @@ /turf/open/floor/plasteel/dark, /area/ship/security) "Wd" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/airless, +/obj/structure/closet/crate/trashcart, +/obj/effect/spawner/random/trash/crushed_can, +/obj/effect/spawner/random/trash/crushed_can, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, /area/ship/maintenance/port) "We" = ( /obj/structure/cable{ @@ -7380,25 +7392,13 @@ /turf/open/floor/plating, /area/ship/security) "Wg" = ( -/obj/structure/sign/warning/vacuum/external, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/maintenance/starboard) -"Wh" = ( /obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 1 + icon_state = "5-8" }, -/obj/item/radio/intercom/directional/south, -/turf/open/floor/plasteel/tech, +/turf/open/floor/plating, +/area/ship/storage/port) +"Wh" = ( +/turf/open/floor/plasteel/dark/airless, /area/ship/storage/port) "Wp" = ( /obj/structure/window/reinforced{ @@ -7415,9 +7415,12 @@ /area/ship/security/armory) "Wr" = ( /obj/machinery/light/small/directional/north, -/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/spawner/random/entertainment/plushie{ + pixel_y = 12 + }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet, -/area/ship/storage/starboard) +/area/ship/crew/dorm/dormtwo) "Wz" = ( /obj/machinery/computer/helm{ dir = 8 @@ -7486,6 +7489,12 @@ }, /turf/closed/wall/mineral/plastitanium, /area/ship/storage) +"WP" = ( +/obj/structure/catwalk/over, +/obj/structure/closet/cardboard, +/obj/effect/spawner/random/maintenance/two, +/turf/open/floor/plating, +/area/ship/maintenance/starboard) "WR" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -7591,9 +7600,11 @@ /turf/open/floor/engine/hull/reinforced/interior, /area/ship/engineering/engine) "Yq" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/airless, +/obj/structure/catwalk/over, +/obj/structure/sign/poster/random{ + pixel_y = 32 + }, +/turf/open/floor/plating, /area/ship/maintenance/port) "Yt" = ( /obj/effect/turf_decal/corner/opaque/yellow{ @@ -7653,9 +7664,19 @@ /obj/item/flashlight/lamp/green, /turf/open/floor/carpet/black, /area/ship/crew/dorm) +"YD" = ( +/obj/machinery/door/airlock/maintenance{ + dir = 8; + req_ship_access = 0 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/ship/storage/starboard) "YI" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating/airless, +/obj/structure/catwalk/over, +/turf/open/floor/plating, /area/ship/storage/starboard) "YK" = ( /obj/structure/cable{ @@ -7666,31 +7687,32 @@ /turf/open/floor/plasteel/dark, /area/ship/storage) "YU" = ( -/obj/effect/turf_decal/industrial/warning/fulltile, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/door/airlock/maintenance_hatch{ - dir = 4 - }, -/obj/effect/mapping_helpers/airlock/abandoned, -/turf/open/floor/plating/airless, +/obj/structure/catwalk/over, +/obj/structure/closet/crate/large, +/obj/effect/spawner/random/maintenance/three, +/turf/open/floor/plating, /area/ship/storage/starboard) "YX" = ( -/obj/structure/grille, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/airless, +/obj/machinery/door/airlock/maintenance{ + dir = 8; + req_ship_access = 0 + }, +/obj/effect/mapping_helpers/airlock/abandoned, +/obj/structure/cable{ + icon_state = "4-10" + }, +/turf/open/floor/plating, /area/ship/maintenance/starboard) "YZ" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/spawner/random/trash/grille_or_waste, -/turf/open/floor/plating/airless, +/obj/structure/closet, +/obj/effect/spawner/random/maintenance/two, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, /area/ship/maintenance/starboard) "Zb" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/garbage, -/turf/open/floor/plating/airless, +/obj/structure/table, +/obj/effect/spawner/random/entertainment/musical_instrument, +/turf/open/floor/plating, /area/ship/maintenance/port) "Zc" = ( /obj/machinery/status_display/shuttle{ @@ -7726,9 +7748,7 @@ /turf/open/floor/plasteel/grimy, /area/ship/crew/dorm) "Ze" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/closet/firecloset, -/turf/open/floor/plating/airless, +/turf/closed/wall/rust, /area/ship/maintenance/starboard) "Zj" = ( /obj/effect/turf_decal/trimline/opaque/yellow/line, @@ -7739,34 +7759,18 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/port) "Zk" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt/dust, /obj/structure/bed, /obj/item/bedsheet/hos{ name = "vanguard's spare bedsheet" }, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/ship/storage/starboard) +/area/ship/crew/dorm/dormtwo) "Zn" = ( -/obj/structure/closet/emcloset/empty{ - anchored = 1; - can_be_unanchored = 1; - name = "oxygen closet" - }, -/obj/item/tank/internals/plasmaman/full, -/obj/item/tank/internals/plasmaman/full, -/obj/item/tank/internals/oxygen, -/obj/item/tank/internals/oxygen, -/obj/item/tank/internals/oxygen, -/obj/item/tank/internals/oxygen, -/obj/item/tank/internals/oxygen, -/obj/item/tank/internals/oxygen, -/obj/effect/turf_decal/techfloor{ - dir = 1 - }, -/obj/machinery/light/small/directional/east, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/tech/grid, +/obj/structure/rack, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plasteel/dark/airless, /area/ship/storage/port) "Zo" = ( /obj/machinery/light/small/directional/north, @@ -7879,19 +7883,21 @@ /turf/open/floor/circuit/telecomms/mainframe, /area/ship/engineering/communications) "ZV" = ( +/obj/structure/cable{ + icon_state = "6-8" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/closet/cardboard, -/obj/effect/spawner/random/maintenance/three, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/ship/storage/port) "ZY" = ( /obj/structure/cable{ - icon_state = "2-4" + icon_state = "4-8" }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/airless, -/area/ship/storage/starboard) +/turf/open/floor/plating, +/area/ship/storage/port) (1,1,1) = {" sw @@ -8987,7 +8993,7 @@ sw sw qz yp -jj +yp Gl yp xj @@ -9002,7 +9008,7 @@ AB sw sw uI -si +uI iu uI gY @@ -9021,9 +9027,9 @@ sw sw sw yp -Bz +wU lM -yp +SH yp yp yp @@ -9040,10 +9046,10 @@ Gu Uq uI uI -uI +bK TN -uI -uI +bK +bK sw sw sw @@ -9057,8 +9063,8 @@ sw vi Zn Wh -yp -AL +LF +wU Aa oY zB @@ -9072,9 +9078,9 @@ sw uI FO Mn -uI +Nf Pt -uI +bK Ng CJ Ff @@ -9089,13 +9095,13 @@ sw sw sw Dw -yp +Zn RY -yp -yp -yp +Wg +fU +KQ jt -yp +zB yp sw sw @@ -9104,11 +9110,11 @@ sw sw sw uI -uI -KQ -uI -TO -uI +YD +Nf +Nf +Nf +bK uc rw ts @@ -9123,13 +9129,13 @@ sw sw sw PF -fU +Qy nD nH -Ex -RT +Qy +GA fr -Vp +zB yp sw sw @@ -9138,11 +9144,11 @@ sw sw sw uI -aV +ik Nf oD oS -uI +bK Wr pb ab @@ -9157,13 +9163,13 @@ sw sw Pf wv -uo -Uy -yp -kJ -RT +Qy Uy -ZV +Qy +Qy +Qy +uo +zB yp sw sw @@ -9173,10 +9179,10 @@ sw sw uI ik -hm +JI YI Rp -uI +bK Zk hz QS @@ -9192,12 +9198,12 @@ sw Pf UD yp -yp -yp +ZV +UQ Qy -yp -yp -yp +yU +TE +Ce yp sw sw @@ -9206,13 +9212,13 @@ sw sw sw uI -uI -uI -uI +TH +lI +aV YU -uI -uI -uI +bK +bK +bK DO sw sw @@ -9227,11 +9233,11 @@ HI sw yp MR -yp +ti tf Ex -nF -bK +RY +RY yp sw sw @@ -9242,10 +9248,10 @@ sw uI Ub lI -ZY -KT -YI -gm +lI +lI +lI +lI uI sw sw @@ -9260,9 +9266,9 @@ sw sw sw yp -Uy -yp -nF +ZY +Fh +wU NF RT Hj @@ -9274,12 +9280,12 @@ sw sw sw uI -uI -uI +BN +nF ub -uI -uI -uI +JI +ub +Rs uI sw sw @@ -9295,11 +9301,11 @@ sw sw yp uo -JI -Fh -TE wU -UQ +wU +wU +wU +wU yp sw sw @@ -9311,7 +9317,7 @@ uI pG BN QV -SH +lI Ho hm uI @@ -9328,12 +9334,12 @@ sw sw sw Pp -Pp -Pp -Pp +Fz +AL +fx tK -Pp -Pp +Vs +kJ Pp sw sw @@ -9341,14 +9347,14 @@ sw sw sw sw -fK -fK -fK +uI +ss +Vp mI -fK -fK -fK -fK +lI +KB +gm +uI sw sw sw @@ -9362,9 +9368,9 @@ sw sw sw Pp -Ri +Hc zL -Vs +Hc Hc Ri IF @@ -9376,12 +9382,12 @@ sw sw sw fK -YZ +Ze hw ff -fK -ti -Ni +ff +ff +ff fK sw sw @@ -9396,12 +9402,12 @@ sw sw sw Pp -Pp +wh sl -Pp -Pp -Pp -Pp +Ts +Hc +QW +OP Pp sw sw @@ -9410,12 +9416,12 @@ sw sw sw fK -If +WP Jk -yP -TH +ff +Fl If -Jk +YZ fK sw sw @@ -9433,7 +9439,7 @@ Pp qp xG BP -Wd +Hc fj Zb Pp @@ -9445,9 +9451,9 @@ sw sw fK oG -If +si ks -fK +Bz IB YZ fK @@ -9465,11 +9471,11 @@ sw Pf Ap Pp -Pp -yU -Pp -Pp -Pp +Hc +Hc +Hc +Ev +TO Pp sw sw @@ -9478,11 +9484,11 @@ sw sw sw fK -fK -fK -Rs -fK -fK +yP +go +rN +Gs +Jv fK sy sw @@ -9500,10 +9506,10 @@ Pf sw Pp zg -go -Pp +xG +od pq -zg +jj Pp sw sw @@ -9513,8 +9519,8 @@ sw sw fK rN -QW -Ev +rN +rN YX Ze fK @@ -9535,7 +9541,7 @@ sw Pp Wd sC -Pp +OP RV CN Pp @@ -9546,11 +9552,11 @@ sw sw sw fK -fK +rN ef -fK -fK -fK +Fl +Ni +dD fK sw sw @@ -9567,10 +9573,10 @@ sw Fi sw Pp -KB +Hc iO -LF -Wd +OP +OP OP Pp sw @@ -9580,10 +9586,10 @@ sw sw sw fK -dD +rN GQ -Jk -If +IB +KT kh fK sw @@ -9603,8 +9609,8 @@ sw aC Pp fN -Pp -Pp +fN +OP Pp Ap sw @@ -9616,8 +9622,8 @@ sw sy fK Gq -If -YZ +Fl +kc fK qt sw @@ -9670,7 +9676,7 @@ sw sw sw Ap -od +Pp ck Pp sw @@ -9685,7 +9691,7 @@ sw sw fK dv -Wg +fK sy sw sw From adc73bde4c5e383f60751840fc2f9d209ae943ce Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Sun, 27 Oct 2024 13:15:06 +0100 Subject: [PATCH 02/21] doesn't work --- _maps/shuttles/inteq/inteq_talos.dmm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/_maps/shuttles/inteq/inteq_talos.dmm b/_maps/shuttles/inteq/inteq_talos.dmm index ba0e17d31b97..066750d2ef2c 100644 --- a/_maps/shuttles/inteq/inteq_talos.dmm +++ b/_maps/shuttles/inteq/inteq_talos.dmm @@ -5209,10 +5209,10 @@ "GA" = ( /obj/structure/catwalk/over, /obj/structure/filingcabinet/chestdrawer/wheeled, -/obj/effect/spawner/random/bureaucracy/folder, -/obj/effect/spawner/random/bureaucracy/folder, -/obj/effect/spawner/random/bureaucracy/folder, -/obj/effect/spawner/random/bureaucracy/pen, +/obj/item/folder, +/obj/item/folder/yellow, +/obj/item/folder/red, +/obj/item/pen/fountain, /obj/structure/cable{ icon_state = "2-10" }, From 4267432f4e4a7064d2c17879dacae333b625eb25 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Sun, 27 Oct 2024 13:16:37 +0100 Subject: [PATCH 03/21] that doesn't work either --- _maps/shuttles/inteq/inteq_talos.dmm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/_maps/shuttles/inteq/inteq_talos.dmm b/_maps/shuttles/inteq/inteq_talos.dmm index 066750d2ef2c..98f9f1827c4d 100644 --- a/_maps/shuttles/inteq/inteq_talos.dmm +++ b/_maps/shuttles/inteq/inteq_talos.dmm @@ -6928,10 +6928,7 @@ "Ts" = ( /obj/structure/closet/crate/secure/weapon, /obj/item/ammo_box/magazine/toy/pistol, -/obj/item/ammo_box/magazine/toy/pistol, -/obj/item/gun/ballistic/automatic/toy/pistol{ - spawn_no_ammo = 1 - }, +/obj/item/gun/ballistic/automatic/toy/pistol, /obj/effect/decal/cleanable/dirt, /obj/structure/sign/poster/random{ pixel_y = -32 From bd0b6599c3c4bd5550d33f869a798880cdb14d13 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Sun, 27 Oct 2024 17:54:05 +0100 Subject: [PATCH 04/21] yea --- .../independent/independent_scarab.dmm | 202 ++++-- _maps/shuttles/inteq/inteq_talos.dmm | 573 ++++++++++++------ 2 files changed, 541 insertions(+), 234 deletions(-) diff --git a/_maps/shuttles/independent/independent_scarab.dmm b/_maps/shuttles/independent/independent_scarab.dmm index 83af7832fd56..79aaae6086e0 100644 --- a/_maps/shuttles/independent/independent_scarab.dmm +++ b/_maps/shuttles/independent/independent_scarab.dmm @@ -23,6 +23,12 @@ }, /obj/effect/decal/cleanable/dirt, /obj/item/radio/intercom/directional/west, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, /turf/open/floor/plasteel/dark/airless, /area/ship/maintenance/port) "as" = ( @@ -88,8 +94,13 @@ /turf/closed/wall/mineral/plastitanium, /area/ship/crew/cryo) "aU" = ( -/turf/closed/wall/mineral/iron, -/area/ship/maintenance/port) +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/plating, +/area/ship/maintenance/fore) "bb" = ( /obj/structure/catwalk/over/plated_catwalk/white, /obj/machinery/shower{ @@ -175,9 +186,6 @@ }, /turf/open/floor/plasteel/dark, /area/ship/security) -"bP" = ( -/turf/closed/wall/rust, -/area/ship/maintenance/fore) "ca" = ( /obj/effect/turf_decal/box/corners{ dir = 8 @@ -208,6 +216,12 @@ }, /obj/effect/decal/cleanable/dirt, /obj/item/cigbutt, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, /turf/open/floor/plating, /area/ship/maintenance/port) "ct" = ( @@ -364,13 +378,13 @@ /turf/open/floor/plasteel, /area/ship/cargo) "ex" = ( -/obj/structure/cable/green{ - icon_state = "2-8" - }, /obj/structure/sign/warning/explosives/alt{ pixel_y = 32 }, /obj/effect/decal/cleanable/dirt, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/open/floor/plating, /area/ship/maintenance/fore) "eB" = ( @@ -397,9 +411,6 @@ /turf/open/floor/plating, /area/ship/bridge) "eM" = ( -/obj/structure/cable/green{ - icon_state = "8-9" - }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/ship/maintenance/port) @@ -498,6 +509,7 @@ req_ship_access = 0 }, /obj/effect/mapping_helpers/airlock/locked, +/obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/plating, /area/ship/maintenance/fore) "gp" = ( @@ -549,9 +561,6 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/central) "gR" = ( -/obj/structure/cable/green{ - icon_state = "2-6" - }, /obj/structure/table, /obj/item/storage/toolbox/emergency{ pixel_y = 4 @@ -588,6 +597,9 @@ /obj/structure/closet/crate/large, /obj/machinery/portable_atmospherics/canister/oxygen, /obj/effect/decal/cleanable/dirt, +/obj/machinery/advanced_airlock_controller{ + pixel_y = 24 + }, /turf/open/floor/plating, /area/ship/maintenance/fore) "hn" = ( @@ -615,13 +627,10 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/central) "hV" = ( +/obj/effect/decal/cleanable/dirt, /obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/cable/green{ - icon_state = "1-6" + icon_state = "6-8" }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/ship/maintenance/port) "io" = ( @@ -1011,6 +1020,12 @@ /obj/structure/rack, /obj/effect/spawner/random/maintenance, /obj/machinery/light/dim/directional/south, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/plating, /area/ship/maintenance/port) "lF" = ( @@ -1119,6 +1134,12 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/oil, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/plating, /area/ship/maintenance/port) "nb" = ( @@ -1182,9 +1203,6 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/bridge) "oe" = ( -/obj/structure/cable/green{ - icon_state = "1-5" - }, /obj/structure/reagent_dispensers/foamtank, /turf/open/floor/plating, /area/ship/maintenance/fore) @@ -1312,6 +1330,12 @@ req_ship_access = 0 }, /obj/effect/mapping_helpers/airlock/abandoned, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/plating, /area/ship/maintenance/port) "qg" = ( @@ -1474,6 +1498,15 @@ /turf/open/floor/plasteel/tech, /area/ship/engineering/atmospherics) "sd" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/plating, /area/ship/maintenance/port) "sk" = ( @@ -1599,6 +1632,12 @@ /obj/structure/sign/poster/random{ pixel_y = 32 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, /turf/open/floor/plating, /area/ship/maintenance/port) "sX" = ( @@ -1647,6 +1686,12 @@ dir = 8; req_ship_access = 0 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/plating, /area/ship/maintenance/port) "tA" = ( @@ -1722,9 +1767,6 @@ }, /turf/open/floor/plasteel/tech/grid, /area/ship/crew/cryo) -"uo" = ( -/turf/closed/wall/rust, -/area/ship/maintenance/port) "ut" = ( /obj/structure/grille, /obj/structure/window/plasma/reinforced/plastitanium, @@ -2045,6 +2087,12 @@ }, /obj/effect/decal/cleanable/dirt, /obj/structure/catwalk/over, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, /turf/open/floor/plating, /area/ship/maintenance/fore) "yr" = ( @@ -2155,11 +2203,11 @@ /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/maintenance/port) "zr" = ( -/obj/structure/cable/green{ - icon_state = "2-10" - }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/oil, +/obj/structure/cable/green{ + icon_state = "2-8" + }, /turf/open/floor/plating, /area/ship/maintenance/fore) "zv" = ( @@ -2178,6 +2226,12 @@ "zE" = ( /obj/effect/decal/cleanable/dirt, /obj/item/cigbutt, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/plating, /area/ship/maintenance/port) "zS" = ( @@ -2241,7 +2295,9 @@ /turf/open/floor/plasteel/dark, /area/ship/security) "AT" = ( -/obj/effect/spawner/random/salvage_machine, +/obj/effect/spawner/random/salvage_machine{ + dir = 8 + }, /obj/effect/decal/cleanable/crayon{ icon_state = "space"; pixel_y = 29; @@ -2685,6 +2741,12 @@ dir = 1; pixel_y = -19 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/plasteel/dark/airless, /area/ship/maintenance/port) "Hv" = ( @@ -2792,6 +2854,12 @@ /obj/effect/decal/cleanable/glass, /obj/effect/decal/cleanable/dirt, /obj/structure/catwalk/over, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/plating, /area/ship/maintenance/fore) "Ia" = ( @@ -2803,9 +2871,6 @@ /obj/structure/spider/stickyweb, /turf/open/floor/plating, /area/ship/maintenance/fore) -"Ic" = ( -/turf/closed/wall/mineral/iron, -/area/ship/maintenance/fore) "Iu" = ( /obj/machinery/pipedispenser, /turf/open/floor/plasteel/dark, @@ -2916,9 +2981,6 @@ /turf/open/floor/plasteel, /area/ship/crew) "Je" = ( -/obj/structure/cable/green{ - icon_state = "6-10" - }, /obj/machinery/door/airlock/maintenance{ req_ship_access = 0 }, @@ -3224,10 +3286,16 @@ /turf/open/floor/plasteel/mono/dark, /area/ship/engineering) "LZ" = ( +/obj/effect/decal/cleanable/dirt, /obj/structure/cable/green{ - icon_state = "5-8" + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/ship/maintenance/port) "Md" = ( @@ -3246,7 +3314,9 @@ /obj/structure/cable/green{ icon_state = "4-5" }, -/obj/effect/spawner/random/salvage_machine, +/obj/effect/spawner/random/salvage_machine{ + dir = 1 + }, /obj/structure/railing{ dir = 4 }, @@ -3625,6 +3695,8 @@ req_ship_access = 0 }, /obj/effect/mapping_helpers/airlock/abandoned, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/ship/maintenance/fore) "Ry" = ( @@ -3792,11 +3864,19 @@ /obj/structure/sign/poster/contraband/hacking_guide{ pixel_y = -32 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/plating, /area/ship/maintenance/port) "UZ" = ( /obj/effect/decal/cleanable/dirt, /obj/item/cigbutt, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/ship/maintenance/fore) "Vc" = ( @@ -4095,11 +4175,17 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/central) "Zc" = ( -/obj/structure/cable/green{ - icon_state = "4-9" - }, /obj/structure/grille, /obj/effect/decal/cleanable/dirt, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/plating, /area/ship/maintenance/port) "Zj" = ( @@ -4363,8 +4449,8 @@ Ku Ku wW yX -aU -aU +QZ +QZ yX Lp NS @@ -4523,9 +4609,9 @@ UB "} (15,1,1) = {" yX -uo -uo -uo +QZ +QZ +QZ ty DN TN @@ -4552,7 +4638,7 @@ UB yX IY yx -uo +QZ LZ DN WU @@ -4690,7 +4776,7 @@ QZ QZ QZ pU -uo +QZ yX wW wW @@ -4740,7 +4826,7 @@ wW (23,1,1) = {" jt gj -Kt +aU UZ Rs yl @@ -4769,7 +4855,7 @@ wW qx AT rn -Ic +CT KP cx qx @@ -4795,8 +4881,8 @@ Ku wW PV qx -Ic -Ic +CT +CT Jj CT qx @@ -4823,7 +4909,7 @@ wW wW qx CU -Ic +CT ex oe qx @@ -4877,8 +4963,8 @@ wW wW qx tj -bP -bP +CT +CT lm qx wW @@ -4903,8 +4989,8 @@ DI wW wW qx -bP -bP +CT +CT zD Am qx @@ -4931,7 +5017,7 @@ wW wW PV qx -bP +CT nq as qx diff --git a/_maps/shuttles/inteq/inteq_talos.dmm b/_maps/shuttles/inteq/inteq_talos.dmm index 98f9f1827c4d..138b66106a28 100644 --- a/_maps/shuttles/inteq/inteq_talos.dmm +++ b/_maps/shuttles/inteq/inteq_talos.dmm @@ -542,6 +542,9 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/mapping_helpers/airlock/locked, +/obj/machinery/atmospherics/pipe/layer_manifold{ + dir = 4 + }, /turf/open/floor/plating, /area/ship/maintenance/starboard) "dw" = ( @@ -815,6 +818,12 @@ /obj/structure/sign/poster/random{ pixel_y = 32 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/plating, /area/ship/maintenance/port) "fo" = ( @@ -834,10 +843,10 @@ /turf/open/floor/circuit/telecomms/mainframe, /area/ship/engineering/communications) "fr" = ( -/obj/structure/catwalk/over, /obj/structure/cable{ - icon_state = "1-4" + icon_state = "4-8" }, +/obj/structure/catwalk/over, /turf/open/floor/plating, /area/ship/storage/port) "fs" = ( @@ -848,10 +857,12 @@ /turf/closed/wall/mineral/plastitanium, /area/ship/engineering/communications) "fx" = ( -/obj/structure/catwalk/over, /obj/structure/cable{ - icon_state = "2-5" + icon_state = "1-2" }, +/obj/structure/catwalk/over, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/ship/maintenance/port) "fC" = ( @@ -886,7 +897,12 @@ /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/maintenance/starboard) "fN" = ( -/obj/structure/catwalk/over, +/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/plating, /area/ship/maintenance/port) "fU" = ( @@ -1141,17 +1157,6 @@ }, /turf/open/floor/plating, /area/ship/storage/starboard) -"hw" = ( -/obj/machinery/door/airlock/maintenance{ - dir = 8; - req_ship_access = 0 - }, -/obj/effect/mapping_helpers/airlock/abandoned, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plating, -/area/ship/maintenance/starboard) "hz" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/bottle/cognac{ @@ -1276,6 +1281,12 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/plating, /area/ship/storage/starboard) "im" = ( @@ -1451,9 +1462,6 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) "jj" = ( -/obj/structure/cable{ - icon_state = "1-9" - }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/ship/maintenance/port) @@ -1479,13 +1487,13 @@ /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) "jt" = ( -/obj/structure/catwalk/over, -/obj/structure/cable{ - icon_state = "5-8" - }, /obj/structure/sign/poster/random{ pixel_y = -32 }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/catwalk/over, /turf/open/floor/plating, /area/ship/storage/port) "jw" = ( @@ -1643,13 +1651,17 @@ /turf/open/floor/plating, /area/ship/engineering) "kc" = ( -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable{ - icon_state = "0-8" +/obj/machinery/door/airlock/maintenance/external{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/ship/maintenance/starboard) +/area/ship/maintenance/port) "kg" = ( /obj/effect/turf_decal/box/corners, /obj/effect/decal/cleanable/dirt, @@ -1659,6 +1671,10 @@ /obj/structure/closet/crate/large, /obj/machinery/portable_atmospherics/canister/oxygen, /obj/effect/decal/cleanable/dirt, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable{ + icon_state = "0-9" + }, /turf/open/floor/plating, /area/ship/maintenance/starboard) "ks" = ( @@ -1667,9 +1683,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/structure/cable{ - icon_state = "1-2" - }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/ship/maintenance/starboard) "kD" = ( @@ -1811,13 +1826,19 @@ /turf/closed/wall, /area/ship/storage/starboard) "lM" = ( -/obj/structure/cable{ - icon_state = "6-8" - }, /obj/machinery/light_switch{ pixel_y = 22 }, /obj/effect/decal/cleanable/dirt, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/plasteel/dark/airless, /area/ship/storage/port) "lO" = ( @@ -1864,8 +1885,14 @@ /turf/open/floor/plasteel/tech, /area/ship/engineering/engine) "mh" = ( -/obj/structure/sign/warning/vacuum/external{ - pixel_y = 22 +/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/advanced_airlock_controller{ + pixel_y = 24 }, /turf/open/floor/plating, /area/ship/maintenance/starboard) @@ -2129,11 +2156,17 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/central) "nD" = ( -/obj/structure/cable{ - icon_state = "4-10" - }, /obj/effect/decal/cleanable/dirt, /obj/item/radio/intercom/directional/north, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/plating, /area/ship/storage/port) "nE" = ( @@ -2142,11 +2175,14 @@ /turf/open/floor/plating, /area/ship/storage) "nF" = ( -/obj/structure/cable{ - icon_state = "6-9" - }, /obj/effect/decal/cleanable/dirt, /obj/item/cigbutt, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, /turf/open/floor/plating, /area/ship/storage/starboard) "nH" = ( @@ -2238,6 +2274,8 @@ "od" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/abandoned, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/ship/maintenance/port) "og" = ( @@ -2480,10 +2518,13 @@ /turf/open/floor/plasteel/tech, /area/ship/engineering/engine) "pq" = ( -/obj/structure/cable{ - icon_state = "2-8" - }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, /turf/open/floor/plating, /area/ship/maintenance/port) "pu" = ( @@ -2524,9 +2565,6 @@ /area/ship/crew/canteen) "pG" = ( /obj/structure/reagent_dispensers/foamtank, -/obj/structure/cable{ - icon_state = "4-6" - }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/ship/storage/starboard) @@ -2896,7 +2934,14 @@ /turf/open/floor/plasteel/dark, /area/ship/security) "rN" = ( -/turf/closed/wall/mineral/iron, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/turf/open/floor/plating, /area/ship/maintenance/starboard) "rP" = ( /obj/structure/cable{ @@ -2964,6 +3009,12 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, /turf/open/floor/plating, /area/ship/maintenance/starboard) "sl" = ( @@ -3003,10 +3054,10 @@ /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/closet/crate, /obj/effect/spawner/random/maintenance/two, +/obj/effect/decal/cleanable/dirt, /obj/structure/cable{ - icon_state = "0-8" + icon_state = "0-2" }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/ship/storage/starboard) "su" = ( @@ -3045,11 +3096,20 @@ "sC" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/oil, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/catwalk/over, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/sign/warning/vacuum/external{ + pixel_y = -22 + }, /turf/open/floor/plating, /area/ship/maintenance/port) "sD" = ( -/obj/structure/catwalk/over, -/obj/structure/sign/warning/vacuum/external{ +/obj/machinery/advanced_airlock_controller{ pixel_y = -21 }, /turf/open/floor/plating, @@ -3281,6 +3341,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/plating, /area/ship/maintenance/port) "tM" = ( @@ -4103,6 +4165,7 @@ /obj/structure/sign/poster/random{ pixel_y = 32 }, +/obj/structure/catwalk/over, /turf/open/floor/plating, /area/ship/maintenance/port) "zh" = ( @@ -4178,7 +4241,21 @@ /turf/open/floor/plasteel/dark, /area/ship/engineering/communications) "zB" = ( -/turf/closed/wall/mineral/iron, +/obj/machinery/door/airlock/maintenance{ + dir = 8; + req_ship_access = 0 + }, +/obj/effect/mapping_helpers/airlock/abandoned, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/plating, /area/ship/storage/port) "zE" = ( /obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, @@ -4214,13 +4291,12 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) "zL" = ( -/obj/machinery/door/airlock/maintenance{ - dir = 8; - req_ship_access = 0 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 }, -/obj/effect/mapping_helpers/airlock/abandoned, -/obj/structure/cable{ - icon_state = "9-10" +/obj/structure/catwalk/over, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 }, /turf/open/floor/plating, /area/ship/maintenance/port) @@ -4395,10 +4471,15 @@ /turf/open/floor/engine/hull/reinforced, /area/ship/cargo) "AL" = ( -/obj/structure/catwalk/over, /obj/structure/sign/poster/random{ pixel_x = -32 }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/catwalk/over, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/ship/maintenance/port) "AO" = ( @@ -4483,10 +4564,16 @@ /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/crew) "Bz" = ( +/obj/effect/decal/cleanable/dirt, /obj/structure/cable{ - icon_state = "1-6" + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/ship/maintenance/starboard) "BJ" = ( @@ -4513,6 +4600,15 @@ /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) "BN" = ( +/obj/structure/cable{ + icon_state = "6-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, /turf/open/floor/plating, /area/ship/storage/starboard) "BP" = ( @@ -4846,13 +4942,16 @@ /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) "Ev" = ( +/obj/effect/decal/cleanable/dirt, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "2-8" }, -/obj/structure/cable{ - icon_state = "2-6" +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/ship/maintenance/port) "Ex" = ( @@ -5035,9 +5134,15 @@ /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) "Fz" = ( -/obj/structure/catwalk/over, /obj/structure/cable{ - icon_state = "6-8" + icon_state = "2-8" + }, +/obj/structure/catwalk/over, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 }, /turf/open/floor/plating, /area/ship/maintenance/port) @@ -5069,13 +5174,18 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/crew/cryo) "FO" = ( -/obj/structure/catwalk/over, -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/structure/sign/poster/random{ pixel_y = 32 }, +/obj/structure/cable{ + icon_state = "4-10" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, /turf/open/floor/plating, /area/ship/storage/starboard) "FV" = ( @@ -5130,15 +5240,15 @@ /turf/open/floor/plasteel/tech, /area/ship/hallway/central) "Gq" = ( -/obj/structure/closet/emcloset/anchored{ - populate = 0 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/door/airlock/maintenance/external{ + dir = 4 }, -/obj/item/tank/internals/emergency_oxygen/engi, -/obj/item/tank/internals/emergency_oxygen/engi, -/obj/item/tank/internals/emergency_oxygen/engi, -/obj/item/clothing/mask/breath, -/obj/item/clothing/mask/breath, -/obj/item/clothing/mask/breath, /turf/open/floor/plating, /area/ship/maintenance/starboard) "Gr" = ( @@ -5149,6 +5259,15 @@ /area/ship/engineering/engine) "Gs" = ( /obj/effect/decal/cleanable/oil, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/plating, /area/ship/maintenance/starboard) "Gt" = ( @@ -5171,10 +5290,6 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/security/armory) "Gu" = ( -/obj/structure/catwalk/over, -/obj/structure/cable{ - icon_state = "4-6" - }, /obj/item/radio/intercom/directional/west, /turf/open/floor/plating, /area/ship/storage/starboard) @@ -5207,15 +5322,12 @@ /turf/open/floor/plasteel/telecomms_floor, /area/ship/storage) "GA" = ( -/obj/structure/catwalk/over, /obj/structure/filingcabinet/chestdrawer/wheeled, /obj/item/folder, /obj/item/folder/yellow, /obj/item/folder/red, /obj/item/pen/fountain, -/obj/structure/cable{ - icon_state = "2-10" - }, +/obj/structure/catwalk/over, /turf/open/floor/plating, /area/ship/storage/port) "GG" = ( @@ -5239,11 +5351,19 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/port) "GQ" = ( -/obj/effect/spawner/random/salvage_machine, /obj/effect/decal/cleanable/dirt, /obj/structure/sign/poster/random{ pixel_y = 32 }, +/obj/structure/closet/emcloset/anchored{ + populate = 0 + }, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, /turf/open/floor/plating, /area/ship/maintenance/starboard) "GR" = ( @@ -5544,6 +5664,12 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/plating, /area/ship/maintenance/starboard) "Jo" = ( @@ -5596,9 +5722,6 @@ /obj/structure/closet/crate/science, /obj/effect/spawner/random/maintenance, /obj/item/circuitboard/computer/crew, -/obj/structure/cable{ - icon_state = "5-9" - }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/ship/maintenance/starboard) @@ -5780,10 +5903,11 @@ /turf/open/floor/plasteel/tech, /area/ship/engineering) "KT" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/effect/decal/cleanable/dirt, +/obj/structure/sign/warning/vacuum/external{ + pixel_x = 29; + pixel_y = 0 + }, /turf/open/floor/plating, /area/ship/maintenance/starboard) "KY" = ( @@ -5855,9 +5979,6 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/engineering/engine) "LF" = ( -/obj/structure/cable{ - icon_state = "4-9" - }, /obj/machinery/light/dim/directional/south, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/dark/airless, @@ -5989,9 +6110,11 @@ /turf/open/floor/plasteel/grimy, /area/ship/crew) "Mn" = ( -/obj/structure/catwalk/over, -/obj/structure/cable{ - icon_state = "8-9" +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 }, /turf/open/floor/plating, /area/ship/storage/starboard) @@ -6051,6 +6174,12 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/plating, /area/ship/storage/port) "MS" = ( @@ -6108,19 +6237,22 @@ }, /turf/open/floor/plasteel/grimy, /area/ship/crew) -"Nf" = ( -/turf/closed/wall/rust, -/area/ship/storage/starboard) "Ng" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/ship/crew/dorm/dormtwo) "Ni" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/effect/decal/cleanable/dirt, /obj/item/cigbutt, +/obj/structure/cable{ + icon_state = "6-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, /turf/open/floor/plating, /area/ship/maintenance/starboard) "Nj" = ( @@ -6317,8 +6449,17 @@ /turf/open/floor/plasteel/dark, /area/ship/security) "OP" = ( -/turf/closed/wall/mineral/iron, -/area/ship/maintenance/port) +/obj/structure/cable{ + icon_state = "4-9" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/plating, +/area/ship/storage/starboard) "Pf" = ( /obj/structure/catwalk, /obj/effect/decal/cleanable/dirt, @@ -6573,9 +6714,6 @@ "QV" = ( /obj/structure/rack, /obj/effect/spawner/random/maintenance, -/obj/structure/cable{ - icon_state = "5-9" - }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/ship/storage/starboard) @@ -6588,6 +6726,12 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/plating, /area/ship/maintenance/port) "QZ" = ( @@ -6636,6 +6780,12 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/plating, /area/ship/maintenance/port) "Rp" = ( @@ -6967,6 +7117,12 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/oil, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/plating, /area/ship/storage/starboard) "TK" = ( @@ -7043,7 +7199,13 @@ req_ship_access = 0 }, /obj/structure/cable{ - icon_state = "6-8" + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 }, /turf/open/floor/plating, /area/ship/storage/starboard) @@ -7129,16 +7291,21 @@ /turf/open/floor/plasteel/grimy, /area/ship/crew) "Uq" = ( -/obj/structure/catwalk/over, -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/machinery/light/small/directional/south, /obj/machinery/light_switch{ dir = 1; pixel_y = -19; pixel_x = -8 }, +/obj/structure/cable{ + icon_state = "5-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, /turf/open/floor/plating, /area/ship/storage/starboard) "Uy" = ( @@ -7149,6 +7316,12 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/plating, /area/ship/storage/port) "UD" = ( @@ -7261,13 +7434,19 @@ /turf/open/floor/plasteel/tech, /area/ship/engineering/engine) "Vp" = ( +/obj/effect/decal/cleanable/dirt, /obj/structure/cable{ - icon_state = "4-10" + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 }, /obj/structure/cable{ - icon_state = "9-10" + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/ship/storage/starboard) "Vr" = ( @@ -7278,6 +7457,12 @@ /obj/structure/cable{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, /turf/open/floor/plating, /area/ship/maintenance/port) "Vz" = ( @@ -7361,6 +7546,7 @@ /obj/effect/spawner/random/trash/crushed_can, /obj/effect/spawner/random/trash/crushed_can, /obj/effect/spawner/random/maintenance, +/obj/structure/catwalk/over, /turf/open/floor/plating, /area/ship/maintenance/port) "We" = ( @@ -7389,12 +7575,18 @@ /turf/open/floor/plating, /area/ship/security) "Wg" = ( -/obj/structure/cable{ - icon_state = "5-8" - }, /turf/open/floor/plating, /area/ship/storage/port) "Wh" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/plasteel/dark/airless, /area/ship/storage/port) "Wp" = ( @@ -7597,10 +7789,12 @@ /turf/open/floor/engine/hull/reinforced/interior, /area/ship/engineering/engine) "Yq" = ( -/obj/structure/catwalk/over, /obj/structure/sign/poster/random{ pixel_y = 32 }, +/obj/machinery/atmospherics/pipe/layer_manifold{ + dir = 4 + }, /turf/open/floor/plating, /area/ship/maintenance/port) "Yt" = ( @@ -7662,15 +7856,18 @@ /turf/open/floor/carpet/black, /area/ship/crew/dorm) "YD" = ( -/obj/machinery/door/airlock/maintenance{ - dir = 8; - req_ship_access = 0 - }, +/obj/effect/decal/cleanable/dirt, /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/plating, -/area/ship/storage/starboard) +/area/ship/storage/port) "YI" = ( /obj/structure/catwalk/over, /turf/open/floor/plating, @@ -7696,7 +7893,13 @@ }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/cable{ - icon_state = "4-10" + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 }, /turf/open/floor/plating, /area/ship/maintenance/starboard) @@ -7745,7 +7948,13 @@ /turf/open/floor/plasteel/grimy, /area/ship/crew/dorm) "Ze" = ( -/turf/closed/wall/rust, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/plating, /area/ship/maintenance/starboard) "Zj" = ( /obj/effect/turf_decal/trimline/opaque/yellow/line, @@ -7887,12 +8096,24 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/plating, /area/ship/storage/port) "ZY" = ( /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/plating, /area/ship/storage/port) @@ -9024,7 +9245,7 @@ sw sw sw yp -wU +Qy lM SH yp @@ -9064,7 +9285,7 @@ LF wU Aa oY -zB +wU yp sw sw @@ -9075,7 +9296,7 @@ sw uI FO Mn -Nf +lI Pt bK Ng @@ -9093,12 +9314,12 @@ sw sw Dw Zn -RY +YD Wg fU KQ jt -zB +Qy yp sw sw @@ -9107,10 +9328,10 @@ sw sw sw uI -YD -Nf -Nf -Nf +Ub +lI +lI +lI bK uc rw @@ -9126,13 +9347,13 @@ sw sw sw PF -Qy +wU nD nH -Qy +wU GA fr -zB +wU yp sw sw @@ -9142,7 +9363,7 @@ sw sw uI ik -Nf +lI oD oS bK @@ -9160,13 +9381,13 @@ sw sw Pf wv -Qy +wU Uy -Qy -Qy -Qy +wU +wU +wU uo -zB +wU yp sw sw @@ -9197,7 +9418,7 @@ UD yp ZV UQ -Qy +wU yU TE Ce @@ -9297,7 +9518,7 @@ sw sw sw yp -uo +zB wU wU wU @@ -9312,7 +9533,7 @@ sw sw uI pG -BN +OP QV lI Ho @@ -9366,7 +9587,7 @@ sw sw Pp Hc -zL +iO Hc Hc Ri @@ -9379,8 +9600,8 @@ sw sw sw fK -Ze -hw +ff +YX ff ff ff @@ -9404,7 +9625,7 @@ sl Ts Hc QW -OP +Hc Pp sw sw @@ -9483,7 +9704,7 @@ sw fK yP go -rN +ff Gs Jv fK @@ -9503,7 +9724,7 @@ Pf sw Pp zg -xG +zL od pq jj @@ -9515,11 +9736,11 @@ sw sw sw fK -rN -rN -rN +ff +ff +ff YX -Ze +ff fK sw sw @@ -9538,7 +9759,7 @@ sw Pp Wd sC -OP +Hc RV CN Pp @@ -9549,9 +9770,9 @@ sw sw sw fK -rN +ff ef -Fl +rN Ni dD fK @@ -9571,10 +9792,10 @@ Fi sw Pp Hc -iO -OP -OP -OP +kc +Hc +Hc +Hc Pp sw sw @@ -9583,9 +9804,9 @@ sw sw sw fK -rN +ff GQ -IB +Ze KT kh fK @@ -9606,8 +9827,8 @@ sw aC Pp fN -fN -OP +xG +Hc Pp Ap sw @@ -9618,9 +9839,9 @@ sw sw sy fK +ff Gq -Fl -kc +ff fK qt sw From 62e5dea139a6a275b7f07627f813cc507e373ba4 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Sun, 27 Oct 2024 18:22:48 +0100 Subject: [PATCH 05/21] idk what's going on --- .../independent/independent_scarab.dmm | 19 ++- _maps/shuttles/inteq/inteq_talos.dmm | 136 ++++++++++-------- 2 files changed, 85 insertions(+), 70 deletions(-) diff --git a/_maps/shuttles/independent/independent_scarab.dmm b/_maps/shuttles/independent/independent_scarab.dmm index 79aaae6086e0..a152fadeba30 100644 --- a/_maps/shuttles/independent/independent_scarab.dmm +++ b/_maps/shuttles/independent/independent_scarab.dmm @@ -93,14 +93,6 @@ "aO" = ( /turf/closed/wall/mineral/plastitanium, /area/ship/crew/cryo) -"aU" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plating, -/area/ship/maintenance/fore) "bb" = ( /obj/structure/catwalk/over/plated_catwalk/white, /obj/machinery/shower{ @@ -1767,6 +1759,14 @@ }, /turf/open/floor/plasteel/tech/grid, /area/ship/crew/cryo) +"uo" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/plating, +/area/ship/maintenance/fore) "ut" = ( /obj/structure/grille, /obj/structure/window/plasma/reinforced/plastitanium, @@ -3694,7 +3694,6 @@ /obj/machinery/door/airlock/maintenance{ req_ship_access = 0 }, -/obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, @@ -4826,7 +4825,7 @@ wW (23,1,1) = {" jt gj -aU +uo UZ Rs yl diff --git a/_maps/shuttles/inteq/inteq_talos.dmm b/_maps/shuttles/inteq/inteq_talos.dmm index 138b66106a28..847bd2f5dac7 100644 --- a/_maps/shuttles/inteq/inteq_talos.dmm +++ b/_maps/shuttles/inteq/inteq_talos.dmm @@ -1157,6 +1157,18 @@ }, /turf/open/floor/plating, /area/ship/storage/starboard) +"hw" = ( +/obj/structure/cable{ + icon_state = "6-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/turf/open/floor/plating, +/area/ship/storage/starboard) "hz" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/bottle/cognac{ @@ -1651,17 +1663,12 @@ /turf/open/floor/plating, /area/ship/engineering) "kc" = ( -/obj/machinery/door/airlock/maintenance/external{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/effect/decal/cleanable/dirt, +/obj/structure/chair/handrail{ + dir = 1 }, /turf/open/floor/plating, -/area/ship/maintenance/port) +/area/ship/maintenance/starboard) "kg" = ( /obj/effect/turf_decal/box/corners, /obj/effect/decal/cleanable/dirt, @@ -2934,15 +2941,22 @@ /turf/open/floor/plasteel/dark, /area/ship/security) "rN" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 +/obj/machinery/door/airlock/maintenance{ + dir = 8; + req_ship_access = 0 + }, +/obj/effect/mapping_helpers/airlock/abandoned, +/obj/structure/cable{ + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 }, /turf/open/floor/plating, -/area/ship/maintenance/starboard) +/area/ship/storage/port) "rP" = ( /obj/structure/cable{ icon_state = "4-8" @@ -4241,22 +4255,15 @@ /turf/open/floor/plasteel/dark, /area/ship/engineering/communications) "zB" = ( -/obj/machinery/door/airlock/maintenance{ - dir = 8; - req_ship_access = 0 - }, -/obj/effect/mapping_helpers/airlock/abandoned, -/obj/structure/cable{ - icon_state = "4-8" +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 + dir = 6 }, /turf/open/floor/plating, -/area/ship/storage/port) +/area/ship/maintenance/starboard) "zE" = ( /obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, /obj/structure/cable{ @@ -4291,15 +4298,14 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) "zL" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/structure/catwalk/over, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 }, /turf/open/floor/plating, -/area/ship/maintenance/port) +/area/ship/maintenance/starboard) "zR" = ( /obj/machinery/firealarm/directional/south, /obj/structure/extinguisher_cabinet/directional/east, @@ -4601,13 +4607,13 @@ /area/ship/crew/canteen) "BN" = ( /obj/structure/cable{ - icon_state = "6-8" + icon_state = "4-9" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 + dir = 4 }, /turf/open/floor/plating, /area/ship/storage/starboard) @@ -5240,17 +5246,17 @@ /turf/open/floor/plasteel/tech, /area/ship/hallway/central) "Gq" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/door/airlock/maintenance/external{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/door/airlock/maintenance/external{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plating, -/area/ship/maintenance/starboard) +/area/ship/maintenance/port) "Gr" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/incinerator_input{ dir = 8 @@ -5360,8 +5366,6 @@ }, /obj/item/tank/internals/emergency_oxygen/engi, /obj/item/tank/internals/emergency_oxygen/engi, -/obj/item/tank/internals/emergency_oxygen/engi, -/obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, /turf/open/floor/plating, @@ -6237,6 +6241,16 @@ }, /turf/open/floor/plasteel/grimy, /area/ship/crew) +"Nf" = ( +/obj/structure/closet/emcloset/anchored{ + populate = 0 + }, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/turf/open/floor/plating, +/area/ship/maintenance/port) "Ng" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, @@ -6449,17 +6463,17 @@ /turf/open/floor/plasteel/dark, /area/ship/security) "OP" = ( -/obj/structure/cable{ - icon_state = "4-9" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/machinery/door/airlock/maintenance/external{ + dir = 4 + }, /turf/open/floor/plating, -/area/ship/storage/starboard) +/area/ship/maintenance/starboard) "Pf" = ( /obj/structure/catwalk, /obj/effect/decal/cleanable/dirt, @@ -7306,7 +7320,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/dark/airless, /area/ship/storage/starboard) "Uy" = ( /obj/machinery/door/airlock/maintenance{ @@ -7795,6 +7809,7 @@ /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, +/obj/structure/chair/handrail, /turf/open/floor/plating, /area/ship/maintenance/port) "Yt" = ( @@ -7948,14 +7963,15 @@ /turf/open/floor/plasteel/grimy, /area/ship/crew/dorm) "Ze" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 + dir = 6 + }, +/obj/structure/catwalk/over, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 }, /turf/open/floor/plating, -/area/ship/maintenance/starboard) +/area/ship/maintenance/port) "Zj" = ( /obj/effect/turf_decal/trimline/opaque/yellow/line, /obj/effect/turf_decal/siding/thinplating, @@ -9498,7 +9514,7 @@ sw sw sw uI -BN +hw nF ub JI @@ -9518,7 +9534,7 @@ sw sw sw yp -zB +rN wU wU wU @@ -9533,7 +9549,7 @@ sw sw uI pG -OP +BN QV lI Ho @@ -9724,7 +9740,7 @@ Pf sw Pp zg -zL +Ze od pq jj @@ -9772,7 +9788,7 @@ sw fK ff ef -rN +zB Ni dD fK @@ -9792,7 +9808,7 @@ Fi sw Pp Hc -kc +Gq Hc Hc Hc @@ -9806,7 +9822,7 @@ sw fK ff GQ -Ze +zL KT kh fK @@ -9827,7 +9843,7 @@ sw aC Pp fN -xG +Nf Hc Pp Ap @@ -9840,7 +9856,7 @@ sw sy fK ff -Gq +OP ff fK qt @@ -9875,7 +9891,7 @@ sw sy fK mh -Fl +kc fK sw sw From 9f164ccf3f21ba272100c12cbba3161c21c06f64 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Sun, 27 Oct 2024 18:26:40 +0100 Subject: [PATCH 06/21] I still dont understand --- _maps/shuttles/inteq/inteq_talos.dmm | 164 +++++++++++++-------------- 1 file changed, 82 insertions(+), 82 deletions(-) diff --git a/_maps/shuttles/inteq/inteq_talos.dmm b/_maps/shuttles/inteq/inteq_talos.dmm index 847bd2f5dac7..9e099e90dcab 100644 --- a/_maps/shuttles/inteq/inteq_talos.dmm +++ b/_maps/shuttles/inteq/inteq_talos.dmm @@ -1158,17 +1158,18 @@ /turf/open/floor/plating, /area/ship/storage/starboard) "hw" = ( +/obj/effect/decal/cleanable/dirt, /obj/structure/cable{ - icon_state = "6-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 }, /turf/open/floor/plating, -/area/ship/storage/starboard) +/area/ship/storage/port) "hz" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/bottle/cognac{ @@ -1664,8 +1665,11 @@ /area/ship/engineering) "kc" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/chair/handrail{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 }, /turf/open/floor/plating, /area/ship/maintenance/starboard) @@ -2941,22 +2945,14 @@ /turf/open/floor/plasteel/dark, /area/ship/security) "rN" = ( -/obj/machinery/door/airlock/maintenance{ - dir = 8; - req_ship_access = 0 - }, -/obj/effect/mapping_helpers/airlock/abandoned, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, -/area/ship/storage/port) +/area/ship/maintenance/starboard) "rP" = ( /obj/structure/cable{ icon_state = "4-8" @@ -4255,15 +4251,22 @@ /turf/open/floor/plasteel/dark, /area/ship/engineering/communications) "zB" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 +/obj/machinery/door/airlock/maintenance{ + dir = 8; + req_ship_access = 0 + }, +/obj/effect/mapping_helpers/airlock/abandoned, +/obj/structure/cable{ + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 }, /turf/open/floor/plating, -/area/ship/maintenance/starboard) +/area/ship/storage/port) "zE" = ( /obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, /obj/structure/cable{ @@ -4298,11 +4301,9 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) "zL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/effect/decal/cleanable/dirt, +/obj/structure/chair/handrail{ + dir = 1 }, /turf/open/floor/plating, /area/ship/maintenance/starboard) @@ -4607,13 +4608,13 @@ /area/ship/crew/canteen) "BN" = ( /obj/structure/cable{ - icon_state = "4-9" + icon_state = "6-8" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 + dir = 10 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 + dir = 10 }, /turf/open/floor/plating, /area/ship/storage/starboard) @@ -5246,17 +5247,17 @@ /turf/open/floor/plasteel/tech, /area/ship/hallway/central) "Gq" = ( -/obj/machinery/door/airlock/maintenance/external{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/door/airlock/maintenance/external{ dir = 4 }, /turf/open/floor/plating, -/area/ship/maintenance/port) +/area/ship/maintenance/starboard) "Gr" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/incinerator_input{ dir = 8 @@ -6242,15 +6243,17 @@ /turf/open/floor/plasteel/grimy, /area/ship/crew) "Nf" = ( -/obj/structure/closet/emcloset/anchored{ - populate = 0 +/obj/structure/cable{ + icon_state = "4-9" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 }, -/obj/item/tank/internals/emergency_oxygen/engi, -/obj/item/tank/internals/emergency_oxygen/engi, -/obj/item/clothing/mask/breath, -/obj/item/clothing/mask/breath, /turf/open/floor/plating, -/area/ship/maintenance/port) +/area/ship/storage/starboard) "Ng" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, @@ -6463,17 +6466,15 @@ /turf/open/floor/plasteel/dark, /area/ship/security) "OP" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 + dir = 6 }, -/obj/machinery/door/airlock/maintenance/external{ - dir = 4 +/obj/structure/catwalk/over, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 }, /turf/open/floor/plating, -/area/ship/maintenance/starboard) +/area/ship/maintenance/port) "Pf" = ( /obj/structure/catwalk, /obj/effect/decal/cleanable/dirt, @@ -7208,21 +7209,17 @@ /turf/open/floor/plasteel/grimy, /area/ship/crew) "Ub" = ( -/obj/machinery/door/airlock/maintenance{ - dir = 8; - req_ship_access = 0 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/door/airlock/maintenance/external{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/plating, -/area/ship/storage/starboard) +/area/ship/maintenance/port) "Uc" = ( /obj/structure/cable{ icon_state = "1-4" @@ -7810,7 +7807,7 @@ dir = 4 }, /obj/structure/chair/handrail, -/turf/open/floor/plating, +/turf/open/floor/plasteel/dark, /area/ship/maintenance/port) "Yt" = ( /obj/effect/turf_decal/corner/opaque/yellow{ @@ -7871,18 +7868,21 @@ /turf/open/floor/carpet/black, /area/ship/crew/dorm) "YD" = ( -/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/airlock/maintenance{ + dir = 8; + req_ship_access = 0 + }, /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, /turf/open/floor/plating, -/area/ship/storage/port) +/area/ship/storage/starboard) "YI" = ( /obj/structure/catwalk/over, /turf/open/floor/plating, @@ -7963,13 +7963,13 @@ /turf/open/floor/plasteel/grimy, /area/ship/crew/dorm) "Ze" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/structure/catwalk/over, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 +/obj/structure/closet/emcloset/anchored{ + populate = 0 }, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, /turf/open/floor/plating, /area/ship/maintenance/port) "Zj" = ( @@ -9330,7 +9330,7 @@ sw sw Dw Zn -YD +hw Wg fU KQ @@ -9344,7 +9344,7 @@ sw sw sw uI -Ub +YD lI lI lI @@ -9480,7 +9480,7 @@ sw sw sw uI -Ub +YD lI lI lI @@ -9514,7 +9514,7 @@ sw sw sw uI -hw +BN nF ub JI @@ -9534,7 +9534,7 @@ sw sw sw yp -rN +zB wU wU wU @@ -9549,7 +9549,7 @@ sw sw uI pG -BN +Nf QV lI Ho @@ -9740,7 +9740,7 @@ Pf sw Pp zg -Ze +OP od pq jj @@ -9788,7 +9788,7 @@ sw fK ff ef -zB +kc Ni dD fK @@ -9808,7 +9808,7 @@ Fi sw Pp Hc -Gq +Ub Hc Hc Hc @@ -9822,7 +9822,7 @@ sw fK ff GQ -zL +rN KT kh fK @@ -9843,7 +9843,7 @@ sw aC Pp fN -Nf +Ze Hc Pp Ap @@ -9856,7 +9856,7 @@ sw sy fK ff -OP +Gq ff fK qt @@ -9891,7 +9891,7 @@ sw sy fK mh -kc +zL fK sw sw From b36d2ce0a3775c462f80b1589a8bb6827b9b3075 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Sat, 9 Nov 2024 11:28:21 +0100 Subject: [PATCH 07/21] airlock --- _maps/shuttles/inteq/inteq_talos.dmm | 56 ++++++++++++---------------- 1 file changed, 23 insertions(+), 33 deletions(-) diff --git a/_maps/shuttles/inteq/inteq_talos.dmm b/_maps/shuttles/inteq/inteq_talos.dmm index 3e63e3f6130e..efcb79bc9a85 100644 --- a/_maps/shuttles/inteq/inteq_talos.dmm +++ b/_maps/shuttles/inteq/inteq_talos.dmm @@ -572,9 +572,6 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/mapping_helpers/airlock/locked, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /turf/open/floor/plating, /area/ship/maintenance/starboard) "dw" = ( @@ -1666,15 +1663,7 @@ /turf/open/floor/plating, /area/ship/engineering) "kc" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/turf/open/floor/plating, -/area/ship/maintenance/starboard) +) "kg" = ( /obj/effect/turf_decal/box/corners, /obj/effect/decal/cleanable/dirt, @@ -1898,15 +1887,13 @@ /turf/open/floor/plasteel/tech, /area/ship/engineering/engine) "mh" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/machinery/advanced_airlock_controller{ pixel_y = 24 }, +/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/layer4, +/obj/structure/chair/handrail{ + dir = 4 + }, /turf/open/floor/plating, /area/ship/maintenance/starboard) "mi" = ( @@ -2948,11 +2935,9 @@ /turf/open/floor/plasteel/dark, /area/ship/security) "rN" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/structure/sign/warning/vacuum/external{ + pixel_x = 29; + pixel_y = 0 }, /turf/open/floor/plating, /area/ship/maintenance/starboard) @@ -4305,8 +4290,11 @@ /area/ship/engineering) "zL" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/chair/handrail{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/layer2{ + dir = 8 }, /turf/open/floor/plating, /area/ship/maintenance/starboard) @@ -5875,9 +5863,11 @@ /area/ship/engineering) "KT" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/sign/warning/vacuum/external{ - pixel_x = 29; - pixel_y = 0 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 }, /turf/open/floor/plating, /area/ship/maintenance/starboard) @@ -6232,10 +6222,10 @@ icon_state = "6-8" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 + dir = 4 }, /turf/open/floor/plating, /area/ship/maintenance/starboard) @@ -8386,7 +8376,7 @@ aD MC zR vp -KW +kc br WE Xn @@ -9760,7 +9750,7 @@ sw fK ff ef -kc +Fl Ni dD fK @@ -9828,8 +9818,8 @@ sw sy fK ff -Gq ff +Gq fK qt sw From f689342045081ef9d60beec1b272c25106928670 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Mon, 23 Dec 2024 16:15:16 +0100 Subject: [PATCH 08/21] updates --- .../independent/independent_scarab.dmm | 8 +- _maps/shuttles/inteq/inteq_talos.dmm | 175 ++++++++++-------- 2 files changed, 96 insertions(+), 87 deletions(-) diff --git a/_maps/shuttles/independent/independent_scarab.dmm b/_maps/shuttles/independent/independent_scarab.dmm index ae2095e3c00c..4f462966a5bb 100644 --- a/_maps/shuttles/independent/independent_scarab.dmm +++ b/_maps/shuttles/independent/independent_scarab.dmm @@ -188,7 +188,7 @@ /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "ch" = ( -/obj/structure/closet/cardboard, +/obj/effect/spawner/random/trash/box, /obj/effect/spawner/random/maintenance, /obj/effect/spawner/random/entertainment/plushie, /obj/effect/spawner/random/entertainment/plushie, @@ -3691,9 +3691,7 @@ /turf/open/floor/plasteel, /area/ship/hallway/starboard) "Rs" = ( -/obj/machinery/door/airlock/maintenance{ - req_ship_access = 0 - }, +/obj/machinery/door/airlock/maintenance/external, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, @@ -4170,7 +4168,7 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/central) "Zc" = ( -/obj/structure/grille, +/obj/effect/spawner/random/structure/grille, /obj/effect/decal/cleanable/dirt, /obj/structure/cable/green{ icon_state = "4-8" diff --git a/_maps/shuttles/inteq/inteq_talos.dmm b/_maps/shuttles/inteq/inteq_talos.dmm index efcb79bc9a85..d717aff6d2b7 100644 --- a/_maps/shuttles/inteq/inteq_talos.dmm +++ b/_maps/shuttles/inteq/inteq_talos.dmm @@ -617,7 +617,11 @@ /turf/open/floor/plasteel/grimy, /area/ship/crew) "ef" = ( -/obj/effect/spawner/random/salvage_machine, +/obj/structure/closet/crate/large, +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/structure/sign/poster/random{ + pixel_y = 32 + }, /turf/open/floor/plating, /area/ship/maintenance/starboard) "ej" = ( @@ -968,12 +972,10 @@ /turf/open/floor/plating, /area/ship/storage/starboard) "go" = ( -/obj/structure/catwalk/over, -/obj/structure/closet/crate, /obj/structure/cable{ icon_state = "8-9" }, -/obj/effect/spawner/random/maintenance/two, +/obj/structure/catwalk/over, /turf/open/floor/plating, /area/ship/maintenance/starboard) "gp" = ( @@ -1150,12 +1152,11 @@ /turf/open/floor/engine/fuel, /area/ship/engineering/engine) "hm" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/sign/poster/random{ - pixel_y = -32 - }, +/obj/structure/closet/crate, +/obj/effect/spawner/random/maintenance/two, +/obj/structure/catwalk/over, /turf/open/floor/plating, -/area/ship/storage/starboard) +/area/ship/maintenance/starboard) "hw" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ @@ -1670,12 +1671,8 @@ /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "kh" = ( -/obj/structure/closet/crate/large, -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable{ - icon_state = "0-9" +/obj/effect/spawner/random/salvage_machine{ + dir = 1 }, /turf/open/floor/plating, /area/ship/maintenance/starboard) @@ -1890,10 +1887,7 @@ /obj/machinery/advanced_airlock_controller{ pixel_y = 24 }, -/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/layer4, -/obj/structure/chair/handrail{ - dir = 4 - }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/ship/maintenance/starboard) "mi" = ( @@ -2892,6 +2886,13 @@ /obj/structure/window/plasma/reinforced/plastitanium, /turf/open/floor/plating, /area/ship/engineering/engine) +"rl" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster/random{ + pixel_y = -32 + }, +/turf/open/floor/plating, +/area/ship/maintenance/starboard) "rv" = ( /obj/structure/cable{ icon_state = "1-2" @@ -2935,10 +2936,10 @@ /turf/open/floor/plasteel/dark, /area/ship/security) "rN" = ( -/obj/structure/sign/warning/vacuum/external{ - pixel_x = 29; - pixel_y = 0 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/ship/maintenance/starboard) "rP" = ( @@ -3240,6 +3241,12 @@ }, /turf/open/floor/plating, /area/ship/storage/port) +"tg" = ( +/obj/structure/closet/crate/science, +/obj/effect/spawner/random/maintenance, +/obj/item/circuitboard/computer/crew, +/turf/open/floor/plating, +/area/ship/maintenance/starboard) "ti" = ( /obj/structure/cable{ icon_state = "2-9" @@ -4129,11 +4136,6 @@ /area/ship/engineering) "yP" = ( /obj/structure/catwalk/over, -/obj/structure/closet/crate/engineering, -/obj/item/stack/sheet/plastic/twenty, -/obj/structure/sign/poster/random{ - pixel_x = 32 - }, /turf/open/floor/plating, /area/ship/maintenance/starboard) "yS" = ( @@ -4289,12 +4291,12 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) "zL" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/layer2{ - dir = 8 +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/structure/closet/emcloset/wall/directional/south{ + populate = 0 }, /turf/open/floor/plating, /area/ship/maintenance/starboard) @@ -4334,7 +4336,6 @@ "Aa" = ( /obj/structure/catwalk/over, /obj/structure/mopbucket, -/obj/item/reagent_containers/glass/bucket, /turf/open/floor/plating, /area/ship/storage/port) "Ag" = ( @@ -4564,7 +4565,7 @@ "Bz" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ - icon_state = "1-4" + icon_state = "1-6" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 @@ -4574,6 +4575,15 @@ }, /turf/open/floor/plating, /area/ship/maintenance/starboard) +"BD" = ( +/obj/structure/closet/crate/engineering, +/obj/item/stack/sheet/plastic/twenty, +/obj/structure/sign/poster/random{ + pixel_x = 32 + }, +/obj/structure/catwalk/over, +/turf/open/floor/plating, +/area/ship/maintenance/starboard) "BJ" = ( /obj/structure/cable{ icon_state = "4-8" @@ -5026,6 +5036,9 @@ /turf/open/floor/plating/airless, /area/ship/external/dark) "Fl" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/layer4{ + dir = 8 + }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/ship/maintenance/starboard) @@ -5201,15 +5214,13 @@ /turf/open/floor/plasteel/tech, /area/ship/hallway/central) "Gq" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/layer2{ + dir = 8 }, -/obj/machinery/door/airlock/maintenance/external{ - dir = 4 +/obj/structure/chair/comfy/shuttle{ + dir = 1 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/ship/maintenance/starboard) "Gr" = ( @@ -5220,9 +5231,6 @@ /area/ship/engineering/engine) "Gs" = ( /obj/effect/decal/cleanable/oil, -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, @@ -5312,17 +5320,16 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/port) "GQ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/sign/poster/random{ - pixel_y = 32 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 }, -/obj/structure/closet/emcloset/anchored{ - populate = 0 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/warning/vacuum/external{ + pixel_y = 24 }, -/obj/item/tank/internals/emergency_oxygen/engi, -/obj/item/tank/internals/emergency_oxygen/engi, -/obj/item/clothing/mask/breath, -/obj/item/clothing/mask/breath, /turf/open/floor/plating, /area/ship/maintenance/starboard) "GR" = ( @@ -5491,9 +5498,8 @@ /area/ship/cargo) "If" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/sign/poster/random{ - pixel_x = -32 - }, +/obj/structure/closet, +/obj/effect/spawner/random/maintenance/two, /turf/open/floor/plating, /area/ship/maintenance/starboard) "Io" = ( @@ -5678,10 +5684,11 @@ /turf/open/floor/plasteel/dark, /area/ship/security) "Jv" = ( -/obj/structure/closet/crate/science, -/obj/effect/spawner/random/maintenance, -/obj/item/circuitboard/computer/crew, /obj/effect/decal/cleanable/dirt, +/obj/structure/cable{ + icon_state = "0-9" + }, +/obj/machinery/power/apc/auto_name/directional/south, /turf/open/floor/plating, /area/ship/maintenance/starboard) "Jz" = ( @@ -5862,12 +5869,11 @@ /turf/open/floor/plasteel/tech, /area/ship/engineering) "KT" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 + dir = 9 }, /turf/open/floor/plating, /area/ship/maintenance/starboard) @@ -6077,6 +6083,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 9 }, +/obj/effect/spawner/random/trash/bucket{ + pixel_x = 7; + pixel_y = -4 + }, /turf/open/floor/plating, /area/ship/storage/starboard) "Mx" = ( @@ -6216,10 +6226,8 @@ /turf/open/floor/plating, /area/ship/crew/dorm/dormtwo) "Ni" = ( -/obj/effect/decal/cleanable/dirt, -/obj/item/cigbutt, -/obj/structure/cable{ - icon_state = "6-8" +/obj/machinery/door/airlock/maintenance/external{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -6274,7 +6282,7 @@ /turf/open/floor/plasteel/tech, /area/ship/hallway/central) "NF" = ( -/obj/structure/closet/cardboard, +/obj/effect/spawner/random/trash/box, /obj/effect/spawner/random/entertainment/plushie, /obj/effect/spawner/random/entertainment/plushie, /obj/effect/spawner/random/entertainment/plushie, @@ -6727,6 +6735,9 @@ "Rs" = ( /obj/structure/table, /obj/effect/spawner/random/maintenance, +/obj/structure/sign/poster/random{ + pixel_x = -32 + }, /turf/open/floor/plating, /area/ship/storage/starboard) "Ry" = ( @@ -7502,9 +7513,9 @@ "Wd" = ( /obj/structure/closet/crate/trashcart, /obj/effect/spawner/random/trash/crushed_can, -/obj/effect/spawner/random/trash/crushed_can, /obj/effect/spawner/random/maintenance, /obj/structure/catwalk/over, +/obj/effect/spawner/random/trash/garbage, /turf/open/floor/plating, /area/ship/maintenance/port) "We" = ( @@ -7668,7 +7679,7 @@ /area/ship/storage) "WP" = ( /obj/structure/catwalk/over, -/obj/structure/closet/cardboard, +/obj/effect/spawner/random/trash/box, /obj/effect/spawner/random/maintenance/two, /turf/open/floor/plating, /area/ship/maintenance/starboard) @@ -9515,7 +9526,7 @@ Nf QV lI Ho -hm +ub uI sw sw @@ -9615,7 +9626,7 @@ fK WP Jk ff -Fl +ff If YZ fK @@ -9651,7 +9662,7 @@ si ks Bz IB -YZ +rl fK sw sw @@ -9714,11 +9725,11 @@ sw sw sw fK +BD +hm ff -ff -ff -YX -ff +GQ +tg fK sw sw @@ -9749,10 +9760,10 @@ sw sw fK ff -ef -Fl +ff +ff Ni -dD +ff fK sw sw @@ -9783,7 +9794,7 @@ sw sw fK ff -GQ +dD rN KT kh @@ -9817,8 +9828,8 @@ sw sw sy fK -ff -ff +ef +Fl Gq fK qt From d3a873034523ecc266b58238bef7c74f1992704d Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Mon, 23 Dec 2024 16:18:47 +0100 Subject: [PATCH 09/21] unrusts this wall --- _maps/shuttles/inteq/inteq_talos.dmm | 98 ++++++++++++++-------------- 1 file changed, 49 insertions(+), 49 deletions(-) diff --git a/_maps/shuttles/inteq/inteq_talos.dmm b/_maps/shuttles/inteq/inteq_talos.dmm index d717aff6d2b7..0cdd9b774c97 100644 --- a/_maps/shuttles/inteq/inteq_talos.dmm +++ b/_maps/shuttles/inteq/inteq_talos.dmm @@ -617,11 +617,10 @@ /turf/open/floor/plasteel/grimy, /area/ship/crew) "ef" = ( -/obj/structure/closet/crate/large, -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/structure/sign/poster/random{ - pixel_y = 32 +/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/layer4{ + dir = 8 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/ship/maintenance/starboard) "ej" = ( @@ -1152,9 +1151,16 @@ /turf/open/floor/engine/fuel, /area/ship/engineering/engine) "hm" = ( -/obj/structure/closet/crate, -/obj/effect/spawner/random/maintenance/two, -/obj/structure/catwalk/over, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/warning/vacuum/external{ + pixel_y = 24 + }, /turf/open/floor/plating, /area/ship/maintenance/starboard) "hw" = ( @@ -2886,13 +2892,6 @@ /obj/structure/window/plasma/reinforced/plastitanium, /turf/open/floor/plating, /area/ship/engineering/engine) -"rl" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/sign/poster/random{ - pixel_y = -32 - }, -/turf/open/floor/plating, -/area/ship/maintenance/starboard) "rv" = ( /obj/structure/cable{ icon_state = "1-2" @@ -3241,12 +3240,6 @@ }, /turf/open/floor/plating, /area/ship/storage/port) -"tg" = ( -/obj/structure/closet/crate/science, -/obj/effect/spawner/random/maintenance, -/obj/item/circuitboard/computer/crew, -/turf/open/floor/plating, -/area/ship/maintenance/starboard) "ti" = ( /obj/structure/cable{ icon_state = "2-9" @@ -3514,6 +3507,14 @@ /obj/item/storage/box/cups, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) +"vh" = ( +/obj/structure/closet/crate/large, +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/structure/sign/poster/random{ + pixel_y = 32 + }, +/turf/open/floor/plating, +/area/ship/maintenance/starboard) "vi" = ( /obj/structure/sign/number/eight{ dir = 1 @@ -4575,15 +4576,6 @@ }, /turf/open/floor/plating, /area/ship/maintenance/starboard) -"BD" = ( -/obj/structure/closet/crate/engineering, -/obj/item/stack/sheet/plastic/twenty, -/obj/structure/sign/poster/random{ - pixel_x = 32 - }, -/obj/structure/catwalk/over, -/turf/open/floor/plating, -/area/ship/maintenance/starboard) "BJ" = ( /obj/structure/cable{ icon_state = "4-8" @@ -5036,10 +5028,9 @@ /turf/open/floor/plating/airless, /area/ship/external/dark) "Fl" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/layer4{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/crate/science, +/obj/effect/spawner/random/maintenance, +/obj/item/circuitboard/computer/crew, /turf/open/floor/plating, /area/ship/maintenance/starboard) "Fm" = ( @@ -5320,16 +5311,12 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/port) "GQ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/sign/warning/vacuum/external{ - pixel_y = 24 +/obj/structure/closet/crate/engineering, +/obj/item/stack/sheet/plastic/twenty, +/obj/structure/sign/poster/random{ + pixel_x = 32 }, +/obj/structure/catwalk/over, /turf/open/floor/plating, /area/ship/maintenance/starboard) "GR" = ( @@ -5490,6 +5477,12 @@ }, /turf/open/floor/plasteel/showroomfloor, /area/ship/crew/toilet) +"HQ" = ( +/obj/structure/closet/crate, +/obj/effect/spawner/random/maintenance/two, +/obj/structure/catwalk/over, +/turf/open/floor/plating, +/area/ship/maintenance/starboard) "Ic" = ( /obj/effect/turf_decal/box/corners{ dir = 8 @@ -7761,6 +7754,13 @@ "XJ" = ( /turf/open/floor/engine/hull/reinforced, /area/ship/external/dark) +"XO" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster/random{ + pixel_y = -32 + }, +/turf/open/floor/plating, +/area/ship/maintenance/starboard) "XV" = ( /obj/effect/turf_decal/siding/thinplating/dark, /obj/effect/turf_decal/trimline/opaque/yellow/line, @@ -9234,7 +9234,7 @@ sw sw sw yp -Qy +wU lM SH yp @@ -9662,7 +9662,7 @@ si ks Bz IB -rl +XO fK sw sw @@ -9725,11 +9725,11 @@ sw sw sw fK -BD -hm -ff GQ -tg +HQ +ff +hm +Fl fK sw sw @@ -9828,8 +9828,8 @@ sw sw sy fK +vh ef -Fl Gq fK qt From 906e44f0c59a3d1f66ff4d6889ced4a3a50189e5 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Mon, 23 Dec 2024 16:21:16 +0100 Subject: [PATCH 10/21] three is too much imo --- _maps/shuttles/inteq/inteq_talos.dmm | 95 ++++++++++++++-------------- 1 file changed, 48 insertions(+), 47 deletions(-) diff --git a/_maps/shuttles/inteq/inteq_talos.dmm b/_maps/shuttles/inteq/inteq_talos.dmm index 0cdd9b774c97..2ab132af7ee3 100644 --- a/_maps/shuttles/inteq/inteq_talos.dmm +++ b/_maps/shuttles/inteq/inteq_talos.dmm @@ -617,10 +617,11 @@ /turf/open/floor/plasteel/grimy, /area/ship/crew) "ef" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/layer4{ - dir = 8 +/obj/structure/closet/crate/large, +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/structure/sign/poster/random{ + pixel_y = 32 }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/ship/maintenance/starboard) "ej" = ( @@ -1140,6 +1141,12 @@ }, /turf/open/floor/plasteel/grimy, /area/ship/crew) +"hj" = ( +/obj/structure/closet/crate/science, +/obj/effect/spawner/random/maintenance, +/obj/item/circuitboard/computer/crew, +/turf/open/floor/plating, +/area/ship/maintenance/starboard) "hl" = ( /obj/effect/turf_decal/industrial/warning{ dir = 8 @@ -1151,15 +1158,9 @@ /turf/open/floor/engine/fuel, /area/ship/engineering/engine) "hm" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, -/obj/structure/sign/warning/vacuum/external{ - pixel_y = 24 +/obj/structure/sign/poster/random{ + pixel_y = -32 }, /turf/open/floor/plating, /area/ship/maintenance/starboard) @@ -3507,14 +3508,6 @@ /obj/item/storage/box/cups, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) -"vh" = ( -/obj/structure/closet/crate/large, -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/structure/sign/poster/random{ - pixel_y = 32 - }, -/turf/open/floor/plating, -/area/ship/maintenance/starboard) "vi" = ( /obj/structure/sign/number/eight{ dir = 1 @@ -3969,6 +3962,12 @@ }, /turf/open/floor/plasteel/tech, /area/ship/engineering/engine) +"xP" = ( +/obj/structure/closet/crate, +/obj/effect/spawner/random/maintenance/two, +/obj/structure/catwalk/over, +/turf/open/floor/plating, +/area/ship/maintenance/starboard) "xT" = ( /obj/structure/cable{ icon_state = "2-4" @@ -4896,6 +4895,19 @@ /obj/structure/crate_shelf, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) +"DJ" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/warning/vacuum/external{ + pixel_y = 24 + }, +/turf/open/floor/plating, +/area/ship/maintenance/starboard) "DO" = ( /turf/closed/wall/mineral/plastitanium, /area/ship/crew/dorm/dormtwo) @@ -5008,8 +5020,9 @@ /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/crew/dorm/dormtwo) "Fh" = ( -/obj/structure/closet/crate/secure/loot, +/obj/structure/closet/crate, /obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/maintenance/two, /turf/open/floor/plating, /area/ship/storage/port) "Fi" = ( @@ -5028,9 +5041,12 @@ /turf/open/floor/plating/airless, /area/ship/external/dark) "Fl" = ( -/obj/structure/closet/crate/science, -/obj/effect/spawner/random/maintenance, -/obj/item/circuitboard/computer/crew, +/obj/structure/closet/crate/engineering, +/obj/item/stack/sheet/plastic/twenty, +/obj/structure/sign/poster/random{ + pixel_x = 32 + }, +/obj/structure/catwalk/over, /turf/open/floor/plating, /area/ship/maintenance/starboard) "Fm" = ( @@ -5311,12 +5327,10 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/port) "GQ" = ( -/obj/structure/closet/crate/engineering, -/obj/item/stack/sheet/plastic/twenty, -/obj/structure/sign/poster/random{ - pixel_x = 32 +/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/layer4{ + dir = 8 }, -/obj/structure/catwalk/over, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/ship/maintenance/starboard) "GR" = ( @@ -5477,12 +5491,6 @@ }, /turf/open/floor/plasteel/showroomfloor, /area/ship/crew/toilet) -"HQ" = ( -/obj/structure/closet/crate, -/obj/effect/spawner/random/maintenance/two, -/obj/structure/catwalk/over, -/turf/open/floor/plating, -/area/ship/maintenance/starboard) "Ic" = ( /obj/effect/turf_decal/box/corners{ dir = 8 @@ -7754,13 +7762,6 @@ "XJ" = ( /turf/open/floor/engine/hull/reinforced, /area/ship/external/dark) -"XO" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/sign/poster/random{ - pixel_y = -32 - }, -/turf/open/floor/plating, -/area/ship/maintenance/starboard) "XV" = ( /obj/effect/turf_decal/siding/thinplating/dark, /obj/effect/turf_decal/trimline/opaque/yellow/line, @@ -9662,7 +9663,7 @@ si ks Bz IB -XO +hm fK sw sw @@ -9725,11 +9726,11 @@ sw sw sw fK -GQ -HQ -ff -hm Fl +xP +ff +DJ +hj fK sw sw @@ -9828,8 +9829,8 @@ sw sw sy fK -vh ef +GQ Gq fK qt From bbba6bc053b7e09a5111b4519a2f01dfac2c7a28 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Mon, 23 Dec 2024 16:57:57 +0100 Subject: [PATCH 11/21] airlocks work now kinda --- .../independent/independent_scarab.dmm | 48 +++---- _maps/shuttles/inteq/inteq_talos.dmm | 118 +++++++++--------- 2 files changed, 86 insertions(+), 80 deletions(-) diff --git a/_maps/shuttles/independent/independent_scarab.dmm b/_maps/shuttles/independent/independent_scarab.dmm index 4f462966a5bb..b3ba003ae910 100644 --- a/_maps/shuttles/independent/independent_scarab.dmm +++ b/_maps/shuttles/independent/independent_scarab.dmm @@ -501,7 +501,7 @@ req_ship_access = 0 }, /obj/effect/mapping_helpers/airlock/locked, -/obj/machinery/atmospherics/pipe/layer_manifold, +/obj/effect/turf_decal/industrial/warning/fulltile, /turf/open/floor/plating, /area/ship/maintenance/fore) "gp" = ( @@ -586,12 +586,12 @@ /turf/open/floor/plasteel/dark, /area/ship/engineering) "he" = ( -/obj/structure/closet/crate/large, -/obj/machinery/portable_atmospherics/canister/oxygen, /obj/effect/decal/cleanable/dirt, /obj/machinery/advanced_airlock_controller{ pixel_y = 24 }, +/obj/structure/rack, +/obj/effect/spawner/random/maintenance, /turf/open/floor/plating, /area/ship/maintenance/fore) "hn" = ( @@ -1344,10 +1344,10 @@ /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "qh" = ( -/obj/structure/rack, -/obj/effect/spawner/random/maintenance, +/obj/structure/closet/crate, /obj/effect/decal/cleanable/dirt, /obj/structure/catwalk/over, +/obj/effect/spawner/random/maintenance/two, /turf/open/floor/plating, /area/ship/maintenance/port) "qv" = ( @@ -1420,11 +1420,12 @@ /area/ship/maintenance/port) "rn" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/closet/crate, -/obj/effect/spawner/random/maintenance/two, /obj/structure/sign/poster/random{ pixel_x = 32 }, +/obj/effect/spawner/random/salvage_machine{ + dir = 8 + }, /turf/open/floor/plating, /area/ship/maintenance/fore) "rt" = ( @@ -1761,10 +1762,7 @@ /area/ship/crew/cryo) "uo" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/layer4, /turf/open/floor/plating, /area/ship/maintenance/fore) "ut" = ( @@ -2295,16 +2293,14 @@ /turf/open/floor/plasteel/dark, /area/ship/security) "AT" = ( -/obj/effect/spawner/random/salvage_machine{ - dir = 8 - }, -/obj/effect/decal/cleanable/crayon{ - icon_state = "space"; - pixel_y = 29; - pixel_x = 1; - paint_colour = "#FF0000" - }, /obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/structure/closet/emcloset/anchored{ + populate = 0 + }, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, /turf/open/floor/plating, /area/ship/maintenance/fore) "AU" = ( @@ -2860,6 +2856,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, +/obj/effect/decal/cleanable/crayon{ + icon_state = "space"; + pixel_y = 29; + pixel_x = 1; + paint_colour = "#FF0000" + }, /turf/open/floor/plating, /area/ship/maintenance/fore) "Ia" = ( @@ -3299,8 +3301,8 @@ /turf/open/floor/plating, /area/ship/maintenance/port) "Md" = ( -/obj/structure/rack, -/obj/effect/spawner/random/maintenance, +/obj/structure/closet/crate/large, +/obj/machinery/portable_atmospherics/canister/oxygen, /turf/open/floor/plating, /area/ship/maintenance/fore) "Me" = ( @@ -3872,7 +3874,7 @@ "UZ" = ( /obj/effect/decal/cleanable/dirt, /obj/item/cigbutt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/ship/maintenance/fore) diff --git a/_maps/shuttles/inteq/inteq_talos.dmm b/_maps/shuttles/inteq/inteq_talos.dmm index 2ab132af7ee3..948d2fba1339 100644 --- a/_maps/shuttles/inteq/inteq_talos.dmm +++ b/_maps/shuttles/inteq/inteq_talos.dmm @@ -617,11 +617,10 @@ /turf/open/floor/plasteel/grimy, /area/ship/crew) "ef" = ( -/obj/structure/closet/crate/large, -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/structure/sign/poster/random{ - pixel_y = 32 +/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/layer4{ + dir = 8 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/ship/maintenance/starboard) "ej" = ( @@ -900,8 +899,8 @@ /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/maintenance/starboard) "fN" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer2{ - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/layer2{ + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -1141,12 +1140,6 @@ }, /turf/open/floor/plasteel/grimy, /area/ship/crew) -"hj" = ( -/obj/structure/closet/crate/science, -/obj/effect/spawner/random/maintenance, -/obj/item/circuitboard/computer/crew, -/turf/open/floor/plating, -/area/ship/maintenance/starboard) "hl" = ( /obj/effect/turf_decal/industrial/warning{ dir = 8 @@ -1158,9 +1151,15 @@ /turf/open/floor/engine/fuel, /area/ship/engineering/engine) "hm" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /obj/effect/decal/cleanable/dirt, -/obj/structure/sign/poster/random{ - pixel_y = -32 +/obj/structure/sign/warning/vacuum/external{ + pixel_y = 24 }, /turf/open/floor/plating, /area/ship/maintenance/starboard) @@ -2781,6 +2780,7 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, +/obj/structure/catwalk/over, /turf/open/floor/plating, /area/ship/engineering) "qF" = ( @@ -3962,12 +3962,6 @@ }, /turf/open/floor/plasteel/tech, /area/ship/engineering/engine) -"xP" = ( -/obj/structure/closet/crate, -/obj/effect/spawner/random/maintenance/two, -/obj/structure/catwalk/over, -/turf/open/floor/plating, -/area/ship/maintenance/starboard) "xT" = ( /obj/structure/cable{ icon_state = "2-4" @@ -4573,6 +4567,12 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 5 }, +/turf/open/floor/plasteel/dark, +/area/ship/maintenance/starboard) +"BE" = ( +/obj/structure/closet/crate/science, +/obj/effect/spawner/random/maintenance, +/obj/item/circuitboard/computer/crew, /turf/open/floor/plating, /area/ship/maintenance/starboard) "BJ" = ( @@ -4824,6 +4824,12 @@ /obj/item/radio/intercom/directional/east, /turf/open/floor/plasteel/tech, /area/ship/engineering/engine) +"Dj" = ( +/obj/structure/closet/crate, +/obj/effect/spawner/random/maintenance/two, +/obj/structure/catwalk/over, +/turf/open/floor/plating, +/area/ship/maintenance/starboard) "Dl" = ( /obj/machinery/light/directional/north, /obj/effect/turf_decal/trimline/opaque/yellow/line{ @@ -4895,19 +4901,6 @@ /obj/structure/crate_shelf, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) -"DJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/sign/warning/vacuum/external{ - pixel_y = 24 - }, -/turf/open/floor/plating, -/area/ship/maintenance/starboard) "DO" = ( /turf/closed/wall/mineral/plastitanium, /area/ship/crew/dorm/dormtwo) @@ -4946,7 +4939,7 @@ autolinkers = list("hub","processor4","bus"); network = "irmg_commnet" }, -/turf/closed/wall/mineral/plastitanium, +/turf/open/floor/circuit/telecomms/mainframe, /area/ship/engineering/communications) "Ep" = ( /obj/item/trash/can, @@ -5041,13 +5034,7 @@ /turf/open/floor/plating/airless, /area/ship/external/dark) "Fl" = ( -/obj/structure/closet/crate/engineering, -/obj/item/stack/sheet/plastic/twenty, -/obj/structure/sign/poster/random{ - pixel_x = 32 - }, -/obj/structure/catwalk/over, -/turf/open/floor/plating, +/turf/closed/wall/yesdiag, /area/ship/maintenance/starboard) "Fm" = ( /obj/structure/cable{ @@ -5327,10 +5314,12 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/port) "GQ" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/layer4{ - dir = 8 +/obj/structure/closet/crate/engineering, +/obj/item/stack/sheet/plastic/twenty, +/obj/structure/sign/poster/random{ + pixel_x = 32 }, -/obj/effect/decal/cleanable/dirt, +/obj/structure/catwalk/over, /turf/open/floor/plating, /area/ship/maintenance/starboard) "GR" = ( @@ -5501,7 +5490,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/closet, /obj/effect/spawner/random/maintenance/two, -/turf/open/floor/plating, +/turf/open/floor/plasteel/dark, /area/ship/maintenance/starboard) "Io" = ( /obj/structure/cable/yellow{ @@ -5565,7 +5554,7 @@ /turf/open/floor/plasteel/tech, /area/ship/security/armory) "IB" = ( -/turf/open/floor/plating, +/turf/open/floor/plasteel/dark, /area/ship/maintenance/starboard) "ID" = ( /obj/machinery/door/airlock/public/glass{ @@ -5603,6 +5592,13 @@ }, /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) +"IO" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster/random{ + pixel_y = -32 + }, +/turf/open/floor/plasteel/dark, +/area/ship/maintenance/starboard) "IR" = ( /obj/structure/cable{ icon_state = "0-8" @@ -7807,12 +7803,20 @@ /obj/structure/sign/poster/random{ pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, /obj/structure/chair/handrail, +/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/layer4{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/ship/maintenance/port) +"Yr" = ( +/obj/structure/closet/crate/large, +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/structure/sign/poster/random{ + pixel_y = 32 + }, +/turf/open/floor/plating, +/area/ship/maintenance/starboard) "Yt" = ( /obj/effect/turf_decal/corner/opaque/yellow{ dir = 1 @@ -7926,7 +7930,7 @@ /obj/structure/closet, /obj/effect/spawner/random/maintenance/two, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, +/turf/open/floor/plasteel/dark, /area/ship/maintenance/starboard) "Zb" = ( /obj/structure/table, @@ -9627,7 +9631,7 @@ fK WP Jk ff -ff +Fl If YZ fK @@ -9663,7 +9667,7 @@ si ks Bz IB -hm +IO fK sw sw @@ -9726,11 +9730,11 @@ sw sw sw fK -Fl -xP +GQ +Dj ff -DJ -hj +hm +BE fK sw sw @@ -9829,8 +9833,8 @@ sw sw sy fK +Yr ef -GQ Gq fK qt From 8eda8d2d033263e11362dd64d1ce1c3999943d6e Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Mon, 23 Dec 2024 16:59:04 +0100 Subject: [PATCH 12/21] fixes the matrix --- _maps/shuttles/inteq/inteq_talos.dmm | 39 +++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/_maps/shuttles/inteq/inteq_talos.dmm b/_maps/shuttles/inteq/inteq_talos.dmm index 948d2fba1339..f5280f1354f8 100644 --- a/_maps/shuttles/inteq/inteq_talos.dmm +++ b/_maps/shuttles/inteq/inteq_talos.dmm @@ -1670,7 +1670,44 @@ /turf/open/floor/plating, /area/ship/engineering) "kc" = ( -) +/obj/item/storage/backpack/industrial, +/obj/item/clothing/suit/hazardvest, +/obj/item/clothing/gloves/color/yellow, +/obj/item/clothing/under/syndicate/inteq/artificer, +/obj/item/clothing/under/syndicate/inteq/skirt/artificer, +/obj/item/clothing/head/soft/inteq, +/obj/item/clothing/head/hardhat, +/obj/item/clothing/shoes/combat, +/obj/structure/closet/secure_closet{ + anchored = 1; + icon_state = "eng_secure"; + name = "artificer's locker"; + req_access_txt = "11"; + req_one_access = null + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/machinery/light/directional/north, +/obj/item/storage/belt/utility/full, +/obj/effect/turf_decal/techfloor{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 8 + }, +/obj/item/clothing/glasses/meson, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 20; + pixel_y = 11 + }, +/obj/item/gear_pack/anglegrinder, +/obj/item/radio/headset/alt, +/obj/item/clothing/mask/gas/inteq, +/turf/open/floor/plasteel/tech/grid, +/area/space) "kg" = ( /obj/effect/turf_decal/box/corners, /obj/effect/decal/cleanable/dirt, From 3ce8345bcca90869a579998f355b88ed46a65c21 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Mon, 23 Dec 2024 17:03:04 +0100 Subject: [PATCH 13/21] forgot area + minor stuff --- _maps/shuttles/independent/independent_scarab.dmm | 6 +++++- _maps/shuttles/inteq/inteq_talos.dmm | 10 +++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/_maps/shuttles/independent/independent_scarab.dmm b/_maps/shuttles/independent/independent_scarab.dmm index b3ba003ae910..35dbb76eba3d 100644 --- a/_maps/shuttles/independent/independent_scarab.dmm +++ b/_maps/shuttles/independent/independent_scarab.dmm @@ -832,7 +832,7 @@ /obj/machinery/door/airlock/maintenance{ req_ship_access = 0 }, -/obj/effect/mapping_helpers/airlock/locked, +/obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/ship/maintenance/fore) "kf" = ( @@ -2230,6 +2230,10 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/effect/spawner/random/trash/bucket{ + pixel_x = -7; + pixel_y = -4 + }, /turf/open/floor/plating, /area/ship/maintenance/port) "zS" = ( diff --git a/_maps/shuttles/inteq/inteq_talos.dmm b/_maps/shuttles/inteq/inteq_talos.dmm index f5280f1354f8..8aa9bd377531 100644 --- a/_maps/shuttles/inteq/inteq_talos.dmm +++ b/_maps/shuttles/inteq/inteq_talos.dmm @@ -1707,7 +1707,7 @@ /obj/item/radio/headset/alt, /obj/item/clothing/mask/gas/inteq, /turf/open/floor/plasteel/tech/grid, -/area/space) +/area/ship/engineering) "kg" = ( /obj/effect/turf_decal/box/corners, /obj/effect/decal/cleanable/dirt, @@ -5322,7 +5322,9 @@ /turf/open/floor/plasteel/telecomms_floor, /area/ship/storage) "GA" = ( -/obj/structure/filingcabinet/chestdrawer/wheeled, +/obj/structure/filingcabinet/chestdrawer/wheeled{ + dir = 8 + }, /obj/item/folder, /obj/item/folder/yellow, /obj/item/folder/red, @@ -7626,7 +7628,9 @@ /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) "WC" = ( -/obj/structure/dresser, +/obj/structure/dresser{ + dir = 8 + }, /obj/machinery/light/small/directional/east, /turf/open/floor/carpet/black, /area/ship/crew/dorm) From 9c2532b3dc1da14b30273a928b88c8e95f7de3af Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Mon, 23 Dec 2024 17:09:45 +0100 Subject: [PATCH 14/21] moves these pipes --- _maps/shuttles/independent/independent_scarab.dmm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/_maps/shuttles/independent/independent_scarab.dmm b/_maps/shuttles/independent/independent_scarab.dmm index 35dbb76eba3d..074ecce40bf8 100644 --- a/_maps/shuttles/independent/independent_scarab.dmm +++ b/_maps/shuttles/independent/independent_scarab.dmm @@ -1762,7 +1762,9 @@ /area/ship/crew/cryo) "uo" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/layer4, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, /turf/open/floor/plating, /area/ship/maintenance/fore) "ut" = ( @@ -2305,6 +2307,9 @@ /obj/item/tank/internals/emergency_oxygen, /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, +/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/layer4{ + dir = 8 + }, /turf/open/floor/plating, /area/ship/maintenance/fore) "AU" = ( @@ -2874,7 +2879,6 @@ icon_state = "0-1" }, /obj/effect/decal/cleanable/dirt, -/obj/structure/spider/stickyweb, /turf/open/floor/plating, /area/ship/maintenance/fore) "Iu" = ( @@ -3307,6 +3311,9 @@ "Md" = ( /obj/structure/closet/crate/large, /obj/machinery/portable_atmospherics/canister/oxygen, +/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/layer2{ + dir = 4 + }, /turf/open/floor/plating, /area/ship/maintenance/fore) "Me" = ( @@ -3878,7 +3885,9 @@ "UZ" = ( /obj/effect/decal/cleanable/dirt, /obj/item/cigbutt, -/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/layer2, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/ship/maintenance/fore) From 83d108474467d303cfdba691f2d87524bda9c9c3 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Mon, 23 Dec 2024 17:11:15 +0100 Subject: [PATCH 15/21] also the decals --- _maps/shuttles/inteq/inteq_talos.dmm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/_maps/shuttles/inteq/inteq_talos.dmm b/_maps/shuttles/inteq/inteq_talos.dmm index 8aa9bd377531..451dd88f8a1b 100644 --- a/_maps/shuttles/inteq/inteq_talos.dmm +++ b/_maps/shuttles/inteq/inteq_talos.dmm @@ -803,9 +803,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/effect/turf_decal/industrial/warning{ - dir = 4 - }, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/central) "fh" = ( @@ -5216,9 +5213,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/effect/turf_decal/industrial/warning{ - dir = 4 - }, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/port) "Gl" = ( From 3b1847c77b482072d4bfc623cc6afd03953a7418 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Tue, 24 Dec 2024 13:43:17 +0100 Subject: [PATCH 16/21] some minor upkeep while I'm here --- .../independent/independent_scarab.dmm | 26 +++++++++++++------ _maps/shuttles/inteq/inteq_talos.dmm | 21 +++++---------- 2 files changed, 25 insertions(+), 22 deletions(-) diff --git a/_maps/shuttles/independent/independent_scarab.dmm b/_maps/shuttles/independent/independent_scarab.dmm index 074ecce40bf8..6a415575a2cc 100644 --- a/_maps/shuttles/independent/independent_scarab.dmm +++ b/_maps/shuttles/independent/independent_scarab.dmm @@ -277,9 +277,9 @@ /area/ship/engineering) "dJ" = ( /obj/structure/closet/crate/trashcart, -/obj/item/trash/chips, -/obj/item/trash/can, -/obj/item/trash/sosjerky, +/obj/effect/spawner/random/trash/garbage, +/obj/effect/spawner/random/trash/garbage, +/obj/effect/spawner/random/trash/garbage, /obj/effect/spawner/random/maintenance, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) @@ -1167,7 +1167,7 @@ /obj/effect/turf_decal/corner/transparent/bar/diagonal, /obj/structure/closet/crate/bin, /obj/effect/spawner/random/maintenance, -/obj/item/trash/chips, +/obj/effect/spawner/random/trash/garbage, /obj/machinery/airalarm/directional/east, /turf/open/floor/plasteel, /area/ship/crew) @@ -1580,6 +1580,10 @@ }, /obj/structure/railing, /obj/machinery/light/directional/west, +/obj/item/stamp/captain{ + pixel_x = -7; + pixel_y = 6 + }, /turf/open/floor/plasteel/tech, /area/ship/bridge) "sG" = ( @@ -2449,7 +2453,9 @@ dir = 1 }, /obj/machinery/light/small/directional/east, -/obj/effect/spawner/random/bedsheet, +/obj/effect/spawner/random/bedsheet{ + dir = 4 + }, /turf/open/floor/carpet, /area/ship/crew/dorm) "Dt" = ( @@ -2615,7 +2621,7 @@ /area/ship/hallway/starboard) "FP" = ( /obj/structure/closet/crate/bin, -/obj/item/trash/boritos, +/obj/effect/spawner/random/trash/garbage, /obj/effect/spawner/random/maintenance, /turf/open/floor/plasteel/dark, /area/ship/bridge) @@ -2797,6 +2803,7 @@ /obj/item/clothing/head/hardhat/white, /obj/effect/turf_decal/box, /obj/item/storage/box/ammo/c38, +/obj/item/clothing/accessory/holster, /obj/item/megaphone/cargo, /turf/open/floor/plasteel/patterned, /area/ship/cargo) @@ -3704,7 +3711,9 @@ /turf/open/floor/plasteel, /area/ship/hallway/starboard) "Rs" = ( -/obj/machinery/door/airlock/maintenance/external, +/obj/machinery/door/airlock/maintenance/external{ + req_ship_access = 0 + }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, @@ -4095,7 +4104,8 @@ "Xd" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp/green{ - pixel_y = 7 + pixel_y = 7; + layer = 3.22 }, /turf/open/floor/carpet, /area/ship/crew/dorm) diff --git a/_maps/shuttles/inteq/inteq_talos.dmm b/_maps/shuttles/inteq/inteq_talos.dmm index 451dd88f8a1b..c6179ebd182f 100644 --- a/_maps/shuttles/inteq/inteq_talos.dmm +++ b/_maps/shuttles/inteq/inteq_talos.dmm @@ -1411,8 +1411,7 @@ /area/ship/hallway/central) "iO" = ( /obj/machinery/door/airlock/maintenance{ - dir = 8; - req_ship_access = 0 + dir = 4 }, /obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, @@ -3466,8 +3465,7 @@ /area/ship/crew/cryo) "uo" = ( /obj/machinery/door/airlock/maintenance{ - dir = 8; - req_ship_access = 0 + dir = 4 }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/cable{ @@ -4270,8 +4268,7 @@ /area/ship/engineering/communications) "zB" = ( /obj/machinery/door/airlock/maintenance{ - dir = 8; - req_ship_access = 0 + dir = 4 }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/cable{ @@ -6686,8 +6683,7 @@ /area/ship/storage/starboard) "QW" = ( /obj/machinery/door/airlock/maintenance{ - dir = 8; - req_ship_access = 0 + dir = 4 }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/cable{ @@ -7276,8 +7272,7 @@ /area/ship/storage/starboard) "Uy" = ( /obj/machinery/door/airlock/maintenance{ - dir = 8; - req_ship_access = 0 + dir = 4 }, /obj/structure/cable{ icon_state = "4-8" @@ -7912,8 +7907,7 @@ /area/ship/crew/dorm) "YD" = ( /obj/machinery/door/airlock/maintenance{ - dir = 8; - req_ship_access = 0 + dir = 4 }, /obj/structure/cable{ icon_state = "4-8" @@ -7946,8 +7940,7 @@ /area/ship/storage/starboard) "YX" = ( /obj/machinery/door/airlock/maintenance{ - dir = 8; - req_ship_access = 0 + dir = 4 }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/cable{ From 6844fcbd5941e150e7043aa36629d7c9ebed2ec0 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Tue, 24 Dec 2024 13:52:59 +0100 Subject: [PATCH 17/21] this shouldn't be that --- _maps/shuttles/independent/independent_scarab.dmm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/_maps/shuttles/independent/independent_scarab.dmm b/_maps/shuttles/independent/independent_scarab.dmm index 6a415575a2cc..db89d8d58b67 100644 --- a/_maps/shuttles/independent/independent_scarab.dmm +++ b/_maps/shuttles/independent/independent_scarab.dmm @@ -497,9 +497,7 @@ /turf/open/floor/plasteel/tech, /area/ship/bridge) "gj" = ( -/obj/machinery/door/airlock/maintenance/external{ - req_ship_access = 0 - }, +/obj/machinery/door/airlock/maintenance/external, /obj/effect/mapping_helpers/airlock/locked, /obj/effect/turf_decal/industrial/warning/fulltile, /turf/open/floor/plating, From 8051eb2797ef9ad951bb4efb741a22a6f384aef2 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Tue, 24 Dec 2024 15:55:32 +0100 Subject: [PATCH 18/21] talos desc --- _maps/configs/inteq_talos.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_maps/configs/inteq_talos.json b/_maps/configs/inteq_talos.json index b2d39c10f443..df6364dc15b2 100644 --- a/_maps/configs/inteq_talos.json +++ b/_maps/configs/inteq_talos.json @@ -3,7 +3,7 @@ "map_name": "Talos-class Command Clipper", "faction": "/datum/faction/inteq", "prefix": "IRMV", - "description": "The Talos is a command and support ship, and a rare example of a purpose-built Inteq ship. Outfitted with an abundance of construction and engineering equipment and a private bluespace communications suite capable of networking IRMG ships across any given system, Taloses are often the lynchpin of coordinated IRMG operations in a system, and offer construction and repair services as part of IRMG’s mercenary offerings. As Talos crews place a larger emphasis on support personnel, they tend to be less well-armed than other Inteq crews. One unusual feature of the Talos is its depressurized “wings” filled with redundant baffles, intended to provide extra durability in the case of impacts or weapons fire. They also double as auxiliary storage space and potential room for modification by their enterprising Artificer crews.", + "description": "The Talos is a command and support ship, and a rare example of a purpose-built Inteq ship. Outfitted with an abundance of construction and engineering equipment and a private bluespace communications suite capable of networking IRMG ships across any given system, Taloses are often the lynchpin of coordinated IRMG operations in a system, and offer construction and repair services as part of IRMG’s mercenary offerings. As Talos crews place a larger emphasis on support personnel, they tend to be less well-armed than other Inteq crews. One unusual feature of the Talos is its “wings” filled with redundant baffles, intended to provide extra durability in the case of impacts or weapons fire. They also offer auxiliary storage space and potential room for modification by their enterprising Artificer crews.", "tags": [ "Engineer", "Telecomms" @@ -47,7 +47,7 @@ }, "Recruit": { "outfit": "/datum/outfit/job/inteq/assistant", - "slots": 4 + "slots": 4 } }, "enabled": true From 9f37eaa62f0eed51d439a3958cd39514d167cb2e Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Tue, 24 Dec 2024 16:06:41 +0100 Subject: [PATCH 19/21] tweak --- _maps/shuttles/inteq/inteq_talos.dmm | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/_maps/shuttles/inteq/inteq_talos.dmm b/_maps/shuttles/inteq/inteq_talos.dmm index c6179ebd182f..f79a29eb6462 100644 --- a/_maps/shuttles/inteq/inteq_talos.dmm +++ b/_maps/shuttles/inteq/inteq_talos.dmm @@ -972,6 +972,8 @@ icon_state = "8-9" }, /obj/structure/catwalk/over, +/obj/structure/closet/crate, +/obj/effect/spawner/random/maintenance/two, /turf/open/floor/plating, /area/ship/maintenance/starboard) "gp" = ( @@ -4162,6 +4164,8 @@ /area/ship/engineering) "yP" = ( /obj/structure/catwalk/over, +/obj/structure/closet/crate/engineering, +/obj/item/stack/sheet/plastic/twenty, /turf/open/floor/plating, /area/ship/maintenance/starboard) "yS" = ( @@ -4855,12 +4859,6 @@ /obj/item/radio/intercom/directional/east, /turf/open/floor/plasteel/tech, /area/ship/engineering/engine) -"Dj" = ( -/obj/structure/closet/crate, -/obj/effect/spawner/random/maintenance/two, -/obj/structure/catwalk/over, -/turf/open/floor/plating, -/area/ship/maintenance/starboard) "Dl" = ( /obj/machinery/light/directional/north, /obj/effect/turf_decal/trimline/opaque/yellow/line{ @@ -5344,13 +5342,10 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/port) "GQ" = ( -/obj/structure/closet/crate/engineering, -/obj/item/stack/sheet/plastic/twenty, /obj/structure/sign/poster/random{ pixel_x = 32 }, -/obj/structure/catwalk/over, -/turf/open/floor/plating, +/turf/closed/wall, /area/ship/maintenance/starboard) "GR" = ( /obj/structure/bed, @@ -5584,6 +5579,7 @@ /turf/open/floor/plasteel/tech, /area/ship/security/armory) "IB" = ( +/obj/item/cigbutt, /turf/open/floor/plasteel/dark, /area/ship/maintenance/starboard) "ID" = ( @@ -5625,7 +5621,7 @@ "IO" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/sign/poster/random{ - pixel_y = -32 + pixel_x = -32 }, /turf/open/floor/plasteel/dark, /area/ship/maintenance/starboard) @@ -9660,7 +9656,7 @@ WP Jk ff Fl -If +IO YZ fK sw @@ -9695,7 +9691,7 @@ si ks Bz IB -IO +If fK sw sw @@ -9759,7 +9755,7 @@ sw sw fK GQ -Dj +ff ff hm BE From 314e4465c643108681ee887ba0cf2368db19a64b Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Tue, 24 Dec 2024 19:40:39 +0100 Subject: [PATCH 20/21] tweak --- _maps/shuttles/independent/independent_scarab.dmm | 1 - _maps/shuttles/inteq/inteq_talos.dmm | 9 ++++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/_maps/shuttles/independent/independent_scarab.dmm b/_maps/shuttles/independent/independent_scarab.dmm index db89d8d58b67..6a18e6d6dad1 100644 --- a/_maps/shuttles/independent/independent_scarab.dmm +++ b/_maps/shuttles/independent/independent_scarab.dmm @@ -2801,7 +2801,6 @@ /obj/item/clothing/head/hardhat/white, /obj/effect/turf_decal/box, /obj/item/storage/box/ammo/c38, -/obj/item/clothing/accessory/holster, /obj/item/megaphone/cargo, /turf/open/floor/plasteel/patterned, /area/ship/cargo) diff --git a/_maps/shuttles/inteq/inteq_talos.dmm b/_maps/shuttles/inteq/inteq_talos.dmm index f79a29eb6462..7ea3dc0ad4ed 100644 --- a/_maps/shuttles/inteq/inteq_talos.dmm +++ b/_maps/shuttles/inteq/inteq_talos.dmm @@ -4859,6 +4859,10 @@ /obj/item/radio/intercom/directional/east, /turf/open/floor/plasteel/tech, /area/ship/engineering/engine) +"Dj" = ( +/obj/structure/grille, +/turf/open/floor/plating, +/area/ship/maintenance/starboard) "Dl" = ( /obj/machinery/light/directional/north, /obj/effect/turf_decal/trimline/opaque/yellow/line{ @@ -5257,6 +5261,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/structure/sink{ + pixel_y = 21 + }, /turf/open/floor/plating, /area/ship/maintenance/starboard) "Gt" = ( @@ -9755,7 +9762,7 @@ sw sw fK GQ -ff +Dj ff hm BE From 81c23b3a11442ffb22877791470484e0d37b297a Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Mon, 6 Jan 2025 16:53:05 +0100 Subject: [PATCH 21/21] directional AACs --- .../shuttles/independent/independent_scarab.dmm | 8 ++------ _maps/shuttles/inteq/inteq_talos.dmm | 16 ++++------------ 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/_maps/shuttles/independent/independent_scarab.dmm b/_maps/shuttles/independent/independent_scarab.dmm index 6a18e6d6dad1..ab9bb9a7426e 100644 --- a/_maps/shuttles/independent/independent_scarab.dmm +++ b/_maps/shuttles/independent/independent_scarab.dmm @@ -319,9 +319,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/high_volume/layer2{ dir = 8 }, -/obj/machinery/advanced_airlock_controller{ - pixel_y = 23 - }, +/obj/machinery/advanced_airlock_controller/directional/north, /obj/structure/chair/handrail{ dir = 8 }, @@ -585,9 +583,7 @@ /area/ship/engineering) "he" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/advanced_airlock_controller{ - pixel_y = 24 - }, +/obj/machinery/advanced_airlock_controller/directional/north, /obj/structure/rack, /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, diff --git a/_maps/shuttles/inteq/inteq_talos.dmm b/_maps/shuttles/inteq/inteq_talos.dmm index e6a3a07c5600..a5a21a0ac772 100644 --- a/_maps/shuttles/inteq/inteq_talos.dmm +++ b/_maps/shuttles/inteq/inteq_talos.dmm @@ -3094,9 +3094,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 9 }, -/obj/machinery/advanced_airlock_controller{ - pixel_y = -21 - }, +/obj/machinery/advanced_airlock_controller/directional/south, /obj/effect/turf_decal/siding/thinplating/dark{ dir = 4 }, @@ -3993,9 +3991,7 @@ /turf/open/floor/plating, /area/ship/storage/starboard) "wM" = ( -/obj/machinery/advanced_airlock_controller{ - pixel_y = -21 - }, +/obj/machinery/advanced_airlock_controller/directional/south, /turf/open/floor/plating, /area/ship/maintenance/port) "wQ" = ( @@ -4646,9 +4642,7 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/advanced_airlock_controller/internal{ - pixel_y = -24 - }, +/obj/machinery/advanced_airlock_controller/internal/directional/south, /turf/open/floor/plasteel/tech, /area/ship/engineering) "AG" = ( @@ -6161,9 +6155,7 @@ /turf/open/floor/plasteel/dark, /area/ship/engineering) "Lq" = ( -/obj/machinery/advanced_airlock_controller{ - pixel_y = 24 - }, +/obj/machinery/advanced_airlock_controller/directional/north, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/ship/maintenance/starboard)