From 6d83868cdbeae949bde0c86ec1fc643564690616 Mon Sep 17 00:00:00 2001 From: Thedragmeme Date: Sat, 22 Jun 2024 15:29:24 -0500 Subject: [PATCH] Fixes! --- _maps/shuttles/syndicate/syndicate_aegis.dmm | 166 +++++++++++++------ 1 file changed, 111 insertions(+), 55 deletions(-) diff --git a/_maps/shuttles/syndicate/syndicate_aegis.dmm b/_maps/shuttles/syndicate/syndicate_aegis.dmm index 99fadf4ab9a2..337aec04b313 100644 --- a/_maps/shuttles/syndicate/syndicate_aegis.dmm +++ b/_maps/shuttles/syndicate/syndicate_aegis.dmm @@ -210,10 +210,12 @@ /turf/open/floor/plasteel/tech, /area/ship/engineering) "bt" = ( -/obj/machinery/igniter/incinerator_atmos, /obj/machinery/air_sensor/atmos/incinerator_tank{ id_tag = "nemo_incinerator_sensor" }, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, /turf/open/floor/engine/airless, /area/ship/engineering) "bw" = ( @@ -487,6 +489,7 @@ pixel_y = 3 }, /obj/machinery/light/small/directional/north, +/obj/item/gun/ballistic/automatic/smg/mini_uzi, /turf/open/floor/plating, /area/ship/security/armory) "dL" = ( @@ -677,7 +680,7 @@ }, /obj/effect/turf_decal/trimline/opaque/orange/line, /obj/structure/disposalpipe/segment{ - dir = 6 + dir = 4 }, /turf/open/floor/plasteel/tech, /area/ship/engineering) @@ -707,13 +710,13 @@ dir = 1; name = "Engine Access" }, -/obj/machinery/door/poddoor/shutters{ - id = "engine"; - name = "Engine Shutters" - }, /obj/machinery/atmospherics/components/unary/shuttle/heater{ dir = 1 }, +/obj/machinery/door/poddoor/shutters{ + id = "aegis_engine"; + name = "Engine Shutters" + }, /turf/open/floor/plasteel/tech/techmaint, /area/ship/engineering) "fE" = ( @@ -756,6 +759,10 @@ "gg" = ( /turf/open/floor/wood/walnut, /area/ship/bridge) +"gh" = ( +/obj/effect/decal/cleanable/dirt, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/crew/dorm) "gl" = ( /obj/effect/turf_decal/siding/wood{ dir = 5 @@ -767,12 +774,14 @@ /turf/open/floor/grass/fairy, /area/ship/crew/dorm) "gp" = ( -/obj/structure/grille, -/obj/structure/window/plasma/reinforced/fulltile, -/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer1{ +/obj/machinery/atmospherics/pipe/simple/violet/visible{ + dir = 8 + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/plasteel/tech, +/turf/open/floor/plating, /area/ship/engineering) "gq" = ( /obj/effect/turf_decal/trimline/opaque/bottlegreen/line{ @@ -807,6 +816,13 @@ /obj/item/clothing/glasses/meson/engine, /obj/item/pipe_dispenser, /obj/item/clothing/mask/gas/atmos, +/obj/item/geiger_counter, +/obj/item/holosign_creator/atmos, +/obj/item/analyzer, +/obj/item/clothing/shoes/workboots, +/obj/item/clothing/suit/hooded/wintercoat/engineering, +/obj/item/clothing/under/rank/engineering/engineer/hazard, +/obj/item/clothing/under/rank/engineering/engineer/nt/skirt, /turf/open/floor/plasteel/tech, /area/ship/engineering) "gx" = ( @@ -1063,15 +1079,12 @@ "ij" = ( /obj/structure/window/plasma/reinforced/spawner/north, /obj/structure/window/plasma/reinforced/spawner/east, -/obj/structure/disposalpipe/segment{ - dir = 2 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/structure/catwalk/over/plated_catwalk/dark, /obj/machinery/door/poddoor/shutters{ - id = "engine"; + id = "aegis_engine"; name = "Engine Shutters" }, /turf/open/floor/plating, @@ -1508,6 +1521,7 @@ /obj/structure/window/plasma/reinforced/spawner/west, /obj/structure/catwalk/over/plated_catwalk/dark, /obj/machinery/power/ship_gravity, +/obj/structure/cable/yellow, /turf/open/floor/plasteel/tech, /area/ship/engineering) "md" = ( @@ -1651,8 +1665,8 @@ "mO" = ( /obj/structure/grille, /obj/structure/window/plasma/reinforced/fulltile, -/obj/machinery/atmospherics/pipe/simple/violet/visible{ - dir = 8 +/obj/machinery/atmospherics/pipe/layer_manifold/visible{ + dir = 4 }, /turf/open/floor/plasteel/tech, /area/ship/engineering) @@ -1663,9 +1677,8 @@ /turf/open/floor/engine/plasma, /area/ship/engineering) "mS" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/layer1{ - dir = 4; - name = "Nitrogen Output" +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 4 }, /turf/open/floor/engine/n2, /area/ship/engineering) @@ -1832,6 +1845,20 @@ /obj/structure/bookcase/random/fiction, /turf/open/floor/wood/walnut, /area/ship/crew/library) +"ox" = ( +/obj/machinery/door/window/eastleft{ + dir = 1; + name = "Engine Access" + }, +/obj/machinery/door/poddoor/shutters{ + id = "aegis_engine"; + name = "Engine Shutters" + }, +/obj/machinery/atmospherics/components/unary/shuttle/heater{ + dir = 1 + }, +/turf/open/floor/plasteel/tech/techmaint, +/area/ship/engineering) "oB" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -1873,7 +1900,7 @@ /obj/structure/window/plasma/reinforced/spawner/west, /obj/structure/catwalk/over/plated_catwalk/dark, /obj/machinery/door/poddoor/shutters{ - id = "engine"; + id = "aegis_engine"; name = "Engine Shutters" }, /turf/open/floor/plating, @@ -2046,7 +2073,7 @@ /turf/open/floor/plasteel/mono/dark, /area/ship/crew/canteen) "qe" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/toxin_output{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 8 }, /turf/open/floor/engine/plasma, @@ -2347,7 +2374,7 @@ /turf/open/floor/plasteel/dark, /area/ship/medical) "sE" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/oxygen_output{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 }, /turf/open/floor/engine/o2, @@ -2474,16 +2501,14 @@ /turf/open/floor/plasteel/tech, /area/ship/medical) "tV" = ( -/obj/machinery/door/airlock/hatch{ - name = "Library"; - req_access_txt = "10"; - id_tag = "aegis_psyc" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/door/airlock/hatch{ + name = "Library" + }, /turf/open/floor/wood/walnut, /area/ship/crew/library) "tW" = ( @@ -2755,6 +2780,9 @@ }, /obj/structure/catwalk/over/plated_catwalk/dark, /obj/machinery/light/floor, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/plating, /area/ship/engineering) "wd" = ( @@ -2856,9 +2884,6 @@ /obj/machinery/atmospherics/components/trinary/mixer{ dir = 8 }, -/obj/structure/disposalpipe/segment{ - dir = 2 - }, /obj/structure/catwalk/over/plated_catwalk/dark, /turf/open/floor/plating, /area/ship/engineering) @@ -3050,6 +3075,9 @@ /obj/structure/disposalpipe/trunk{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/dark, /area/ship/medical) "yD" = ( @@ -3090,6 +3118,7 @@ /obj/item/clothing/suit/hooded/wintercoat/medical, /obj/item/clothing/under/nanotrasen/medical, /obj/item/storage/firstaid/medical, +/obj/item/healthanalyzer/advanced, /turf/open/floor/plasteel/dark, /area/ship/medical) "zm" = ( @@ -3134,8 +3163,8 @@ icon_state = "1-2" }, /obj/effect/turf_decal/trimline/opaque/orange/line, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/disposalpipe/junction{ + dir = 8 }, /turf/open/floor/plasteel/tech, /area/ship/engineering) @@ -3250,6 +3279,9 @@ dir = 10 }, /obj/structure/catwalk/over/plated_catwalk/dark, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, /turf/open/floor/plating, /area/ship/engineering) "AZ" = ( @@ -3754,6 +3786,7 @@ icon_state = "2-8" }, /obj/structure/catwalk/over/plated_catwalk/dark, +/obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/ship/engineering) "Fj" = ( @@ -4383,6 +4416,9 @@ "Lb" = ( /obj/structure/catwalk/over/plated_catwalk/dark, /obj/structure/reagent_dispensers/fueltank, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, /turf/open/floor/plating, /area/ship/engineering) "Lc" = ( @@ -4465,6 +4501,14 @@ /obj/machinery/light/directional/east, /turf/open/floor/plasteel/dark, /area/ship/hallway/central) +"LI" = ( +/obj/structure/window/plasma/reinforced/fulltile, +/obj/structure/grille, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, +/turf/open/floor/plating, +/area/ship/engineering) "LN" = ( /obj/structure/cable/yellow{ icon_state = "0-8" @@ -4937,9 +4981,6 @@ /area/ship/engineering) "PV" = ( /obj/structure/window/plasma/reinforced/spawner/east, -/obj/structure/disposalpipe/segment{ - dir = 2 - }, /obj/structure/catwalk/over/plated_catwalk/dark, /obj/machinery/portable_atmospherics/scrubber, /turf/open/floor/plasteel/tech, @@ -4956,8 +4997,10 @@ dir = 2; layer = 3.1 }, -/obj/machinery/vending/wardrobe/engi_wardrobe, /obj/machinery/door/firedoor/border_only, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk, +/obj/item/weldingtool, /turf/open/floor/engine, /area/ship/engineering) "Qj" = ( @@ -5361,6 +5404,9 @@ }, /obj/structure/catwalk/over/plated_catwalk/dark, /obj/machinery/light/floor, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plating, /area/ship/engineering) "TL" = ( @@ -5469,6 +5515,9 @@ "UC" = ( /obj/structure/window/plasma/reinforced/fulltile, /obj/structure/grille, +/obj/machinery/atmospherics/pipe/layer_manifold/visible{ + dir = 4 + }, /turf/open/floor/engine/air, /area/ship/engineering) "UH" = ( @@ -5504,10 +5553,6 @@ /turf/open/floor/wood/walnut, /area/ship/crew/dorm/dormtwo) "UY" = ( -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/structure/disposaloutlet, /turf/open/floor/plating, /area/ship/engineering) "Vk" = ( @@ -5561,7 +5606,7 @@ name = "Engine Access" }, /obj/machinery/door/poddoor/shutters{ - id = "engine"; + id = "aegis_engine"; name = "Engine Shutters" }, /turf/open/floor/plasteel/tech/techmaint, @@ -5868,6 +5913,13 @@ dir = 8 }, /obj/item/clothing/mask/gas/atmos, +/obj/item/geiger_counter, +/obj/item/holosign_creator/atmos, +/obj/item/analyzer, +/obj/item/clothing/shoes/workboots, +/obj/item/clothing/suit/hooded/wintercoat/engineering, +/obj/item/clothing/under/rank/engineering/engineer/hazard, +/obj/item/clothing/under/rank/engineering/engineer/nt/skirt, /turf/open/floor/plasteel/tech, /area/ship/engineering) "Xk" = ( @@ -5978,11 +6030,11 @@ dir = 1; name = "Engine Access" }, +/obj/structure/window/plasma/reinforced/spawner/east, /obj/machinery/door/poddoor/shutters{ - id = "engine"; + id = "aegis_engine"; name = "Engine Shutters" }, -/obj/structure/window/plasma/reinforced/spawner/east, /turf/open/floor/plasteel/tech/techmaint, /area/ship/engineering) "Yo" = ( @@ -6127,6 +6179,9 @@ /turf/open/floor/plasteel/tech, /area/ship/engineering) "Zg" = ( +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, /turf/open/floor/engine/airless, /area/ship/engineering) "Zj" = ( @@ -6154,12 +6209,10 @@ /turf/open/floor/carpet/blue, /area/ship/crew/library) "Zz" = ( +/obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/hatch{ - name = "Library"; - req_access_txt = "10"; - id_tag = "aegis_psyc" + name = "Library" }, -/obj/structure/disposalpipe/segment, /turf/open/floor/wood/walnut, /area/ship/crew/library) "ZB" = ( @@ -6202,6 +6255,9 @@ dir = 8 }, /obj/structure/catwalk/over/plated_catwalk/dark, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/plating, /area/ship/engineering) "ZU" = ( @@ -6346,7 +6402,7 @@ Fv Fv Fv Fv -Fv +Vk Xl Fv Sa @@ -6462,7 +6518,7 @@ Fv Fv nY ei -nY +gh oM Sg Fv @@ -6496,7 +6552,7 @@ DC "} (7,1,1) = {" Fv -Fv +Vk Rg Fv Pc @@ -6526,7 +6582,7 @@ eN OW Xk PU -gp +mO qK Wy eN @@ -6918,7 +6974,7 @@ Uu di OL ZJ -PU +LI bt Zg Yo @@ -6956,7 +7012,7 @@ kz Dt eC dB -ZJ +gp ZB zm tn @@ -6973,8 +7029,8 @@ dT bG kI ZU -kD qy +kD bp mZ Vq @@ -7231,7 +7287,7 @@ QD cR Ys Fz -fD +ox sb DC "}