diff --git a/_maps/PentestMaps/Shuttles/independent/independent_schmiedeberg.dmm b/_maps/PentestMaps/Shuttles/independent/independent_schmiedeberg.dmm index 359cc63ac4..5beb61f10c 100644 --- a/_maps/PentestMaps/Shuttles/independent/independent_schmiedeberg.dmm +++ b/_maps/PentestMaps/Shuttles/independent/independent_schmiedeberg.dmm @@ -226,10 +226,10 @@ color = "#543C30"; dir = 1 }, -/obj/effect/turf_decal/siding/wood/corner{ - color = "#543C30"; - dir = 8 +/obj/effect/turf_decal/siding/wood{ + color = "#543C30" }, +/obj/machinery/smartfridge/drying_rack, /turf/open/floor/concrete/slab_3, /area/ship/crew/hydroponics) "cp" = ( @@ -317,10 +317,11 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 5 }, -/obj/structure/extinguisher_cabinet/directional/south, -/turf/open/floor/plasteel/stairs{ - dir = 8 +/obj/effect/turf_decal/siding/white/corner, +/obj/effect/turf_decal/siding/white/corner{ + dir = 4 }, +/turf/open/floor/carpet/nanoweave/beige, /area/ship/crew/canteen) "dU" = ( /obj/machinery/vending/wallmed{ @@ -349,7 +350,6 @@ /obj/item/geiger_counter, /obj/item/reagent_scanner, /obj/structure/closet/wall/white/chem{ - dir = 1; name = "Pharmacist's Locker"; pixel_y = -28 }, @@ -400,7 +400,6 @@ /turf/open/floor/wood/walnut, /area/ship/crew) "eY" = ( -/obj/structure/closet/crate/secure/loot, /obj/item/stack/cable_coil/blue, /obj/item/circuitboard/computer/pandemic, /obj/effect/turf_decal/box/white, @@ -410,6 +409,7 @@ /obj/effect/turf_decal/siding/thinplating/dark/corner{ dir = 8 }, +/obj/structure/closet/crate/secure/loot, /turf/open/floor/plasteel/tech/techmaint, /area/ship/engineering) "fb" = ( @@ -467,10 +467,12 @@ dir = 4 }, /obj/structure/curtain/bounty, -/obj/structure/closet/emcloset/wall/directional/south, /obj/effect/turf_decal/siding/wood{ dir = 1 }, +/obj/structure/sign/poster/contraband/hacking_guide{ + pixel_y = -32 + }, /turf/open/floor/carpet/blue, /area/ship/crew) "fO" = ( @@ -667,7 +669,7 @@ /turf/open/floor/wood/walnut, /area/ship/cargo) "is" = ( -/obj/machinery/smartfridge/food, +/obj/machinery/smartfridge, /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/medical) "iJ" = ( @@ -681,9 +683,6 @@ /obj/item/reagent_containers/glass/filter, /obj/item/reagent_containers/glass/beaker/large, /obj/item/reagent_containers/glass/beaker/large, -/obj/structure/window/reinforced/tinted{ - dir = 1 - }, /obj/machinery/door/window{ dir = 8 }, @@ -698,19 +697,18 @@ color = "#543C30"; dir = 6 }, +/obj/structure/window/reinforced{ + dir = 1 + }, /turf/open/floor/wood/walnut, /area/ship/crew/hydroponics) "iN" = ( -/obj/machinery/suit_storage_unit/inherit, -/obj/item/clothing/mask/breath/medical, -/obj/item/tank/internals/oxygen, /obj/effect/turf_decal/siding/wideplating/dark{ dir = 10 }, -/obj/item/clothing/suit/space/hardsuit/medical/cmo, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/structure/curtain/bounty, +/obj/effect/spawner/random/bedsheet, +/obj/structure/bed, /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) "iS" = ( @@ -721,6 +719,7 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt/dust, +/obj/structure/window/reinforced/tinted, /turf/open/floor/carpet/blue, /area/ship/bridge) "iX" = ( @@ -738,7 +737,7 @@ pixel_x = -1 }, /turf/closed/wall/mineral/titanium/nodiagonal, -/area/ship/medical) +/area/ship/crew/canteen) "jB" = ( /turf/closed/wall/mineral/titanium, /area/ship/crew) @@ -748,7 +747,6 @@ /turf/open/floor/mineral/titanium/white, /area/ship/medical) "jQ" = ( -/obj/machinery/light/small/directional/south, /obj/effect/turf_decal/siding/wood{ color = "#543C30"; dir = 1 @@ -800,10 +798,14 @@ /obj/item/seeds/aloe, /obj/item/seeds/coffee, /obj/item/seeds/corn, -/obj/effect/turf_decal/siding/wood/end{ +/obj/effect/turf_decal/siding/wood{ color = "#543C30"; dir = 8 }, +/obj/effect/turf_decal/siding/wood{ + color = "#543C30"; + dir = 4 + }, /turf/open/floor/wood/walnut, /area/ship/crew/hydroponics) "kC" = ( @@ -811,10 +813,6 @@ /obj/structure/cable{ icon_state = "1-4" }, -/obj/effect/turf_decal/siding/wood/corner{ - color = "#543C30"; - dir = 1 - }, /obj/effect/turf_decal/siding/wood{ color = "#543C30" }, @@ -999,6 +997,9 @@ pixel_x = 20; pixel_y = 12 }, +/obj/machinery/firealarm/directional/east{ + pixel_x = 38 + }, /turf/open/floor/wood/walnut, /area/ship/crew/toilet) "mO" = ( @@ -1089,14 +1090,9 @@ /turf/open/floor/concrete/tiles, /area/ship/crew/hydroponics) "oc" = ( -/obj/machinery/light/small/directional/west, /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/turf_decal/siding/wood/corner{ - color = "#543C30"; - dir = 8 - }, /turf/open/floor/concrete/tiles, /area/ship/crew/hydroponics) "om" = ( @@ -1155,6 +1151,10 @@ "pB" = ( /turf/closed/wall/mineral/titanium, /area/ship/crew/hydroponics) +"pP" = ( +/obj/machinery/vending/boozeomat, +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/ship/crew/canteen) "pY" = ( /obj/structure/table/wood/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -1230,11 +1230,6 @@ /turf/open/floor/wood/walnut, /area/ship/crew/canteen) "qV" = ( -/obj/machinery/light/small/directional/north, -/obj/structure/sign/departments/chemistry{ - pixel_x = -27; - pixel_y = 29 - }, /obj/effect/decal/cleanable/oil, /obj/structure/cable{ icon_state = "2-4" @@ -1245,8 +1240,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 }, -/obj/structure/extinguisher_cabinet/directional/west, -/turf/open/floor/mineral/titanium/white, +/obj/effect/turf_decal/siding/white/end{ + dir = 1 + }, +/turf/open/floor/carpet/nanoweave/beige, /area/ship/crew/canteen) "rj" = ( /obj/structure/catwalk/over, @@ -1284,14 +1281,10 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/structure/cable{ - icon_state = "1-4" - }, /turf/open/floor/plating, /area/ship/engineering) "rC" = ( /obj/machinery/light/small/directional/south, -/obj/structure/closet/crate/secure/loot, /obj/item/plunger, /obj/effect/turf_decal/box/white, /obj/effect/decal/cleanable/dirt/dust, @@ -1300,6 +1293,7 @@ dir = 8 }, /obj/item/seeds/random, +/obj/structure/closet/crate/secure/loot, /turf/open/floor/plasteel/tech/techmaint, /area/ship/engineering) "rE" = ( @@ -1425,13 +1419,6 @@ /turf/open/floor/carpet/nanoweave/beige, /area/ship/medical) "tB" = ( -/obj/structure/table, -/obj/item/reagent_containers/food/drinks/shaker{ - pixel_x = -9; - pixel_y = 2 - }, -/obj/item/reagent_containers/glass/rag, -/obj/machinery/light/directional/east, /obj/effect/turf_decal/siding/wood{ color = "#543C30"; dir = 8 @@ -1439,9 +1426,6 @@ /turf/open/floor/wood/walnut, /area/ship/crew/canteen) "tG" = ( -/obj/machinery/door/airlock/grunge{ - dir = 4 - }, /obj/effect/turf_decal/siding/white{ dir = 1 }, @@ -1455,13 +1439,8 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/turf/open/floor/plasteel/tech/techmaint, +/obj/structure/extinguisher_cabinet/directional/south, +/turf/open/floor/carpet/nanoweave/beige, /area/ship/crew/canteen) "tK" = ( /obj/machinery/atmospherics/pipe/layer_manifold, @@ -1475,6 +1454,12 @@ }, /turf/open/floor/plating, /area/ship/engineering) +"ug" = ( +/obj/effect/turf_decal/siding/wood/corner{ + color = "#543C30" + }, +/turf/open/floor/wood/walnut, +/area/ship/crew/canteen) "uB" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/item/chair, @@ -1515,7 +1500,13 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plasteel/stairs, +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, +/obj/effect/turf_decal/siding/white{ + dir = 4 + }, +/turf/open/floor/carpet/nanoweave/beige, /area/ship/crew/canteen) "vL" = ( /obj/structure/sign/poster/official/cleanliness{ @@ -1527,6 +1518,7 @@ /obj/machinery/light/directional/west, /obj/effect/decal/cleanable/greenglow/filled, /obj/machinery/duct, +/obj/item/stack/tile/carpet/nanoweave/beige, /turf/open/floor/plating, /area/ship/medical) "vM" = ( @@ -1575,7 +1567,7 @@ /obj/machinery/button/door{ dir = 1; id = "pharmwindows"; - name = "window shutters"; + name = "bolts"; pixel_y = -23 }, /obj/machinery/light_switch{ @@ -1583,6 +1575,10 @@ pixel_x = -20; pixel_y = 12 }, +/obj/machinery/suit_storage_unit/inherit, +/obj/item/clothing/suit/space/hardsuit/medical/cmo, +/obj/item/tank/internals/oxygen, +/obj/item/clothing/mask/breath/medical, /turf/open/floor/carpet/blue, /area/ship/bridge) "wD" = ( @@ -1666,7 +1662,14 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, -/obj/machinery/firealarm/directional/south, +/obj/machinery/button/door{ + dir = 1; + id = "bathroombolts"; + name = "Bathroom Lock"; + pixel_y = -23; + normaldoorcontrol = 1; + specialfunctions = 4 + }, /turf/open/floor/wood/walnut, /area/ship/crew/toilet) "xp" = ( @@ -1722,26 +1725,17 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/effect/turf_decal/siding/white{ - dir = 1 - }, -/obj/effect/turf_decal/siding/white, -/obj/machinery/door/airlock/maintenance{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 +/obj/effect/turf_decal/siding/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 1 }, -/turf/open/floor/plasteel/tech/techmaint, +/turf/open/floor/carpet/nanoweave/beige, /area/ship/crew/canteen) "yj" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -1771,6 +1765,14 @@ }, /turf/open/floor/wood/walnut, /area/ship/crew/hydroponics) +"yy" = ( +/obj/effect/turf_decal/siding/wood/end{ + color = "#543C30"; + dir = 1 + }, +/obj/machinery/light/small/directional/west, +/turf/open/floor/wood/walnut, +/area/ship/crew/hydroponics) "yB" = ( /obj/machinery/vending/cola, /obj/effect/turf_decal/corner/opaque/blue/three_quarters{ @@ -2036,7 +2038,14 @@ dir = 9 }, /obj/structure/closet/emcloset/wall/directional/east, -/turf/open/floor/plasteel/tech/techmaint, +/obj/effect/turf_decal/siding/white/corner{ + dir = 1 + }, +/obj/effect/turf_decal/siding/white, +/obj/effect/turf_decal/siding/white/corner{ + dir = 4 + }, +/turf/open/floor/carpet/nanoweave/beige, /area/ship/crew/canteen) "CX" = ( /obj/structure/window/reinforced/tinted{ @@ -2370,6 +2379,13 @@ }, /turf/open/floor/wood/walnut, /area/ship/cargo) +"Kc" = ( +/obj/structure/railing/wood{ + color = "#543C30"; + dir = 4 + }, +/turf/open/floor/wood/walnut, +/area/ship/crew/canteen) "KK" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/chair/sofa/brown/left/directional/west, @@ -2467,12 +2483,15 @@ /area/ship/crew/toilet) "LK" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/reagent_dispensers/fueltank, /obj/effect/turf_decal/siding/thinplating/dark{ dir = 9 }, /obj/effect/turf_decal/box/white, /obj/machinery/light/directional/east, +/obj/machinery/power/ship_gravity, +/obj/structure/cable{ + icon_state = "0-8" + }, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) "LS" = ( @@ -2485,6 +2504,13 @@ }, /turf/open/floor/plasteel/white, /area/ship/cargo) +"LT" = ( +/obj/structure/sign/departments/chemistry{ + pixel_x = -30; + pixel_y = 29 + }, +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/ship/medical) "Mb" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, @@ -2531,7 +2557,10 @@ /turf/open/floor/concrete/slab_3, /area/ship/crew/canteen) "MQ" = ( -/obj/machinery/door/airlock/grunge, +/obj/machinery/door/airlock/grunge{ + id_tag = "bathroombolts"; + name = "Bathroom" + }, /obj/structure/cable{ icon_state = "1-2" }, @@ -2562,6 +2591,22 @@ /obj/effect/turf_decal/steeldecal, /turf/open/floor/plasteel/tech/grid, /area/ship/external) +"MU" = ( +/obj/effect/turf_decal/siding/wood/end{ + color = "#543C30"; + dir = 2 + }, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -20; + pixel_y = 12 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/wood/walnut, +/area/ship/crew/hydroponics) "MV" = ( /obj/effect/turf_decal/siding/white{ dir = 1 @@ -2662,12 +2707,16 @@ dir = 8 }, /obj/effect/decal/cleanable/oil/streak, -/obj/machinery/power/ship_gravity, -/obj/structure/cable{ - icon_state = "0-8" - }, +/obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) +"NX" = ( +/obj/structure/rack, +/obj/effect/spawner/random/food_or_drink/ration, +/obj/effect/spawner/random/food_or_drink/ration, +/obj/effect/spawner/random/food_or_drink/ration, +/turf/open/floor/wood/walnut, +/area/ship/crew/canteen) "Oe" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt, @@ -2778,6 +2827,9 @@ /obj/structure/cable{ icon_state = "0-2" }, +/obj/machinery/door/poddoor{ + id = "pharmentrance" + }, /turf/open/floor/plasteel/tech, /area/ship/cargo) "Pt" = ( @@ -2993,11 +3045,20 @@ /turf/open/floor/carpet/blue, /area/ship/crew) "Ug" = ( -/obj/structure/railing{ +/obj/structure/railing/wood{ + color = "#543C30" + }, +/obj/structure/railing/wood{ + color = "#543C30"; dir = 4 }, -/obj/machinery/vending/boozeomat, -/turf/closed/wall/mineral/titanium/nodiagonal, +/obj/structure/table, +/obj/item/reagent_containers/food/drinks/shaker{ + pixel_x = -9; + pixel_y = 2 + }, +/obj/item/reagent_containers/glass/rag, +/turf/open/floor/wood/walnut, /area/ship/crew/canteen) "Um" = ( /obj/effect/turf_decal/siding/wideplating/dark{ @@ -3079,17 +3140,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable{ - icon_state = "0-2" - }, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/effect/turf_decal/siding/wood/corner{ - color = "#543C30"; - dir = 1 - }, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -20; - pixel_y = 12 + icon_state = "2-8" }, /turf/open/floor/concrete/tiles, /area/ship/crew/hydroponics) @@ -3128,6 +3179,16 @@ }, /turf/open/floor/plasteel/white, /area/ship/cargo) +"WA" = ( +/obj/machinery/light/small/directional/east, +/obj/structure/extinguisher_cabinet/directional/east{ + pixel_y = 10 + }, +/obj/effect/turf_decal/siding/wood{ + color = "#543C30" + }, +/turf/open/floor/wood/walnut, +/area/ship/crew/canteen) "WP" = ( /obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -3140,7 +3201,6 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) "WT" = ( -/obj/effect/decal/cleanable/dirt/dust, /obj/item/stack/tile/carpet/nanoweave/beige, /obj/structure/cable{ icon_state = "4-8" @@ -3151,7 +3211,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, -/turf/open/floor/concrete/slab_3, +/turf/open/floor/plating, /area/ship/crew/canteen) "WY" = ( /obj/structure/table, @@ -3168,17 +3228,15 @@ /turf/open/floor/wood/walnut, /area/ship/crew/canteen) "Xc" = ( -/obj/machinery/modular_computer/console/preset/command, /obj/item/radio/intercom/wideband/directional/north, +/obj/machinery/modular_computer/console/preset/id, /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) "Xh" = ( -/obj/structure/sign/poster/contraband/hacking_guide{ - pixel_y = -32 - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, +/obj/structure/closet/emcloset/wall/directional/south, /turf/open/floor/wood/walnut, /area/ship/crew) "Xv" = ( @@ -3201,6 +3259,9 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable{ + icon_state = "1-4" + }, /turf/open/floor/plating, /area/ship/engineering) "XG" = ( @@ -3245,9 +3306,6 @@ /turf/open/floor/carpet/nanoweave/beige, /area/ship/cargo) "Yc" = ( -/obj/machinery/door/poddoor/multi_tile/three_tile_hor{ - id = "pharmentrance" - }, /obj/effect/turf_decal/arrows/white, /obj/machinery/power/shieldwallgen/atmos{ anchored = 1; @@ -3258,6 +3316,9 @@ /obj/structure/cable{ icon_state = "0-2" }, +/obj/machinery/door/poddoor{ + id = "pharmentrance" + }, /turf/open/floor/plasteel/tech, /area/ship/cargo) "Yh" = ( @@ -3420,6 +3481,15 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/airlock/maintenance{ + dir = 4 + }, /turf/open/floor/plasteel/stairs{ dir = 8 }, @@ -3448,9 +3518,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plasteel/stairs{ - dir = 8 - }, +/turf/open/floor/concrete/tiles, /area/ship/crew/hydroponics) "ZO" = ( /obj/effect/turf_decal/siding/wood, @@ -3495,6 +3563,9 @@ preferred_direction = 4 }, /obj/effect/turf_decal/arrows/white, +/obj/machinery/door/poddoor{ + id = "pharmentrance" + }, /turf/open/floor/plasteel/tech, /area/ship/cargo) "ZX" = ( @@ -3526,6 +3597,7 @@ /obj/item/clothing/shoes/sneakers/orange, /obj/item/reagent_containers/glass/bottle/vial/large, /obj/item/reagent_containers/glass/bottle/vial/large, +/obj/structure/curtain/bounty, /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) @@ -3534,7 +3606,7 @@ xJ xJ xJ xJ -Fz +OO su YV zT @@ -3666,7 +3738,7 @@ Wv Wv Wv xT -YU +NX YU "} (8,1,1) = {" @@ -3766,7 +3838,7 @@ fq tB WY dF -YU +pP YU "} (13,1,1) = {" @@ -3782,8 +3854,8 @@ il PG vM jQ -YU -YU +ug +Kc Ug tG YU @@ -3802,7 +3874,7 @@ YD gO Na Vh -YU +WA qV vt CV @@ -3819,14 +3891,14 @@ qa MZ OL VY -YU -YU -YU HE -KS -jg HE HE +HE +KS +jg +YU +YU pd "} (16,1,1) = {" @@ -3845,7 +3917,7 @@ vL hX rX CX -HE +LT Ga xJ "} @@ -3855,9 +3927,9 @@ xJ kp XR nz -XR +MU ZF -XR +yy kt HE dU diff --git a/_maps/configs/independent_schmiedeberg.json b/_maps/configs/independent_schmiedeberg.json index e0b4305185..aa71a9cd03 100644 --- a/_maps/configs/independent_schmiedeberg.json +++ b/_maps/configs/independent_schmiedeberg.json @@ -50,7 +50,7 @@ "architect": "TypeVar", "contributors": [ - "No Contributors" + "Ravellon" ] } diff --git a/_maps/shuttles/_images/Schmiedeberg-class.png b/_maps/shuttles/_images/Schmiedeberg-class.png index 4b389740da..ee75dacfeb 100644 Binary files a/_maps/shuttles/_images/Schmiedeberg-class.png and b/_maps/shuttles/_images/Schmiedeberg-class.png differ