From ae5414a4c42aaca1fe1a204dea91b30b82363d5d Mon Sep 17 00:00:00 2001 From: BarteG44 Date: Sun, 20 Aug 2023 21:31:29 +0200 Subject: [PATCH 01/14] fixes some issues in the box and li tieg --- _maps/shuttles/shiptest/independent_box.dmm | 227 +++++++++++------- .../shiptest/independent_litieguai.dmm | 162 ++++++------- 2 files changed, 214 insertions(+), 175 deletions(-) diff --git a/_maps/shuttles/shiptest/independent_box.dmm b/_maps/shuttles/shiptest/independent_box.dmm index 0a011231ffbd..9c1f7d89a520 100644 --- a/_maps/shuttles/shiptest/independent_box.dmm +++ b/_maps/shuttles/shiptest/independent_box.dmm @@ -82,6 +82,9 @@ }, /turf/open/floor/plasteel/mono/dark, /area/ship/cargo) +"ar" = ( +/turf/closed/wall/mineral/titanium, +/area/ship/crew/toilet) "at" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/engineering) @@ -257,7 +260,6 @@ /obj/structure/cable{ icon_state = "1-8" }, -/obj/effect/turf_decal/ntspaceworks_small, /obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{ dir = 4 }, @@ -324,7 +326,7 @@ /area/ship/engineering) "bo" = ( /obj/structure/catwalk/over, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/ship/external) "bq" = ( /turf/closed/wall/mineral/titanium/nodiagonal, @@ -600,7 +602,6 @@ icon_state = "6-9" }, /obj/effect/decal/cleanable/wrapping, -/obj/effect/turf_decal/ntspaceworks_small/right, /turf/open/floor/plating, /area/ship/engineering) "cu" = ( @@ -612,6 +613,9 @@ /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/medical) "cB" = ( +/obj/structure/sign/departments/restroom{ + pixel_y = -32 + }, /turf/open/floor/plasteel/mono/dark, /area/ship/medical) "cC" = ( @@ -654,7 +658,8 @@ /area/ship/cargo) "cE" = ( /obj/machinery/door/airlock{ - name = "Restroom" + name = "Restroom"; + id_tag = "boxbathroom" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -668,11 +673,10 @@ icon_state = "1-2" }, /turf/open/floor/plasteel/dark, -/area/ship/crew) +/area/ship/crew/toilet) "cF" = ( -/obj/structure/sign/departments/restroom, /turf/closed/wall/mineral/titanium/nodiagonal, -/area/ship/crew) +/area/ship/crew/toilet) "cG" = ( /obj/structure/closet/emcloset/anchored, /obj/machinery/atmospherics/pipe/simple/orange/hidden{ @@ -730,8 +734,8 @@ /obj/item/reagent_containers/glass/filter{ pixel_x = -8 }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/crew) +/turf/open/floor/plasteel/tech/grid, +/area/ship/crew/toilet) "cO" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 @@ -741,22 +745,33 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/turf_decal/spline/fancy/opaque/blue{ + dir = 8 + }, /turf/open/floor/plasteel/freezer, -/area/ship/crew) +/area/ship/crew/toilet) "cP" = ( -/obj/structure/sink{ +/obj/machinery/button/door{ dir = 8; - pixel_x = 12 + id = "boxbathroom"; + name = "Privacy Button"; + normaldoorcontrol = 1; + pixel_x = 26; + pixel_y = -2; + specialfunctions = 4; + inertia_last_loc = s }, -/obj/structure/mirror{ - pixel_x = 28 +/obj/machinery/light_switch{ + pixel_x = 25; + pixel_y = 7; + dir = 8 }, /turf/open/floor/plasteel/freezer, -/area/ship/crew) +/area/ship/crew/toilet) "cQ" = ( /obj/machinery/smartfridge/chemistry/preloaded, /turf/closed/wall/mineral/titanium/nodiagonal, -/area/ship/crew) +/area/ship/crew/toilet) "cT" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -764,13 +779,10 @@ /obj/structure/flora/bigplant{ pixel_x = -16 }, +/obj/machinery/airalarm/directional/north, /turf/open/floor/wood, /area/ship/crew) "cU" = ( -/obj/machinery/light_switch{ - pixel_x = -25; - pixel_y = 25 - }, /obj/effect/turf_decal/siding/wood/corner{ dir = 4 }, @@ -805,8 +817,14 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/effect/turf_decal/spline/fancy/opaque/blue/corner{ + dir = 1 + }, /turf/open/floor/plasteel/freezer, -/area/ship/crew) +/area/ship/crew/toilet) "da" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -815,8 +833,11 @@ dir = 4 }, /obj/item/cigbutt, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/freezer, -/area/ship/crew) +/area/ship/crew/toilet) "dc" = ( /obj/effect/turf_decal/corner/opaque/blue{ dir = 8 @@ -831,6 +852,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/white, /area/ship/crew) "de" = ( @@ -844,6 +868,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/wood, /area/ship/crew) "df" = ( @@ -856,6 +883,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/wood, /area/ship/crew) "dg" = ( @@ -866,6 +896,9 @@ /obj/structure/chair/stool{ dir = 1 }, +/obj/structure/cable{ + icon_state = "1-8" + }, /turf/open/floor/wood, /area/ship/crew) "dh" = ( @@ -895,6 +928,7 @@ /obj/item/clothing/neck/stethoscope, /obj/structure/window/reinforced/spawner/north, /obj/effect/turf_decal/spline/fancy/opaque/black/corner, +/obj/machinery/light/small/directional/west, /turf/open/floor/plasteel/dark, /area/ship/crew) "do" = ( @@ -927,6 +961,7 @@ /area/ship/medical) "ds" = ( /obj/machinery/suit_storage_unit/cmo, +/obj/machinery/light/small/directional/east, /turf/open/floor/plasteel/dark, /area/ship/crew) "dt" = ( @@ -1199,11 +1234,14 @@ /area/ship/medical) "hS" = ( /obj/item/cigbutt/roach, -/obj/effect/turf_decal/spline/fancy/opaque/lightgrey{ - dir = 8 +/obj/structure/window/reinforced/tinted/frosted{ + dir = 4 }, -/turf/open/floor/plasteel/freezer, -/area/ship/crew) +/obj/machinery/door/window/survival_pod, +/obj/structure/curtain, +/obj/structure/toilet, +/turf/open/floor/plasteel/patterned/grid, +/area/ship/crew/toilet) "iv" = ( /obj/effect/turf_decal/industrial/warning{ dir = 1 @@ -1269,8 +1307,8 @@ dir = 1 }, /obj/structure/table/chem, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/crew) +/turf/open/floor/plasteel/tech/grid, +/area/ship/crew/toilet) "jk" = ( /obj/machinery/firealarm/directional/south, /obj/machinery/stasis{ @@ -1383,6 +1421,10 @@ icon_state = "0-4" }, /obj/item/radio/intercom/directional/west, +/obj/machinery/light_switch{ + pixel_x = -12; + pixel_y = 23 + }, /turf/open/floor/plasteel/tech, /area/ship/medical) "mx" = ( @@ -1432,8 +1474,15 @@ pixel_x = -5; pixel_y = 3 }, -/obj/machinery/light/small/directional/north, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/light_switch{ + pixel_x = -12; + pixel_y = 23 + }, /turf/open/floor/wood, /area/ship/crew) "nQ" = ( @@ -1484,7 +1533,6 @@ icon_state = "5-9" }, /obj/structure/catwalk/over, -/obj/effect/turf_decal/number/two, /obj/effect/turf_decal/trimline/opaque/yellow/filled/corner{ dir = 1 }, @@ -1505,11 +1553,6 @@ /turf/open/floor/plating, /area/ship/engineering) "ro" = ( -/obj/machinery/light_switch{ - dir = 1; - pixel_x = -25; - pixel_y = -25 - }, /obj/effect/turf_decal/corner/opaque/lightgrey/diagonal, /obj/effect/turf_decal/trimline/opaque/white/filled/line{ dir = 8 @@ -1540,18 +1583,27 @@ /turf/open/floor/plasteel/white, /area/ship/cargo) "ss" = ( -/obj/structure/toilet{ - dir = 4 +/obj/structure/sink{ + dir = 4; + pixel_x = -12 }, -/obj/machinery/door/window/survival_pod{ - dir = 4 +/obj/structure/closet/wall/white/chem{ + dir = 1; + name = "Chemistry Locker"; + pixel_y = -28 }, -/obj/structure/curtain, -/obj/structure/window/reinforced/tinted/frosted{ +/obj/item/clothing/head/beret/chem, +/obj/item/clothing/suit/longcoat/chemist, +/obj/item/reagent_containers/dropper, +/obj/item/storage/box/pillbottles, +/obj/structure/mirror{ + pixel_x = -28 + }, +/obj/effect/turf_decal/spline/fancy/opaque/blue{ dir = 1 }, -/turf/open/floor/mineral/titanium/airless, -/area/ship/crew) +/turf/open/floor/plasteel/freezer, +/area/ship/crew/toilet) "su" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -1599,7 +1651,6 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/effect/turf_decal/number/nine, /obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{ dir = 1 }, @@ -1631,19 +1682,14 @@ "uj" = ( /obj/machinery/light/small/built/directional/west, /obj/machinery/power/apc/auto_name/directional/north, -/obj/machinery/light_switch{ - pixel_x = -25; - pixel_y = 25 - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/structure/cable{ icon_state = "0-2" }, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/light_switch{ - dir = 4; - pixel_x = -20; - pixel_y = 10 + pixel_x = -12; + pixel_y = 23 }, /turf/open/floor/carpet/nanoweave/blue, /area/ship/bridge) @@ -1794,6 +1840,7 @@ /area/ship/bridge) "vE" = ( /obj/structure/dresser, +/obj/machinery/light/small/directional/north, /turf/open/floor/plasteel, /area/ship/crew) "vX" = ( @@ -1858,7 +1905,6 @@ icon_state = "2-4" }, /obj/structure/catwalk/over, -/obj/effect/turf_decal/ntspaceworks_small/left, /turf/open/floor/plating, /area/ship/engineering) "wj" = ( @@ -2207,7 +2253,7 @@ dir = 8 }, /obj/item/reagent_containers/food/snacks/burrito, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/ship/external) "Dr" = ( /obj/machinery/door/airlock{ @@ -2358,9 +2404,6 @@ "HM" = ( /obj/machinery/firealarm/directional/north, /obj/machinery/portable_atmospherics/canister/oxygen, -/obj/structure/railing{ - dir = 8 - }, /obj/machinery/atmospherics/components/unary/portables_connector/layer2, /obj/effect/turf_decal/industrial/hatch/yellow, /obj/structure/railing{ @@ -2420,7 +2463,6 @@ /obj/structure/chair/office/light{ dir = 1 }, -/obj/machinery/light/small/directional/south, /obj/effect/turf_decal/corner/opaque/blue{ dir = 8 }, @@ -2471,8 +2513,8 @@ "Lf" = ( /obj/structure/table, /obj/machinery/microwave, -/obj/machinery/airalarm/directional/north, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/machinery/light/small/directional/north, /turf/open/floor/wood, /area/ship/crew) "Ln" = ( @@ -2509,20 +2551,11 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, -/obj/structure/closet/wall/white/chem{ - dir = 4; - pixel_y = -32; - pixel_x = -32 - }, -/obj/item/storage/box/pillbottles, -/obj/item/clothing/suit/longcoat/chemist, -/obj/item/reagent_containers/dropper, -/obj/item/clothing/head/beret/chem, -/obj/effect/turf_decal/spline/fancy/opaque/lightgrey{ - dir = 8 +/obj/effect/turf_decal/spline/fancy/opaque/blue{ + dir = 1 }, /turf/open/floor/plasteel/freezer, -/area/ship/crew) +/area/ship/crew/toilet) "Mi" = ( /turf/closed/wall/mineral/titanium, /area/ship/medical/morgue) @@ -2559,8 +2592,8 @@ /obj/item/stack/cable_coil/cyan{ amount = 5 }, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/crew) +/turf/open/floor/plasteel/tech/grid, +/area/ship/crew/toilet) "OF" = ( /obj/machinery/fax, /obj/structure/table/reinforced, @@ -2570,7 +2603,8 @@ "OS" = ( /obj/machinery/door/airlock{ dir = 4; - name = "Restroom" + name = "Restroom"; + id_tag = "boxbathroom" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -2584,19 +2618,27 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/dark, -/area/ship/crew) +/area/ship/crew/toilet) "Ps" = ( /obj/structure/catwalk/over, /obj/machinery/atmospherics/components/unary/outlet_injector/on{ dir = 8 }, /obj/item/chair/plastic, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/ship/external) "Qh" = ( /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = 10; + pixel_y = -16 + }, /turf/open/floor/plasteel/white, /area/ship/cargo) "QD" = ( @@ -2678,6 +2720,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 5 }, +/obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/wood, /area/ship/crew) "Tr" = ( @@ -2809,16 +2852,17 @@ /area/ship/engineering) "XD" = ( /obj/machinery/firealarm/directional/west, -/obj/structure/curtain, /obj/machinery/shower{ pixel_y = 15 }, -/obj/machinery/door/window/survival_pod{ +/obj/item/soap, +/obj/machinery/door/window/survival_pod, +/obj/structure/window/reinforced/tinted/frosted{ dir = 4 }, -/obj/item/soap, -/turf/open/floor/mineral/titanium/airless, -/area/ship/crew) +/obj/structure/curtain, +/turf/open/floor/plasteel/patterned/grid, +/area/ship/crew/toilet) "XN" = ( /obj/structure/extinguisher_cabinet/directional/north, /obj/effect/turf_decal/siding/thinplating/dark{ @@ -2851,6 +2895,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/white, /area/ship/crew) "Ye" = ( @@ -3202,11 +3249,11 @@ QM bM VQ Ic -tD +cF XD ss -tD -nQ +cF +ar aa "} (15,1,1) = {" @@ -3226,7 +3273,7 @@ cF hS LV NT -tD +cF aa "} (16,1,1) = {" @@ -3246,7 +3293,7 @@ cE cO cZ cK -tD +cF aa "} (17,1,1) = {" @@ -3266,7 +3313,7 @@ cQ cP da ja -tD +cF aa "} (18,1,1) = {" @@ -3282,11 +3329,11 @@ dr Bh tT jk -tD -tD +cF +cF OS -tD -tD +cF +cF cY "} (19,1,1) = {" diff --git a/_maps/shuttles/shiptest/independent_litieguai.dmm b/_maps/shuttles/shiptest/independent_litieguai.dmm index cf8ac312b338..2a379ab8c86a 100644 --- a/_maps/shuttles/shiptest/independent_litieguai.dmm +++ b/_maps/shuttles/shiptest/independent_litieguai.dmm @@ -78,12 +78,13 @@ dir = 1 }, /obj/effect/turf_decal/industrial/hatch/red, +/obj/machinery/light/directional/south, /turf/open/floor/plasteel/white, /area/ship/medical) "cn" = ( /obj/effect/turf_decal/trimline/opaque/red/filled/warning, /turf/open/floor/plasteel, -/area/ship/hallway/aft) +/area/ship/cargo) "cs" = ( /obj/machinery/defibrillator_mount/loaded{ pixel_y = -32 @@ -91,7 +92,7 @@ /obj/effect/turf_decal/industrial/loading{ dir = 4 }, -/turf/open/floor/plasteel/tech/techmaint, +/turf/open/floor/plasteel/tech, /area/ship/medical) "cI" = ( /obj/effect/turf_decal/trimline/opaque/red/filled/line{ @@ -202,7 +203,7 @@ /area/ship/crew) "eS" = ( /turf/open/floor/plasteel, -/area/ship/hallway/aft) +/area/ship/cargo) "fa" = ( /obj/structure/table, /obj/effect/spawner/lootdrop/donkpockets, @@ -229,7 +230,7 @@ /obj/machinery/stasis, /obj/effect/turf_decal/industrial/outline/red, /obj/machinery/light/directional/west, -/turf/open/floor/plasteel/tech, +/turf/open/floor/plasteel/tech/grid, /area/ship/medical) "go" = ( /obj/effect/turf_decal/corner/opaque/red/full, @@ -246,10 +247,10 @@ icon_state = "2-8" }, /turf/open/floor/plasteel, -/area/ship/hallway/aft) +/area/ship/cargo) "gL" = ( /turf/closed/wall/mineral/titanium/nodiagonal, -/area/ship/hallway/aft) +/area/ship/cargo) "gO" = ( /obj/structure/cable{ icon_state = "0-4" @@ -268,7 +269,7 @@ name = "Lobby" }, /turf/open/floor/engine, -/area/ship/hallway/aft) +/area/ship/cargo) "hq" = ( /turf/open/floor/plasteel/stairs/right{ dir = 8 @@ -278,10 +279,10 @@ /obj/effect/turf_decal/arrows/red{ dir = 8 }, -/obj/effect/turf_decal/siding/thinplating/dark{ +/obj/effect/turf_decal/spline/fancy/opaque/black{ dir = 4 }, -/turf/open/floor/plasteel/tech/techmaint, +/turf/open/floor/plasteel/patterned/grid, /area/ship/storage) "hF" = ( /obj/structure/table/reinforced, @@ -297,7 +298,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/turf/open/floor/plasteel/tech, +/turf/open/floor/plasteel/tech/grid, /area/ship/medical) "hT" = ( /obj/machinery/power/apc/auto_name/directional/south, @@ -324,7 +325,7 @@ }, /obj/effect/turf_decal/corner/opaque/white/mono, /turf/open/floor/plasteel/white, -/area/ship/medical) +/area/ship/cargo) "iA" = ( /turf/closed/wall/mineral/titanium, /area/ship/crew) @@ -391,8 +392,8 @@ /obj/item/radio/intercom/directional/east, /obj/machinery/power/terminal, /obj/structure/cable/yellow, -/obj/structure/reagent_dispensers/fueltank, /obj/effect/turf_decal/industrial/hatch/yellow, +/obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, /area/ship/maintenance/starboard) "kO" = ( @@ -439,7 +440,7 @@ pixel_y = -1 }, /obj/item/reagent_containers/medigel/sterilizine, -/turf/open/floor/plasteel/tech, +/turf/open/floor/plasteel/tech/grid, /area/ship/medical) "kR" = ( /obj/machinery/computer/crew, @@ -457,6 +458,11 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 20; + pixel_y = 11 + }, /turf/open/floor/plasteel/white, /area/ship/medical) "lj" = ( @@ -467,7 +473,7 @@ /obj/effect/turf_decal/spline/fancy/opaque/black{ dir = 1 }, -/turf/open/floor/plasteel/tech/techmaint, +/turf/open/floor/plasteel/tech, /area/ship/medical) "lF" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -492,7 +498,7 @@ icon_state = "1-4" }, /turf/open/floor/plasteel, -/area/ship/hallway/aft) +/area/ship/cargo) "lY" = ( /obj/machinery/door/airlock/medical{ dir = 4; @@ -609,6 +615,8 @@ /obj/effect/turf_decal/number/five{ dir = 4 }, +/obj/structure/closet/secure_closet/medical2, +/obj/item/reagent_containers/glass/bottle/morphine, /turf/open/floor/plating, /area/ship/maintenance/starboard) "nm" = ( @@ -637,7 +645,7 @@ icon_state = "4-8" }, /turf/open/floor/plasteel, -/area/ship/hallway/aft) +/area/ship/cargo) "oH" = ( /obj/effect/turf_decal/trimline/opaque/red/filled/warning{ dir = 1 @@ -651,7 +659,7 @@ icon_state = "1-4" }, /turf/open/floor/plasteel, -/area/ship/hallway/aft) +/area/ship/cargo) "oQ" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/southleft, @@ -689,7 +697,7 @@ pixel_y = -4 }, /turf/open/floor/plating, -/area/ship/medical) +/area/ship/cargo) "oS" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 @@ -769,7 +777,7 @@ icon_state = "1-2" }, /turf/open/floor/plasteel, -/area/ship/hallway/aft) +/area/ship/cargo) "ru" = ( /obj/effect/turf_decal/trimline/opaque/red/filled/warning{ dir = 8 @@ -890,7 +898,7 @@ /obj/item/kirbyplants/random, /obj/machinery/airalarm/directional/west, /turf/open/floor/plasteel, -/area/ship/hallway/aft) +/area/ship/cargo) "tO" = ( /obj/structure/closet/secure_closet{ icon_state = "med_secure"; @@ -899,7 +907,6 @@ /obj/machinery/airalarm/directional/south, /obj/item/clothing/glasses/hud/health, /obj/item/clothing/glasses/hud/health, -/obj/structure/extinguisher_cabinet/directional/north, /obj/item/clothing/glasses/hud/health, /obj/item/healthanalyzer, /obj/item/healthanalyzer, @@ -907,15 +914,13 @@ /obj/item/storage/backpack/satchel/med, /obj/item/storage/backpack/satchel/med, /obj/item/storage/backpack/satchel/med, -/obj/item/clothing/under/rank/medical, -/obj/item/clothing/under/rank/medical, -/obj/item/clothing/under/rank/medical, -/obj/item/clothing/under/rank/medical, -/obj/item/clothing/under/rank/medical, -/obj/item/clothing/under/rank/medical, /obj/item/clothing/shoes/sneakers/blue, /obj/item/clothing/shoes/sneakers/blue, /obj/item/clothing/shoes/sneakers/blue, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/item/clothing/under/rank/medical/paramedic/emt, +/obj/item/clothing/under/rank/medical/paramedic/emt, +/obj/item/clothing/under/rank/medical/paramedic/emt, /turf/open/floor/plasteel/grimy, /area/ship/crew) "tT" = ( @@ -927,7 +932,7 @@ pixel_x = 32 }, /turf/open/floor/plasteel, -/area/ship/hallway/aft) +/area/ship/cargo) "tW" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/effect/turf_decal/corner/opaque/white/mono, @@ -951,7 +956,7 @@ /obj/effect/turf_decal/spline/fancy/opaque/black{ dir = 1 }, -/turf/open/floor/plasteel/tech/techmaint, +/turf/open/floor/plasteel/tech, /area/ship/medical) "uq" = ( /obj/structure/table/reinforced, @@ -965,15 +970,14 @@ /obj/item/folder/white, /obj/item/pen, /turf/open/floor/plating, -/area/ship/medical) +/area/ship/cargo) "ur" = ( /obj/effect/turf_decal/trimline/opaque/red/filled/line{ dir = 1 }, /turf/open/floor/plasteel, -/area/ship/hallway/aft) +/area/ship/cargo) "uE" = ( -/obj/machinery/light/directional/south, /obj/structure/window/reinforced/tinted/frosted{ dir = 8 }, @@ -995,14 +999,14 @@ icon_state = "4-8" }, /turf/open/floor/plasteel, -/area/ship/hallway/aft) +/area/ship/cargo) "uW" = ( /obj/structure/chair{ dir = 8 }, -/obj/structure/extinguisher_cabinet/directional/north, +/obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/plasteel, -/area/ship/hallway/aft) +/area/ship/cargo) "ve" = ( /obj/structure/table/reinforced, /obj/structure/window/reinforced{ @@ -1016,7 +1020,7 @@ /obj/machinery/door/firedoor/border_only, /obj/effect/turf_decal/industrial/hatch/red, /turf/open/floor/plating, -/area/ship/medical) +/area/ship/cargo) "vj" = ( /obj/effect/turf_decal/trimline/opaque/red/filled/warning{ dir = 1 @@ -1031,7 +1035,7 @@ pixel_y = 14 }, /turf/open/floor/plasteel, -/area/ship/hallway/aft) +/area/ship/cargo) "vn" = ( /obj/effect/turf_decal/trimline/opaque/red/filled/line{ dir = 8 @@ -1112,7 +1116,7 @@ dir = 1 }, /turf/open/floor/plasteel, -/area/ship/hallway/aft) +/area/ship/cargo) "yi" = ( /obj/machinery/power/apc/auto_name/directional/west, /obj/structure/cable{ @@ -1147,7 +1151,7 @@ /obj/structure/bodycontainer/morgue{ dir = 8 }, -/turf/open/floor/plasteel/tech/techmaint, +/turf/open/floor/plasteel/tech, /area/ship/medical) "zE" = ( /obj/structure/cable{ @@ -1200,25 +1204,25 @@ /turf/open/floor/plasteel/white, /area/ship/hallway/fore) "AG" = ( -/obj/effect/turf_decal/siding/thinplating/dark, /obj/structure/railing{ dir = 6 }, /obj/effect/turf_decal/spline/fancy/opaque/black{ dir = 1 }, -/turf/open/floor/plasteel/tech/techmaint, +/obj/effect/turf_decal/spline/fancy/opaque/black, +/turf/open/floor/plasteel/patterned/grid, /area/ship/storage) "AJ" = ( /turf/closed/wall/mineral/titanium, -/area/ship/hallway/aft) +/area/ship/cargo) "Bl" = ( /obj/effect/turf_decal/corner/opaque/red/full, /obj/structure/cable{ icon_state = "1-2" }, /turf/open/floor/plasteel, -/area/ship/hallway/aft) +/area/ship/cargo) "BH" = ( /obj/machinery/power/shieldwallgen/atmos/roundstart{ dir = 1; @@ -1277,7 +1281,7 @@ name = "Lobby" }, /turf/open/floor/engine, -/area/ship/hallway/aft) +/area/ship/cargo) "Cr" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -1367,7 +1371,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/turf/open/floor/plasteel/tech, +/turf/open/floor/plasteel/tech/grid, /area/ship/medical) "Ev" = ( /turf/closed/wall/mineral/titanium/nodiagonal, @@ -1412,7 +1416,7 @@ /obj/effect/turf_decal/spline/fancy/opaque/black{ dir = 1 }, -/turf/open/floor/plasteel/tech/techmaint, +/turf/open/floor/plasteel/tech, /area/ship/medical) "Gs" = ( /obj/effect/turf_decal/industrial/hatch/yellow, @@ -1482,7 +1486,7 @@ /obj/effect/turf_decal/spline/fancy/opaque/black{ dir = 1 }, -/turf/open/floor/plasteel/tech/techmaint, +/turf/open/floor/plasteel/tech, /area/ship/medical) "HP" = ( /turf/open/floor/carpet/nanoweave/beige, @@ -1505,13 +1509,13 @@ dir = 1 }, /turf/open/floor/plasteel, -/area/ship/hallway/aft) +/area/ship/cargo) "Ja" = ( /obj/structure/chair{ dir = 4 }, /turf/open/floor/plasteel, -/area/ship/hallway/aft) +/area/ship/cargo) "Je" = ( /obj/machinery/power/terminal, /obj/structure/cable/yellow, @@ -1613,7 +1617,7 @@ "KW" = ( /obj/structure/sign/departments/medbay/alt, /turf/closed/wall/mineral/titanium/nodiagonal, -/area/ship/hallway/aft) +/area/ship/cargo) "Lh" = ( /obj/machinery/atmospherics/components/binary/pump/on/layer2, /obj/structure/closet/firecloset/wall{ @@ -1640,11 +1644,11 @@ /obj/effect/turf_decal/arrows/red{ dir = 8 }, -/obj/effect/turf_decal/siding/thinplating/dark/corner, /obj/effect/turf_decal/spline/fancy/opaque/black{ dir = 1 }, -/turf/open/floor/plasteel/tech/techmaint, +/obj/effect/turf_decal/spline/fancy/opaque/black/corner, +/turf/open/floor/plasteel/patterned/grid, /area/ship/storage) "Lt" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -1705,15 +1709,8 @@ /area/ship/maintenance/starboard) "MK" = ( /obj/effect/turf_decal/industrial/outline/red, -/obj/structure/rack, -/obj/item/pickaxe/emergency{ - desc = "For extracting yourself from rough landings, and getting to the even rougher ones"; - name = "Medical Retrieval Tool" - }, -/obj/item/pickaxe/emergency{ - desc = "For extracting yourself from rough landings, and getting to the even rougher ones"; - name = "Medical Retrieval Tool" - }, +/obj/structure/railing/corner, +/obj/machinery/vending/medical, /turf/open/floor/plasteel/tech/grid, /area/ship/storage) "MN" = ( @@ -1811,7 +1808,7 @@ /obj/machinery/airalarm/directional/south, /obj/effect/turf_decal/industrial/hatch/red, /obj/structure/closet/crate/freezer/surplus_limbs/organs, -/turf/open/floor/plasteel/tech/techmaint, +/turf/open/floor/plasteel/tech, /area/ship/medical) "OB" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -1834,7 +1831,7 @@ /obj/effect/turf_decal/spline/fancy/opaque/black{ dir = 1 }, -/turf/open/floor/plasteel/tech/techmaint, +/turf/open/floor/plasteel/tech, /area/ship/medical) "Pp" = ( /obj/effect/turf_decal/corner/opaque/white/mono, @@ -1908,7 +1905,7 @@ /obj/machinery/vending/snack/random, /obj/effect/turf_decal/trimline/opaque/red/filled/line, /turf/open/floor/plasteel, -/area/ship/hallway/aft) +/area/ship/cargo) "Qq" = ( /turf/closed/wall/mineral/titanium, /area/ship/medical) @@ -1966,7 +1963,7 @@ /obj/machinery/light_switch{ dir = 4; pixel_x = -20; - pixel_y = 10 + pixel_y = -11 }, /turf/open/floor/plasteel, /area/ship/crew) @@ -2001,7 +1998,7 @@ dir = 4 }, /turf/open/floor/plasteel, -/area/ship/hallway/aft) +/area/ship/cargo) "Rs" = ( /obj/effect/turf_decal/trimline/opaque/red/filled/warning{ dir = 8 @@ -2028,7 +2025,7 @@ density = 0; pixel_y = 32 }, -/turf/open/floor/plasteel/tech, +/turf/open/floor/plasteel/tech/grid, /area/ship/medical) "RW" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -2068,10 +2065,10 @@ /obj/effect/turf_decal/arrows/red{ dir = 8 }, -/obj/effect/turf_decal/siding/thinplating/dark{ +/obj/effect/turf_decal/spline/fancy/opaque/black{ dir = 4 }, -/turf/open/floor/plasteel/tech/techmaint, +/turf/open/floor/plasteel/patterned/grid, /area/ship/storage) "Sy" = ( /obj/machinery/stasis, @@ -2080,7 +2077,7 @@ density = 0; pixel_y = 32 }, -/turf/open/floor/plasteel/tech, +/turf/open/floor/plasteel/tech/grid, /area/ship/medical) "SH" = ( /obj/machinery/light/directional/east, @@ -2171,7 +2168,7 @@ name = "Lobby" }, /turf/open/floor/engine, -/area/ship/hallway/aft) +/area/ship/cargo) "TR" = ( /obj/structure/chair, /obj/effect/landmark/start/assistant, @@ -2301,7 +2298,7 @@ }, /obj/effect/turf_decal/corner/opaque/white/mono, /turf/open/floor/plasteel/white, -/area/ship/medical) +/area/ship/cargo) "Vs" = ( /obj/item/radio/intercom/wideband/directional/south, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -2327,7 +2324,7 @@ }, /obj/item/reagent_containers/syringe, /obj/item/radio/intercom/directional/north, -/turf/open/floor/plasteel/tech, +/turf/open/floor/plasteel/tech/grid, /area/ship/medical) "VM" = ( /obj/machinery/power/smes/shuttle/precharged{ @@ -2453,7 +2450,7 @@ dir = 4 }, /turf/open/floor/plasteel, -/area/ship/hallway/aft) +/area/ship/cargo) "Xs" = ( /obj/machinery/light/small/directional/south{ pixel_x = 17 @@ -2537,7 +2534,7 @@ /obj/effect/turf_decal/spline/fancy/opaque/black{ dir = 1 }, -/turf/open/floor/plasteel/tech/techmaint, +/turf/open/floor/plasteel/tech, /area/ship/medical) "YI" = ( /obj/machinery/light/directional/west, @@ -2548,7 +2545,7 @@ pixel_x = -32 }, /turf/open/floor/plasteel, -/area/ship/hallway/aft) +/area/ship/cargo) "YK" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -2566,11 +2563,6 @@ dir = 1 }, /obj/structure/extinguisher_cabinet/directional/west, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -20; - pixel_y = 10 - }, /turf/open/floor/plasteel/white, /area/ship/medical) "YM" = ( @@ -2592,14 +2584,14 @@ /obj/effect/turf_decal/spline/fancy/opaque/black{ dir = 1 }, -/turf/open/floor/plasteel/tech/techmaint, +/turf/open/floor/plasteel/tech, /area/ship/medical) "ZO" = ( /obj/machinery/vending/cola/random, /obj/effect/turf_decal/trimline/opaque/red/filled/line, /obj/machinery/firealarm/directional/east, /turf/open/floor/plasteel, -/area/ship/hallway/aft) +/area/ship/cargo) (1,1,1) = {" UG @@ -2802,7 +2794,7 @@ OA YM YM JA -YM +gL gL Rh gL @@ -2982,7 +2974,7 @@ ck YM YM JA -YM +gL gL Xj gL From 22cc1d5890c5e3cf2a3918ff96072f5e2c91c27e Mon Sep 17 00:00:00 2001 From: BarteG44 Date: Sun, 20 Aug 2023 21:36:57 +0200 Subject: [PATCH 02/14] morphine... --- _maps/shuttles/shiptest/independent_litieguai.dmm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/_maps/shuttles/shiptest/independent_litieguai.dmm b/_maps/shuttles/shiptest/independent_litieguai.dmm index 2a379ab8c86a..059c70aa2ede 100644 --- a/_maps/shuttles/shiptest/independent_litieguai.dmm +++ b/_maps/shuttles/shiptest/independent_litieguai.dmm @@ -615,8 +615,6 @@ /obj/effect/turf_decal/number/five{ dir = 4 }, -/obj/structure/closet/secure_closet/medical2, -/obj/item/reagent_containers/glass/bottle/morphine, /turf/open/floor/plating, /area/ship/maintenance/starboard) "nm" = ( @@ -2144,6 +2142,9 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/closet/secure_closet/medical2, +/obj/item/reagent_containers/glass/bottle/morphine, +/obj/item/reagent_containers/glass/bottle/morphine, /turf/open/floor/plating, /area/ship/maintenance/starboard) "TI" = ( From b568197786fe8c65fe3e59261177331fb0551402 Mon Sep 17 00:00:00 2001 From: BarteG44 Date: Sun, 20 Aug 2023 21:43:02 +0200 Subject: [PATCH 03/14] s --- _maps/shuttles/shiptest/independent_box.dmm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/_maps/shuttles/shiptest/independent_box.dmm b/_maps/shuttles/shiptest/independent_box.dmm index 9c1f7d89a520..ada88520bd33 100644 --- a/_maps/shuttles/shiptest/independent_box.dmm +++ b/_maps/shuttles/shiptest/independent_box.dmm @@ -82,9 +82,6 @@ }, /turf/open/floor/plasteel/mono/dark, /area/ship/cargo) -"ar" = ( -/turf/closed/wall/mineral/titanium, -/area/ship/crew/toilet) "at" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/engineering) @@ -758,8 +755,7 @@ normaldoorcontrol = 1; pixel_x = 26; pixel_y = -2; - specialfunctions = 4; - inertia_last_loc = s + specialfunctions = 4 }, /obj/machinery/light_switch{ pixel_x = 25; @@ -2459,6 +2455,9 @@ }, /turf/open/floor/plasteel/white, /area/ship/medical) +"Jy" = ( +/turf/closed/wall/mineral/titanium, +/area/ship/crew/toilet) "JI" = ( /obj/structure/chair/office/light{ dir = 1 @@ -3253,7 +3252,7 @@ cF XD ss cF -ar +Jy aa "} (15,1,1) = {" From 80923d41ce5d9265e4b21b93fc034ffd63d35a70 Mon Sep 17 00:00:00 2001 From: BarteG44 Date: Sun, 20 Aug 2023 22:25:15 +0200 Subject: [PATCH 04/14] bathroom problems --- _maps/shuttles/shiptest/independent_box.dmm | 298 ++++++++++---------- 1 file changed, 151 insertions(+), 147 deletions(-) diff --git a/_maps/shuttles/shiptest/independent_box.dmm b/_maps/shuttles/shiptest/independent_box.dmm index ada88520bd33..d48e99622d00 100644 --- a/_maps/shuttles/shiptest/independent_box.dmm +++ b/_maps/shuttles/shiptest/independent_box.dmm @@ -260,6 +260,9 @@ /obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{ dir = 4 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plating, /area/ship/engineering) "bk" = ( @@ -319,10 +322,12 @@ /obj/effect/turf_decal/industrial/shutoff{ dir = 1 }, +/obj/effect/decal/cleanable/wrapping, /turf/open/floor/plating, /area/ship/engineering) "bo" = ( /obj/structure/catwalk/over, +/obj/item/cigbutt/roach, /turf/open/floor/plating, /area/ship/external) "bq" = ( @@ -595,10 +600,12 @@ /turf/open/floor/carpet/nanoweave/blue, /area/ship/bridge) "cr" = ( +/obj/effect/turf_decal/industrial/hatch/yellow, +/obj/machinery/atmospherics/components/unary/portables_connector/layer2, +/obj/machinery/portable_atmospherics/canister/oxygen, /obj/structure/cable{ - icon_state = "6-9" + icon_state = "6-8" }, -/obj/effect/decal/cleanable/wrapping, /turf/open/floor/plating, /area/ship/engineering) "cu" = ( @@ -610,9 +617,6 @@ /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/medical) "cB" = ( -/obj/structure/sign/departments/restroom{ - pixel_y = -32 - }, /turf/open/floor/plasteel/mono/dark, /area/ship/medical) "cC" = ( @@ -654,10 +658,6 @@ /turf/open/floor/plasteel/dark, /area/ship/cargo) "cE" = ( -/obj/machinery/door/airlock{ - name = "Restroom"; - id_tag = "boxbathroom" - }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -669,6 +669,9 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/door/airlock{ + pixel_x = "chemistry" + }, /turf/open/floor/plasteel/dark, /area/ship/crew/toilet) "cF" = ( @@ -718,16 +721,9 @@ }, /obj/structure/table/chem, /obj/machinery/light/broken/directional/south, -/obj/structure/cable{ - icon_state = "1-4" - }, /obj/effect/turf_decal/siding/white{ dir = 1 }, -/obj/machinery/reagentgrinder{ - pixel_y = 8; - pixel_x = 16 - }, /obj/item/reagent_containers/glass/filter{ pixel_x = -8 }, @@ -742,27 +738,32 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/turf_decal/spline/fancy/opaque/blue{ - dir = 8 +/obj/structure/cable{ + icon_state = "1-4" }, -/turf/open/floor/plasteel/freezer, +/obj/item/cigbutt/roach, +/obj/effect/turf_decal/spline/fancy/opaque/bottlegreen/corner{ + dir = 4 + }, +/obj/effect/turf_decal/spline/fancy/opaque/bottlegreen/corner{ + dir = 1 + }, +/turf/open/floor/plasteel/showroomfloor, /area/ship/crew/toilet) "cP" = ( -/obj/machinery/button/door{ - dir = 8; - id = "boxbathroom"; - name = "Privacy Button"; - normaldoorcontrol = 1; - pixel_x = 26; - pixel_y = -2; - specialfunctions = 4 - }, +/obj/machinery/power/apc/auto_name/directional/east, /obj/machinery/light_switch{ - pixel_x = 25; - pixel_y = 7; + pixel_x = 20; + pixel_y = 10; dir = 8 }, -/turf/open/floor/plasteel/freezer, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/effect/turf_decal/spline/fancy/opaque/bottlegreen{ + dir = 5 + }, +/turf/open/floor/plasteel/showroomfloor, /area/ship/crew/toilet) "cQ" = ( /obj/machinery/smartfridge/chemistry/preloaded, @@ -810,16 +811,10 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/structure/cable{ icon_state = "1-4" }, -/obj/effect/turf_decal/spline/fancy/opaque/blue/corner{ - dir = 1 - }, -/turf/open/floor/plasteel/freezer, +/turf/open/floor/plasteel/showroomfloor, /area/ship/crew/toilet) "da" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -832,7 +827,11 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plasteel/freezer, +/obj/effect/turf_decal/spline/fancy/opaque/bottlegreen/corner{ + dir = 4 + }, +/obj/effect/turf_decal/spline/fancy/opaque/bottlegreen/corner, +/turf/open/floor/plasteel/showroomfloor, /area/ship/crew/toilet) "dc" = ( /obj/effect/turf_decal/corner/opaque/blue{ @@ -1229,14 +1228,20 @@ /turf/open/floor/plating, /area/ship/medical) "hS" = ( -/obj/item/cigbutt/roach, -/obj/structure/window/reinforced/tinted/frosted{ - dir = 4 +/obj/item/clothing/head/beret/chem, +/obj/item/clothing/suit/longcoat/chemist, +/obj/item/reagent_containers/dropper, +/obj/item/storage/box/pillbottles, +/obj/structure/closet/wall/white/chem{ + pixel_y = 32 }, -/obj/machinery/door/window/survival_pod, -/obj/structure/curtain, -/obj/structure/toilet, -/turf/open/floor/plasteel/patterned/grid, +/obj/effect/turf_decal/spline/fancy/opaque/bottlegreen{ + dir = 1 + }, +/obj/effect/turf_decal/spline/fancy/opaque/bottlegreen/corner{ + dir = 8 + }, +/turf/open/floor/plasteel/showroomfloor, /area/ship/crew/toilet) "iv" = ( /obj/effect/turf_decal/industrial/warning{ @@ -1265,19 +1270,26 @@ /turf/open/floor/plating, /area/ship/engineering) "iQ" = ( -/obj/machinery/power/terminal{ - dir = 1 +/obj/effect/turf_decal/spline/fancy/opaque/blue, +/obj/structure/sink{ + dir = 4; + pixel_x = -12 }, -/obj/structure/cable/yellow{ - icon_state = "0-8" +/obj/structure/mirror{ + pixel_x = -24 }, -/obj/structure/catwalk/over, -/obj/structure/sign/warning/electricshock{ - pixel_x = 32 +/obj/structure/toilet{ + pixel_y = 13 }, -/obj/machinery/light/small/directional/east, -/turf/open/floor/plating, -/area/ship/engineering) +/obj/machinery/light_switch{ + pixel_x = 11; + pixel_y = 22 + }, +/obj/machinery/light/small/directional/north{ + pixel_x = -10 + }, +/turf/open/floor/plasteel/freezer, +/area/ship/crew/toilet) "iU" = ( /obj/structure/closet/secure_closet/medical2, /turf/open/floor/plasteel/dark, @@ -1295,14 +1307,13 @@ /obj/structure/sign/poster/official/cleanliness{ pixel_x = 32 }, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable{ - icon_state = "0-8" - }, /obj/effect/turf_decal/siding/white{ dir = 1 }, -/obj/structure/table/chem, +/obj/structure/frame/machine, +/obj/item/stack/cable_coil/cyan{ + amount = 5 + }, /turf/open/floor/plasteel/tech/grid, /area/ship/crew/toilet) "jk" = ( @@ -1519,18 +1530,15 @@ /turf/open/floor/plating, /area/ship/cargo) "qD" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/structure/catwalk/over, +/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{ + dir = 1 }, /obj/structure/cable{ icon_state = "5-9" }, -/obj/structure/catwalk/over, -/obj/effect/turf_decal/trimline/opaque/yellow/filled/corner{ - dir = 1 +/obj/structure/sign/warning/electricshock{ + pixel_x = 32 }, /turf/open/floor/plating, /area/ship/engineering) @@ -1546,6 +1554,7 @@ /obj/structure/railing{ dir = 4 }, +/obj/machinery/light/small/directional/south, /turf/open/floor/plating, /area/ship/engineering) "ro" = ( @@ -1579,26 +1588,8 @@ /turf/open/floor/plasteel/white, /area/ship/cargo) "ss" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = -12 - }, -/obj/structure/closet/wall/white/chem{ - dir = 1; - name = "Chemistry Locker"; - pixel_y = -28 - }, -/obj/item/clothing/head/beret/chem, -/obj/item/clothing/suit/longcoat/chemist, -/obj/item/reagent_containers/dropper, -/obj/item/storage/box/pillbottles, -/obj/structure/mirror{ - pixel_x = -28 - }, -/obj/effect/turf_decal/spline/fancy/opaque/blue{ - dir = 1 - }, -/turf/open/floor/plasteel/freezer, +/obj/machinery/door/window/northleft, +/turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/crew/toilet) "su" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -1641,14 +1632,14 @@ /area/ship/engineering) "tz" = ( /obj/structure/catwalk/over, +/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{ + dir = 1 + }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 + dir = 9 }, /obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{ - dir = 1 + icon_state = "2-5" }, /turf/open/floor/plating, /area/ship/engineering) @@ -1868,7 +1859,7 @@ /obj/effect/turf_decal/industrial/outline/yellow, /obj/item/wrench, /obj/structure/cable/yellow, -/obj/machinery/light/small/directional/south, +/obj/machinery/airalarm/directional/south, /turf/open/floor/plating, /area/ship/engineering) "wd" = ( @@ -2346,9 +2337,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "1-6" - }, /obj/structure/cable{ icon_state = "1-2" }, @@ -2398,13 +2386,24 @@ /turf/open/floor/plating, /area/ship/engineering) "HM" = ( -/obj/machinery/firealarm/directional/north, -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/machinery/atmospherics/components/unary/portables_connector/layer2, -/obj/effect/turf_decal/industrial/hatch/yellow, -/obj/structure/railing{ +/obj/machinery/power/terminal{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "0-10" + }, +/obj/effect/spawner/lootdrop/maintenance/three, +/obj/structure/rack, +/obj/item/areaeditor/shuttle, +/obj/item/flashlight{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/toolbox/mechanical{ + pixel_y = 4 + }, +/obj/item/bot_assembly/hygienebot, +/obj/machinery/firealarm/directional/north, /turf/open/floor/plating, /area/ship/engineering) "Ic" = ( @@ -2427,15 +2426,12 @@ /turf/open/floor/plasteel/mono/dark, /area/ship/medical) "In" = ( -/obj/machinery/airalarm/directional/north, -/obj/effect/turf_decal/industrial/outline/yellow, /obj/machinery/power/smes/engineering{ charge = 1e+006 }, /obj/structure/cable{ icon_state = "0-10" }, -/obj/effect/turf_decal/industrial/outline/yellow, /turf/open/floor/plating, /area/ship/engineering) "Ja" = ( @@ -2550,10 +2546,14 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, -/obj/effect/turf_decal/spline/fancy/opaque/blue{ - dir = 1 +/obj/structure/sign/departments/restroom{ + pixel_x = -32 }, -/turf/open/floor/plasteel/freezer, +/obj/effect/turf_decal/siding/white{ + dir = 5 + }, +/obj/structure/table/chem, +/turf/open/floor/plasteel/tech/grid, /area/ship/crew/toilet) "Mi" = ( /turf/closed/wall/mineral/titanium, @@ -2584,12 +2584,12 @@ /area/ship/medical) "NT" = ( /obj/machinery/airalarm/directional/south, -/obj/effect/turf_decal/siding/white{ - dir = 1 +/obj/effect/turf_decal/siding/white/corner{ + dir = 4 }, -/obj/structure/frame/machine, -/obj/item/stack/cable_coil/cyan{ - amount = 5 +/obj/structure/table/chem, +/obj/machinery/reagentgrinder{ + pixel_y = 14 }, /turf/open/floor/plasteel/tech/grid, /area/ship/crew/toilet) @@ -2600,11 +2600,6 @@ /turf/open/floor/plasteel/dark, /area/ship/crew) "OS" = ( -/obj/machinery/door/airlock{ - dir = 4; - name = "Restroom"; - id_tag = "boxbathroom" - }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, @@ -2620,6 +2615,10 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/door/airlock{ + pixel_x = "chemistry"; + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/ship/crew/toilet) "Ps" = ( @@ -2739,20 +2738,24 @@ /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/medical/morgue) "UA" = ( -/obj/structure/rack, -/obj/item/storage/toolbox/mechanical{ - pixel_y = 4 +/obj/machinery/button/door{ + dir = 8; + id = "boxbathroom"; + name = "Privacy Button"; + normaldoorcontrol = 1; + pixel_x = 26; + pixel_y = 7; + specialfunctions = 4 }, -/obj/item/flashlight{ - pixel_x = 3; - pixel_y = 3 +/obj/machinery/shower{ + dir = 1; + layer = 3 }, -/obj/item/areaeditor/shuttle, -/obj/effect/spawner/lootdrop/maintenance/three, -/obj/item/bot_assembly/hygienebot, -/obj/effect/turf_decal/number/four, -/turf/open/floor/plating, -/area/ship/engineering) +/obj/structure/curtain, +/obj/item/soap, +/obj/machinery/door/window/northleft, +/turf/open/floor/plasteel/patterned/grid, +/area/ship/crew/toilet) "UN" = ( /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -2850,17 +2853,18 @@ /turf/open/floor/plating, /area/ship/engineering) "XD" = ( -/obj/machinery/firealarm/directional/west, -/obj/machinery/shower{ - pixel_y = 15 +/obj/machinery/door/airlock{ + dir = 4; + name = "Restroom"; + id_tag = "boxbathroom" }, -/obj/item/soap, -/obj/machinery/door/window/survival_pod, -/obj/structure/window/reinforced/tinted/frosted{ +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ dir = 4 }, -/obj/structure/curtain, -/turf/open/floor/plasteel/patterned/grid, +/turf/open/floor/plasteel/dark, /area/ship/crew/toilet) "XN" = ( /obj/structure/extinguisher_cabinet/directional/north, @@ -3208,10 +3212,10 @@ bq aa at In -iQ -UA -at -aS +cF +cF +cF +Jy aa aa "} @@ -3228,10 +3232,10 @@ bq hQ al al -at -at -at -at +cF +iQ +UA +cF aa aa "} From cffa00a3f82c429b69d002ba0e9f18f6d5660d84 Mon Sep 17 00:00:00 2001 From: BarteG44 Date: Sun, 20 Aug 2023 23:18:44 +0200 Subject: [PATCH 05/14] light switch adjustments --- _maps/shuttles/shiptest/independent_box.dmm | 23 +++++++++++-------- .../shiptest/independent_litieguai.dmm | 22 +++++++++--------- 2 files changed, 24 insertions(+), 21 deletions(-) diff --git a/_maps/shuttles/shiptest/independent_box.dmm b/_maps/shuttles/shiptest/independent_box.dmm index d48e99622d00..f60034019b1c 100644 --- a/_maps/shuttles/shiptest/independent_box.dmm +++ b/_maps/shuttles/shiptest/independent_box.dmm @@ -148,6 +148,7 @@ dir = 5 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/machinery/airalarm/directional/east, /turf/open/floor/plasteel/tech/grid, /area/ship/medical/morgue) "aI" = ( @@ -753,7 +754,7 @@ "cP" = ( /obj/machinery/power/apc/auto_name/directional/east, /obj/machinery/light_switch{ - pixel_x = 20; + pixel_x = 19; pixel_y = 10; dir = 8 }, @@ -1314,6 +1315,7 @@ /obj/item/stack/cable_coil/cyan{ amount = 5 }, +/obj/machinery/airalarm/directional/south, /turf/open/floor/plasteel/tech/grid, /area/ship/crew/toilet) "jk" = ( @@ -1430,7 +1432,7 @@ /obj/item/radio/intercom/directional/west, /obj/machinery/light_switch{ pixel_x = -12; - pixel_y = 23 + pixel_y = 21 }, /turf/open/floor/plasteel/tech, /area/ship/medical) @@ -1488,7 +1490,7 @@ /obj/machinery/power/apc/auto_name/directional/north, /obj/machinery/light_switch{ pixel_x = -12; - pixel_y = 23 + pixel_y = 21 }, /turf/open/floor/wood, /area/ship/crew) @@ -1676,7 +1678,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/light_switch{ pixel_x = -12; - pixel_y = 23 + pixel_y = 21 }, /turf/open/floor/carpet/nanoweave/blue, /area/ship/bridge) @@ -1785,7 +1787,7 @@ /obj/machinery/light_switch{ dir = 1; pixel_x = 11; - pixel_y = -16 + pixel_y = -14 }, /turf/open/floor/plasteel/tech/grid, /area/ship/medical/morgue) @@ -1800,7 +1802,6 @@ /turf/open/floor/plating, /area/ship/crew) "vs" = ( -/obj/machinery/airalarm/directional/south, /obj/effect/turf_decal/industrial/warning/fulltile, /obj/machinery/light/small/built/directional/south, /obj/structure/sign/warning/biohazard{ @@ -2230,7 +2231,7 @@ /obj/machinery/light_switch{ dir = 1; pixel_x = 11; - pixel_y = -16 + pixel_y = -14 }, /turf/open/floor/plating, /area/ship/engineering) @@ -2583,7 +2584,6 @@ /turf/open/floor/plasteel/tech, /area/ship/medical) "NT" = ( -/obj/machinery/airalarm/directional/south, /obj/effect/turf_decal/siding/white/corner{ dir = 4 }, @@ -2591,6 +2591,9 @@ /obj/machinery/reagentgrinder{ pixel_y = 14 }, +/obj/structure/sign/poster/official/moth/meth{ + pixel_y = -32 + }, /turf/open/floor/plasteel/tech/grid, /area/ship/crew/toilet) "OF" = ( @@ -2634,8 +2637,8 @@ /obj/structure/cable, /obj/machinery/light_switch{ dir = 1; - pixel_x = 10; - pixel_y = -16 + pixel_x = 11; + pixel_y = -14 }, /turf/open/floor/plasteel/white, /area/ship/cargo) diff --git a/_maps/shuttles/shiptest/independent_litieguai.dmm b/_maps/shuttles/shiptest/independent_litieguai.dmm index 059c70aa2ede..6fb56f3737a8 100644 --- a/_maps/shuttles/shiptest/independent_litieguai.dmm +++ b/_maps/shuttles/shiptest/independent_litieguai.dmm @@ -310,7 +310,7 @@ /obj/machinery/light_switch{ dir = 1; pixel_x = -12; - pixel_y = -16 + pixel_y = -13 }, /turf/open/floor/vault, /area/ship/storage) @@ -459,9 +459,9 @@ dir = 1 }, /obj/machinery/light_switch{ - dir = 8; - pixel_x = 20; - pixel_y = 11 + pixel_x = 19; + pixel_y = 10; + dir = 8 }, /turf/open/floor/plasteel/white, /area/ship/medical) @@ -717,7 +717,7 @@ /obj/machinery/light_switch{ dir = 1; pixel_x = -12; - pixel_y = -16 + pixel_y = -13 }, /turf/open/floor/plasteel/freezer, /area/ship/crew/toilet) @@ -802,7 +802,7 @@ /obj/machinery/light_switch{ dir = 1; pixel_x = -12; - pixel_y = -16 + pixel_y = -14 }, /turf/open/floor/carpet/nanoweave, /area/ship/bridge) @@ -1029,8 +1029,8 @@ }, /obj/machinery/light_switch{ dir = 8; - pixel_x = 20; - pixel_y = 14 + pixel_x = 19; + pixel_y = 11 }, /turf/open/floor/plasteel, /area/ship/cargo) @@ -1079,8 +1079,8 @@ /obj/item/storage/toolbox/electrical, /obj/machinery/light_switch{ dir = 8; - pixel_x = 20; - pixel_y = 14 + pixel_x = 19; + pixel_y = 11 }, /turf/open/floor/plating, /area/ship/maintenance/port) @@ -1960,7 +1960,7 @@ }, /obj/machinery/light_switch{ dir = 4; - pixel_x = -20; + pixel_x = -19; pixel_y = -11 }, /turf/open/floor/plasteel, From 623b8acdb9ed5f122e01a27e75e5aaf97ac0d421 Mon Sep 17 00:00:00 2001 From: BarteG44 Date: Mon, 21 Aug 2023 00:03:42 +0200 Subject: [PATCH 06/14] the --- _maps/shuttles/shiptest/independent_box.dmm | 64 ++++++++++----------- 1 file changed, 31 insertions(+), 33 deletions(-) diff --git a/_maps/shuttles/shiptest/independent_box.dmm b/_maps/shuttles/shiptest/independent_box.dmm index f60034019b1c..d7efc8527d7b 100644 --- a/_maps/shuttles/shiptest/independent_box.dmm +++ b/_maps/shuttles/shiptest/independent_box.dmm @@ -358,9 +358,24 @@ /turf/open/floor/plasteel/dark, /area/ship/medical) "bw" = ( -/obj/structure/sign/poster/official/random, -/turf/closed/wall/mineral/titanium/nodiagonal, -/area/ship/medical) +/obj/machinery/button/door{ + dir = 8; + id = "boxbathroom"; + name = "Privacy Button"; + normaldoorcontrol = 1; + pixel_x = 26; + pixel_y = 7; + specialfunctions = 4 + }, +/obj/machinery/shower{ + dir = 1; + layer = 3 + }, +/obj/structure/curtain, +/obj/item/soap, +/obj/machinery/door/window/northleft, +/turf/open/floor/plasteel/patterned/grid, +/area/ship/crew/toilet) "by" = ( /obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper, @@ -603,20 +618,16 @@ "cr" = ( /obj/effect/turf_decal/industrial/hatch/yellow, /obj/machinery/atmospherics/components/unary/portables_connector/layer2, -/obj/machinery/portable_atmospherics/canister/oxygen, /obj/structure/cable{ icon_state = "6-8" }, +/obj/machinery/portable_atmospherics/canister/air, /turf/open/floor/plating, /area/ship/engineering) "cu" = ( /obj/machinery/atmospherics/pipe/layer_manifold/visible, /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/engineering) -"cw" = ( -/obj/structure/sign/poster/random, -/turf/closed/wall/mineral/titanium/nodiagonal, -/area/ship/medical) "cB" = ( /turf/open/floor/plasteel/mono/dark, /area/ship/medical) @@ -777,7 +788,6 @@ /obj/structure/flora/bigplant{ pixel_x = -16 }, -/obj/machinery/airalarm/directional/north, /turf/open/floor/wood, /area/ship/crew) "cU" = ( @@ -957,7 +967,7 @@ /area/ship/medical) "ds" = ( /obj/machinery/suit_storage_unit/cmo, -/obj/machinery/light/small/directional/east, +/obj/machinery/airalarm/directional/east, /turf/open/floor/plasteel/dark, /area/ship/crew) "dt" = ( @@ -1489,7 +1499,7 @@ }, /obj/machinery/power/apc/auto_name/directional/north, /obj/machinery/light_switch{ - pixel_x = -12; + pixel_x = 11; pixel_y = 21 }, /turf/open/floor/wood, @@ -1610,6 +1620,7 @@ /obj/effect/turf_decal/siding/wood, /obj/structure/bookcase/manuals/medical, /obj/effect/turf_decal/siding/wood, +/obj/machinery/light/small/directional/south, /turf/open/floor/wood, /area/ship/crew) "tn" = ( @@ -2060,6 +2071,9 @@ /obj/structure/closet/crate/freezer/surplus_limbs, /obj/item/reagent_containers/glass/beaker/synthflesh, /obj/effect/turf_decal/corner/opaque/lightgrey/diagonal, +/obj/structure/sign/poster/official/random{ + pixel_y = -32 + }, /turf/open/floor/plasteel/dark, /area/ship/cargo) "zy" = ( @@ -2740,25 +2754,6 @@ /obj/structure/sign/departments/engineering, /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/medical/morgue) -"UA" = ( -/obj/machinery/button/door{ - dir = 8; - id = "boxbathroom"; - name = "Privacy Button"; - normaldoorcontrol = 1; - pixel_x = 26; - pixel_y = 7; - specialfunctions = 4 - }, -/obj/machinery/shower{ - dir = 1; - layer = 3 - }, -/obj/structure/curtain, -/obj/item/soap, -/obj/machinery/door/window/northleft, -/turf/open/floor/plasteel/patterned/grid, -/area/ship/crew/toilet) "UN" = ( /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -2935,6 +2930,9 @@ /obj/effect/turf_decal/siding/thinplating/dark{ dir = 6 }, +/obj/structure/sign/poster/random{ + pixel_y = -32 + }, /turf/open/floor/plasteel/tech, /area/ship/medical) "Yj" = ( @@ -3237,7 +3235,7 @@ al al cF iQ -UA +bw cF aa aa @@ -3470,11 +3468,11 @@ aq bc jI zl -bw +al gB fJ Yg -cw +al vE cV di From 3622689c8897a04914b471ec4379b297ef1d3bb5 Mon Sep 17 00:00:00 2001 From: BarteG44 Date: Mon, 21 Aug 2023 00:06:38 +0200 Subject: [PATCH 07/14] litiegmm --- _maps/shuttles/shiptest/independent_litieguai.dmm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/_maps/shuttles/shiptest/independent_litieguai.dmm b/_maps/shuttles/shiptest/independent_litieguai.dmm index 6fb56f3737a8..cead1a85bb2f 100644 --- a/_maps/shuttles/shiptest/independent_litieguai.dmm +++ b/_maps/shuttles/shiptest/independent_litieguai.dmm @@ -926,9 +926,6 @@ /obj/structure/chair{ dir = 8 }, -/obj/structure/sign/poster/official/soft_cap_pop_art{ - pixel_x = 32 - }, /turf/open/floor/plasteel, /area/ship/cargo) "tW" = ( @@ -1002,7 +999,9 @@ /obj/structure/chair{ dir = 8 }, -/obj/structure/extinguisher_cabinet/directional/east, +/obj/structure/sign/poster/official/soft_cap_pop_art{ + pixel_x = 32 + }, /turf/open/floor/plasteel, /area/ship/cargo) "ve" = ( @@ -1512,6 +1511,7 @@ /obj/structure/chair{ dir = 4 }, +/obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/plasteel, /area/ship/cargo) "Je" = ( @@ -1902,6 +1902,9 @@ "Qp" = ( /obj/machinery/vending/snack/random, /obj/effect/turf_decal/trimline/opaque/red/filled/line, +/obj/structure/sign/poster/official/cleanliness{ + pixel_x = -32 + }, /turf/open/floor/plasteel, /area/ship/cargo) "Qq" = ( @@ -2542,9 +2545,6 @@ /obj/structure/chair{ dir = 4 }, -/obj/structure/sign/poster/official/cleanliness{ - pixel_x = -32 - }, /turf/open/floor/plasteel, /area/ship/cargo) "YK" = ( From 32cd2787c1cb4d26c7b0aaad79300666d3797277 Mon Sep 17 00:00:00 2001 From: BarteG44 Date: Mon, 21 Aug 2023 00:07:26 +0200 Subject: [PATCH 08/14] boxmm --- _maps/shuttles/shiptest/independent_box.dmm | 74 ++++++++++----------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/_maps/shuttles/shiptest/independent_box.dmm b/_maps/shuttles/shiptest/independent_box.dmm index d7efc8527d7b..3912f002eac1 100644 --- a/_maps/shuttles/shiptest/independent_box.dmm +++ b/_maps/shuttles/shiptest/independent_box.dmm @@ -357,25 +357,6 @@ }, /turf/open/floor/plasteel/dark, /area/ship/medical) -"bw" = ( -/obj/machinery/button/door{ - dir = 8; - id = "boxbathroom"; - name = "Privacy Button"; - normaldoorcontrol = 1; - pixel_x = 26; - pixel_y = 7; - specialfunctions = 4 - }, -/obj/machinery/shower{ - dir = 1; - layer = 3 - }, -/obj/structure/curtain, -/obj/item/soap, -/obj/machinery/door/window/northleft, -/turf/open/floor/plasteel/patterned/grid, -/area/ship/crew/toilet) "by" = ( /obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper, @@ -1281,25 +1262,23 @@ /turf/open/floor/plating, /area/ship/engineering) "iQ" = ( -/obj/effect/turf_decal/spline/fancy/opaque/blue, -/obj/structure/sink{ - dir = 4; - pixel_x = -12 - }, -/obj/structure/mirror{ - pixel_x = -24 - }, -/obj/structure/toilet{ - pixel_y = 13 - }, -/obj/machinery/light_switch{ - pixel_x = 11; - pixel_y = 22 +/obj/machinery/button/door{ + dir = 8; + id = "boxbathroom"; + name = "Privacy Button"; + normaldoorcontrol = 1; + pixel_x = 26; + pixel_y = 7; + specialfunctions = 4 }, -/obj/machinery/light/small/directional/north{ - pixel_x = -10 +/obj/machinery/shower{ + dir = 1; + layer = 3 }, -/turf/open/floor/plasteel/freezer, +/obj/structure/curtain, +/obj/item/soap, +/obj/machinery/door/window/northleft, +/turf/open/floor/plasteel/patterned/grid, /area/ship/crew/toilet) "iU" = ( /obj/structure/closet/secure_closet/medical2, @@ -2754,6 +2733,27 @@ /obj/structure/sign/departments/engineering, /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/medical/morgue) +"UA" = ( +/obj/effect/turf_decal/spline/fancy/opaque/blue, +/obj/structure/sink{ + dir = 4; + pixel_x = -12 + }, +/obj/structure/mirror{ + pixel_x = -24 + }, +/obj/structure/toilet{ + pixel_y = 13 + }, +/obj/machinery/light_switch{ + pixel_x = 11; + pixel_y = 22 + }, +/obj/machinery/light/small/directional/north{ + pixel_x = -10 + }, +/turf/open/floor/plasteel/freezer, +/area/ship/crew/toilet) "UN" = ( /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -3234,8 +3234,8 @@ hQ al al cF +UA iQ -bw cF aa aa From 616d421a075c255bb8232a15ed255eb0f4617792 Mon Sep 17 00:00:00 2001 From: BarteG44 Date: Mon, 21 Aug 2023 00:35:23 +0200 Subject: [PATCH 09/14] *sigh --- _maps/shuttles/shiptest/independent_box.dmm | 150 +++++++++--------- .../shiptest/independent_litieguai.dmm | 46 ++---- 2 files changed, 89 insertions(+), 107 deletions(-) diff --git a/_maps/shuttles/shiptest/independent_box.dmm b/_maps/shuttles/shiptest/independent_box.dmm index 3912f002eac1..558e3569c252 100644 --- a/_maps/shuttles/shiptest/independent_box.dmm +++ b/_maps/shuttles/shiptest/independent_box.dmm @@ -328,7 +328,9 @@ /area/ship/engineering) "bo" = ( /obj/structure/catwalk/over, -/obj/item/cigbutt/roach, +/obj/machinery/atmospherics/components/unary/outlet_injector/on{ + dir = 8 + }, /turf/open/floor/plating, /area/ship/external) "bq" = ( @@ -357,9 +359,23 @@ }, /turf/open/floor/plasteel/dark, /area/ship/medical) +"bw" = ( +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/light/small/directional/south, +/turf/open/floor/plating, +/area/ship/engineering) "by" = ( /obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/machinery/atmospherics/pipe/layer_manifold/visible, /turf/open/floor/plating, /area/ship/engineering) "bz" = ( @@ -550,6 +566,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/machinery/atmospherics/pipe/layer_manifold/visible, /turf/open/floor/plating, /area/ship/engineering) "cd" = ( @@ -609,6 +626,27 @@ /obj/machinery/atmospherics/pipe/layer_manifold/visible, /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/engineering) +"cw" = ( +/obj/effect/turf_decal/spline/fancy/opaque/blue, +/obj/structure/sink{ + dir = 4; + pixel_x = -12 + }, +/obj/structure/mirror{ + pixel_x = -24 + }, +/obj/structure/toilet{ + pixel_y = 13 + }, +/obj/machinery/light_switch{ + pixel_x = 11; + pixel_y = 22 + }, +/obj/machinery/light/small/directional/north{ + pixel_x = -10 + }, +/turf/open/floor/plasteel/freezer, +/area/ship/crew/toilet) "cB" = ( /turf/open/floor/plasteel/mono/dark, /area/ship/medical) @@ -671,20 +709,17 @@ /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/crew/toilet) "cG" = ( +/obj/effect/spawner/lootdrop/maintenance/three, /obj/structure/closet/emcloset/anchored, /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 4 }, -/obj/effect/spawner/lootdrop/maintenance/three, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 6 - }, +/obj/machinery/light/small/broken/directional/south, /obj/machinery/button/door{ id = "box_engine1"; name = "Egnine shutter"; pixel_y = 28 }, -/obj/machinery/light/small/broken/directional/south, /turf/open/floor/plating, /area/ship/engineering) "cJ" = ( @@ -747,7 +782,7 @@ /obj/machinery/power/apc/auto_name/directional/east, /obj/machinery/light_switch{ pixel_x = 19; - pixel_y = 10; + pixel_y = 12; dir = 8 }, /obj/structure/cable{ @@ -1021,13 +1056,10 @@ /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 4 }, -/obj/structure/catwalk/over, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ + dir = 6 }, +/obj/machinery/light/small/directional/north, /turf/open/floor/plating, /area/ship/engineering) "eR" = ( @@ -1419,10 +1451,6 @@ icon_state = "0-4" }, /obj/item/radio/intercom/directional/west, -/obj/machinery/light_switch{ - pixel_x = -12; - pixel_y = 21 - }, /turf/open/floor/plasteel/tech, /area/ship/medical) "mx" = ( @@ -1667,7 +1695,7 @@ }, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/light_switch{ - pixel_x = -12; + pixel_x = -13; pixel_y = 21 }, /turf/open/floor/carpet/nanoweave/blue, @@ -1777,7 +1805,7 @@ /obj/machinery/light_switch{ dir = 1; pixel_x = 11; - pixel_y = -14 + pixel_y = -16 }, /turf/open/floor/plasteel/tech/grid, /area/ship/medical/morgue) @@ -2013,19 +2041,12 @@ /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, /obj/machinery/button/door{ dir = 1; id = "box_engine3"; name = "Egnine shutter"; pixel_y = -28 }, -/obj/machinery/light/small/directional/north, /turf/open/floor/plating, /area/ship/engineering) "yN" = ( @@ -2081,6 +2102,11 @@ /obj/machinery/sleeper{ dir = 4 }, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -21; + pixel_y = -10 + }, /turf/open/floor/plasteel/tech, /area/ship/medical) "AH" = ( @@ -2221,18 +2247,11 @@ /obj/item/mop, /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable, -/obj/machinery/light_switch{ - dir = 1; - pixel_x = 11; - pixel_y = -14 - }, /turf/open/floor/plating, /area/ship/engineering) "Dm" = ( /obj/structure/catwalk/over, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 8 - }, +/obj/item/cigbutt/roach, /obj/item/reagent_containers/food/snacks/burrito, /turf/open/floor/plating, /area/ship/external) @@ -2253,15 +2272,9 @@ /turf/open/floor/plasteel/dark, /area/ship/medical) "DP" = ( -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 4 - }, -/obj/structure/catwalk/over, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/plating, -/area/ship/engineering) +/obj/structure/closet/emcloset/anchored, +/turf/template_noop, +/area/template_noop) "ED" = ( /obj/machinery/iv_drip, /obj/machinery/smartfridge/organ{ @@ -2322,6 +2335,11 @@ /obj/effect/turf_decal/trimline/opaque/yellow/filled/corner{ dir = 4 }, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = 10; + pixel_y = -19 + }, /turf/open/floor/plating, /area/ship/engineering) "Gb" = ( @@ -2587,6 +2605,7 @@ /obj/structure/sign/poster/official/moth/meth{ pixel_y = -32 }, +/obj/machinery/firealarm/directional/west, /turf/open/floor/plasteel/tech/grid, /area/ship/crew/toilet) "OF" = ( @@ -2619,7 +2638,7 @@ /area/ship/crew/toilet) "Ps" = ( /obj/structure/catwalk/over, -/obj/machinery/atmospherics/components/unary/outlet_injector/on{ +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 8 }, /obj/item/chair/plastic, @@ -2630,8 +2649,8 @@ /obj/structure/cable, /obj/machinery/light_switch{ dir = 1; - pixel_x = 11; - pixel_y = -14 + pixel_x = 12; + pixel_y = -17 }, /turf/open/floor/plasteel/white, /area/ship/cargo) @@ -2733,27 +2752,6 @@ /obj/structure/sign/departments/engineering, /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/medical/morgue) -"UA" = ( -/obj/effect/turf_decal/spline/fancy/opaque/blue, -/obj/structure/sink{ - dir = 4; - pixel_x = -12 - }, -/obj/structure/mirror{ - pixel_x = -24 - }, -/obj/structure/toilet{ - pixel_y = 13 - }, -/obj/machinery/light_switch{ - pixel_x = 11; - pixel_y = 22 - }, -/obj/machinery/light/small/directional/north{ - pixel_x = -10 - }, -/turf/open/floor/plasteel/freezer, -/area/ship/crew/toilet) "UN" = ( /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -3031,11 +3029,11 @@ at cG cu Dm -cu +at yI at aa -aa +DP aa aa aa @@ -3048,11 +3046,11 @@ aa aa aa at -AH +eP by Ps cc -yA +bw at aa aa @@ -3068,11 +3066,11 @@ aa aa aa at -Gi +AH at bo at -lM +yA at aa aa @@ -3088,11 +3086,11 @@ aa aa aS at -DP +Gi at aa at -eP +lM at aS aa @@ -3234,7 +3232,7 @@ hQ al al cF -UA +cw iQ cF aa diff --git a/_maps/shuttles/shiptest/independent_litieguai.dmm b/_maps/shuttles/shiptest/independent_litieguai.dmm index cead1a85bb2f..dbe9e521e1ef 100644 --- a/_maps/shuttles/shiptest/independent_litieguai.dmm +++ b/_maps/shuttles/shiptest/independent_litieguai.dmm @@ -307,11 +307,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/obj/machinery/light_switch{ - dir = 1; - pixel_x = -12; - pixel_y = -13 - }, /turf/open/floor/vault, /area/ship/storage) "ie" = ( @@ -460,7 +455,7 @@ }, /obj/machinery/light_switch{ pixel_x = 19; - pixel_y = 10; + pixel_y = 13; dir = 8 }, /turf/open/floor/plasteel/white, @@ -801,8 +796,8 @@ }, /obj/machinery/light_switch{ dir = 1; - pixel_x = -12; - pixel_y = -14 + pixel_x = -13; + pixel_y = -16 }, /turf/open/floor/carpet/nanoweave, /area/ship/bridge) @@ -981,6 +976,7 @@ }, /obj/machinery/rnd/production/techfab/department/medical, /obj/effect/turf_decal/industrial/hatch/red, +/obj/machinery/firealarm/directional/south, /turf/open/floor/plasteel/white, /area/ship/medical) "uN" = ( @@ -1029,7 +1025,7 @@ /obj/machinery/light_switch{ dir = 8; pixel_x = 19; - pixel_y = 11 + pixel_y = 13 }, /turf/open/floor/plasteel, /area/ship/cargo) @@ -1079,7 +1075,7 @@ /obj/machinery/light_switch{ dir = 8; pixel_x = 19; - pixel_y = 11 + pixel_y = 13 }, /turf/open/floor/plating, /area/ship/maintenance/port) @@ -1125,7 +1121,7 @@ /obj/machinery/light_switch{ dir = 4; pixel_x = -20; - pixel_y = 10 + pixel_y = 13 }, /turf/open/floor/plating, /area/ship/maintenance/starboard) @@ -1188,18 +1184,6 @@ /obj/effect/turf_decal/industrial/hatch/yellow, /turf/open/floor/plating, /area/ship/maintenance/port) -"Aj" = ( -/obj/effect/turf_decal/trimline/opaque/red/filled/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/firealarm/directional/west, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/white, -/area/ship/hallway/fore) "AG" = ( /obj/structure/railing{ dir = 6 @@ -1290,9 +1274,10 @@ }, /obj/machinery/light_switch{ dir = 4; - pixel_x = -20; + pixel_x = -21; pixel_y = 10 }, +/obj/machinery/firealarm/directional/west, /turf/open/floor/plasteel/white, /area/ship/hallway/fore) "CX" = ( @@ -1357,7 +1342,6 @@ /obj/item/storage/box/gloves, /obj/item/storage/box/masks, /obj/item/storage/box/bodybags, -/obj/machinery/firealarm/directional/east, /turf/open/floor/plasteel/white, /area/ship/medical) "DU" = ( @@ -1556,6 +1540,11 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/firealarm/directional/west, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -21; + pixel_y = -10 + }, /turf/open/floor/plasteel, /area/ship/crew) "Ko" = ( @@ -1961,11 +1950,6 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -19; - pixel_y = -11 - }, /turf/open/floor/plasteel, /area/ship/crew) "QY" = ( @@ -2873,7 +2857,7 @@ Wc Ll Pr BK -Aj +Ll sM Cr vn From 9dcda8200ffed65c4a138b0c66dbe29b25c3899a Mon Sep 17 00:00:00 2001 From: BarteG44 Date: Mon, 21 Aug 2023 00:52:02 +0200 Subject: [PATCH 10/14] no more layers --- _maps/shuttles/shiptest/independent_box.dmm | 114 ++++++++++---------- 1 file changed, 55 insertions(+), 59 deletions(-) diff --git a/_maps/shuttles/shiptest/independent_box.dmm b/_maps/shuttles/shiptest/independent_box.dmm index 558e3569c252..7f6e929732f6 100644 --- a/_maps/shuttles/shiptest/independent_box.dmm +++ b/_maps/shuttles/shiptest/independent_box.dmm @@ -359,19 +359,6 @@ }, /turf/open/floor/plasteel/dark, /area/ship/medical) -"bw" = ( -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/light/small/directional/south, -/turf/open/floor/plating, -/area/ship/engineering) "by" = ( /obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper, @@ -623,30 +610,9 @@ /turf/open/floor/plating, /area/ship/engineering) "cu" = ( -/obj/machinery/atmospherics/pipe/layer_manifold/visible, -/turf/closed/wall/mineral/titanium/nodiagonal, -/area/ship/engineering) -"cw" = ( -/obj/effect/turf_decal/spline/fancy/opaque/blue, -/obj/structure/sink{ - dir = 4; - pixel_x = -12 - }, -/obj/structure/mirror{ - pixel_x = -24 - }, -/obj/structure/toilet{ - pixel_y = 13 - }, -/obj/machinery/light_switch{ - pixel_x = 11; - pixel_y = 22 - }, -/obj/machinery/light/small/directional/north{ - pixel_x = -10 - }, -/turf/open/floor/plasteel/freezer, -/area/ship/crew/toilet) +/obj/structure/closet/emcloset/anchored, +/turf/template_noop, +/area/template_noop) "cB" = ( /turf/open/floor/plasteel/mono/dark, /area/ship/medical) @@ -1294,23 +1260,25 @@ /turf/open/floor/plating, /area/ship/engineering) "iQ" = ( -/obj/machinery/button/door{ - dir = 8; - id = "boxbathroom"; - name = "Privacy Button"; - normaldoorcontrol = 1; - pixel_x = 26; - pixel_y = 7; - specialfunctions = 4 +/obj/effect/turf_decal/spline/fancy/opaque/blue, +/obj/structure/sink{ + dir = 4; + pixel_x = -12 }, -/obj/machinery/shower{ - dir = 1; - layer = 3 +/obj/structure/mirror{ + pixel_x = -24 }, -/obj/structure/curtain, -/obj/item/soap, -/obj/machinery/door/window/northleft, -/turf/open/floor/plasteel/patterned/grid, +/obj/structure/toilet{ + pixel_y = 13 + }, +/obj/machinery/light_switch{ + pixel_x = 11; + pixel_y = 22 + }, +/obj/machinery/light/small/directional/north{ + pixel_x = -10 + }, +/turf/open/floor/plasteel/freezer, /area/ship/crew/toilet) "iU" = ( /obj/structure/closet/secure_closet/medical2, @@ -2272,9 +2240,18 @@ /turf/open/floor/plasteel/dark, /area/ship/medical) "DP" = ( -/obj/structure/closet/emcloset/anchored, -/turf/template_noop, -/area/template_noop) +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/light/small/directional/south, +/turf/open/floor/plating, +/area/ship/engineering) "ED" = ( /obj/machinery/iv_drip, /obj/machinery/smartfridge/organ{ @@ -2752,6 +2729,25 @@ /obj/structure/sign/departments/engineering, /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/medical/morgue) +"UA" = ( +/obj/machinery/button/door{ + dir = 8; + id = "boxbathroom"; + name = "Privacy Button"; + normaldoorcontrol = 1; + pixel_x = 26; + pixel_y = 7; + specialfunctions = 4 + }, +/obj/machinery/shower{ + dir = 1; + layer = 3 + }, +/obj/structure/curtain, +/obj/item/soap, +/obj/machinery/door/window/northleft, +/turf/open/floor/plasteel/patterned/grid, +/area/ship/crew/toilet) "UN" = ( /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -3027,13 +3023,13 @@ aa aa at cG -cu +at Dm at yI at aa -DP +cu aa aa aa @@ -3050,7 +3046,7 @@ eP by Ps cc -bw +DP at aa aa @@ -3232,8 +3228,8 @@ hQ al al cF -cw iQ +UA cF aa aa From c2ccd94f12e094a69544c36f663d029f67c668b8 Mon Sep 17 00:00:00 2001 From: BarteG44 Date: Mon, 21 Aug 2023 00:52:26 +0200 Subject: [PATCH 11/14] no locker too --- _maps/shuttles/shiptest/independent_box.dmm | 110 ++++++++++---------- 1 file changed, 53 insertions(+), 57 deletions(-) diff --git a/_maps/shuttles/shiptest/independent_box.dmm b/_maps/shuttles/shiptest/independent_box.dmm index 7f6e929732f6..9823af9d73d5 100644 --- a/_maps/shuttles/shiptest/independent_box.dmm +++ b/_maps/shuttles/shiptest/independent_box.dmm @@ -359,6 +359,25 @@ }, /turf/open/floor/plasteel/dark, /area/ship/medical) +"bw" = ( +/obj/machinery/button/door{ + dir = 8; + id = "boxbathroom"; + name = "Privacy Button"; + normaldoorcontrol = 1; + pixel_x = 26; + pixel_y = 7; + specialfunctions = 4 + }, +/obj/machinery/shower{ + dir = 1; + layer = 3 + }, +/obj/structure/curtain, +/obj/item/soap, +/obj/machinery/door/window/northleft, +/turf/open/floor/plasteel/patterned/grid, +/area/ship/crew/toilet) "by" = ( /obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper, @@ -610,9 +629,36 @@ /turf/open/floor/plating, /area/ship/engineering) "cu" = ( -/obj/structure/closet/emcloset/anchored, -/turf/template_noop, -/area/template_noop) +/obj/effect/turf_decal/spline/fancy/opaque/blue, +/obj/structure/sink{ + dir = 4; + pixel_x = -12 + }, +/obj/structure/mirror{ + pixel_x = -24 + }, +/obj/structure/toilet{ + pixel_y = 13 + }, +/obj/machinery/light_switch{ + pixel_x = 11; + pixel_y = 22 + }, +/obj/machinery/light/small/directional/north{ + pixel_x = -10 + }, +/turf/open/floor/plasteel/freezer, +/area/ship/crew/toilet) +"cw" = ( +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ + dir = 6 + }, +/obj/machinery/light/small/directional/north, +/turf/open/floor/plating, +/area/ship/engineering) "cB" = ( /turf/open/floor/plasteel/mono/dark, /area/ship/medical) @@ -1018,16 +1064,6 @@ /obj/machinery/firealarm/directional/east, /turf/open/floor/plasteel/dark, /area/ship/cargo) -"eP" = ( -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 6 - }, -/obj/machinery/light/small/directional/north, -/turf/open/floor/plating, -/area/ship/engineering) "eR" = ( /obj/machinery/door/window/westright, /obj/effect/turf_decal/trimline/opaque/blue/warning{ @@ -1259,27 +1295,6 @@ }, /turf/open/floor/plating, /area/ship/engineering) -"iQ" = ( -/obj/effect/turf_decal/spline/fancy/opaque/blue, -/obj/structure/sink{ - dir = 4; - pixel_x = -12 - }, -/obj/structure/mirror{ - pixel_x = -24 - }, -/obj/structure/toilet{ - pixel_y = 13 - }, -/obj/machinery/light_switch{ - pixel_x = 11; - pixel_y = 22 - }, -/obj/machinery/light/small/directional/north{ - pixel_x = -10 - }, -/turf/open/floor/plasteel/freezer, -/area/ship/crew/toilet) "iU" = ( /obj/structure/closet/secure_closet/medical2, /turf/open/floor/plasteel/dark, @@ -2729,25 +2744,6 @@ /obj/structure/sign/departments/engineering, /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/medical/morgue) -"UA" = ( -/obj/machinery/button/door{ - dir = 8; - id = "boxbathroom"; - name = "Privacy Button"; - normaldoorcontrol = 1; - pixel_x = 26; - pixel_y = 7; - specialfunctions = 4 - }, -/obj/machinery/shower{ - dir = 1; - layer = 3 - }, -/obj/structure/curtain, -/obj/item/soap, -/obj/machinery/door/window/northleft, -/turf/open/floor/plasteel/patterned/grid, -/area/ship/crew/toilet) "UN" = ( /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -3029,7 +3025,7 @@ at yI at aa -cu +aa aa aa aa @@ -3042,7 +3038,7 @@ aa aa aa at -eP +cw by Ps cc @@ -3228,8 +3224,8 @@ hQ al al cF -iQ -UA +cu +bw cF aa aa From 33e0e4151f4e49028455690f0a8eca5c14f719c6 Mon Sep 17 00:00:00 2001 From: BarteG44 Date: Mon, 21 Aug 2023 12:52:45 +0200 Subject: [PATCH 12/14] too many scrubbers --- _maps/shuttles/shiptest/independent_box.dmm | 34 +++++++++---------- .../shiptest/independent_litieguai.dmm | 9 ++--- 2 files changed, 20 insertions(+), 23 deletions(-) diff --git a/_maps/shuttles/shiptest/independent_box.dmm b/_maps/shuttles/shiptest/independent_box.dmm index 9823af9d73d5..ae3878e12a62 100644 --- a/_maps/shuttles/shiptest/independent_box.dmm +++ b/_maps/shuttles/shiptest/independent_box.dmm @@ -649,16 +649,6 @@ }, /turf/open/floor/plasteel/freezer, /area/ship/crew/toilet) -"cw" = ( -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 6 - }, -/obj/machinery/light/small/directional/north, -/turf/open/floor/plating, -/area/ship/engineering) "cB" = ( /turf/open/floor/plasteel/mono/dark, /area/ship/medical) @@ -2259,12 +2249,9 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 + dir = 6 }, -/obj/machinery/light/small/directional/south, +/obj/machinery/light/small/directional/north, /turf/open/floor/plating, /area/ship/engineering) "ED" = ( @@ -2744,6 +2731,19 @@ /obj/structure/sign/departments/engineering, /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/medical/morgue) +"UA" = ( +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/light/small/directional/south, +/turf/open/floor/plating, +/area/ship/engineering) "UN" = ( /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -3038,11 +3038,11 @@ aa aa aa at -cw +DP by Ps cc -DP +UA at aa aa diff --git a/_maps/shuttles/shiptest/independent_litieguai.dmm b/_maps/shuttles/shiptest/independent_litieguai.dmm index dbe9e521e1ef..a0309fedd56e 100644 --- a/_maps/shuttles/shiptest/independent_litieguai.dmm +++ b/_maps/shuttles/shiptest/independent_litieguai.dmm @@ -54,9 +54,6 @@ /area/ship/storage) "bC" = ( /obj/item/radio/intercom/directional/south, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, /obj/effect/turf_decal/industrial/outline/red, /obj/machinery/autolathe, /turf/open/floor/plasteel/tech, @@ -1656,13 +1653,13 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, /obj/effect/turf_decal/siding/white, /obj/effect/turf_decal/siding/white{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, /turf/open/floor/vault, /area/ship/storage) "Ml" = ( From 18b2bb72ff3e16c9bfe05b8c9bf3ed8aa9e37968 Mon Sep 17 00:00:00 2001 From: BarteG44 Date: Mon, 21 Aug 2023 17:20:20 +0200 Subject: [PATCH 13/14] button... --- _maps/shuttles/shiptest/independent_litieguai.dmm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/_maps/shuttles/shiptest/independent_litieguai.dmm b/_maps/shuttles/shiptest/independent_litieguai.dmm index a0309fedd56e..5b4be0603925 100644 --- a/_maps/shuttles/shiptest/independent_litieguai.dmm +++ b/_maps/shuttles/shiptest/independent_litieguai.dmm @@ -304,6 +304,11 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = -13; + pixel_y = -16 + }, /turf/open/floor/vault, /area/ship/storage) "ie" = ( From 0f6b7f00631c1ead6e012be8bc563636a057ead5 Mon Sep 17 00:00:00 2001 From: BarteG44 Date: Thu, 24 Aug 2023 00:02:48 +0200 Subject: [PATCH 14/14] awful awful --- _maps/shuttles/shiptest/independent_box.dmm | 15 ++++++++------- _maps/shuttles/shiptest/independent_litieguai.dmm | 10 ++++------ 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/_maps/shuttles/shiptest/independent_box.dmm b/_maps/shuttles/shiptest/independent_box.dmm index ae3878e12a62..8cfdd8d3850b 100644 --- a/_maps/shuttles/shiptest/independent_box.dmm +++ b/_maps/shuttles/shiptest/independent_box.dmm @@ -716,7 +716,6 @@ /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 4 }, -/obj/machinery/light/small/broken/directional/south, /obj/machinery/button/door{ id = "box_engine1"; name = "Egnine shutter"; @@ -1037,7 +1036,6 @@ /turf/open/floor/plating, /area/ship/engineering) "ei" = ( -/obj/machinery/light/small/directional/east, /obj/machinery/cryopod, /obj/effect/turf_decal/box/white, /obj/machinery/computer/cryopod/retro/directional/north, @@ -1183,7 +1181,6 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/directional/west, /obj/structure/closet/firecloset/wall{ dir = 4; pixel_x = -32 @@ -1423,7 +1420,7 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/item/radio/intercom/directional/west, +/obj/machinery/light/directional/west, /turf/open/floor/plasteel/tech, /area/ship/medical) "mx" = ( @@ -1605,13 +1602,13 @@ /area/ship/crew) "tn" = ( /obj/machinery/vending/wardrobe/medi_wardrobe, -/obj/machinery/firealarm/directional/north, /obj/effect/turf_decal/corner/transparent/neutral{ dir = 1 }, /obj/effect/turf_decal/corner/transparent/neutral{ dir = 8 }, +/obj/machinery/light/small/directional/north, /turf/open/floor/plasteel/dark, /area/ship/crew) "tw" = ( @@ -1819,7 +1816,7 @@ /area/ship/bridge) "vE" = ( /obj/structure/dresser, -/obj/machinery/light/small/directional/north, +/obj/machinery/firealarm/directional/north, /turf/open/floor/plasteel, /area/ship/crew) "vX" = ( @@ -2080,6 +2077,10 @@ pixel_x = -21; pixel_y = -10 }, +/obj/item/radio/intercom/directional/west{ + pixel_x = -41; + pixel_y = -3 + }, /turf/open/floor/plasteel/tech, /area/ship/medical) "AH" = ( @@ -2251,7 +2252,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ dir = 6 }, -/obj/machinery/light/small/directional/north, +/obj/machinery/light/small/broken/directional/north, /turf/open/floor/plating, /area/ship/engineering) "ED" = ( diff --git a/_maps/shuttles/shiptest/independent_litieguai.dmm b/_maps/shuttles/shiptest/independent_litieguai.dmm index 5b4be0603925..2a6105eab217 100644 --- a/_maps/shuttles/shiptest/independent_litieguai.dmm +++ b/_maps/shuttles/shiptest/independent_litieguai.dmm @@ -75,7 +75,6 @@ dir = 1 }, /obj/effect/turf_decal/industrial/hatch/red, -/obj/machinery/light/directional/south, /turf/open/floor/plasteel/white, /area/ship/medical) "cn" = ( @@ -331,6 +330,9 @@ dir = 4 }, /obj/machinery/airalarm/directional/south, +/obj/structure/sign/poster/official/cleanliness{ + pixel_x = -32 + }, /turf/open/floor/plasteel/freezer, /area/ship/crew/toilet) "iP" = ( @@ -1383,7 +1385,6 @@ /obj/item/lighter{ pixel_x = -8 }, -/obj/machinery/light/directional/north, /turf/open/floor/plasteel/white, /area/ship/medical) "Go" = ( @@ -1593,7 +1594,6 @@ /obj/item/clothing/glasses/science, /obj/item/reagent_containers/glass/beaker/large, /obj/item/reagent_containers/glass/beaker/large, -/obj/machinery/airalarm/directional/east, /obj/structure/closet/wall/white/chem{ dir = 1; name = "Chemistry Locker"; @@ -1601,6 +1601,7 @@ }, /obj/item/storage/backpack/satchel/chem, /obj/item/clothing/head/beret/chem, +/obj/machinery/light/directional/east, /turf/open/floor/plasteel/white, /area/ship/medical) "KW" = ( @@ -2340,9 +2341,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/structure/sign/poster/official/cleanliness{ - pixel_y = -32 - }, /turf/open/floor/plasteel/freezer, /area/ship/crew/toilet) "Wc" = (