diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm index 39c8ec119b3..f83887d9b42 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm @@ -449,7 +449,7 @@ /turf/open/floor/pod/dark, /area/ruin/powered/snow_biodome) "UM" = ( -/obj/machinery/computer/monitor/secret{ +/obj/machinery/computer/monitor{ dir = 1 }, /turf/open/floor/pod/dark, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm index 0022970008e..4575acc7690 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm @@ -3239,7 +3239,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, -/obj/machinery/computer/monitor/secret{ +/obj/machinery/computer/monitor{ dir = 4 }, /turf/open/floor/plating, diff --git a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm index 20e66cf8a32..d1448a9d738 100644 --- a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm +++ b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm @@ -431,22 +431,6 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/plating/airless, /area/ruin/space/ks13/ai/vault) -"gx" = ( -/obj/machinery/computer/monitor/secret{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/power/apc/unlocked{ - dir = 8; - environ = 0; - equipment = 0; - lighting = 0; - name = "Aft Solar APC"; - pixel_x = -25; - start_charge = 0 - }, -/turf/open/floor/iron, -/area/ruin/space/ks13/engineering/sb_bow_solars_control) "gy" = ( /obj/structure/chair{ dir = 1 @@ -3731,15 +3715,6 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/plating/airless, /area/ruin/space/ks13/security/sec) -"Dp" = ( -/obj/machinery/light/small/directional/east, -/obj/item/circuitboard/machine/smes, -/obj/structure/table, -/obj/machinery/light/small/directional/east, -/obj/effect/spawner/random/maintenance, -/obj/effect/mapping_helpers/burnt_floor, -/turf/open/floor/iron/airless, -/area/ruin/space/ks13/engineering/secure_storage) "Dq" = ( /obj/structure/lattice, /obj/structure/door_assembly/door_assembly_public, @@ -6023,6 +5998,15 @@ /obj/structure/cable, /turf/open/floor/iron, /area/ruin/space/ks13/security/court) +"Ps" = ( +/obj/machinery/light/small/directional/east, +/obj/item/circuitboard/machine/smes, +/obj/structure/table, +/obj/machinery/light/small/directional/east, +/obj/effect/spawner/random/maintenance, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/iron/airless, +/area/ruin/space/ks13/engineering/secure_storage) "Pt" = ( /obj/structure/cable, /obj/effect/mapping_helpers/broken_floor, @@ -8153,6 +8137,22 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/airless, /area/ruin/space/ks13/security/sec) +"ZQ" = ( +/obj/machinery/computer/monitor{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/power/apc/unlocked{ + dir = 8; + environ = 0; + equipment = 0; + lighting = 0; + name = "Aft Solar APC"; + pixel_x = -25; + start_charge = 0 + }, +/turf/open/floor/iron, +/area/ruin/space/ks13/engineering/sb_bow_solars_control) "ZR" = ( /obj/effect/decal/cleanable/blood/gibs/torso, /turf/open/floor/iron/dark, @@ -13659,7 +13659,7 @@ rk rr rr ab -Dp +Ps DL rr rr @@ -15770,7 +15770,7 @@ pR pR xS VB -gx +ZQ DU yz yz diff --git a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm index fa16a3647ba..de80531e5ce 100644 --- a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm @@ -700,18 +700,6 @@ "JB" = ( /turf/closed/wall/r_wall, /area/ruin/space/has_grav/listeningstation) -"JC" = ( -/obj/structure/table, -/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{ - name = "Use To Avert Loneliness"; - desc = "It's been used..."; - pixel_x = 8 - }, -/obj/item/reagent_containers/spray/cleaner{ - pixel_x = -6 - }, -/turf/open/floor/plating, -/area/ruin/space/has_grav/listeningstation) "JD" = ( /obj/docking_port/stationary{ dir = 8; @@ -860,16 +848,6 @@ /obj/machinery/microwave, /turf/open/floor/iron/small, /area/ruin/space/has_grav/listeningstation) -"Sa" = ( -/obj/structure/table, -/obj/item/paper_bin, -/obj/item/pen/edagger, -/obj/item/reagent_containers/cup/glass/waterbottle{ - pixel_x = 10; - pixel_y = 16 - }, -/turf/open/floor/plating, -/area/ruin/space/has_grav/listeningstation) "Sx" = ( /obj/structure/cable, /obj/effect/decal/cleanable/dirt, @@ -884,16 +862,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/ruin/space/has_grav/listeningstation) -"SA" = ( -/obj/effect/turf_decal/tile/red/opposingcorners, -/obj/item/radio/intercom/directional/east{ - freerange = 1 - }, -/obj/machinery/computer/camera_advanced{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/ruin/space/has_grav/listeningstation) "SB" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, @@ -1398,7 +1366,7 @@ JB JB JB JB -JC +ov eR eR cj @@ -1469,14 +1437,14 @@ vI JB xp SK -SA +dm tm TK rG Zj wm Sz -Sa +cO FV DC CU diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm index f26652cc108..8b0e67526ca 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm @@ -1662,7 +1662,7 @@ /obj/effect/turf_decal/siding/thinplating/dark{ dir = 8 }, -/obj/machinery/computer/monitor/secret{ +/obj/machinery/computer/monitor{ dir = 8 }, /obj/structure/window/reinforced/survival_pod{ diff --git a/_maps/RandomZLevels/moonoutpost19.dmm b/_maps/RandomZLevels/moonoutpost19.dmm index b36a35d7225..42230fbd2b9 100644 --- a/_maps/RandomZLevels/moonoutpost19.dmm +++ b/_maps/RandomZLevels/moonoutpost19.dmm @@ -493,7 +493,7 @@ }, /area/awaymission/moonoutpost19/syndicate) "bS" = ( -/obj/machinery/computer/monitor/secret, +/obj/machinery/computer/monitor, /obj/effect/turf_decal/stripes/line{ dir = 5 }, @@ -2432,7 +2432,7 @@ }, /area/awaymission/moonoutpost19/research) "gA" = ( -/obj/machinery/computer/monitor/secret{ +/obj/machinery/computer/monitor{ dir = 1 }, /obj/structure/cable, diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm index b7565abd75e..5454e495650 100644 --- a/_maps/RandomZLevels/snowdin.dmm +++ b/_maps/RandomZLevels/snowdin.dmm @@ -1933,6 +1933,10 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/awaymission/snowdin/post/gateway) +"fI" = ( +/obj/machinery/computer/monitor, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/minipost) "fJ" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/tile/bar, @@ -3810,6 +3814,11 @@ }, /turf/open/floor/iron/showroomfloor, /area/awaymission/snowdin/post/dorm) +"kE" = ( +/obj/structure/window/reinforced/fulltile/ice, +/obj/structure/grille, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/mining_main) "kF" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -4959,11 +4968,6 @@ /obj/structure/flora/bush/snow/style_random, /turf/open/misc/asteroid/snow, /area/awaymission/snowdin/cave) -"ns" = ( -/obj/machinery/computer/monitor/secret, -/obj/structure/cable, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/engineering) "nt" = ( /turf/closed/wall/rust, /area/awaymission/snowdin/post/engineering) @@ -6308,13 +6312,6 @@ }, /turf/open/floor/plating/snowed/cavern, /area/awaymission/snowdin/cave/cavern) -"rx" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/fulltile/ice, -/obj/structure/cable, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/cavern2) "ry" = ( /obj/structure/cable, /obj/effect/mapping_helpers/broken_floor, @@ -6569,13 +6566,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/awaymission/snowdin/post/cavern2) -"sv" = ( -/obj/machinery/computer/monitor/secret{ - dir = 8 - }, -/obj/structure/cable, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/cavern2) "sz" = ( /obj/machinery/door/poddoor{ id = "snowdinturbinegas"; @@ -6829,6 +6819,12 @@ "ue" = ( /turf/open/floor/wood, /area/awaymission/snowdin/post/cavern1) +"uf" = ( +/obj/machinery/door/firedoor, +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile/ice, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/mining_main/robotics) "ug" = ( /obj/structure/table, /turf/open/floor/plating, @@ -6839,11 +6835,6 @@ }, /turf/open/misc/asteroid/snow/ice, /area/awaymission/snowdin/cave/cavern) -"uj" = ( -/obj/machinery/computer/monitor/secret, -/obj/structure/cable, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/cavern1) "uk" = ( /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/wood, @@ -6914,6 +6905,13 @@ /obj/structure/cable, /turf/open/floor/plating, /area/awaymission/snowdin/post/cavern1) +"uC" = ( +/obj/machinery/computer/monitor{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/cavern2) "uD" = ( /obj/machinery/door/airlock/maintenance{ name = "Misc Storage" @@ -6963,13 +6961,6 @@ }, /turf/open/floor/iron, /area/awaymission/snowdin/post/cavern1) -"uO" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/fulltile/ice, -/obj/structure/cable, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/cavern1) "uS" = ( /mob/living/simple_animal/hostile/skeleton/plasmaminer, /obj/effect/mapping_helpers/broken_floor, @@ -7134,6 +7125,11 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/iron/showroomfloor, /area/awaymission/snowdin/post/dorm) +"vz" = ( +/obj/machinery/computer/monitor, +/obj/structure/cable, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/engineering) "vA" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, /turf/closed/wall/ice, @@ -7258,11 +7254,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_dock) -"wJ" = ( -/obj/machinery/computer/monitor/secret, -/obj/structure/cable, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/mining_dock) "wK" = ( /obj/machinery/power/terminal{ dir = 1 @@ -7447,6 +7438,13 @@ /obj/structure/cable, /turf/open/floor/engine/cult, /area/awaymission/snowdin/post/mining_dock) +"xv" = ( +/obj/machinery/computer/monitor{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/mining_main) "xw" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ dir = 6; @@ -8142,13 +8140,6 @@ }, /turf/open/floor/wood, /area/awaymission/snowdin/igloo) -"zR" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/fulltile/ice, -/obj/structure/cable, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/mining_dock) "zS" = ( /obj/machinery/door/airlock/external/glass/ruin, /obj/structure/fans/tiny, @@ -8236,6 +8227,11 @@ }, /turf/open/floor/plating/snowed/cavern, /area/awaymission/snowdin/cave/cavern) +"Af" = ( +/obj/machinery/computer/monitor, +/obj/structure/cable, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/cavern1) "Ag" = ( /obj/structure/rack, /obj/item/clothing/suit/hooded/wintercoat, @@ -8565,10 +8561,6 @@ slowdown = 1 }, /area/awaymission/snowdin/cave) -"Br" = ( -/obj/machinery/computer/monitor/secret, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/minipost) "Bs" = ( /obj/structure/table, /obj/effect/turf_decal/tile/blue{ @@ -9029,6 +9021,13 @@ }, /turf/open/floor/plating/snowed/smoothed, /area/awaymission/snowdin/cave) +"Do" = ( +/obj/machinery/door/firedoor, +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile/ice, +/obj/structure/cable, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/cavern2) "Dq" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -9507,14 +9506,14 @@ heat_capacity = 1e+006 }, /area/awaymission/snowdin/post/mining_dock) +"FY" = ( +/obj/machinery/computer/monitor, +/obj/structure/cable, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/mining_dock) "FZ" = ( /turf/closed/wall/ice, /area/awaymission/snowdin/post/mining_main) -"Ga" = ( -/obj/structure/window/reinforced/fulltile/ice, -/obj/structure/grille, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/mining_main) "Gb" = ( /obj/machinery/door/airlock/external/glass/ruin, /obj/effect/mapping_helpers/airlock/cyclelink_helper, @@ -9523,12 +9522,6 @@ "Gd" = ( /turf/closed/wall/ice, /area/awaymission/snowdin/post/mining_main/robotics) -"Ge" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/fulltile/ice, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/mining_main/robotics) "Gf" = ( /obj/machinery/light/small/directional/south, /turf/open/floor/plating/snowed, @@ -9809,12 +9802,6 @@ /obj/structure/mecha_wreckage/ripley, /turf/open/floor/iron, /area/awaymission/snowdin/post/mining_main/mechbay) -"Hj" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/fulltile/ice, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/mining_main/mechbay) "Hk" = ( /obj/machinery/conveyor{ id = "snowdin_belt_mine" @@ -10921,13 +10908,6 @@ /obj/structure/sign/warning/docking/directional/east, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_dock) -"KH" = ( -/obj/machinery/computer/monitor/secret{ - dir = 1 - }, -/obj/structure/cable, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/mining_main) "KI" = ( /obj/structure/table, /obj/item/storage/toolbox/mechanical, @@ -12252,6 +12232,12 @@ /obj/machinery/airalarm/directional/west, /turf/open/floor/iron/cafeteria, /area/awaymission/snowdin/post/messhall) +"RM" = ( +/obj/machinery/door/firedoor, +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile/ice, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/mining_main/mechbay) "RN" = ( /obj/structure/flora/bush/snow/style_random, /obj/effect/light_emitter{ @@ -13029,6 +13015,13 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/awaymission/snowdin/post/dorm) +"Wk" = ( +/obj/machinery/door/firedoor, +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile/ice, +/obj/structure/cable, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/mining_dock) "Wl" = ( /obj/structure/rack, /obj/machinery/light/small/directional/east, @@ -13140,6 +13133,13 @@ /obj/structure/cable, /turf/open/floor/plating, /area/awaymission/snowdin/post/minipost) +"WL" = ( +/obj/machinery/door/firedoor, +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile/ice, +/obj/structure/cable, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/cavern1) "WM" = ( /obj/machinery/light/small/directional/north, /turf/open/floor/plating, @@ -23689,7 +23689,7 @@ ae Go Kj Gq -KH +xv GP ae ac @@ -24959,7 +24959,7 @@ Zy Zy Zy Zy -Ga +kE PC GQ Hm @@ -25652,7 +25652,7 @@ AN Aj Bf yY -Br +fI BC yX ae @@ -26248,7 +26248,7 @@ Zy Zy Zy TI -Ga +kE HF HW HW @@ -26505,7 +26505,7 @@ UC Zy TI Qd -Ga +kE HF GR HW @@ -27334,7 +27334,7 @@ gA lB ZU dO -ns +vz nU oq oQ @@ -58112,7 +58112,7 @@ WN WN WN WN -Ge +uf Gy GV Hs @@ -58369,7 +58369,7 @@ WN WN WN WN -Ge +uf Gz GW Ht @@ -58377,7 +58377,7 @@ HK HL IA GU -wJ +FY Uf wL wO @@ -58626,7 +58626,7 @@ WN WN WN WN -Ge +uf GA GX Hu @@ -58883,7 +58883,7 @@ WN WN WN WN -Ge +uf GB GY Xk @@ -59000,7 +59000,7 @@ eJ eJ uI uZ -uO +WL uZ uI WN @@ -61819,7 +61819,7 @@ fr fr fr tY -uj +Af um um uB @@ -62338,11 +62338,11 @@ eJ eJ eJ uI -uO -uO -uO -uO -uO +WL +WL +WL +WL +WL uI fr fr @@ -63768,7 +63768,7 @@ Sy rL Gk GN -Hj +RM HB GN GH @@ -65121,7 +65121,7 @@ WN WN pa rc -rx +Do rc pa eJ @@ -65221,7 +65221,7 @@ wM zm OD zG -zR +Wk qi qi Ar @@ -65992,7 +65992,7 @@ yS zm zw zH -zR +Wk qi As rV @@ -66489,7 +66489,7 @@ eJ eJ eJ wE -wJ +FY wL Wa wP @@ -68464,7 +68464,7 @@ eJ ox Te sc -sv +uC ow eJ eJ diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm index dddf221ee6e..7ccd1a1abdb 100644 --- a/_maps/RandomZLevels/undergroundoutpost45.dmm +++ b/_maps/RandomZLevels/undergroundoutpost45.dmm @@ -11265,7 +11265,7 @@ }, /area/awaymission/undergroundoutpost45/caves) "BN" = ( -/obj/machinery/computer/monitor/secret{ +/obj/machinery/computer/monitor{ dir = 1; name = "primary power monitoring console" }, @@ -11354,7 +11354,7 @@ }, /area/awaymission/undergroundoutpost45/engineering) "De" = ( -/obj/machinery/computer/monitor/secret{ +/obj/machinery/computer/monitor{ name = "primary power monitoring console" }, /obj/structure/sign/warning/no_smoking/directional/west, diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index f149d2bbe48..59b82975526 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -15,6 +15,21 @@ /obj/structure/railing/corner, /turf/open/floor/plating/icemoon, /area/centcom/syndicate_mothership/control) +"ah" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, +/obj/machinery/computer/monitor{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/status_display/evac/directional/south, +/turf/open/floor/iron, +/area/centcom/central_command_areas/admin/storage) "ai" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, /obj/machinery/atmospherics/pipe/smart/manifold4w/orange/hidden/layer5, @@ -296,18 +311,6 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/simple, /turf/closed/indestructible/syndicate, /area/centcom/syndicate_mothership/expansion_bioterrorism) -"aY" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/cup/glass/bottle/beer{ - pixel_x = 5; - pixel_y = -2 - }, -/obj/item/toy/cards/deck/syndicate{ - pixel_x = -6; - pixel_y = 6 - }, -/turf/open/floor/wood/tile, -/area/centcom/syndicate_mothership/control) "aZ" = ( /obj/effect/turf_decal/siding/thinplating_new/dark{ dir = 4 @@ -411,11 +414,6 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/prison) -"bl" = ( -/obj/structure/sink/kitchen/directional/west, -/obj/item/reagent_containers/cup/bucket, -/turf/open/floor/catwalk_floor/iron_smooth, -/area/centcom/syndicate_mothership/control) "bm" = ( /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable, @@ -731,6 +729,35 @@ /obj/machinery/duct, /turf/open/floor/iron/cafeteria, /area/centcom/central_command_areas/holding) +"cj" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 9 + }, +/obj/structure/table/glass/plasmaglass, +/obj/machinery/reagentgrinder{ + pixel_x = -5; + pixel_y = 12 + }, +/obj/item/reagent_containers/cup/beaker/large{ + pixel_x = -7; + pixel_y = -8 + }, +/obj/item/reagent_containers/cup/beaker/cryoxadone{ + pixel_x = 9; + pixel_y = -7 + }, +/obj/structure/sign/poster/contraband/lizard{ + pixel_x = -32 + }, +/obj/structure/sign/poster/contraband/kudzu{ + pixel_y = 32 + }, +/obj/item/reagent_containers/spray/plantbgone{ + pixel_x = 10; + pixel_y = 5 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/centcom/syndicate_mothership/expansion_bioterrorism) "ck" = ( /obj/machinery/door/airlock/centcom{ name = "Thunderdome" @@ -926,35 +953,6 @@ /obj/structure/bookcase/random/fiction, /turf/open/floor/carpet/black, /area/centcom/central_command_areas/holding) -"cK" = ( -/obj/effect/turf_decal/tile/bar, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/obj/structure/table/wood/poker, -/obj/machinery/light/warm/directional/north, -/obj/item/reagent_containers/cup/glass/bottle/whiskey{ - pixel_x = -4; - pixel_y = 14 - }, -/obj/item/toy/cards/deck{ - pixel_x = 3; - pixel_y = 6 - }, -/obj/item/clothing/mask/cigarette/robust{ - pixel_x = -4; - pixel_y = 1 - }, -/obj/effect/decal/cleanable/ash{ - pixel_x = 12; - pixel_y = -6 - }, -/obj/effect/spawner/random/entertainment/lighter{ - pixel_x = 9; - pixel_y = -3 - }, -/turf/open/floor/iron, -/area/centcom/syndicate_mothership/control) "cL" = ( /obj/item/gun/energy/pulse/carbine/loyalpin, /obj/item/flashlight/seclite, @@ -1025,11 +1023,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/tdome/observation) -"cX" = ( -/obj/structure/table/rolling, -/obj/item/reagent_containers/condiment/soymilk, -/turf/open/floor/mineral/titanium, -/area/centcom/syndicate_mothership/control) "cY" = ( /obj/machinery/icecream_vat, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -1445,21 +1438,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/admin) -"eg" = ( -/obj/structure/table/glass/plasmaglass, -/obj/item/stack/sheet/mineral/plasma{ - pixel_y = 15 - }, -/obj/item/grenade/chem_grenade, -/obj/item/stack/cable_coil, -/obj/item/reagent_containers/cup/beaker{ - pixel_x = 8; - pixel_y = 14 - }, -/obj/machinery/light/cold/directional/west, -/obj/item/stack/cable_coil, -/turf/open/floor/mineral/titanium/tiled/yellow, -/area/centcom/syndicate_mothership/expansion_chemicalwarfare) "eh" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -1679,20 +1657,6 @@ /obj/machinery/light/directional/south, /turf/open/misc/asteroid, /area/centcom/central_command_areas/evacuation) -"eL" = ( -/obj/structure/table/glass/plasmaglass, -/obj/item/reagent_containers/cup/beaker/large{ - pixel_x = -5; - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/beaker{ - pixel_x = 8; - pixel_y = 2 - }, -/obj/machinery/light/cold/directional/east, -/obj/item/gun/syringe/syndicate, -/turf/open/floor/mineral/titanium/tiled/yellow, -/area/centcom/syndicate_mothership/expansion_chemicalwarfare) "eM" = ( /obj/machinery/vending/cola, /obj/effect/turf_decal/delivery, @@ -2082,6 +2046,19 @@ }, /turf/open/space/basic, /area/space) +"fT" = ( +/obj/structure/table/wood, +/obj/machinery/chem_dispenser/drinks/beer{ + dir = 4; + pixel_x = -8; + pixel_y = 1 + }, +/obj/item/reagent_containers/cup/beaker{ + pixel_x = 7; + pixel_y = -4 + }, +/turf/open/floor/carpet/black, +/area/centcom/central_command_areas/holding) "fV" = ( /obj/machinery/light/small/directional/north, /turf/open/floor/wood/tile, @@ -2216,6 +2193,17 @@ /obj/item/storage/crayons, /turf/open/floor/catwalk_floor, /area/centcom/central_command_areas/holding) +"gp" = ( +/obj/structure/table/wood, +/obj/item/storage/box/drinkingglasses, +/obj/item/reagent_containers/cup/glass/bottle/whiskey{ + pixel_y = 5 + }, +/obj/machinery/light/directional/south, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/status_display/evac/directional/south, +/turf/open/floor/iron/dark, +/area/centcom/tdome/administration) "gq" = ( /obj/machinery/light/directional/west, /obj/structure/bed{ @@ -2576,6 +2564,35 @@ }, /turf/open/floor/iron, /area/centcom/tdome/observation) +"hu" = ( +/obj/machinery/light/small/directional/west, +/obj/structure/closet/secure_closet/freezer/fridge/open, +/obj/item/food/meat/slab/rawcrab, +/obj/item/food/meat/slab/rawcrab, +/obj/item/food/meat/slab/rawcrab, +/obj/item/food/fishmeat, +/obj/item/food/fishmeat, +/obj/item/food/fishmeat, +/obj/item/food/grown/tomato, +/obj/item/food/grown/tomato, +/obj/item/food/grown/tomato, +/obj/item/reagent_containers/condiment/enzyme{ + layer = 5 + }, +/obj/item/storage/fancy/egg_box, +/obj/item/storage/fancy/egg_box, +/obj/item/reagent_containers/condiment/milk, +/obj/item/reagent_containers/condiment/milk, +/obj/item/reagent_containers/condiment/flour{ + pixel_x = -5; + pixel_y = 9 + }, +/obj/item/reagent_containers/condiment/flour{ + pixel_x = -5; + pixel_y = 9 + }, +/turf/open/floor/plastic, +/area/centcom/syndicate_mothership/expansion_fridgerummage) "hv" = ( /obj/structure/table/reinforced, /obj/machinery/microwave{ @@ -2771,11 +2788,6 @@ }, /turf/open/floor/catwalk_floor, /area/centcom/central_command_areas/holding) -"hR" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/cup/glass/trophy/gold_cup, -/turf/open/floor/iron/grimy, -/area/centcom/tdome/observation) "hS" = ( /obj/structure/flora/rock/icy/style_random, /turf/open/misc/asteroid/snow/airless, @@ -2877,6 +2889,15 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/tdome/administration) +"ii" = ( +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/structure/table/wood, +/obj/item/reagent_containers/cup/rag, +/turf/open/floor/iron, +/area/centcom/syndicate_mothership/control) "ik" = ( /turf/open/misc/ashplanet/wateryrock{ initial_gas_mix = "o2=22;n2=82;TEMP=293.15"; @@ -3560,15 +3581,6 @@ /obj/machinery/vending/cigarette/syndicate, /turf/open/floor/catwalk_floor/titanium, /area/centcom/syndicate_mothership/control) -"jZ" = ( -/obj/effect/turf_decal/tile/bar, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/obj/structure/table/wood, -/obj/item/reagent_containers/cup/rag, -/turf/open/floor/iron, -/area/centcom/syndicate_mothership/control) "ka" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -4167,6 +4179,11 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/prison) +"lQ" = ( +/obj/structure/table/rolling, +/obj/item/reagent_containers/condiment/soymilk, +/turf/open/floor/mineral/titanium, +/area/centcom/syndicate_mothership/control) "lR" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -4657,38 +4674,6 @@ "ng" = ( /turf/closed/indestructible/syndicate, /area/centcom/syndicate_mothership/control) -"nh" = ( -/obj/structure/closet/crate/freezer{ - name = "pantry crate" - }, -/obj/structure/sign/poster/contraband/moffuchis_pizza{ - pixel_y = -32 - }, -/obj/item/reagent_containers/condiment/rice{ - pixel_y = 12 - }, -/obj/item/reagent_containers/condiment/rice{ - pixel_y = 12 - }, -/obj/item/reagent_containers/condiment/saltshaker, -/obj/item/reagent_containers/condiment/peppermill, -/obj/item/food/grown/wheat, -/obj/item/food/grown/wheat, -/obj/item/reagent_containers/condiment/sugar, -/obj/item/reagent_containers/condiment/sugar, -/obj/item/food/grown/soybeans, -/obj/item/food/grown/soybeans, -/obj/item/food/grown/vanillapod, -/obj/item/food/grown/vanillapod, -/obj/item/food/grown/herbs, -/obj/item/food/grown/herbs, -/obj/item/food/grown/cocoapod, -/obj/item/food/grown/cocoapod, -/obj/item/food/grown/aloe, -/obj/item/food/grown/coffee, -/obj/item/food/grown/coffee, -/turf/open/floor/plastic, -/area/centcom/syndicate_mothership/expansion_fridgerummage) "ni" = ( /obj/machinery/light/directional/south, /obj/effect/turf_decal/tile/red/fourcorners, @@ -4870,6 +4855,11 @@ /obj/structure/chair/office, /turf/open/floor/iron/grimy, /area/centcom/central_command_areas/control) +"nP" = ( +/obj/structure/sink/kitchen/directional/west, +/obj/item/reagent_containers/cup/bucket, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/centcom/syndicate_mothership/control) "nQ" = ( /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ @@ -4881,12 +4871,6 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron, /area/centcom/syndicate_mothership/control) -"nR" = ( -/obj/structure/sink/kitchen/directional/west, -/obj/item/reagent_containers/cup/bucket, -/obj/effect/turf_decal/siding/wood, -/turf/open/floor/catwalk_floor, -/area/centcom/central_command_areas/holding) "nS" = ( /obj/structure/bookcase/random, /obj/machinery/light/directional/north, @@ -5363,15 +5347,6 @@ /obj/item/food/meat/slab/synthmeat, /turf/open/floor/catwalk_floor, /area/centcom/central_command_areas/holding) -"pa" = ( -/obj/structure/table/wood, -/obj/item/storage/box/drinkingglasses, -/obj/item/reagent_containers/cup/glass/bottle/whiskey{ - pixel_y = 5 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/briefing) "pb" = ( /turf/open/misc/asteroid/snow/airless, /area/centcom/syndicate_mothership/control) @@ -6228,13 +6203,6 @@ /obj/structure/flora/bush/pointy/style_random, /turf/open/floor/grass, /area/centcom/central_command_areas/control) -"rL" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/cup/glass/bottle/sake{ - pixel_y = 15 - }, -/turf/open/floor/carpet/black, -/area/centcom/central_command_areas/holding) "rM" = ( /turf/open/floor/iron/grimy, /area/centcom/central_command_areas/courtroom) @@ -6385,18 +6353,6 @@ /obj/effect/mapping_helpers/airlock/access/all/admin/medical, /turf/open/floor/iron, /area/centcom/central_command_areas/control) -"sp" = ( -/obj/structure/table/reinforced, -/obj/item/storage/fancy/egg_box, -/obj/item/reagent_containers/condiment/flour{ - pixel_x = -5; - pixel_y = 9 - }, -/obj/item/reagent_containers/condiment/rice{ - pixel_y = 12 - }, -/turf/open/floor/iron/cafeteria, -/area/centcom/central_command_areas/holding) "sq" = ( /obj/machinery/computer/shuttle/white_ship{ dir = 4 @@ -6677,20 +6633,6 @@ /obj/structure/sign/departments/drop, /turf/closed/indestructible/riveted, /area/centcom/central_command_areas/ferry) -"te" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/condiment/saltshaker{ - pixel_x = -8; - pixel_y = 5 - }, -/obj/item/reagent_containers/condiment/peppermill{ - pixel_x = -8 - }, -/obj/item/knife/kitchen, -/obj/machinery/newscaster/directional/west, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/tdome/observation) "tg" = ( /obj/structure/chair{ dir = 1 @@ -6702,35 +6644,6 @@ /obj/machinery/newscaster/directional/south, /turf/open/floor/iron, /area/centcom/central_command_areas/control) -"th" = ( -/obj/effect/turf_decal/siding/thinplating_new/dark{ - dir = 1 - }, -/obj/structure/sink/directional/south, -/obj/item/shovel/spade{ - pixel_x = -4 - }, -/obj/item/reagent_containers/cup/bucket, -/turf/open/floor/mineral/plastitanium/red, -/area/centcom/syndicate_mothership/expansion_bioterrorism) -"ti" = ( -/obj/structure/closet/secure_closet/freezer/fridge/open, -/obj/item/food/grown/chili, -/obj/item/food/grown/chili, -/obj/item/food/grown/chili, -/obj/item/food/grown/chili, -/obj/item/food/grown/chili, -/obj/item/reagent_containers/condiment/milk, -/obj/item/reagent_containers/condiment/milk, -/obj/item/reagent_containers/condiment/soymilk, -/obj/item/reagent_containers/condiment/soymilk, -/obj/item/storage/fancy/egg_box, -/obj/item/food/grown/citrus/lime, -/obj/item/food/grown/citrus/orange, -/obj/item/food/grown/citrus/lemon, -/obj/item/food/grown/watermelon, -/turf/open/floor/carpet/black, -/area/centcom/central_command_areas/holding) "tk" = ( /obj/structure/window/reinforced/survival_pod{ name = "Tinted Window"; @@ -7155,18 +7068,6 @@ }, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/control) -"uz" = ( -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/siding/thinplating_new/dark{ - dir = 1 - }, -/obj/machinery/door/poddoor/shutters{ - id = "FBBZ1"; - name = "Security Shutters" - }, -/obj/structure/fans/tiny, -/turf/open/floor/mineral/titanium, -/area/centcom/syndicate_mothership/control) "uA" = ( /obj/structure/chair{ dir = 4 @@ -7737,17 +7638,6 @@ }, /turf/open/floor/mineral/plastitanium/red, /area/centcom/syndicate_mothership/expansion_bombthreat) -"wp" = ( -/obj/structure/table/wood, -/obj/item/storage/box/drinkingglasses, -/obj/item/reagent_containers/cup/glass/bottle/whiskey{ - pixel_y = 5 - }, -/obj/machinery/light/directional/south, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/status_display/evac/directional/south, -/turf/open/floor/iron/dark, -/area/centcom/tdome/administration) "wq" = ( /obj/structure/chair/comfy/black{ dir = 1 @@ -7972,16 +7862,6 @@ }, /turf/open/floor/iron/white, /area/centcom/tdome/observation) -"wS" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/cup/glass/bottle/whiskey{ - pixel_y = 5 - }, -/obj/item/clothing/mask/cigarette/cigar/havana{ - pixel_x = 2 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/supplypod) "wT" = ( /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ @@ -8262,18 +8142,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/orange/hidden/layer5, /turf/closed/indestructible/syndicate, /area/centcom/syndicate_mothership/control) -"xL" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/cup/bottle/multiver{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/epinephrine{ - pixel_x = -4 - }, -/obj/item/reagent_containers/hypospray/medipen, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) "xN" = ( /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron, @@ -8505,6 +8373,18 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/control) +"yA" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/cup/glass/bottle/beer{ + pixel_x = 5; + pixel_y = -2 + }, +/obj/item/toy/cards/deck/syndicate{ + pixel_x = -6; + pixel_y = 6 + }, +/turf/open/floor/wood/tile, +/area/centcom/syndicate_mothership/control) "yB" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -9057,21 +8937,6 @@ /obj/effect/turf_decal/tile/brown, /turf/open/floor/iron, /area/centcom/central_command_areas/supplypod/loading/three) -"Aa" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 1 - }, -/obj/machinery/computer/monitor/secret{ - dir = 1 - }, -/obj/structure/cable, -/obj/machinery/status_display/evac/directional/south, -/turf/open/floor/iron, -/area/centcom/central_command_areas/admin/storage) "Ab" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, @@ -9254,6 +9119,20 @@ /obj/effect/decal/remains/xeno, /turf/open/floor/grass, /area/centcom/wizard_station) +"AC" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_x = -8; + pixel_y = 5 + }, +/obj/item/reagent_containers/condiment/peppermill{ + pixel_x = -8 + }, +/obj/item/reagent_containers/cup/glass/britcup, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/centcom/tdome/observation) "AD" = ( /obj/effect/turf_decal/tile/yellow/half, /obj/effect/turf_decal/tile/yellow/half{ @@ -9643,6 +9522,46 @@ /obj/machinery/status_display/evac/directional/west, /turf/open/floor/iron/white, /area/centcom/central_command_areas/control) +"BG" = ( +/obj/item/reagent_containers/cup/bottle/epinephrine{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/multiver{ + pixel_x = -3 + }, +/obj/item/reagent_containers/cup/bottle/epinephrine{ + pixel_x = -3; + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/bottle/multiver{ + pixel_x = 6; + pixel_y = 8 + }, +/obj/item/reagent_containers/syringe/epinephrine{ + pixel_x = 3; + pixel_y = -2 + }, +/obj/item/reagent_containers/syringe/epinephrine{ + pixel_x = 4; + pixel_y = 1 + }, +/obj/item/reagent_containers/syringe/epinephrine{ + pixel_x = -2; + pixel_y = 5 + }, +/obj/item/reagent_containers/syringe/epinephrine{ + pixel_x = 2; + pixel_y = 8 + }, +/obj/structure/table/reinforced, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/centcom/central_command_areas/control) "BH" = ( /obj/machinery/sleeper{ dir = 4 @@ -9845,6 +9764,38 @@ /obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/catwalk_floor/iron, /area/centcom/syndicate_mothership/control) +"Cm" = ( +/obj/structure/closet/crate/freezer{ + name = "pantry crate" + }, +/obj/structure/sign/poster/contraband/moffuchis_pizza{ + pixel_y = -32 + }, +/obj/item/reagent_containers/condiment/rice{ + pixel_y = 12 + }, +/obj/item/reagent_containers/condiment/rice{ + pixel_y = 12 + }, +/obj/item/reagent_containers/condiment/saltshaker, +/obj/item/reagent_containers/condiment/peppermill, +/obj/item/food/grown/wheat, +/obj/item/food/grown/wheat, +/obj/item/reagent_containers/condiment/sugar, +/obj/item/reagent_containers/condiment/sugar, +/obj/item/food/grown/soybeans, +/obj/item/food/grown/soybeans, +/obj/item/food/grown/vanillapod, +/obj/item/food/grown/vanillapod, +/obj/item/food/grown/herbs, +/obj/item/food/grown/herbs, +/obj/item/food/grown/cocoapod, +/obj/item/food/grown/cocoapod, +/obj/item/food/grown/aloe, +/obj/item/food/grown/coffee, +/obj/item/food/grown/coffee, +/turf/open/floor/plastic, +/area/centcom/syndicate_mothership/expansion_fridgerummage) "Cn" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -9965,15 +9916,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/evacuation) -"CF" = ( -/obj/structure/table/wood, -/obj/item/book/manual/wiki/barman_recipes, -/obj/item/reagent_containers/cup/glass/shaker, -/obj/item/reagent_containers/cup/rag, -/obj/machinery/newscaster/directional/south, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/tdome/observation) "CG" = ( /obj/effect/turf_decal/siding/wideplating/dark{ dir = 8 @@ -10114,16 +10056,6 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/control) -"Dc" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/firedoor, -/obj/item/reagent_containers/cup/glass/britcup, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron, -/area/centcom/central_command_areas/control) "Dd" = ( /obj/machinery/door/window/survival_pod{ dir = 8; @@ -10141,16 +10073,6 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/mineral/titanium, /area/centcom/syndicate_mothership/control) -"De" = ( -/obj/effect/turf_decal/tile/bar, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/obj/structure/table/reinforced/plastitaniumglass, -/obj/machinery/light/directional/west, -/obj/item/reagent_containers/cup/glass/shaker, -/turf/open/floor/iron, -/area/centcom/syndicate_mothership/control) "Df" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/siding/red{ @@ -10252,6 +10174,16 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/centcom/central_command_areas/control) +"Du" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/item/reagent_containers/cup/glass/britcup, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/centcom/central_command_areas/control) "Dv" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -10433,15 +10365,6 @@ /obj/structure/sign/poster/contraband/cc64k_ad, /turf/closed/indestructible/syndicate, /area/centcom/syndicate_mothership/control) -"DU" = ( -/obj/structure/table/reinforced, -/obj/item/food/mint, -/obj/item/reagent_containers/condiment/enzyme{ - pixel_y = 5 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/tdome/observation) "DV" = ( /obj/item/kirbyplants{ icon_state = "plant-21" @@ -10559,12 +10482,6 @@ }, /turf/open/floor/iron/white, /area/centcom/wizard_station) -"Ep" = ( -/obj/structure/closet/abductor, -/obj/item/storage/box/alienhandcuffs, -/obj/item/reagent_containers/cup/beaker/synthflesh, -/turf/open/floor/plating/abductor, -/area/centcom/abductor_ship) "Er" = ( /obj/structure/lattice/catwalk, /obj/effect/turf_decal/stripes/line, @@ -11055,26 +10972,6 @@ /obj/structure/chair/stool/directional/north, /turf/open/floor/iron/dark/textured_large, /area/centcom/syndicate_mothership/control) -"FI" = ( -/obj/effect/turf_decal/tile/bar, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/obj/structure/table/reinforced, -/obj/item/knife/combat/survival{ - pixel_x = 7; - pixel_y = 17 - }, -/obj/item/reagent_containers/cup/glass/bottle/rum{ - pixel_x = -5; - pixel_y = 17 - }, -/obj/structure/sign/poster/contraband/red_rum{ - pixel_x = 32 - }, -/obj/machinery/recharger, -/turf/open/floor/iron, -/area/centcom/syndicate_mothership/control) "FJ" = ( /obj/structure/fence/cut/large{ dir = 4 @@ -11135,6 +11032,11 @@ /obj/machinery/portable_atmospherics/canister/oxygen, /turf/open/floor/plating, /area/centcom/syndicate_mothership/expansion_bombthreat) +"FQ" = ( +/obj/structure/table/rolling, +/obj/item/reagent_containers/cup/glass/bottle/juice/tomatojuice, +/turf/open/floor/mineral/titanium, +/area/centcom/syndicate_mothership/control) "FR" = ( /obj/effect/light_emitter{ set_cap = 1; @@ -11207,6 +11109,26 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/ferry) +"Gc" = ( +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/structure/table/reinforced, +/obj/item/knife/combat/survival{ + pixel_x = 7; + pixel_y = 17 + }, +/obj/item/reagent_containers/cup/glass/bottle/rum{ + pixel_x = -5; + pixel_y = 17 + }, +/obj/structure/sign/poster/contraband/red_rum{ + pixel_x = 32 + }, +/obj/machinery/recharger, +/turf/open/floor/iron, +/area/centcom/syndicate_mothership/control) "Ge" = ( /obj/machinery/abductor/pad{ team_number = 4 @@ -11220,15 +11142,6 @@ }, /turf/open/floor/iron/grimy, /area/centcom/central_command_areas/admin) -"Gh" = ( -/obj/structure/table/wood, -/obj/item/storage/box/drinkingglasses, -/obj/item/reagent_containers/cup/glass/bottle/whiskey{ - pixel_y = 5 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/tdome/observation) "Gi" = ( /obj/effect/turf_decal/siding/thinplating_new/dark{ dir = 6 @@ -11347,6 +11260,21 @@ }, /turf/open/floor/mineral/titanium/tiled/yellow, /area/centcom/syndicate_mothership/expansion_bombthreat) +"Gx" = ( +/obj/structure/table/glass/plasmaglass, +/obj/item/stack/sheet/mineral/plasma{ + pixel_y = 15 + }, +/obj/item/grenade/chem_grenade, +/obj/item/stack/cable_coil, +/obj/item/reagent_containers/cup/beaker{ + pixel_x = 8; + pixel_y = 14 + }, +/obj/machinery/light/cold/directional/west, +/obj/item/stack/cable_coil, +/turf/open/floor/mineral/titanium/tiled/yellow, +/area/centcom/syndicate_mothership/expansion_chemicalwarfare) "Gy" = ( /turf/open/floor/mineral/plastitanium/red, /area/centcom/syndicate_mothership/expansion_chemicalwarfare) @@ -11450,19 +11378,6 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/supply) -"GM" = ( -/obj/structure/table/wood, -/obj/machinery/chem_dispenser/drinks/beer{ - dir = 4; - pixel_x = -8; - pixel_y = 1 - }, -/obj/item/reagent_containers/cup/beaker{ - pixel_x = 7; - pixel_y = -4 - }, -/turf/open/floor/carpet/black, -/area/centcom/central_command_areas/holding) "GN" = ( /obj/structure/table/reinforced, /obj/item/storage/fancy/donut_box, @@ -11505,20 +11420,6 @@ }, /turf/open/floor/iron/dark/textured_large, /area/centcom/syndicate_mothership/control) -"GV" = ( -/obj/structure/table/wood, -/obj/machinery/chem_dispenser/drinks{ - dir = 4; - pixel_x = -8; - pixel_y = 4 - }, -/obj/item/reagent_containers/condiment/enzyme{ - layer = 5; - pixel_x = 10; - pixel_y = 2 - }, -/turf/open/floor/carpet/black, -/area/centcom/central_command_areas/holding) "GW" = ( /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ @@ -11534,11 +11435,6 @@ /obj/structure/shuttle/engine/propulsion, /turf/open/space, /area/centcom/wizard_station) -"GY" = ( -/obj/structure/table/rolling, -/obj/item/reagent_containers/cup/glass/bottle/juice/tomatojuice, -/turf/open/floor/mineral/titanium, -/area/centcom/syndicate_mothership/control) "GZ" = ( /obj/structure/sign/poster/contraband/gorlex_recruitment{ pixel_y = 32 @@ -11555,38 +11451,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/courtroom) -"Hd" = ( -/obj/effect/turf_decal/siding/thinplating_new/dark{ - dir = 1 - }, -/obj/structure/table/glass/plasmaglass, -/obj/item/reagent_containers/syringe{ - pixel_x = -5; - pixel_y = 12 - }, -/obj/item/reagent_containers/syringe{ - pixel_x = -2; - pixel_y = 13 - }, -/obj/item/reagent_containers/syringe{ - pixel_x = 1; - pixel_y = 14 - }, -/obj/machinery/light/cold/directional/north, -/obj/item/reagent_containers/dropper{ - pixel_x = -4; - pixel_y = -6 - }, -/obj/item/storage/box/monkeycubes{ - pixel_x = -6; - pixel_y = 5 - }, -/obj/item/reagent_containers/cup/bottle/formaldehyde{ - pixel_x = 8; - pixel_y = 4 - }, -/turf/open/floor/mineral/plastitanium/red, -/area/centcom/syndicate_mothership/expansion_bioterrorism) "He" = ( /obj/item/kirbyplants/random, /turf/open/floor/mineral/plastitanium, @@ -11787,6 +11651,18 @@ }, /turf/open/floor/vault/rock, /area/centcom/central_command_areas/holding) +"HM" = ( +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 1 + }, +/obj/machinery/door/poddoor/shutters{ + id = "FBBZ1"; + name = "Security Shutters" + }, +/obj/structure/fans/tiny, +/turf/open/floor/mineral/titanium, +/area/centcom/syndicate_mothership/control) "HN" = ( /turf/open/floor/mineral/titanium, /area/centcom/syndicate_mothership/control) @@ -11918,24 +11794,6 @@ /obj/machinery/recharger, /turf/open/floor/carpet, /area/centcom/syndicate_mothership/control) -"Id" = ( -/obj/structure/window/reinforced/survival_pod{ - name = "Tinted Window"; - opacity = 1 - }, -/obj/effect/turf_decal/siding/thinplating{ - dir = 6 - }, -/obj/structure/table/reinforced/plasmarglass, -/obj/item/reagent_containers/cup/bottle/epinephrine, -/obj/item/reagent_containers/cup/bottle/multiver{ - pixel_x = 6 - }, -/obj/item/reagent_containers/syringe{ - pixel_y = 15 - }, -/turf/open/floor/mineral/titanium/tiled/blue, -/area/centcom/syndicate_mothership/control) "If" = ( /obj/machinery/atmospherics/components/unary/passive_vent{ dir = 4 @@ -11973,6 +11831,17 @@ }, /turf/open/floor/mineral/plastitanium, /area/centcom/syndicate_mothership/expansion_bombthreat) +"Il" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 1 + }, +/obj/structure/sink/directional/south, +/obj/item/shovel/spade{ + pixel_x = -4 + }, +/obj/item/reagent_containers/cup/bucket, +/turf/open/floor/mineral/plastitanium/red, +/area/centcom/syndicate_mothership/expansion_bioterrorism) "In" = ( /obj/structure/flora/grass/both/style_random, /obj/structure/railing{ @@ -12101,6 +11970,38 @@ }, /turf/open/floor/iron, /area/centcom/tdome/arena) +"IH" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 1 + }, +/obj/structure/table/glass/plasmaglass, +/obj/item/reagent_containers/syringe{ + pixel_x = -5; + pixel_y = 12 + }, +/obj/item/reagent_containers/syringe{ + pixel_x = -2; + pixel_y = 13 + }, +/obj/item/reagent_containers/syringe{ + pixel_x = 1; + pixel_y = 14 + }, +/obj/machinery/light/cold/directional/north, +/obj/item/reagent_containers/dropper{ + pixel_x = -4; + pixel_y = -6 + }, +/obj/item/storage/box/monkeycubes{ + pixel_x = -6; + pixel_y = 5 + }, +/obj/item/reagent_containers/cup/bottle/formaldehyde{ + pixel_x = 8; + pixel_y = 4 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/centcom/syndicate_mothership/expansion_bioterrorism) "II" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -12483,29 +12384,6 @@ /obj/effect/turf_decal/trimline/red, /turf/open/floor/mineral/plastitanium, /area/centcom/syndicate_mothership/expansion_chemicalwarfare) -"Kb" = ( -/obj/structure/closet/secure_closet/freezer/fridge/open{ - name = "freezer" - }, -/obj/item/food/meat/slab/killertomato, -/obj/item/food/meat/slab/killertomato, -/obj/item/food/grown/tomato, -/obj/item/food/grown/tomato, -/obj/item/food/grown/tomato, -/obj/item/food/grown/wheat, -/obj/item/food/grown/wheat, -/obj/item/food/grown/wheat, -/obj/item/food/grown/berries, -/obj/item/food/grown/berries, -/obj/item/food/grown/cabbage, -/obj/item/food/grown/cherries, -/obj/item/food/grown/cherries, -/obj/item/reagent_containers/condiment/enzyme{ - layer = 5 - }, -/obj/item/food/grown/redbeet, -/turf/open/floor/catwalk_floor, -/area/centcom/central_command_areas/holding) "Kc" = ( /obj/effect/turf_decal/siding/thinplating_new/dark{ dir = 1 @@ -12953,20 +12831,6 @@ /obj/effect/spawner/structure/window/reinforced/shuttle, /turf/open/floor/plating, /area/centcom/central_command_areas/evacuation/ship) -"Lx" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/firedoor, -/obj/item/reagent_containers/condiment/saltshaker{ - pixel_x = -8; - pixel_y = 5 - }, -/obj/item/reagent_containers/condiment/peppermill{ - pixel_x = -8 - }, -/obj/item/reagent_containers/cup/glass/britcup, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron, -/area/centcom/tdome/observation) "Ly" = ( /obj/machinery/door/airlock/titanium, /turf/open/floor/mineral/titanium, @@ -13210,6 +13074,35 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/centcom/tdome/observation) +"Mx" = ( +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/structure/table/wood/poker, +/obj/machinery/light/warm/directional/north, +/obj/item/reagent_containers/cup/glass/bottle/whiskey{ + pixel_x = -4; + pixel_y = 14 + }, +/obj/item/toy/cards/deck{ + pixel_x = 3; + pixel_y = 6 + }, +/obj/item/clothing/mask/cigarette/robust{ + pixel_x = -4; + pixel_y = 1 + }, +/obj/effect/decal/cleanable/ash{ + pixel_x = 12; + pixel_y = -6 + }, +/obj/effect/spawner/random/entertainment/lighter{ + pixel_x = 9; + pixel_y = -3 + }, +/turf/open/floor/iron, +/area/centcom/syndicate_mothership/control) "My" = ( /obj/structure/chair/office{ dir = 4 @@ -13431,6 +13324,11 @@ "Nd" = ( /turf/closed/indestructible/wood, /area/centcom/central_command_areas/holding) +"Ne" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/cup/glass/trophy/gold_cup, +/turf/open/floor/iron/grimy, +/area/centcom/tdome/observation) "Ng" = ( /obj/item/storage/box/ids{ pixel_x = 3; @@ -13441,6 +13339,12 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/control) +"Nh" = ( +/obj/structure/table/wood, +/obj/item/storage/box/drinkingglasses, +/obj/item/reagent_containers/cup/glass/shaker, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/supplypod) "Nj" = ( /obj/effect/turf_decal/stripes/end{ dir = 8 @@ -13600,6 +13504,15 @@ /obj/effect/mapping_helpers/airlock/access/all/admin/general, /turf/open/floor/iron, /area/centcom/central_command_areas/control) +"NH" = ( +/obj/structure/table/reinforced, +/obj/item/food/mint, +/obj/item/reagent_containers/condiment/enzyme{ + pixel_y = 5 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/tdome/observation) "NJ" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/status_display/ai/directional/south, @@ -13704,6 +13617,18 @@ "Oa" = ( /turf/open/floor/iron/dark/textured_large, /area/centcom/syndicate_mothership/control) +"Ob" = ( +/obj/structure/table/reinforced, +/obj/item/storage/fancy/egg_box, +/obj/item/reagent_containers/condiment/flour{ + pixel_x = -5; + pixel_y = 9 + }, +/obj/item/reagent_containers/condiment/rice{ + pixel_y = 12 + }, +/turf/open/floor/iron/cafeteria, +/area/centcom/central_command_areas/holding) "Oc" = ( /obj/machinery/door/airlock/centcom{ name = "Administrative Office" @@ -14286,6 +14211,20 @@ /obj/machinery/computer/libraryconsole/bookmanagement, /turf/open/floor/carpet/black, /area/centcom/central_command_areas/holding) +"Py" = ( +/obj/structure/table/glass/plasmaglass, +/obj/item/reagent_containers/cup/beaker/large{ + pixel_x = -5; + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/beaker{ + pixel_x = 8; + pixel_y = 2 + }, +/obj/machinery/light/cold/directional/east, +/obj/item/gun/syringe/syndicate, +/turf/open/floor/mineral/titanium/tiled/yellow, +/area/centcom/syndicate_mothership/expansion_chemicalwarfare) "Pz" = ( /obj/structure/table/reinforced, /obj/item/paper/pamphlet/centcom/visitor_info, @@ -14341,6 +14280,12 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/ferry) +"PI" = ( +/obj/structure/sink/kitchen/directional/west, +/obj/item/reagent_containers/cup/bucket, +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/catwalk_floor, +/area/centcom/central_command_areas/holding) "PK" = ( /obj/effect/turf_decal/tile/brown, /obj/effect/turf_decal/tile/brown{ @@ -14363,11 +14308,38 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/briefing) +"PN" = ( +/obj/structure/table/wood, +/obj/item/book/manual/wiki/barman_recipes, +/obj/item/reagent_containers/cup/glass/shaker, +/obj/item/reagent_containers/cup/rag, +/obj/machinery/newscaster/directional/south, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/tdome/observation) "PO" = ( /obj/structure/kitchenspike, /obj/item/gun/magic/hook, /turf/open/floor/catwalk_floor, /area/centcom/central_command_areas/holding) +"PP" = ( +/obj/structure/closet/secure_closet/freezer/fridge/open, +/obj/item/food/grown/chili, +/obj/item/food/grown/chili, +/obj/item/food/grown/chili, +/obj/item/food/grown/chili, +/obj/item/food/grown/chili, +/obj/item/reagent_containers/condiment/milk, +/obj/item/reagent_containers/condiment/milk, +/obj/item/reagent_containers/condiment/soymilk, +/obj/item/reagent_containers/condiment/soymilk, +/obj/item/storage/fancy/egg_box, +/obj/item/food/grown/citrus/lime, +/obj/item/food/grown/citrus/orange, +/obj/item/food/grown/citrus/lemon, +/obj/item/food/grown/watermelon, +/turf/open/floor/carpet/black, +/area/centcom/central_command_areas/holding) "PQ" = ( /obj/machinery/atmospherics/components/trinary/mixer, /obj/effect/turf_decal/siding/thinplating_new/dark{ @@ -14630,46 +14602,6 @@ /obj/item/clothing/under/costume/roman, /turf/open/floor/wood/parquet, /area/centcom/central_command_areas/holding) -"QE" = ( -/obj/item/reagent_containers/cup/bottle/epinephrine{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/multiver{ - pixel_x = -3 - }, -/obj/item/reagent_containers/cup/bottle/epinephrine{ - pixel_x = -3; - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/bottle/multiver{ - pixel_x = 6; - pixel_y = 8 - }, -/obj/item/reagent_containers/syringe/epinephrine{ - pixel_x = 3; - pixel_y = -2 - }, -/obj/item/reagent_containers/syringe/epinephrine{ - pixel_x = 4; - pixel_y = 1 - }, -/obj/item/reagent_containers/syringe/epinephrine{ - pixel_x = -2; - pixel_y = 5 - }, -/obj/item/reagent_containers/syringe/epinephrine{ - pixel_x = 2; - pixel_y = 8 - }, -/obj/structure/table/reinforced, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/centcom/central_command_areas/control) "QH" = ( /obj/item/toy/figure/syndie, /turf/open/misc/asteroid/snow/icemoon, @@ -15001,6 +14933,20 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/tdome/administration) +"Rx" = ( +/obj/structure/table/reinforced, +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_x = -8; + pixel_y = 5 + }, +/obj/item/reagent_containers/condiment/peppermill{ + pixel_x = -8 + }, +/obj/item/knife/kitchen, +/obj/machinery/newscaster/directional/west, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/tdome/observation) "Ry" = ( /obj/item/storage/medkit/fire, /obj/item/storage/medkit/regular{ @@ -15114,6 +15060,12 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/courtroom) +"RQ" = ( +/obj/structure/closet/abductor, +/obj/item/storage/box/alienhandcuffs, +/obj/item/reagent_containers/cup/beaker/synthflesh, +/turf/open/floor/plating/abductor, +/area/centcom/abductor_ship) "RR" = ( /obj/machinery/light/directional/north, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -15171,6 +15123,13 @@ }, /turf/open/floor/iron/sepia, /area/centcom/central_command_areas/holding) +"Sb" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/cup/glass/bottle/sake{ + pixel_y = 15 + }, +/turf/open/floor/carpet/black, +/area/centcom/central_command_areas/holding) "Sc" = ( /obj/structure/railing{ dir = 6 @@ -15545,6 +15504,29 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/holding) +"Tf" = ( +/obj/structure/closet/secure_closet/freezer/fridge/open{ + name = "freezer" + }, +/obj/item/food/meat/slab/killertomato, +/obj/item/food/meat/slab/killertomato, +/obj/item/food/grown/tomato, +/obj/item/food/grown/tomato, +/obj/item/food/grown/tomato, +/obj/item/food/grown/wheat, +/obj/item/food/grown/wheat, +/obj/item/food/grown/wheat, +/obj/item/food/grown/berries, +/obj/item/food/grown/berries, +/obj/item/food/grown/cabbage, +/obj/item/food/grown/cherries, +/obj/item/food/grown/cherries, +/obj/item/reagent_containers/condiment/enzyme{ + layer = 5 + }, +/obj/item/food/grown/redbeet, +/turf/open/floor/catwalk_floor, +/area/centcom/central_command_areas/holding) "Tg" = ( /obj/item/storage/briefcase{ pixel_x = -3; @@ -15569,6 +15551,16 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/control) +"Tj" = ( +/obj/structure/table/reinforced, +/obj/item/reagent_containers/cup/glass/bottle/whiskey{ + pixel_y = 5 + }, +/obj/item/clothing/mask/cigarette/cigar/havana{ + pixel_x = 2 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/supplypod) "Tk" = ( /obj/machinery/hydroponics/constructable, /turf/open/floor/grass, @@ -15749,6 +15741,12 @@ /obj/structure/cable, /turf/open/floor/iron, /area/centcom/central_command_areas/ferry) +"TL" = ( +/obj/item/mop, +/obj/structure/sink/kitchen/directional/west, +/obj/item/reagent_containers/cup/bucket, +/turf/open/floor/catwalk_floor, +/area/centcom/central_command_areas/holding) "TM" = ( /obj/effect/turf_decal/tile/yellow/half{ dir = 4 @@ -15877,12 +15875,6 @@ /obj/structure/noticeboard/directional/east, /turf/open/floor/mineral/plastitanium, /area/centcom/syndicate_mothership/expansion_bioterrorism) -"Ud" = ( -/obj/structure/table/wood, -/obj/item/storage/box/drinkingglasses, -/obj/item/reagent_containers/cup/glass/shaker, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/supplypod) "Ue" = ( /obj/effect/baseturf_helper/asteroid/snow, /turf/closed/indestructible/syndicate, @@ -16050,6 +16042,18 @@ "Uu" = ( /turf/closed/indestructible/syndicate, /area/centcom/syndicate_mothership) +"Uv" = ( +/obj/structure/table/reinforced, +/obj/item/reagent_containers/cup/bottle/multiver{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/epinephrine{ + pixel_x = -4 + }, +/obj/item/reagent_containers/hypospray/medipen, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/control) "Uw" = ( /obj/machinery/light/directional/west, /turf/open/floor/iron/dark, @@ -16443,35 +16447,6 @@ /obj/structure/cable, /turf/open/floor/iron/grimy, /area/centcom/central_command_areas/admin) -"VA" = ( -/obj/effect/turf_decal/siding/thinplating_new/dark{ - dir = 9 - }, -/obj/structure/table/glass/plasmaglass, -/obj/machinery/reagentgrinder{ - pixel_x = -5; - pixel_y = 12 - }, -/obj/item/reagent_containers/cup/beaker/large{ - pixel_x = -7; - pixel_y = -8 - }, -/obj/item/reagent_containers/cup/beaker/cryoxadone{ - pixel_x = 9; - pixel_y = -7 - }, -/obj/structure/sign/poster/contraband/lizard{ - pixel_x = -32 - }, -/obj/structure/sign/poster/contraband/kudzu{ - pixel_y = 32 - }, -/obj/item/reagent_containers/spray/plantbgone{ - pixel_x = 10; - pixel_y = 5 - }, -/turf/open/floor/mineral/plastitanium/red, -/area/centcom/syndicate_mothership/expansion_bioterrorism) "VB" = ( /obj/structure/table/reinforced, /obj/item/clipboard, @@ -16495,6 +16470,16 @@ }, /turf/open/floor/iron/sepia, /area/centcom/central_command_areas/holding) +"VH" = ( +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/structure/table/reinforced/plastitaniumglass, +/obj/machinery/light/directional/west, +/obj/item/reagent_containers/cup/glass/shaker, +/turf/open/floor/iron, +/area/centcom/syndicate_mothership/control) "VI" = ( /obj/machinery/autolathe, /turf/open/floor/catwalk_floor, @@ -16582,6 +16567,40 @@ }, /turf/open/floor/engine/vacuum, /area/centcom/syndicate_mothership/expansion_bombthreat) +"VV" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 8 + }, +/obj/structure/table/glass/plasmaglass, +/obj/item/folder/white{ + pixel_x = 4; + pixel_y = -3 + }, +/obj/item/reagent_containers/syringe{ + pixel_x = -5; + pixel_y = 12 + }, +/obj/item/reagent_containers/syringe{ + pixel_x = -2; + pixel_y = 13 + }, +/obj/item/reagent_containers/syringe{ + pixel_x = 1; + pixel_y = 14 + }, +/obj/item/reagent_containers/syringe{ + pixel_x = 4; + pixel_y = 15 + }, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/item/reagent_containers/cup/bottle/radium{ + pixel_x = -8; + pixel_y = 9 + }, +/obj/item/stack/sheet/mineral/plasma, +/obj/item/stack/sheet/mineral/plasma, +/turf/open/floor/mineral/plastitanium/red, +/area/centcom/syndicate_mothership/expansion_bioterrorism) "VW" = ( /obj/machinery/computer/prisoner/management{ dir = 1 @@ -16695,12 +16714,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/courtroom) -"Wj" = ( -/obj/item/mop, -/obj/structure/sink/kitchen/directional/west, -/obj/item/reagent_containers/cup/bucket, -/turf/open/floor/catwalk_floor, -/area/centcom/central_command_areas/holding) "Wl" = ( /obj/structure/table/wood, /obj/machinery/recharger, @@ -16891,6 +16904,15 @@ /obj/machinery/biogenerator, /turf/open/floor/wood/tile, /area/centcom/central_command_areas/holding) +"WI" = ( +/obj/structure/table/wood, +/obj/item/storage/box/drinkingglasses, +/obj/item/reagent_containers/cup/glass/bottle/whiskey{ + pixel_y = 5 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/tdome/observation) "WJ" = ( /obj/structure/flora/rock/pile/style_random, /turf/open/misc/asteroid/snow/airless, @@ -16914,6 +16936,15 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron, /area/centcom/central_command_areas/supplypod) +"WN" = ( +/obj/structure/table/wood, +/obj/item/storage/box/drinkingglasses, +/obj/item/reagent_containers/cup/glass/bottle/whiskey{ + pixel_y = 5 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/briefing) "WO" = ( /obj/structure/table/wood, /obj/item/phone{ @@ -17409,6 +17440,24 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/tdome/observation) +"Yf" = ( +/obj/structure/window/reinforced/survival_pod{ + name = "Tinted Window"; + opacity = 1 + }, +/obj/effect/turf_decal/siding/thinplating{ + dir = 6 + }, +/obj/structure/table/reinforced/plasmarglass, +/obj/item/reagent_containers/cup/bottle/epinephrine, +/obj/item/reagent_containers/cup/bottle/multiver{ + pixel_x = 6 + }, +/obj/item/reagent_containers/syringe{ + pixel_y = 15 + }, +/turf/open/floor/mineral/titanium/tiled/blue, +/area/centcom/syndicate_mothership/control) "Yg" = ( /obj/effect/baseturf_helper/asteroid/snow, /turf/closed/indestructible/syndicate, @@ -17897,6 +17946,20 @@ /obj/machinery/vending/dinnerware, /turf/open/floor/catwalk_floor/titanium, /area/centcom/syndicate_mothership/control) +"ZA" = ( +/obj/structure/table/wood, +/obj/machinery/chem_dispenser/drinks{ + dir = 4; + pixel_x = -8; + pixel_y = 4 + }, +/obj/item/reagent_containers/condiment/enzyme{ + layer = 5; + pixel_x = 10; + pixel_y = 2 + }, +/turf/open/floor/carpet/black, +/area/centcom/central_command_areas/holding) "ZB" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -17952,35 +18015,6 @@ /obj/structure/closet/crate/cardboard, /turf/open/floor/plating, /area/centcom/syndicate_mothership/control) -"ZK" = ( -/obj/machinery/light/small/directional/west, -/obj/structure/closet/secure_closet/freezer/fridge/open, -/obj/item/food/meat/slab/rawcrab, -/obj/item/food/meat/slab/rawcrab, -/obj/item/food/meat/slab/rawcrab, -/obj/item/food/fishmeat, -/obj/item/food/fishmeat, -/obj/item/food/fishmeat, -/obj/item/food/grown/tomato, -/obj/item/food/grown/tomato, -/obj/item/food/grown/tomato, -/obj/item/reagent_containers/condiment/enzyme{ - layer = 5 - }, -/obj/item/storage/fancy/egg_box, -/obj/item/storage/fancy/egg_box, -/obj/item/reagent_containers/condiment/milk, -/obj/item/reagent_containers/condiment/milk, -/obj/item/reagent_containers/condiment/flour{ - pixel_x = -5; - pixel_y = 9 - }, -/obj/item/reagent_containers/condiment/flour{ - pixel_x = -5; - pixel_y = 9 - }, -/turf/open/floor/plastic, -/area/centcom/syndicate_mothership/expansion_fridgerummage) "ZM" = ( /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, @@ -18043,40 +18077,6 @@ /obj/machinery/computer/security/telescreen/entertainment/directional/west, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/admin) -"ZU" = ( -/obj/effect/turf_decal/siding/thinplating_new/dark{ - dir = 8 - }, -/obj/structure/table/glass/plasmaglass, -/obj/item/folder/white{ - pixel_x = 4; - pixel_y = -3 - }, -/obj/item/reagent_containers/syringe{ - pixel_x = -5; - pixel_y = 12 - }, -/obj/item/reagent_containers/syringe{ - pixel_x = -2; - pixel_y = 13 - }, -/obj/item/reagent_containers/syringe{ - pixel_x = 1; - pixel_y = 14 - }, -/obj/item/reagent_containers/syringe{ - pixel_x = 4; - pixel_y = 15 - }, -/obj/structure/extinguisher_cabinet/directional/west, -/obj/item/reagent_containers/cup/bottle/radium{ - pixel_x = -8; - pixel_y = 9 - }, -/obj/item/stack/sheet/mineral/plasma, -/obj/item/stack/sheet/mineral/plasma, -/turf/open/floor/mineral/plastitanium/red, -/area/centcom/syndicate_mothership/expansion_bioterrorism) "ZV" = ( /obj/structure/table, /obj/structure/bedsheetbin, @@ -20069,7 +20069,7 @@ aa aa ks kP -Ep +RQ lG lj mw @@ -20096,7 +20096,7 @@ aa aa ks kP -Ep +RQ lG lj mw @@ -20126,7 +20126,7 @@ aa aa ks kP -Ep +RQ lG lj mw @@ -20153,7 +20153,7 @@ aa aa ks kP -Ep +RQ lG lj mw @@ -23164,7 +23164,7 @@ nH Ue rp Zq -eg +Gx HY zX nH @@ -23429,8 +23429,8 @@ ng ng ng CN -VA -ZU +cj +VV Xe EA RK @@ -24200,7 +24200,7 @@ ng ac ng CN -Hd +IH pS Gu JO @@ -24457,7 +24457,7 @@ gL FD Ih RK -th +Il Na Sf FM @@ -25220,7 +25220,7 @@ nH nH pV AP -eL +Py Un OI we @@ -26247,7 +26247,7 @@ Ff bZ ng Uj -Id +Yf Md Hg Gi @@ -26761,10 +26761,10 @@ nz ng fd YJ -De +VH lx bK -ZK +hu bK ng tz @@ -27270,7 +27270,7 @@ Ff Bt Ff nz -GY +FQ HN dE pZ @@ -27278,7 +27278,7 @@ pZ pZ Gn bK -nh +Cm bK BV Go @@ -27788,7 +27788,7 @@ HN HN Wx py -jZ +ii fn wE bK @@ -28316,7 +28316,7 @@ ng MB Jm Fd -cK +Mx HA aC nz @@ -28554,7 +28554,7 @@ Bz GD Ff nz -cX +lQ HN HN tY @@ -29588,7 +29588,7 @@ Kn ng QT Ut -aY +yA aJ ng Gl @@ -29853,7 +29853,7 @@ WW WW Hr ng -bl +nP ng gd ES @@ -33694,7 +33694,7 @@ Zb ll ZJ rP -uz +HM ng nz nz @@ -33951,7 +33951,7 @@ Zb ll ll ll -uz +HM oS vL uv @@ -34208,7 +34208,7 @@ Zb ll ll ll -uz +HM Dg vL uv @@ -35498,7 +35498,7 @@ ng ng Ws Wa -FI +Gc ng ng xI @@ -35538,7 +35538,7 @@ pJ pJ pJ Nd -Kb +Tf Zo YF Nd @@ -35785,7 +35785,7 @@ pJ pJ fg bE -sp +Ob zS Nd Nd @@ -36046,10 +36046,10 @@ Fh hj fO AJ -GM -GV +fT +ZA Bn -ti +PP pK fO tc @@ -37075,7 +37075,7 @@ aF fO KE Ww -rL +Sb Qa SX Zr @@ -44798,7 +44798,7 @@ YC YC cN CQ -Wj +TL Nd OL aa @@ -47365,7 +47365,7 @@ pJ hs pJ Nd -nR +PI uI Ov MX @@ -54531,7 +54531,7 @@ wv wv mD yL -pa +WN cb wW tb @@ -57606,7 +57606,7 @@ Mo Sx Gs Ow -Aa +ah YU uZ oe @@ -58662,8 +58662,8 @@ oi QC aM BW -te -DU +Rx +NH Tp Yu VT @@ -59435,7 +59435,7 @@ Zj bi ni zw -Lx +AC Bs di QC @@ -60717,7 +60717,7 @@ Rh PT QC eN -hR +Ne Tl QC yY @@ -62248,7 +62248,7 @@ mQ io io iu -Dc +Du DI iu in @@ -62259,7 +62259,7 @@ Rh Ad QC sc -hR +Ne YT QC yY @@ -62504,7 +62504,7 @@ io iu io el -xL +Uv Dv DJ XQ @@ -63049,7 +63049,7 @@ Pj Pr Xw Sz -wp +gp uf uf uf @@ -64300,7 +64300,7 @@ io zI Ab xN -QE +BG iu qw iu @@ -64314,14 +64314,14 @@ Sl Qi cZ QC -Gh +WI BW uM JV dG MR TV -CF +PN QC IM QP @@ -69443,7 +69443,7 @@ aP cg qz cg -Ud +Nh Ro Yn Se @@ -70471,7 +70471,7 @@ Bd cg cg cg -wS +Tj Su Yn Vk diff --git a/_maps/shuttles/emergency_cere.dmm b/_maps/shuttles/emergency_cere.dmm index 3c07a3ce01c..a26125ce258 100644 --- a/_maps/shuttles/emergency_cere.dmm +++ b/_maps/shuttles/emergency_cere.dmm @@ -886,7 +886,7 @@ /area/shuttle/escape) "cV" = ( /obj/machinery/light/directional/north, -/obj/machinery/computer/monitor/secret, +/obj/machinery/computer/monitor, /obj/effect/turf_decal/tile/yellow{ dir = 1 }, diff --git a/_maps/shuttles/infiltrator_advanced.dmm b/_maps/shuttles/infiltrator_advanced.dmm index 9936f1fdf28..7390a56ab15 100644 --- a/_maps/shuttles/infiltrator_advanced.dmm +++ b/_maps/shuttles/infiltrator_advanced.dmm @@ -243,14 +243,6 @@ /obj/structure/cable, /turf/open/floor/mineral/plastitanium/red, /area/shuttle/syndicate/bridge) -"az" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/computer/monitor/secret{ - dir = 8 - }, -/obj/structure/cable, -/turf/open/floor/mineral/plastitanium, -/area/shuttle/syndicate/bridge) "aA" = ( /obj/effect/turf_decal/delivery, /obj/machinery/door/airlock/hatch{ @@ -1183,12 +1175,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/pod/dark, /area/shuttle/syndicate/medical) -"cx" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/plasma/plastitanium, -/obj/structure/shuttle/engine/heater, -/turf/open/floor/plating, -/area/shuttle/syndicate/medical) "cy" = ( /obj/structure/shuttle/engine/propulsion, /obj/effect/turf_decal/stripes/line, @@ -1243,12 +1229,6 @@ /obj/structure/shuttle/engine/heater, /turf/closed/wall/r_wall/syndicate, /area/shuttle/syndicate/armory) -"cH" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/plasma/plastitanium, -/obj/structure/shuttle/engine/heater, -/turf/open/floor/plating, -/area/shuttle/syndicate/armory) "cI" = ( /obj/structure/shuttle/engine/large, /obj/effect/turf_decal/stripes/line, @@ -1274,12 +1254,6 @@ /obj/structure/shuttle/engine/heater, /turf/closed/wall/r_wall/syndicate, /area/shuttle/syndicate/hallway) -"cN" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/plasma/plastitanium, -/obj/structure/shuttle/engine/heater, -/turf/open/floor/plating, -/area/shuttle/syndicate/hallway) "cO" = ( /obj/structure/shuttle/engine/propulsion, /obj/effect/turf_decal/stripes/line, @@ -2172,6 +2146,32 @@ "ev" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/shuttle/syndicate/hallway) +"jY" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/computer/monitor{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/mineral/plastitanium, +/area/shuttle/syndicate/bridge) +"yB" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/plasma/plastitanium, +/obj/structure/shuttle/engine/heater, +/turf/open/floor/plating, +/area/shuttle/syndicate/medical) +"GJ" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/plasma/plastitanium, +/obj/structure/shuttle/engine/heater, +/turf/open/floor/plating, +/area/shuttle/syndicate/hallway) +"Yi" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/plasma/plastitanium, +/obj/structure/shuttle/engine/heater, +/turf/open/floor/plating, +/area/shuttle/syndicate/armory) (1,1,1) = {" ad @@ -2284,7 +2284,7 @@ dr bV dE dU -cx +yB cA cL "} @@ -2307,7 +2307,7 @@ bN bW ch dV -cx +yB cB cP "} @@ -2398,7 +2398,7 @@ aQ bR dB cl -cN +GJ cX cE ad @@ -2444,7 +2444,7 @@ aQ bT dC cl -cN +GJ cX cI ad @@ -2476,7 +2476,7 @@ ad ae aa as -az +jY aO aC bg @@ -2537,7 +2537,7 @@ ef dN dQ dW -cH +Yi cQ cS "} @@ -2560,7 +2560,7 @@ eg ei et dX -cH +Yi cR cT "} diff --git a/_maps/shuttles/pirate_default.dmm b/_maps/shuttles/pirate_default.dmm index 5a999d43860..99fe70563d2 100644 --- a/_maps/shuttles/pirate_default.dmm +++ b/_maps/shuttles/pirate_default.dmm @@ -292,24 +292,6 @@ }, /turf/open/floor/iron, /area/shuttle/pirate) -"aB" = ( -/obj/machinery/light/small/directional/east, -/obj/machinery/computer/monitor/secret{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/airalarm/all_access{ - pixel_y = -24 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/shuttle/pirate) "aC" = ( /obj/machinery/shuttle_scrambler, /obj/effect/decal/cleanable/dirt, @@ -868,14 +850,6 @@ /obj/item/wrench, /turf/open/floor/plating/airless, /area/shuttle/pirate) -"ey" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "piratebridge" - }, -/obj/structure/grille, -/obj/structure/window/reinforced/plasma/plastitanium, -/turf/open/floor/plating, -/area/shuttle/pirate) "ez" = ( /obj/structure/window/reinforced, /obj/structure/frame/machine, @@ -948,6 +922,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/shuttle/pirate) +"sF" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + id = "piratebridge" + }, +/obj/structure/grille, +/obj/structure/window/reinforced/plasma/plastitanium, +/turf/open/floor/plating, +/area/shuttle/pirate) "vB" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -1041,6 +1023,24 @@ }, /turf/open/floor/pod/light, /area/shuttle/pirate) +"Nc" = ( +/obj/machinery/light/small/directional/east, +/obj/machinery/computer/monitor{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/airalarm/all_access{ + pixel_y = -24 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/shuttle/pirate) "Ni" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, @@ -1162,7 +1162,7 @@ af af af af -ey +sF ay Oe OL @@ -1195,8 +1195,8 @@ aR af af af -ey -ey +sF +sF aj aj aj @@ -1212,8 +1212,8 @@ aJ (7,1,1) = {" af af -ey -ey +sF +sF aC aW aj @@ -1230,7 +1230,7 @@ aj (8,1,1) = {" af af -ey +sF ab ae bf @@ -1248,7 +1248,7 @@ aH (9,1,1) = {" af af -ey +sF ac ag am @@ -1266,7 +1266,7 @@ aK (10,1,1) = {" af af -ey +sF ad ah an @@ -1284,10 +1284,10 @@ er (11,1,1) = {" af af -ey -ey +sF +sF al -aB +Nc aj ek bA @@ -1303,8 +1303,8 @@ aj af af af -ey -ey +sF +sF aj aj aj @@ -1342,7 +1342,7 @@ af af af af -ey +sF eE bC bJ diff --git a/_maps/shuttles/pirate_dutchman.dmm b/_maps/shuttles/pirate_dutchman.dmm index 686d6c90e22..58146e30a59 100644 --- a/_maps/shuttles/pirate_dutchman.dmm +++ b/_maps/shuttles/pirate_dutchman.dmm @@ -109,7 +109,7 @@ /turf/open/floor/wood/airless, /area/shuttle/pirate/flying_dutchman) "aw" = ( -/obj/machinery/computer/monitor/secret{ +/obj/machinery/computer/monitor{ dir = 8 }, /turf/open/floor/carpet/royalblack/airless, diff --git a/_maps/shuttles/pirate_silverscale.dmm b/_maps/shuttles/pirate_silverscale.dmm index b9a8c5d0843..b2cf5c59be8 100644 --- a/_maps/shuttles/pirate_silverscale.dmm +++ b/_maps/shuttles/pirate_silverscale.dmm @@ -293,7 +293,7 @@ /turf/open/floor/carpet/royalblack, /area/shuttle/pirate) "nh" = ( -/obj/machinery/computer/monitor/secret{ +/obj/machinery/computer/monitor{ dir = 8 }, /turf/open/floor/iron/dark/side{ diff --git a/_maps/shuttles/skyrat/goldeneye_cruiser.dmm b/_maps/shuttles/skyrat/goldeneye_cruiser.dmm index e6ce170b600..4071ca962bf 100644 --- a/_maps/shuttles/skyrat/goldeneye_cruiser.dmm +++ b/_maps/shuttles/skyrat/goldeneye_cruiser.dmm @@ -225,7 +225,7 @@ /turf/open/floor/iron/dark/textured_large, /area/shuttle/syndicate/cruiser/bridge) "dQ" = ( -/obj/machinery/computer/monitor/secret{ +/obj/machinery/computer/monitor{ dir = 8 }, /obj/structure/cable, @@ -1930,7 +1930,7 @@ /turf/open/floor/iron/smooth, /area/shuttle/syndicate/cruiser/brig) "ND" = ( -/obj/machinery/computer/monitor/secret{ +/obj/machinery/computer/monitor{ dir = 4 }, /obj/effect/turf_decal/bot_white, diff --git a/code/game/machinery/computer/apc_control.dm b/code/game/machinery/computer/apc_control.dm index 9fc5b487b12..8d546b45430 100644 --- a/code/game/machinery/computer/apc_control.dm +++ b/code/game/machinery/computer/apc_control.dm @@ -6,7 +6,6 @@ req_access = list(ACCESS_CE) circuit = /obj/item/circuitboard/computer/apc_control light_color = LIGHT_COLOR_YELLOW - var/mob/living/operator //Who's operating the computer right now var/obj/machinery/power/apc/active_apc //The APC we're using right now var/should_log = TRUE var/restoring = FALSE @@ -17,18 +16,10 @@ . = ..() logs = list() -/obj/machinery/computer/apc_control/process() - if(operator && (!operator.Adjacent(src) || machine_stat)) - operator = null - if(active_apc) - if(!active_apc.locked) - active_apc.say("Remote access canceled. Interface locked.") - playsound(active_apc, 'sound/machines/boltsdown.ogg', 25, FALSE) - playsound(active_apc, 'sound/machines/terminal_alert.ogg', 50, FALSE) - active_apc.locked = TRUE - active_apc.update_appearance() - active_apc.remote_control = null - active_apc = null +/obj/machinery/computer/apc_control/on_set_machine_stat(old_value) + . = ..() + if(machine_stat) + disconnect_apc() /obj/machinery/computer/apc_control/attack_ai(mob/user) if(!isAdminGhostAI(user)) @@ -36,12 +27,52 @@ return ..() +/obj/machinery/computer/apc_control/emag_act(mob/user) + if(obj_flags & EMAGGED) + return + obj_flags |= EMAGGED + usr.log_message("emagged [src].", LOG_ATTACK, color="red") + playsound(src, SFX_SPARKS, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + +/obj/machinery/computer/apc_control/proc/log_activity(log_text) + if(!should_log) + return + LAZYADD(logs, "([station_time_timestamp()]): [auth_id] [log_text]") + +/obj/machinery/computer/apc_control/proc/restore_comp(mob/user) + obj_flags &= ~EMAGGED + should_log = TRUE + user.log_message("restored the logs of [src].", LOG_GAME) + log_activity("-=- Logging restored to full functionality at this point -=-") + restoring = FALSE + +/obj/machinery/computer/apc_control/proc/connect_apc(obj/machinery/power/apc/apc, mob/user) + if(isnull(apc)) + return + if(apc.remote_control_user) + to_chat(user, span_warning("\The [apc] is being controlled by someone else!")) + return + if(active_apc) + disconnect_apc() + playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE) + apc.connect_remote_access(user) + user.log_message("remotely accessed [apc] from [src].", LOG_GAME) + log_activity("[auth_id] remotely accessed APC in [get_area_name(apc.area, TRUE)]") + active_apc = apc + +/obj/machinery/computer/apc_control/proc/disconnect_apc() + // check if apc exists and is not controlled by anyone + if(QDELETED(active_apc)) + return + if(active_apc.remote_control_user) + active_apc.disconnect_remote_access() + active_apc = null + /obj/machinery/computer/apc_control/proc/check_apc(obj/machinery/power/apc/APC) return APC.z == z && !APC.malfhack && !APC.aidisabled && !(APC.obj_flags & EMAGGED) && !APC.machine_stat && !istype(APC.area, /area/station/ai_monitored) && !(APC.area.area_flags & NO_ALERTS) /obj/machinery/computer/apc_control/ui_interact(mob/user, datum/tgui/ui) . = ..() - operator = user ui = SStgui.try_update_ui(user, src, ui) if(!ui) ui = new(user, src, "ApcControl") @@ -80,7 +111,7 @@ ) return data -/obj/machinery/computer/apc_control/ui_act(action, params) +/obj/machinery/computer/apc_control/ui_act(action, params, datum/tgui/ui) . = ..() if(.) return @@ -92,6 +123,9 @@ auth_id = "Unknown (Unknown):" log_activity("[auth_id] logged in to the terminal") return + var/mob/living/operator = usr + if(!istype(operator)) + return var/obj/item/card/id/ID = operator.get_idcard(TRUE) if(ID && istype(ID)) if(check_access(ID)) @@ -103,7 +137,7 @@ auth_id = "[ID.registered_name] ([ID.assignment]):" log_activity("[auth_id] attempted to log into the terminal") playsound(src, 'sound/machines/terminal_error.ogg', 50, FALSE) - to_chat(usr, span_warning("ID REJECTED - Access Denied.")) + say("ID rejected, access denied!") return auth_id = "Unknown (Unknown):" log_activity("[auth_id] attempted to log into the terminal") @@ -114,37 +148,15 @@ auth_id = "\[NULL\]" if("toggle-logs") should_log = !should_log - operator.log_message("set the logs of [src] [should_log ? "On" : "Off"].", LOG_GAME) + usr.log_message("set the logs of [src] [should_log ? "On" : "Off"].", LOG_GAME) if("restore-console") restoring = TRUE - addtimer(CALLBACK(src, .proc/restore_comp), rand(3,5) * 9) + addtimer(CALLBACK(src, .proc/restore_comp), rand(3,5) * 9 SECONDS) if("access-apc") var/ref = params["ref"] playsound(src, SFX_TERMINAL_TYPE, 50, FALSE) var/obj/machinery/power/apc/APC = locate(ref) in GLOB.apcs_list - if(!APC) - return - if(active_apc) - to_chat(operator, "[icon2html(src, auth_id)] Disconnected from [active_apc].") - active_apc.say("Remote access canceled. Interface locked.") - playsound(active_apc, 'sound/machines/boltsdown.ogg', 25, FALSE) - playsound(active_apc, 'sound/machines/terminal_alert.ogg', 50, FALSE) - active_apc.locked = TRUE - active_apc.update_appearance() - active_apc.remote_control = null - active_apc = null - APC.remote_control = src - APC.ui_interact(operator) - playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE) - operator.log_message("remotely accessed [APC] from [src].", LOG_GAME) - log_activity("[auth_id] remotely accessed APC in [get_area_name(APC.area, TRUE)]") - if(APC.locked) - APC.say("Remote access detected. Interface unlocked.") - playsound(APC, 'sound/machines/boltsup.ogg', 25, FALSE) - playsound(APC, 'sound/machines/terminal_alert.ogg', 50, FALSE) - APC.locked = FALSE - APC.update_appearance() - active_apc = APC + connect_apc(APC, usr) if("check-logs") log_activity("Checked Logs") if("check-apcs") @@ -179,7 +191,7 @@ if(3) setTo = "Auto On" log_activity("Set APC [target.area.name] [type] to [setTo]") - operator.log_message("set APC [target.area.name] [type] to [setTo]]", LOG_GAME) + usr.log_message("set APC [target.area.name] [type] to [setTo]]", LOG_GAME) if("breaker") var/ref = params["ref"] var/obj/machinery/power/apc/target = locate(ref) in GLOB.apcs_list @@ -187,27 +199,7 @@ var/setTo = target.operating ? "On" : "Off" log_activity("Turned APC [target.area.name]'s breaker [setTo]") -/obj/machinery/computer/apc_control/emag_act(mob/user) - if(obj_flags & EMAGGED) - return - obj_flags |= EMAGGED - usr.log_message("emagged [src].", LOG_ATTACK, color="red") - playsound(src, SFX_SPARKS, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) - -/obj/machinery/computer/apc_control/proc/log_activity(log_text) - if(!should_log) - return - LAZYADD(logs, "([station_time_timestamp()]): [auth_id] [log_text]") - -/obj/machinery/computer/apc_control/proc/restore_comp() - obj_flags &= ~EMAGGED - should_log = TRUE - operator.log_message("restored the logs of [src].", LOG_GAME) - log_activity("-=- Logging restored to full functionality at this point -=-") - restoring = FALSE - -/mob/proc/using_power_flow_console() - for(var/obj/machinery/computer/apc_control/A in range(1, src)) - if(A.operator && A.operator == src && !A.machine_stat) - return TRUE - return +/obj/machinery/computer/apc_control/ui_close(mob/user) + . = ..() + if(active_apc) + disconnect_apc() diff --git a/code/game/objects/items/circuitboards/computer_circuitboards.dm b/code/game/objects/items/circuitboards/computer_circuitboards.dm index 5d0e364d400..011fd851545 100644 --- a/code/game/objects/items/circuitboards/computer_circuitboards.dm +++ b/code/game/objects/items/circuitboards/computer_circuitboards.dm @@ -203,11 +203,6 @@ greyscale_colors = CIRCUIT_COLOR_ENGINEERING build_path = /obj/machinery/computer/monitor -/obj/item/circuitboard/computer/powermonitor/secret - name = "Outdated Power Monitor" //Variant used on ruins to prevent them from showing up on PDA's. - greyscale_colors = CIRCUIT_COLOR_ENGINEERING - build_path = /obj/machinery/computer/monitor/secret - /obj/item/circuitboard/computer/sat_control name = "Satellite Network Control" greyscale_colors = CIRCUIT_COLOR_ENGINEERING diff --git a/code/modules/modular_computers/file_system/programs/powermonitor.dm b/code/modules/modular_computers/file_system/programs/powermonitor.dm index 92969d3355f..c2a47f47a00 100644 --- a/code/modules/modular_computers/file_system/programs/powermonitor.dm +++ b/code/modules/modular_computers/file_system/programs/powermonitor.dm @@ -45,7 +45,7 @@ var/area/A = get_area(computer) //if the computer isn't directly connected to a wire, attempt to find the APC powering it to pull it's powernet instead if(!A) return - var/obj/machinery/power/apc/local_apc = WEAKREF(A.apc) + var/obj/machinery/power/apc/local_apc = A.apc if(!local_apc) return if(!local_apc.terminal) //this really shouldn't happen without badminnery. diff --git a/code/modules/power/apc/apc_attack.dm b/code/modules/power/apc/apc_attack.dm index 36605c3f8b1..2890bd1501a 100644 --- a/code/modules/power/apc/apc_attack.dm +++ b/code/modules/power/apc/apc_attack.dm @@ -289,11 +289,6 @@ return FALSE return TRUE -/obj/machinery/power/apc/can_interact(mob/user) - . = ..() - if(!. && !QDELETED(remote_control)) - . = remote_control.can_interact(user) - /obj/machinery/power/apc/proc/set_broken() if(malfai && operating) malfai.malf_picker.processing_time = clamp(malfai.malf_picker.processing_time - 10,0,1000) diff --git a/code/modules/power/apc/apc_main.dm b/code/modules/power/apc/apc_main.dm index 8e979cb3575..c0744ddaf8c 100644 --- a/code/modules/power/apc/apc_main.dm +++ b/code/modules/power/apc/apc_main.dm @@ -104,7 +104,7 @@ ///Used to stop process from updating the icons too much var/icon_update_needed = FALSE ///Reference to our remote control - var/obj/machinery/computer/apc_control/remote_control = null + var/mob/remote_control_user = null ///Represents a signel source of power alarms for this apc var/datum/alarm_handler/alarm_manager /// Offsets the object by APC_PIXEL_OFFSET (defined in apc_defines.dm) pixels in the direction we want it placed in. This allows the APC to be embedded in a wall, yet still inside an area (like mapping). @@ -268,7 +268,8 @@ "chargingStatus" = charging, "totalLoad" = display_power(lastused_total), "coverLocked" = coverlocked, - "siliconUser" = user.has_unlimited_silicon_privilege || user.using_power_flow_console(), + "remoteAccess" = (user == remote_control_user), + "siliconUser" = user.has_unlimited_silicon_privilege, "malfStatus" = get_malf_status(user), "emergencyLights" = !emergency_lights, "nightshiftLights" = nightshift_lights, @@ -309,9 +310,35 @@ ) return data +/obj/machinery/power/apc/proc/connect_remote_access(mob/remote_user) + if(opened) + return + remote_control_user = remote_user + ui_interact(remote_user) + remote_user.log_message("remotely accessed [src].", LOG_GAME) + say("Remote access detected.[locked ? " Interface unlocked." : ""]") + to_chat(remote_control_user, span_danger("[icon2html(src, remote_control_user)] Connected to [src].")) + if(locked) + playsound(src, 'sound/machines/terminal_on.ogg', 25, FALSE) + locked = FALSE + playsound(src, 'sound/machines/terminal_alert.ogg', 50, FALSE) + update_appearance() + +/obj/machinery/power/apc/proc/disconnect_remote_access() + // nothing to disconnect from + if(isnull(remote_control_user)) + return + locked = TRUE + say("Remote access canceled. Interface locked.") + to_chat(remote_control_user, span_danger("[icon2html(src, remote_control_user)] Disconnected from [src].")) + playsound(src, 'sound/machines/terminal_off.ogg', 25, FALSE) + playsound(src, 'sound/machines/terminal_alert.ogg', 50, FALSE) + update_appearance() + remote_control_user = null + /obj/machinery/power/apc/ui_status(mob/user) . = ..() - if(!QDELETED(remote_control) && user == remote_control.operator) + if(!QDELETED(remote_control_user) && user == remote_control_user) . = UI_INTERACTIVE /obj/machinery/power/apc/ui_act(action, params) @@ -322,7 +349,7 @@ switch(action) if("lock") if(usr.has_unlimited_silicon_privilege) - if((obj_flags & EMAGGED) || (machine_stat & (BROKEN|MAINT))) + if((obj_flags & EMAGGED) || (machine_stat & (BROKEN|MAINT)) || remote_control_user) to_chat(usr, span_warning("The APC does not respond to the command!")) else locked = !locked @@ -384,6 +411,11 @@ CHECK_TICK return TRUE +/obj/machinery/power/apc/ui_close(mob/user) + . = ..() + if(user == remote_control_user) + disconnect_remote_access() + /obj/machinery/power/apc/process() if(icon_update_needed) update_appearance() diff --git a/code/modules/power/apc/apc_tool_act.dm b/code/modules/power/apc/apc_tool_act.dm index e1e71fff6a3..780172428f1 100644 --- a/code/modules/power/apc/apc_tool_act.dm +++ b/code/modules/power/apc/apc_tool_act.dm @@ -215,7 +215,7 @@ else if(machine_stat & (BROKEN|MAINT)) balloon_alert(user, "nothing happens!") else - if(allowed(usr) && !wires.is_cut(WIRE_IDSCAN) && !malfhack) + if(allowed(usr) && !wires.is_cut(WIRE_IDSCAN) && !malfhack && !remote_control_user) locked = !locked balloon_alert(user, "APC [ locked ? "locked" : "unlocked"]") update_appearance() diff --git a/code/modules/power/monitor.dm b/code/modules/power/monitor.dm index 091151fe479..856193d3cda 100644 --- a/code/modules/power/monitor.dm +++ b/code/modules/power/monitor.dm @@ -10,24 +10,13 @@ circuit = /obj/item/circuitboard/computer/powermonitor tgui_id = "PowerMonitor" - var/obj/structure/cable/attached_wire - var/obj/machinery/power/apc/local_apc + var/datum/weakref/attached_wire_ref + var/datum/weakref/local_apc_ref var/list/history = list() var/record_size = 60 var/record_interval = 50 var/next_record = 0 - var/is_secret_monitor = FALSE - -/obj/machinery/computer/monitor/secret //Hides the power monitor (such as ones on ruins & CentCom) from PDA's to prevent metagaming. - name = "outdated power monitoring console" - desc = "It monitors power levels across the local powernet." - circuit = /obj/item/circuitboard/computer/powermonitor/secret - is_secret_monitor = TRUE - -/obj/machinery/computer/monitor/secret/examine(mob/user) - . = ..() - . += span_notice("It's operating system seems quite outdated... It doesn't seem like it'd be compatible with the latest remote NTOS monitoring systems.") /obj/machinery/computer/monitor/Initialize(mapload) . = ..() @@ -43,21 +32,24 @@ update_use_power(ACTIVE_POWER_USE) record() -/obj/machinery/computer/monitor/proc/search() //keep in sync with /datum/computer_file/program/power_monitor's version +/obj/machinery/computer/monitor/proc/search() //keep in sync with /obj/machinery/computer/monitor's version var/turf/T = get_turf(src) - attached_wire = locate(/obj/structure/cable) in T - if(attached_wire) + attached_wire_ref = WEAKREF(locate(/obj/structure/cable) in T) + if(attached_wire_ref) return var/area/A = get_area(src) //if the computer isn't directly connected to a wire, attempt to find the APC powering it to pull it's powernet instead if(!A) return - local_apc = A.apc + var/obj/machinery/power/apc/local_apc = A.apc if(!local_apc) return if(!local_apc.terminal) //this really shouldn't happen without badminnery. local_apc = null + local_apc_ref = WEAKREF(local_apc) -/obj/machinery/computer/monitor/proc/get_powernet() //keep in sync with /datum/computer_file/program/power_monitor's version +/obj/machinery/computer/monitor/proc/get_powernet() //keep in sync with /datum/computer_file/program/power_monitor's version //np + var/obj/structure/cable/attached_wire = attached_wire_ref?.resolve() + var/obj/machinery/power/apc/local_apc = local_apc_ref?.resolve() if(attached_wire || (local_apc?.terminal)) return attached_wire ? attached_wire.powernet : local_apc.terminal.powernet return FALSE diff --git a/tgui/packages/tgui/interfaces/Apc.js b/tgui/packages/tgui/interfaces/Apc.js index baf818edcbc..4802d1966f9 100644 --- a/tgui/packages/tgui/interfaces/Apc.js +++ b/tgui/packages/tgui/interfaces/Apc.js @@ -83,7 +83,10 @@ const ApcContent = (props, context) => { } return ( <> - +
{ const { data } = useBackend(context); return ( - {data.authenticated === 1 && } - {data.authenticated === 0 && } + + {data.authenticated === 1 && } + {data.authenticated === 0 && } + ); }; @@ -21,14 +23,15 @@ const ApcLoggedOut = (props, context) => { const { emagged } = data; const text = emagged === 1 ? 'Open' : 'Log In'; return ( - +
); }; @@ -37,7 +40,7 @@ const ApcLoggedIn = (props, context) => { const { restoring } = data; const [tabIndex, setTabIndex] = useLocalState(context, 'tab-index', 1); return ( - <> + { )} {tabIndex === 1 && ( - <> - - - + + +
+ +
+ + +
- - - +
+ + )} {tabIndex === 2 && ( - - +
+ - - + +
)} - + ); }; @@ -89,11 +96,11 @@ const ControlPanel = (props, context) => { const [sortByField, setSortByField] = useLocalState( context, 'sortByField', - null + 'name' ); return ( - - + + Sort by: @@ -112,9 +119,9 @@ const ControlPanel = (props, context) => { content="Draw" onClick={() => setSortByField(sortByField !== 'draw' && 'draw')} /> - - - + + + {emagged === 1 && ( <>