diff --git a/maps/submaps/admin_use_vr/avii_eventMapv2.dmm b/maps/submaps/admin_use_vr/avii_eventMapv2.dmm index 2c9219cbfec..69812acaaca 100644 --- a/maps/submaps/admin_use_vr/avii_eventMapv2.dmm +++ b/maps/submaps/admin_use_vr/avii_eventMapv2.dmm @@ -4,7 +4,7 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/blue2, /area/crew_quarters/sleep/Dorm_3) "ac" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -135,7 +135,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/blue2, /area/crew_quarters/sleep/Dorm_3) "aV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -175,7 +175,7 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/purple, /area/crew_quarters/sleep/Dorm_7) "bl" = ( /obj/structure/cable{ @@ -216,6 +216,14 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plating, /area/maintenance/asmaint) +"bv" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/research) "bw" = ( /obj/structure/cable/green{ icon_state = "1-4" @@ -226,7 +234,7 @@ pixel_x = 25; pixel_y = 25 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/green, /area/crew_quarters/sleep/Dorm_8) "bx" = ( /obj/machinery/door/airlock/glass_external{ @@ -589,7 +597,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/sblucarpet, /area/crew_quarters/sleep/Dorm_1) "dh" = ( /obj/structure/table/standard, @@ -720,7 +728,7 @@ /obj/item/weapon/bedsheet/bluedouble, /obj/structure/bed/double/padded, /obj/structure/curtain/black, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/sleep/Dorm_5) "dP" = ( /turf/simulated/floor/tiled/techfloor, @@ -732,6 +740,8 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/steel_grid, /area/crew_quarters/sleep/vistor_room_1) "dR" = ( @@ -827,6 +837,10 @@ }, /turf/simulated/floor/tiled, /area/hallway/secondary/civilian_hallway_aft) +"eo" = ( +/obj/machinery/recharge_station, +/turf/simulated/floor/plating, +/area/maintenance/asmaint) "ep" = ( /obj/random/trash_pile, /obj/effect/decal/cleanable/cobweb2, @@ -909,7 +923,7 @@ /obj/item/weapon/bedsheet/bluedouble, /obj/structure/bed/double/padded, /obj/structure/curtain/black, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/sblucarpet, /area/crew_quarters/sleep/Dorm_1) "eG" = ( /obj/machinery/door/firedoor/glass, @@ -970,7 +984,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/sleep/Dorm_4) "eY" = ( /obj/machinery/vending/loadout/uniform, @@ -1026,6 +1040,9 @@ /obj/machinery/light/small{ dir = 8 }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/tiled/steel_grid, /area/crew_quarters/sleep/vistor_room_2) "fv" = ( @@ -1091,7 +1108,7 @@ /obj/structure/bed/chair/comfy/black{ dir = 1 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/blue2, /area/crew_quarters/sleep/Dorm_3) "fP" = ( /obj/machinery/camera/network/engine{ @@ -1163,7 +1180,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/green, /area/crew_quarters/sleep/Dorm_8) "gc" = ( /turf/simulated/wall/r_wall, @@ -1264,15 +1281,15 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /obj/effect/floor_decal/industrial/warning{ dir = 6 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, /turf/simulated/floor/tiled/techfloor, /area/engineering/engine_monitoring) "gA" = ( @@ -1391,6 +1408,12 @@ /turf/simulated/floor/tiled/eris/white/bluecorner, /area/medical/medbay) "gW" = ( +/obj/machinery/alarm/angled{ + dir = 8 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_grid, /area/crew_quarters/sleep/vistor_room_2) "gX" = ( @@ -1612,7 +1635,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/sleep/Dorm_4) "hY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -1632,7 +1655,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/purple, /area/crew_quarters/sleep/Dorm_7) "ic" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -1665,6 +1688,15 @@ /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/plating, /area/maintenance/aft) +"ip" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/research) "ir" = ( /obj/structure/table/glass, /turf/simulated/floor/carpet/blue2, @@ -1870,7 +1902,7 @@ /obj/item/weapon/bedsheet/bluedouble, /obj/structure/bed/double/padded, /obj/structure/curtain/black, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/oracarpet, /area/crew_quarters/sleep/Dorm_2) "jg" = ( /obj/structure/cable/cyan, @@ -2031,7 +2063,7 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/sleep/Dorm_4) "jZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -2202,7 +2234,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/sleep/Dorm_5) "kO" = ( /obj/structure/cable/cyan{ @@ -2251,7 +2283,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/purple, /area/crew_quarters/sleep/Dorm_7) "kY" = ( /obj/random/pottedplant, @@ -2365,7 +2397,7 @@ /obj/machinery/light/small{ dir = 4 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/oracarpet, /area/crew_quarters/sleep/Dorm_2) "lF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -2525,6 +2557,9 @@ /obj/machinery/light/small{ dir = 8 }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/tiled/steel_grid, /area/crew_quarters/sleep/vistor_room_1) "mx" = ( @@ -2677,7 +2712,7 @@ /obj/structure/bed/chair/comfy/black{ dir = 1 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/oracarpet, /area/crew_quarters/sleep/Dorm_2) "nn" = ( /obj/machinery/light/small/flicker, @@ -2699,6 +2734,9 @@ /obj/item/weapon/cell/hyper{ charge = 30000 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/tiled/steel, /area/rnd/workshop) "ns" = ( @@ -2746,7 +2784,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/oracarpet, /area/crew_quarters/sleep/Dorm_2) "nB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -2789,6 +2827,15 @@ }, /turf/simulated/floor/tiled, /area/engineering/engine_smes) +"nH" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/research) "nI" = ( /obj/random/vendorall, /turf/simulated/floor/plating, @@ -2821,6 +2868,12 @@ /obj/fiftyspawner/wood, /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_monitoring) +"nU" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/research_storage) "nW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -2831,6 +2884,13 @@ /obj/random/pottedplant, /turf/simulated/floor/tiled, /area/hallway/primary/fore) +"nX" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/machinery/recharge_station, +/turf/simulated/floor/plating, +/area/maintenance/asmaint) "nY" = ( /obj/structure/cable/cyan{ icon_state = "4-8" @@ -2943,7 +3003,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/oracarpet, /area/crew_quarters/sleep/Dorm_2) "on" = ( /obj/structure/cable, @@ -2998,7 +3058,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/oracarpet, /area/crew_quarters/sleep/Dorm_2) "oM" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, @@ -3038,7 +3098,7 @@ pixel_x = -24; pixel_y = -24 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/sblucarpet, /area/crew_quarters/sleep/Dorm_1) "oU" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -3176,7 +3236,7 @@ /obj/structure/closet/crate/bin{ anchored = 1 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/sleep/Dorm_5) "pD" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -3225,6 +3285,12 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/rnd/research_restroom) "pV" = ( @@ -3248,7 +3314,7 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/oracarpet, /area/crew_quarters/sleep/Dorm_2) "pY" = ( /obj/structure/cable{ @@ -3314,7 +3380,7 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/green, /area/crew_quarters/sleep/Dorm_8) "qn" = ( /turf/simulated/wall/r_wall, @@ -3329,6 +3395,12 @@ /obj/structure/cable{ icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/research) "qs" = ( @@ -3353,6 +3425,12 @@ }, /turf/simulated/floor, /area/space) +"qw" = ( +/obj/machinery/alarm/angled{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/rnd/research_restroom) "qx" = ( /obj/structure/curtain/open/shower, /obj/machinery/shower{ @@ -3580,7 +3658,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/green, /area/crew_quarters/sleep/Dorm_8) "rx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -3610,7 +3688,7 @@ pixel_x = 25; pixel_y = 25 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/sleep/Dorm_5) "rC" = ( /obj/machinery/airlock_sensor/airlock_interior{ @@ -3747,7 +3825,7 @@ /obj/item/weapon/bedsheet/bluedouble, /obj/structure/bed/double/padded, /obj/structure/curtain/black, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/sleep/Dorm_4) "sd" = ( /obj/structure/cable/yellow{ @@ -3774,7 +3852,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/sblucarpet, /area/crew_quarters/sleep/Dorm_1) "sk" = ( /obj/structure/bed/chair/comfy/beige{ @@ -3793,7 +3871,7 @@ /obj/machinery/firealarm/angled{ dir = 8 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/green, /area/crew_quarters/sleep/Dorm_8) "so" = ( /obj/machinery/sleeper{ @@ -3931,12 +4009,30 @@ }, /turf/simulated/floor/tiled/eris/white/bluecorner, /area/medical/medbay) +"sI" = ( +/obj/machinery/alarm/angled{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/research_storage) "sO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/plating, /area/maintenance/asmaint) +"sR" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/research) "sS" = ( /obj/machinery/light/small, /turf/simulated/floor/tiled/white, @@ -4012,7 +4108,7 @@ /obj/machinery/light/small{ dir = 8 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/green, /area/crew_quarters/sleep/Dorm_8) "to" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -4102,7 +4198,7 @@ /obj/item/weapon/bedsheet/bluedouble, /obj/structure/bed/double/padded, /obj/structure/curtain/black, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/green, /area/crew_quarters/sleep/Dorm_8) "tN" = ( /obj/structure/table/bench/wooden, @@ -4260,6 +4356,12 @@ }, /turf/simulated/floor/tiled, /area/hallway/secondary/engineering_hallway) +"us" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/rnd/research_restroom) "uu" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -4331,7 +4433,7 @@ /obj/machinery/light/small{ dir = 4 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/blue2, /area/crew_quarters/sleep/Dorm_3) "uG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -4465,6 +4567,9 @@ /obj/structure/bed/chair/comfy/black{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/tiled/steel_grid, /area/crew_quarters/sleep/vistor_room_2) "vs" = ( @@ -4658,6 +4763,17 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/maintenance/aft) +"wo" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/alarm/angled{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/research) "wp" = ( /turf/simulated/wall, /area/crew_quarters/bar) @@ -4739,6 +4855,9 @@ charge = 30000 }, /obj/machinery/camera/network/research, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, /turf/simulated/floor/tiled/steel, /area/rnd/workshop) "wP" = ( @@ -4783,7 +4902,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/sleep/Dorm_5) "wZ" = ( /obj/structure/cable/yellow{ @@ -4931,6 +5050,15 @@ /area/crew_quarters/recreation_area_restroom{ name = "\improper Recreation Area Showers" }) +"xR" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/research) "xY" = ( /obj/structure/cable{ icon_state = "4-8" @@ -4954,7 +5082,7 @@ /obj/machinery/light/small{ dir = 8 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/sleep/Dorm_5) "yb" = ( /obj/structure/grille, @@ -5086,7 +5214,7 @@ /obj/structure/closet/crate/bin{ anchored = 1 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/purple, /area/crew_quarters/sleep/Dorm_7) "yC" = ( /obj/structure/grille, @@ -5106,6 +5234,8 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/steel_grid, /area/crew_quarters/sleep/vistor_room_2) "yI" = ( @@ -5192,6 +5322,12 @@ /obj/structure/cable{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/research) "zh" = ( @@ -5406,6 +5542,12 @@ /obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled, /area/engineering/engine_room) +"Ak" = ( +/obj/machinery/alarm/angled{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/rnd/workshop) "Am" = ( /obj/structure/cable{ icon_state = "1-2" @@ -5467,7 +5609,7 @@ /obj/item/weapon/bedsheet/bluedouble, /obj/structure/bed/double/padded, /obj/structure/curtain/black, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/purple, /area/crew_quarters/sleep/Dorm_7) "AE" = ( /obj/structure/cable{ @@ -5524,7 +5666,7 @@ /obj/machinery/light/small{ dir = 8 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/purple, /area/crew_quarters/sleep/Dorm_7) "AP" = ( /turf/simulated/floor/wood/broken, @@ -5605,6 +5747,12 @@ /turf/simulated/wall/r_wall, /area/medical/medbay2) "Bj" = ( +/obj/machinery/alarm/angled{ + dir = 8 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_grid, /area/crew_quarters/sleep/vistor_room_1) "Bl" = ( @@ -5615,7 +5763,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/sleep/Dorm_4) "Bo" = ( /obj/machinery/light/small{ @@ -5712,7 +5860,7 @@ pixel_x = -24; pixel_y = -24 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/sleep/Dorm_4) "BO" = ( /obj/machinery/light/small{ @@ -5758,7 +5906,7 @@ /obj/machinery/light/small{ dir = 4 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/sleep/Dorm_4) "BZ" = ( /obj/machinery/telecomms/receiver/preset_right, @@ -5926,6 +6074,12 @@ /obj/structure/cable{ icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/research) "CH" = ( @@ -6086,6 +6240,11 @@ /obj/structure/lattice, /turf/simulated/floor, /area/space) +"Du" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/research) "Dy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -6132,6 +6291,12 @@ }, /turf/simulated/floor/tiled, /area/bridge) +"DJ" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/rnd/research_restroom) "DK" = ( /turf/simulated/wall, /area/rnd/research_storage) @@ -6209,6 +6374,9 @@ /obj/random/material/precious, /obj/random/material/precious, /obj/structure/table/rack/shelf/steel, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/research_storage) "Eg" = ( @@ -6216,7 +6384,7 @@ /obj/machinery/firealarm/angled{ dir = 8 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/purple, /area/crew_quarters/sleep/Dorm_7) "Ei" = ( /obj/machinery/telecomms/server/presets/common, @@ -6277,7 +6445,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/purple, /area/crew_quarters/sleep/Dorm_7) "Ex" = ( /obj/effect/floor_decal/steeldecal/steel_decals5, @@ -6595,7 +6763,7 @@ /obj/machinery/light/small{ dir = 4 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/sblucarpet, /area/crew_quarters/sleep/Dorm_1) "FW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -6790,8 +6958,17 @@ /obj/structure/closet/crate/bin{ anchored = 1 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/green, /area/crew_quarters/sleep/Dorm_8) +"GL" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/workshop) "GM" = ( /obj/machinery/button/remote/blast_door{ desc = "A remote control-switch for the engine charging port."; @@ -6843,6 +7020,10 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_monitoring) +"GW" = ( +/obj/machinery/recharge_station, +/turf/simulated/floor/plating, +/area/maintenance/aft) "GX" = ( /turf/simulated/floor/tiled, /turf/simulated/wall/r_wall, @@ -6972,7 +7153,7 @@ pixel_x = -24; pixel_y = -24 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/blue2, /area/crew_quarters/sleep/Dorm_3) "HJ" = ( /obj/machinery/computer/atmoscontrol, @@ -7021,6 +7202,18 @@ temperature = 80 }, /area/tcommsat/chamber) +"HS" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/research) "HT" = ( /obj/machinery/light/small, /obj/structure/table/marble, @@ -7173,6 +7366,12 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plating, /area/maintenance/asmaint) +"IE" = ( +/obj/structure/curtain/open/privacy{ + color = s + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/research) "IF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -7334,7 +7533,9 @@ /turf/simulated/floor/plating, /area/maintenance/fore) "Jm" = ( -/obj/structure/curtain/black, +/obj/structure/curtain/black{ + color = "#361447" + }, /obj/structure/bed/double/padded, /obj/item/weapon/bedsheet/bluedouble, /turf/simulated/floor/tiled/steel_grid, @@ -7354,7 +7555,7 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/sblucarpet, /area/crew_quarters/sleep/Dorm_1) "Jw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -7556,7 +7757,7 @@ pixel_x = 25; pixel_y = 25 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/purple, /area/crew_quarters/sleep/Dorm_7) "KA" = ( /obj/structure/cable/cyan{ @@ -7655,6 +7856,9 @@ "KX" = ( /obj/structure/table/glass, /obj/machinery/light/floortube/flicker, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/research) "KY" = ( @@ -7719,7 +7923,7 @@ name = "always night shift APC"; nightshift_setting = 3 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/blue2, /area/crew_quarters/sleep/Dorm_3) "Lo" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -7752,6 +7956,10 @@ /obj/structure/cable{ icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/steel_grid, /area/crew_quarters/sleep/vistor_room_2) "Lv" = ( @@ -7899,6 +8107,10 @@ /obj/structure/cable{ icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/steel_grid, /area/crew_quarters/sleep/vistor_room_1) "Mp" = ( @@ -7947,6 +8159,9 @@ "MA" = ( /obj/structure/table/glass, /obj/machinery/light/floortube, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/research) "MB" = ( @@ -7960,7 +8175,7 @@ pixel_x = -24; pixel_y = -24 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/oracarpet, /area/crew_quarters/sleep/Dorm_2) "MD" = ( /obj/structure/cable{ @@ -7999,6 +8214,8 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled/steel_grid, /area/rnd/research) "MN" = ( @@ -8218,10 +8435,22 @@ /turf/simulated/floor/tiled, /turf/simulated/wall/r_wall, /area/crew_quarters/sleep/Dorm_6) +"NL" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/research) "NM" = ( /obj/structure/bed/chair/comfy/black{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/tiled/steel_grid, /area/crew_quarters/sleep/vistor_room_1) "NN" = ( @@ -8331,6 +8560,16 @@ /obj/random/mre, /turf/simulated/floor/tiled/eris/dark/monofloor, /area/bridge) +"Oj" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/workshop) "Ok" = ( /obj/structure/cable{ icon_state = "1-2" @@ -8479,6 +8718,15 @@ /obj/structure/table/steel, /turf/simulated/floor/tiled, /area/bridge) +"OJ" = ( +/obj/structure/bed/chair/bay/comfy{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/research) "OM" = ( /obj/structure/table/reinforced, /obj/random/toolbox, @@ -8519,6 +8767,12 @@ /obj/structure/cable{ icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/tiled/steel, /area/rnd/research_restroom) "OW" = ( @@ -8571,6 +8825,12 @@ /obj/machinery/door/airlock/research{ name = "Research Bathroom" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/research_storage) "Pj" = ( @@ -8581,6 +8841,10 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled, /area/submap/pa_room) +"Pl" = ( +/obj/machinery/recharge_station, +/turf/simulated/floor/plating, +/area/maintenance/fore) "Pm" = ( /obj/random/trash, /obj/machinery/light/small/flicker, @@ -8666,7 +8930,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/blue2, /area/crew_quarters/sleep/Dorm_3) "PI" = ( /obj/machinery/light/small{ @@ -8716,7 +8980,7 @@ name = "always night shift APC"; nightshift_setting = 3 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/sleep/Dorm_4) "PP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -8733,7 +8997,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/sblucarpet, /area/crew_quarters/sleep/Dorm_1) "PR" = ( /obj/machinery/camera/network/civilian, @@ -8822,7 +9086,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/green, /area/crew_quarters/sleep/Dorm_8) "Ql" = ( /obj/structure/cable{ @@ -9025,7 +9289,7 @@ /obj/structure/bed/chair/comfy/black{ dir = 1 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/sleep/Dorm_4) "Rc" = ( /obj/structure/cable{ @@ -9154,6 +9418,12 @@ dir = 2; req_access = list() }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/rnd/research) "RG" = ( @@ -9302,6 +9572,15 @@ }, /turf/simulated/wall/r_wall, /area/submap/pa_room) +"Se" = ( +/obj/structure/bed/chair/bay/comfy{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/research) "Sg" = ( /obj/structure/bed/chair/wood{ dir = 8 @@ -9503,7 +9782,7 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/sleep/Dorm_5) "Tm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -9893,7 +10172,7 @@ /obj/structure/bed/chair/comfy/black{ dir = 1 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/sblucarpet, /area/crew_quarters/sleep/Dorm_1) "Vr" = ( /turf/simulated/wall/r_wall, @@ -9981,7 +10260,7 @@ /obj/machinery/firealarm/angled{ dir = 8 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/sleep/Dorm_5) "VO" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, @@ -10060,7 +10339,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/sleep/Dorm_5) "Wd" = ( /obj/random/empty_or_lootable_crate, @@ -10097,7 +10376,7 @@ /obj/item/weapon/bedsheet/bluedouble, /obj/structure/bed/double/padded, /obj/structure/curtain/black, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/blue2, /area/crew_quarters/sleep/Dorm_3) "Wr" = ( /obj/structure/table/woodentable, @@ -10116,7 +10395,7 @@ name = "always night shift APC"; nightshift_setting = 3 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/sblucarpet, /area/crew_quarters/sleep/Dorm_1) "Wx" = ( /obj/effect/decal/cleanable/blood/oil/streak, @@ -10156,7 +10435,9 @@ /turf/simulated/floor/tiled/steel_grid, /area/rnd/research) "WK" = ( -/obj/structure/curtain/black, +/obj/structure/curtain/black{ + color = "#361447" + }, /obj/structure/bed/double/padded, /obj/item/weapon/bedsheet/bluedouble, /turf/simulated/floor/tiled/steel_grid, @@ -10174,13 +10455,21 @@ name = "always night shift APC"; nightshift_setting = 3 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/oracarpet, /area/crew_quarters/sleep/Dorm_2) "WO" = ( /obj/machinery/portable_atmospherics/canister/nitrogen, /obj/effect/floor_decal/industrial/outline, /turf/simulated/floor/tiled/techfloor, /area/engineering/engine_gas) +"WP" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/research) "WR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -10194,6 +10483,18 @@ /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/plating, /area/maintenance/central) +"WS" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/research) "WV" = ( /obj/structure/grille, /obj/structure/window/reinforced, @@ -10459,7 +10760,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/blue2, /area/crew_quarters/sleep/Dorm_3) "Yk" = ( /obj/random/trash, @@ -10615,6 +10916,12 @@ }, /turf/simulated/floor/plating, /area/maintenance/fore) +"YS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/research) "YT" = ( /obj/structure/closet/radiation, /turf/simulated/floor/tiled/techmaint, @@ -10739,6 +11046,8 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/steel_grid, /area/rnd/workshop) "Zu" = ( @@ -10746,6 +11055,9 @@ /obj/random/material, /obj/random/material, /obj/structure/table/rack/shelf/steel, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/research_storage) "Zw" = ( @@ -10775,6 +11087,12 @@ /obj/structure/cable{ icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/research_storage) "ZB" = ( @@ -16131,7 +16449,7 @@ Er Er Er Zk -Om +eo BH Zk Er @@ -16867,7 +17185,7 @@ ix Er FG UQ -UQ +GW Tw EQ pr @@ -19551,7 +19869,7 @@ Zk Om Ya Fs -ri +nX Om Ya Bw @@ -24429,7 +24747,7 @@ Dj Dj WH LS -Dj +NL Ga Ga Ga @@ -24571,7 +24889,7 @@ Dj Dj Dj Zc -Dj +NL fy Er Er @@ -24713,7 +25031,7 @@ Kk Kk Dj Nv -Vt +HS fy Er Er @@ -24847,7 +25165,7 @@ Er fy jy uM -rn +IE Dj Dj dR @@ -24855,7 +25173,7 @@ MA dR Dj Zc -Dj +NL VT Er Er @@ -24993,11 +25311,11 @@ no Dj Dj Td -Td +OJ Td Dj Zc -Dj +NL VT Er Er @@ -25135,11 +25453,11 @@ no Dj Dj Dj -Dj +YS EV Vt OC -Dj +NL fy Er Er @@ -25275,13 +25593,13 @@ vr Lu yE ze -Dj -Dj -Dj -Zc -Dj -Dj -Dj +Du +Du +ip +bv +xR +Du +nH fy Er Er @@ -25392,7 +25710,7 @@ Er Er Er mi -as +Pl Wx mr cG @@ -25416,12 +25734,12 @@ BX WK gW no -Zc +sR Dj Kk -Kk +Se nz -Dj +NL gZ gZ gZ @@ -25558,15 +25876,15 @@ hp XN XN XN -Zc +sR Dj dR KX tq -Dj +NL gZ EK -yY +Ak IG lo FK @@ -25700,12 +26018,12 @@ hp mw WY XN -Zc +sR Dj Td Td AG -Dj +NL gZ hV yY @@ -25847,7 +26165,7 @@ Dj Dj Dj Zc -Dj +NL vv FK yY @@ -25985,14 +26303,14 @@ Jm Bj XN CG -Vt -Vt -Vt +WP +wo +WP qq -Vt +WS Zt -MD -MD +Oj +GL MD MD WD @@ -26130,7 +26448,7 @@ pU UZ KY Dj -Zc +sR Dj gZ wN @@ -26269,7 +26587,7 @@ Er CL ve OR -fT +DJ DK DK Pi @@ -26410,7 +26728,7 @@ Er Er CL lj -fT +us vM DK Ud @@ -26556,7 +26874,7 @@ UZ fT DK jo -zl +nU Zu gZ qX @@ -26695,7 +27013,7 @@ Er CL Vm Fj -fT +qw DK cb zl @@ -26840,7 +27158,7 @@ CL CL mC jU -zl +sI zl gZ OM