From 1d5c52ddf8bf37c32bd52d6dc46ef828b9b8409a Mon Sep 17 00:00:00 2001 From: Poojawa Date: Tue, 11 Sep 2018 12:01:21 -0500 Subject: [PATCH] shit ain't pretty, but whatever cleaned --- _maps/map_files/BoxStation/BoxStation.dmm | 463 +++++++-------- .../map_files/Deltastation/DeltaStation2.dmm | 516 +++++----------- _maps/map_files/MetaStation/MetaStation.dmm | 560 ++++++++---------- _maps/map_files/OmegaStation/OmegaStation.dmm | 107 ++-- _maps/map_files/PubbyStation/PubbyStation.dmm | 283 +++------ 5 files changed, 737 insertions(+), 1192 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index ebfa70b48a..2d27e73283 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -163,17 +163,17 @@ /turf/open/floor/plating, /area/security/prison) "aat" = ( -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "aau" = ( /obj/machinery/biogenerator, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "aav" = ( /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "aaw" = ( /obj/machinery/light{ @@ -194,7 +194,7 @@ /area/security/prison) "aaA" = ( /obj/machinery/seed_extractor, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "aaB" = ( /obj/structure/window/reinforced, @@ -250,18 +250,18 @@ /obj/machinery/light{ dir = 4 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "aaH" = ( /turf/open/floor/plating/airless, /area/space/nearstation) "aaI" = ( /obj/structure/bookcase, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "aaJ" = ( /obj/structure/chair/stool, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "aaK" = ( /obj/machinery/washing_machine, @@ -297,7 +297,7 @@ /obj/machinery/newscaster{ pixel_x = -32 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "aaN" = ( /obj/structure/table, @@ -351,7 +351,7 @@ /area/space/nearstation) "aaU" = ( /obj/machinery/computer/arcade, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "aaV" = ( /obj/structure/table, @@ -422,7 +422,7 @@ /area/security/execution/transfer) "abf" = ( /obj/machinery/vending/sustenance, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "abg" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -432,7 +432,7 @@ /area/security/execution/transfer) "abh" = ( /obj/machinery/holopad, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "abi" = ( /obj/machinery/shower{ @@ -561,43 +561,37 @@ /area/security/execution/transfer) "abx" = ( /obj/machinery/vending/cola/random, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "aby" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall/r_wall, /area/security/execution/transfer) -"abz" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel/floorgrime, -/area/security/prison) "abA" = ( /obj/machinery/light, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "abB" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 10 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "abC" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "abD" = ( /obj/machinery/light, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "abE" = ( /obj/structure/cable{ @@ -606,7 +600,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "abF" = ( /turf/open/floor/plasteel/freezer, @@ -738,7 +732,7 @@ specialfunctions = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "abL" = ( /obj/structure/chair/stool, @@ -755,13 +749,13 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 8 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "abM" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 8 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "abN" = ( /obj/structure/closet/secure_closet/lethalshots, @@ -901,7 +895,7 @@ name = "Cell 3" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "acf" = ( /obj/machinery/door/poddoor/preopen{ @@ -914,7 +908,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/mapping_helpers/airlock/cyclelink_helper, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "acg" = ( /obj/structure/cable{ @@ -930,7 +924,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/mapping_helpers/airlock/cyclelink_helper, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "ach" = ( /obj/machinery/door/airlock{ @@ -1079,7 +1073,7 @@ pixel_y = 24; prison_radio = 1 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "acD" = ( /obj/structure/chair/stool, @@ -1094,7 +1088,7 @@ specialfunctions = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "acE" = ( /obj/structure/bed, @@ -1109,14 +1103,14 @@ pixel_y = 24; prison_radio = 1 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "acF" = ( /turf/open/floor/plasteel, /area/ai_monitored/security/armory) "acG" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "acH" = ( /obj/structure/bed, @@ -1131,7 +1125,7 @@ pixel_y = 24; prison_radio = 1 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "acI" = ( /obj/machinery/door/poddoor/preopen{ @@ -1162,7 +1156,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "acK" = ( /obj/structure/sink{ @@ -1298,7 +1292,7 @@ /obj/item/paper, /obj/item/pen, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "acZ" = ( /obj/effect/spawner/structure/window/reinforced, @@ -1315,13 +1309,13 @@ id = "PCell 3"; pixel_x = -28 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "adb" = ( /obj/structure/table, /obj/item/paper, /obj/item/pen, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "adc" = ( /obj/machinery/flasher{ @@ -1331,7 +1325,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "add" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, @@ -1339,7 +1333,7 @@ id = "PCell 2"; pixel_x = -28 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "ade" = ( /obj/structure/cable{ @@ -1348,7 +1342,7 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 4 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "adf" = ( /obj/structure/toilet{ @@ -1622,7 +1616,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "adI" = ( /obj/machinery/door/airlock/security/glass{ @@ -1633,7 +1627,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "adJ" = ( /obj/machinery/door/airlock/security/glass{ @@ -1647,7 +1641,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "adK" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, @@ -1691,7 +1685,7 @@ "adO" = ( /obj/structure/chair/stool, /obj/effect/landmark/event_spawn, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "adP" = ( /obj/structure/cable{ @@ -5094,7 +5088,7 @@ /area/security/courtroom) "akz" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/brig) "akA" = ( /obj/structure/chair{ @@ -5399,7 +5393,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 1 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/brig) "alg" = ( /obj/structure/cable{ @@ -5496,7 +5490,7 @@ pixel_y = -2; prison_radio = 1 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/brig) "alw" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ @@ -5505,10 +5499,7 @@ /obj/machinery/light/small{ dir = 4 }, -/turf/open/floor/plasteel/floorgrime, -/area/security/brig) -"alx" = ( -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/brig) "aly" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ @@ -5522,7 +5513,7 @@ pixel_y = -2; prison_radio = 1 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/brig) "alz" = ( /obj/machinery/button/door{ @@ -5590,7 +5581,7 @@ /obj/machinery/light/small{ dir = 4 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/brig) "alF" = ( /obj/machinery/atmospherics/components/unary/tank/air{ @@ -5761,14 +5752,14 @@ id = "Cell 1"; pixel_x = -28 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/brig) "amg" = ( /obj/structure/closet/secure_closet/brig{ id = "Cell 1"; name = "Cell 1 Locker" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/brig) "amh" = ( /obj/structure/bed, @@ -5777,14 +5768,14 @@ id = "Cell 2"; pixel_x = -28 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/brig) "ami" = ( /obj/structure/closet/secure_closet/brig{ id = "Cell 2"; name = "Cell 2 Locker" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/brig) "amj" = ( /obj/structure/bed, @@ -5793,14 +5784,14 @@ id = "Cell 3"; pixel_x = -28 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/brig) "amk" = ( /obj/structure/closet/secure_closet/brig{ id = "Cell 3"; name = "Cell 3 Locker" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/brig) "aml" = ( /obj/machinery/light/small{ @@ -5868,7 +5859,7 @@ id = "Cell 4"; name = "Cell 4 Locker" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/brig) "amq" = ( /obj/structure/bed, @@ -5881,7 +5872,7 @@ pixel_y = -2; prison_radio = 1 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/brig) "amr" = ( /obj/effect/spawner/structure/window/reinforced, @@ -7205,14 +7196,14 @@ lootcount = 2; name = "2maintenance loot spawner" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/port/fore) "apM" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible, /obj/machinery/light/small{ dir = 1 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/port/fore) "apN" = ( /turf/open/floor/plating, @@ -7540,7 +7531,7 @@ /area/maintenance/port/fore) "aqK" = ( /obj/structure/chair/stool, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/port/fore) "aqL" = ( /obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ @@ -8597,11 +8588,11 @@ /obj/item/stack/sheet/mineral/plasma{ amount = 10 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/department/electrical) "atD" = ( /obj/machinery/recharge_station, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/department/electrical) "atE" = ( /obj/machinery/power/port_gen/pacman, @@ -9016,13 +9007,13 @@ /turf/open/floor/plating, /area/maintenance/department/electrical) "auJ" = ( -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/department/electrical) "auK" = ( /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/department/electrical) "auL" = ( /obj/structure/cable{ @@ -9031,7 +9022,7 @@ /obj/structure/cable{ icon_state = "1-4" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/department/electrical) "auM" = ( /obj/structure/extinguisher_cabinet{ @@ -9040,7 +9031,7 @@ /obj/structure/cable{ icon_state = "1-8" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/department/electrical) "auO" = ( /obj/structure/closet/emcloset, @@ -9496,7 +9487,7 @@ name = "Station Intercom (General)"; pixel_x = 29 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/department/electrical) "avP" = ( /obj/structure/sign/warning/pods, @@ -9799,7 +9790,7 @@ /area/crew_quarters/dorms) "aww" = ( /obj/effect/landmark/event_spawn, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/brig) "awx" = ( /obj/structure/cable{ @@ -9996,7 +9987,7 @@ pixel_x = -8; pixel_y = 4 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/department/electrical) "awV" = ( /obj/effect/turf_decal/stripes/line{ @@ -13815,6 +13806,7 @@ /area/ai_monitored/nuke_storage) "aGb" = ( /obj/effect/turf_decal/bot_white/right, +/obj/machinery/ore_silo, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -18920,11 +18912,11 @@ /turf/open/floor/plasteel, /area/bridge) "aSF" = ( -/mob/living/carbon/monkey/punpun, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ dir = 1 }, +/mob/living/carbon/monkey/punpun, /turf/open/floor/plasteel, /area/crew_quarters/bar) "aSG" = ( @@ -20877,7 +20869,7 @@ /obj/machinery/computer/security/telescreen/entertainment{ pixel_x = 32 }, -/obj/item/book/manual/barman_recipes, +/obj/item/book/manual/wiki/barman_recipes, /obj/item/reagent_containers/glass/rag, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ @@ -21419,7 +21411,7 @@ /turf/closed/wall/r_wall, /area/ai_monitored/turret_protected/ai_upload) "aYy" = ( -/obj/machinery/ai_status_display, +/obj/machinery/status_display/ai, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -21777,7 +21769,7 @@ maxcharge = 2000 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "aZq" = ( /obj/machinery/button/door{ @@ -21907,7 +21899,7 @@ /obj/structure/rack, /obj/item/stack/sheet/cardboard, /obj/item/stack/rods/fifty, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "aZJ" = ( /obj/structure/table/wood, @@ -22162,7 +22154,7 @@ /turf/open/floor/plasteel, /area/hydroponics) "baq" = ( -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_y = 32 }, /obj/structure/cable{ @@ -22366,7 +22358,7 @@ /turf/open/floor/plasteel, /area/hallway/primary/starboard) "baS" = ( -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "baT" = ( /obj/structure/cable{ @@ -22405,7 +22397,7 @@ "baY" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/closet/crate, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "baZ" = ( /obj/machinery/status_display{ @@ -22558,7 +22550,7 @@ "bbt" = ( /obj/structure/closet/crate, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "bbu" = ( /obj/machinery/power/apc{ @@ -22723,7 +22715,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "bbQ" = ( /obj/structure/table/wood, @@ -22741,7 +22733,7 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "bbT" = ( /obj/structure/table/wood, @@ -22998,13 +22990,13 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "bcF" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 8 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "bcG" = ( /obj/structure/table/wood, @@ -23026,7 +23018,7 @@ dir = 8 }, /obj/structure/closet/crate/freezer, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "bcK" = ( /obj/structure/rack, @@ -23077,7 +23069,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "bcS" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -23087,7 +23079,7 @@ /obj/machinery/light/small{ dir = 4 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "bcT" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -23477,7 +23469,7 @@ /area/maintenance/port) "bdS" = ( /obj/structure/closet/crate/internals, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "bdT" = ( /obj/machinery/power/apc{ @@ -23496,7 +23488,7 @@ /area/maintenance/port) "bdU" = ( /obj/structure/closet/crate/medical, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "bdW" = ( /obj/item/clothing/gloves/color/rainbow, @@ -23754,7 +23746,7 @@ dir = 6 }, /obj/structure/closet/crate, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "bey" = ( /turf/open/floor/plasteel/white/corner{ @@ -23796,7 +23788,7 @@ dir = 9 }, /obj/structure/closet/crate, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "beE" = ( /obj/machinery/light, @@ -24044,7 +24036,7 @@ "bfg" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/item/stack/sheet/cardboard, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "bfh" = ( /obj/structure/disposalpipe/segment{ @@ -24055,7 +24047,7 @@ /area/maintenance/port) "bfi" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "bfj" = ( /obj/structure/disposalpipe/trunk, @@ -24141,7 +24133,7 @@ /turf/closed/wall/r_wall, /area/ai_monitored/turret_protected/ai_upload) "bft" = ( -/obj/machinery/ai_status_display, +/obj/machinery/status_display/ai, /turf/closed/wall/r_wall, /area/ai_monitored/turret_protected/ai_upload) "bfu" = ( @@ -24529,7 +24521,7 @@ /area/quartermaster/office) "bgA" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "bgB" = ( /obj/structure/disposalpipe/segment{ @@ -25177,7 +25169,7 @@ /obj/machinery/door/window/eastleft{ dir = 4; icon_state = "right"; - name = "Mail"; + name = "Incoming Mail"; req_access_txt = "50" }, /turf/open/floor/plating, @@ -25520,7 +25512,7 @@ req_access_txt = "29" }, /obj/structure/table, -/obj/item/book/manual/robotics_cyborgs{ +/obj/item/book/manual/wiki/robotics_cyborgs{ pixel_x = 2; pixel_y = 5 }, @@ -25771,9 +25763,6 @@ /obj/structure/table, /obj/machinery/cell_charger, /obj/item/radio/intercom{ - broadcasting = 0; - listening = 1; - name = "Station Intercom (General)"; pixel_y = 20 }, /turf/open/floor/plasteel, @@ -25812,9 +25801,6 @@ "bju" = ( /obj/machinery/photocopier, /obj/item/radio/intercom{ - broadcasting = 0; - listening = 1; - name = "Station Intercom (General)"; pixel_y = 20 }, /turf/open/floor/plasteel, @@ -26224,9 +26210,8 @@ /turf/open/floor/plasteel, /area/quartermaster/office) "bkx" = ( -/obj/machinery/status_display{ - pixel_y = 2; - supply_display = 1 +/obj/machinery/status_display/supply{ + pixel_y = 2 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -27042,7 +27027,8 @@ /area/quartermaster/sorting) "bml" = ( /obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plasteel/floorgrime, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, /area/quartermaster/office) "bmm" = ( /obj/structure/cable{ @@ -27056,12 +27042,13 @@ dir = 8 }, /obj/machinery/door/firedoor, -/obj/machinery/status_display{ - pixel_x = -32 - }, /obj/effect/turf_decal/tile/brown{ dir = 8 }, +/obj/machinery/status_display/supply{ + pixel_x = -28; + pixel_y = 2 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "bmo" = ( @@ -31082,7 +31069,7 @@ pixel_y = 24 }, /obj/structure/table, -/obj/item/book/manual/medical_cloning{ +/obj/item/book/manual/wiki/medical_cloning{ pixel_y = 6 }, /turf/open/floor/plasteel/white, @@ -31337,10 +31324,7 @@ id = "QMLoad" }, /obj/machinery/light, -/obj/machinery/status_display{ - pixel_y = -30; - supply_display = 1 - }, +/obj/machinery/status_display/supply, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -31987,7 +31971,7 @@ "bxq" = ( /obj/structure/table, /obj/item/clipboard, -/obj/item/book/manual/experimentor, +/obj/item/book/manual/wiki/experimentor, /turf/open/floor/plasteel/white/corner{ dir = 4 }, @@ -32152,7 +32136,7 @@ /turf/closed/wall, /area/engine/gravity_generator) "bxI" = ( -/obj/machinery/ai_status_display, +/obj/machinery/status_display/ai, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 10 }, @@ -33607,10 +33591,7 @@ name = "Station Intercom (General)"; pixel_y = -35 }, -/obj/machinery/status_display{ - pixel_x = -32; - supply_display = 1 - }, +/obj/machinery/status_display/supply /obj/machinery/computer/security/qm{ dir = 4 }, @@ -34583,7 +34564,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/science/storage) "bCY" = ( /obj/effect/turf_decal/tile/blue{ @@ -34648,7 +34629,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/science/storage) "bDg" = ( /obj/structure/rack, @@ -34673,7 +34654,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/science/storage) "bDk" = ( /obj/structure/table, @@ -34784,7 +34765,7 @@ }, /obj/item/assembly/flash/handheld, /obj/item/assembly/flash/handheld, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_x = -32 }, /turf/open/floor/plating, @@ -35026,7 +35007,7 @@ icon_state = "4-8" }, /obj/effect/landmark/xeno_spawn, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/science/storage) "bDZ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -35047,13 +35028,13 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/science/storage) "bEc" = ( /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/science/storage) "bEd" = ( /obj/structure/disposalpipe/segment{ @@ -35096,7 +35077,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/science/storage) "bEh" = ( /obj/structure/table/glass, @@ -35120,13 +35101,13 @@ /obj/structure/table/glass, /obj/item/pen, /obj/item/clothing/neck/stethoscope, -/mob/living/simple_animal/pet/cat/Runtime, /obj/effect/turf_decal/tile/blue{ dir = 4 }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/mob/living/simple_animal/pet/cat/Runtime, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/heads/cmo) "bEk" = ( @@ -35796,7 +35777,7 @@ /obj/machinery/light/small{ dir = 8 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/science/storage) "bFJ" = ( /obj/structure/bed, @@ -36325,7 +36306,7 @@ /area/medical/medbay/central) "bGY" = ( /obj/machinery/portable_atmospherics/scrubber/huge, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/science/storage) "bGZ" = ( /obj/machinery/holopad, @@ -36388,7 +36369,7 @@ dir = 4; network = list("ss13","rd") }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/science/storage) "bHf" = ( /obj/structure/disposalpipe/segment, @@ -37044,7 +37025,7 @@ /turf/open/floor/plasteel, /area/science/storage) "bIC" = ( -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/science/storage) "bID" = ( /obj/structure/disposalpipe/segment{ @@ -39153,7 +39134,6 @@ "bNH" = ( /obj/structure/table/reinforced, /obj/item/radio/intercom{ - name = "Station Intercom (General)"; pixel_y = -26 }, /obj/item/paper_bin{ @@ -39279,7 +39259,7 @@ /area/medical/virology) "bNX" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/science/misc_lab) "bNY" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -39470,7 +39450,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/science/misc_lab) "bOz" = ( /obj/structure/chair/stool, @@ -40559,9 +40539,6 @@ }, /turf/open/floor/engine, /area/science/misc_lab) -"bQX" = ( -/turf/open/floor/plasteel/floorgrime, -/area/science/misc_lab) "bQY" = ( /obj/structure/table/reinforced, /obj/item/integrated_circuit_printer, @@ -41015,7 +40992,7 @@ /area/science/misc_lab) "bSf" = ( /obj/structure/chair/stool, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/science/misc_lab) "bSg" = ( /obj/machinery/atmospherics/pipe/manifold/general/visible{ @@ -41442,7 +41419,7 @@ pixel_y = -30 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/science/misc_lab) "bTg" = ( /obj/structure/cable{ @@ -41870,7 +41847,7 @@ /obj/machinery/light{ dir = 8 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/science/misc_lab) "bUk" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ @@ -42296,7 +42273,7 @@ /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 4 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/science/misc_lab) "bVm" = ( /obj/structure/cable{ @@ -42312,7 +42289,7 @@ dir = 4 }, /obj/machinery/meter, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/science/misc_lab) "bVo" = ( /obj/effect/spawner/structure/window/reinforced, @@ -42694,18 +42671,18 @@ /obj/item/radio/intercom{ pixel_x = -25 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/science/misc_lab) "bWp" = ( /obj/structure/chair/office/light, /obj/effect/landmark/start/scientist, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/science/misc_lab) "bWq" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 2 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/science/misc_lab) "bWr" = ( /turf/open/floor/plasteel, @@ -42750,7 +42727,7 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "bWy" = ( -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/port/aft) "bWz" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ @@ -43066,7 +43043,7 @@ /area/science/xenobiology) "bXh" = ( /obj/structure/filingcabinet/chestdrawer, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/science/misc_lab) "bXi" = ( /obj/structure/table, @@ -43074,7 +43051,7 @@ /obj/item/folder/white, /obj/item/pen, /obj/item/taperecorder, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/science/misc_lab) "bXj" = ( /obj/structure/table, @@ -43091,7 +43068,7 @@ pixel_y = 2; req_access_txt = "55" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/science/misc_lab) "bXk" = ( /obj/machinery/navbeacon{ @@ -43117,7 +43094,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/science/misc_lab) "bXm" = ( /obj/structure/cable{ @@ -43202,15 +43179,15 @@ /area/maintenance/port/aft) "bXw" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/port/aft) "bXx" = ( /obj/effect/landmark/blobstart, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/port/aft) "bXy" = ( /obj/machinery/atmospherics/pipe/simple/general/visible, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/port/aft) "bXz" = ( /obj/machinery/telecomms/processor/preset_four, @@ -43615,19 +43592,19 @@ dir = 8; name = "Mix to Space" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/port/aft) "bYw" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 4 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/port/aft) "bYx" = ( /obj/machinery/atmospherics/pipe/manifold/general/visible{ dir = 4 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/port/aft) "bYy" = ( /obj/machinery/door/airlock/maintenance/abandoned{ @@ -44752,7 +44729,7 @@ icon_state = "0-8" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/science/misc_lab) "cbe" = ( /obj/structure/table/reinforced, @@ -44877,7 +44854,6 @@ /obj/structure/filingcabinet/chestdrawer, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/mob/living/simple_animal/parrot/Poly, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -44888,6 +44864,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/mob/living/simple_animal/parrot/Poly, /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/chief) "cbr" = ( @@ -45552,20 +45529,12 @@ dir = 2 }, /area/science/misc_lab) -"ccS" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/floorgrime, -/area/science/misc_lab) "ccT" = ( /obj/machinery/light{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/science/misc_lab) "ccU" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -46725,7 +46694,7 @@ pixel_y = 26 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "cga" = ( /obj/machinery/power/smes{ @@ -47206,21 +47175,21 @@ /obj/machinery/atmospherics/components/unary/tank/toxins{ dir = 4 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "chi" = ( /obj/machinery/atmospherics/pipe/manifold4w/general{ level = 2 }, /obj/machinery/meter, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "chj" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 4; name = "plasma tank pump" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "chk" = ( /obj/machinery/atmospherics/pipe/simple/yellow/visible, @@ -47234,7 +47203,7 @@ dir = 2; name = "atmospherics mix pump" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "chm" = ( /obj/machinery/power/terminal{ @@ -47247,7 +47216,7 @@ /obj/structure/cable/yellow{ icon_state = "0-8" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "chn" = ( /obj/structure/disposalpipe/segment, @@ -47257,7 +47226,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 10 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "cho" = ( /obj/machinery/light, @@ -47787,26 +47756,26 @@ name = "input gas connector port" }, /obj/machinery/portable_atmospherics/canister/oxygen, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "ciz" = ( /obj/machinery/atmospherics/pipe/manifold/general/visible{ dir = 4 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "ciA" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 4; name = "input port pump" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "ciB" = ( /obj/effect/decal/cleanable/cobweb, /obj/structure/reagent_dispensers/watertank, /obj/item/extinguisher, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "ciC" = ( /obj/structure/lattice, @@ -47823,7 +47792,7 @@ /obj/structure/sign/warning/nosmoking{ pixel_x = 28 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "ciE" = ( /obj/structure/cable/yellow{ @@ -47831,7 +47800,7 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "ciF" = ( /obj/structure/table, @@ -48158,29 +48127,29 @@ }, /obj/structure/reagent_dispensers/fueltank, /obj/item/storage/toolbox/emergency, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "cjq" = ( /obj/machinery/atmospherics/components/binary/valve{ name = "Mix to Space" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "cjr" = ( -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "cjs" = ( /obj/machinery/atmospherics/pipe/simple/general/visible, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "cjt" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "cju" = ( /obj/machinery/atmospherics/components/binary/pump{ @@ -48193,7 +48162,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "cjv" = ( /obj/structure/cable/yellow{ @@ -48206,7 +48175,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "cjw" = ( /obj/structure/disposalpipe/segment{ @@ -48484,7 +48453,7 @@ /area/engine/atmos) "cke" = ( /obj/structure/chair/stool, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "ckf" = ( /obj/effect/spawner/structure/window/reinforced, @@ -48495,28 +48464,28 @@ dir = 8 }, /obj/machinery/meter, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "ckh" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 8; name = "Mix to MiniSat" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "cki" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "ckj" = ( /obj/item/cigbutt, /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 10 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "ckk" = ( /obj/structure/cable/yellow{ @@ -48527,7 +48496,7 @@ name = "Incinerator to Space" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "ckl" = ( /obj/machinery/portable_atmospherics/canister, @@ -48742,7 +48711,7 @@ /area/crew_quarters/heads/chief) "ckQ" = ( /obj/structure/closet/cardboard, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "ckS" = ( /obj/structure/closet/cardboard, @@ -48814,20 +48783,20 @@ dir = 4; name = "Mix to Incinerator" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "cle" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 2 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "clf" = ( /obj/machinery/light{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/general/visible, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "clg" = ( /obj/item/radio/intercom{ @@ -48851,7 +48820,7 @@ dir = 1; id = "incineratorturbine" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "cli" = ( /obj/machinery/button/door/incinerator_vent_atmos_aux{ @@ -48866,14 +48835,14 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/general/visible, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "clj" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "clk" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ @@ -49606,15 +49575,6 @@ }, /turf/open/floor/plasteel/dark, /area/engine/engine_smes) -"cno" = ( -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/machinery/power/smes/engineering, -/turf/open/floor/plasteel/vault{ - dir = 4 - }, -/area/engine/engine_smes) "cnp" = ( /obj/structure/cable{ icon_state = "1-8" @@ -49629,15 +49589,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /turf/open/floor/plasteel/dark, /area/engine/engine_smes) -"cnq" = ( -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/machinery/power/smes/engineering, -/turf/open/floor/plasteel/vault{ - dir = 1 - }, -/area/engine/engine_smes) "cnr" = ( /obj/machinery/door/window/southleft{ base_state = "left"; @@ -51274,7 +51225,7 @@ dir = 1; pixel_y = -30 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "csr" = ( /obj/machinery/button/ignition{ @@ -51286,7 +51237,7 @@ dir = 4 }, /obj/machinery/meter, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "css" = ( /obj/structure/lattice/catwalk, @@ -51892,7 +51843,7 @@ /turf/closed/wall/r_wall, /area/ai_monitored/turret_protected/aisat/service) "cug" = ( -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_y = -32 }, /obj/structure/table, @@ -52388,15 +52339,15 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, -/mob/living/simple_animal/bot/floorbot, /obj/effect/turf_decal/tile/blue, +/mob/living/simple_animal/bot/floorbot, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat/atmos) "cva" = ( /turf/closed/wall/r_wall, /area/ai_monitored/turret_protected/ai) "cvb" = ( -/obj/machinery/ai_status_display, +/obj/machinery/status_display/ai, /turf/closed/wall/r_wall, /area/ai_monitored/turret_protected/ai) "cvc" = ( @@ -52459,10 +52410,10 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, -/mob/living/simple_animal/bot/cleanbot, /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/mob/living/simple_animal/bot/cleanbot, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat/service) "cvh" = ( @@ -53040,7 +52991,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_x = 32 }, /turf/open/floor/circuit, @@ -54056,7 +54007,7 @@ "cBi" = ( /obj/effect/landmark/event_spawn, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "cBj" = ( /obj/structure/table, @@ -54116,7 +54067,7 @@ /turf/open/floor/plasteel/white, /area/science/explab) "cBu" = ( -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_y = 32 }, /obj/effect/landmark/event_spawn, @@ -54868,7 +54819,7 @@ /turf/open/floor/engine, /area/engine/engineering) "cEf" = ( -/obj/machinery/ai_status_display, +/obj/machinery/status_display/ai, /turf/closed/wall/r_wall, /area/engine/supermatter) "cEg" = ( @@ -56701,7 +56652,7 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 8 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "eRz" = ( /obj/structure/lattice, @@ -57289,10 +57240,6 @@ }, /turf/open/floor/plating, /area/maintenance/disposal) -"pNx" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/floorgrime, -/area/science/misc_lab) "qeQ" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -57321,7 +57268,7 @@ /area/science/circuit) "rfW" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "rmX" = ( /obj/structure/table, @@ -83545,7 +83492,7 @@ aat aat adO aat -abz +aei acd acE add @@ -84333,8 +84280,8 @@ agj auj akl akO -alx -alx +afM +afM amR anw anz @@ -85361,8 +85308,8 @@ aiz ajg akl akR -alx -alx +afM +afM amR anw anz @@ -86390,7 +86337,7 @@ ajI akl akT aww -alx +afM amR anw anz @@ -88702,7 +88649,7 @@ ajf ajK aks akY -alx +afM amp aiX anA @@ -103934,8 +103881,8 @@ bIE bJr bJO bWr -bQX -bQX +bWr +bWr bUk bVn bWq @@ -104190,10 +104137,10 @@ bBD bBD bJo bPK -bQX bWr -bQX -bQX +bWr +bWr +bWr bWr bWp bXi @@ -104451,7 +104398,7 @@ bQS bSf bWr bWr -bQX +bWr bWr bXl caZ @@ -105223,7 +105170,7 @@ bSg bTk bSh bXr -bQX +bWr bOv bYk bYk @@ -105480,7 +105427,7 @@ coT bTm bUn bXr -bQX +bWr bOv bYm bYm @@ -105744,8 +105691,8 @@ bYl caa ckM cbW -ccS -ccS +ceQ +ceQ ceQ cft cgs @@ -105999,7 +105946,7 @@ bOB bPs bYo bSc -pNx +bSc cbd ccT bSc diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index cbd651b3ca..c29d3d7a14 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -3512,7 +3512,7 @@ /turf/open/floor/plasteel, /area/security/checkpoint/customs) "alx" = ( -/obj/machinery/ai_status_display, +/obj/machinery/status_display/ai, /turf/closed/wall, /area/hallway/secondary/entry) "aly" = ( @@ -3822,7 +3822,7 @@ /turf/open/floor/carpet, /area/security/vacantoffice) "amh" = ( -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_x = 32 }, /obj/structure/frame/computer, @@ -4357,7 +4357,7 @@ /obj/machinery/computer/crew{ dir = 4 }, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_x = -32 }, /obj/effect/turf_decal/tile/blue{ @@ -4610,11 +4610,6 @@ }, /turf/open/floor/plasteel, /area/maintenance/starboard/fore) -"anF" = ( -/turf/open/floor/plasteel/vault{ - dir = 8 - }, -/area/engine/atmospherics_engine) "anG" = ( /obj/structure/reflector/double/anchored{ dir = 6 @@ -5291,14 +5286,6 @@ }, /turf/open/floor/plasteel/dark, /area/engine/atmospherics_engine) -"aoJ" = ( -/obj/structure/reflector/double/anchored{ - dir = 10 - }, -/turf/open/floor/plasteel/vault{ - dir = 8 - }, -/area/engine/atmospherics_engine) "aoK" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -5607,7 +5594,7 @@ /obj/machinery/computer/secure_data{ dir = 8 }, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_x = 32 }, /obj/effect/turf_decal/tile/red{ @@ -9656,7 +9643,7 @@ /turf/open/floor/plasteel, /area/engine/atmospherics_engine) "awf" = ( -/obj/machinery/ai_status_display, +/obj/machinery/status_display/ai, /turf/closed/wall/r_wall, /area/engine/supermatter) "awg" = ( @@ -10260,10 +10247,7 @@ /turf/open/floor/plasteel, /area/quartermaster/storage) "axn" = ( -/obj/machinery/status_display{ - name = "cargo display"; - supply_display = 1 - }, +/obj/machinery/status_display/supply, /turf/closed/wall, /area/quartermaster/storage) "axo" = ( @@ -10633,10 +10617,6 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, /obj/effect/landmark/event_spawn, -/mob/living/simple_animal/hostile/lizard{ - name = "Eats-The-Roaches"; - real_name = "Wags-His-Tail" - }, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -10647,6 +10627,10 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/mob/living/simple_animal/hostile/lizard{ + name = "Eats-The-Roaches"; + real_name = "Wags-His-Tail" + }, /turf/open/floor/plasteel, /area/janitor) "axY" = ( @@ -14452,7 +14436,7 @@ pixel_y = 32; receive_ore_updates = 1 }, -/obj/item/book/manual/barman_recipes, +/obj/item/book/manual/wiki/barman_recipes, /obj/item/reagent_containers/food/drinks/shaker, /obj/item/reagent_containers/glass/rag, /obj/effect/turf_decal/tile/neutral{ @@ -15314,7 +15298,7 @@ /turf/open/floor/plasteel, /area/security/checkpoint/supply) "aGw" = ( -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_y = 32 }, /obj/machinery/firealarm{ @@ -15557,10 +15541,10 @@ }, /obj/item/reagent_containers/glass/bucket, /obj/effect/decal/cleanable/dirt, -/mob/living/simple_animal/mouse, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, +/mob/living/simple_animal/mouse, /turf/open/floor/plasteel, /area/security/prison) "aGL" = ( @@ -18162,7 +18146,7 @@ icon_state = "0-4" }, /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_x = -32 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -18788,7 +18772,7 @@ }, /obj/item/soap/nanotrasen, /obj/machinery/atmospherics/components/unary/vent_pump/on, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "aMd" = ( /obj/structure/table, @@ -18948,7 +18932,7 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/structure/weightlifter, +/obj/structure/weightmachine/weightlifter, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating{ icon_state = "platingdmg3" @@ -19567,7 +19551,7 @@ /obj/structure/sign/poster/official/cleanliness{ pixel_y = 32 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "aNz" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -19581,7 +19565,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/mob/living/simple_animal/mouse, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -19592,6 +19575,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/mob/living/simple_animal/mouse, /turf/open/floor/plasteel, /area/security/prison) "aNB" = ( @@ -20000,14 +19984,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/engine/atmos) -"aOg" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 4 - }, -/turf/open/floor/plasteel/vault{ - dir = 6 - }, -/area/engine/atmos) "aOh" = ( /obj/machinery/status_display{ pixel_y = 32 @@ -20030,12 +20006,6 @@ }, /turf/open/floor/plasteel/dark, /area/engine/atmos) -"aOi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 4 - }, -/turf/open/floor/plasteel/vault, -/area/engine/atmos) "aOj" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 4 @@ -21047,12 +21017,6 @@ }, /turf/open/floor/plasteel/checker, /area/engine/atmos) -"aPK" = ( -/obj/item/twohanded/required/kirbyplants/random, -/turf/open/floor/plasteel/vault{ - dir = 8 - }, -/area/engine/atmos) "aPL" = ( /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, @@ -21214,11 +21178,6 @@ }, /turf/open/floor/plasteel/dark, /area/engine/atmos) -"aPV" = ( -/turf/open/floor/plasteel/vault{ - dir = 5 - }, -/area/engine/atmos) "aPW" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -21751,10 +21710,7 @@ /turf/open/floor/plasteel, /area/quartermaster/storage) "aQO" = ( -/obj/machinery/status_display{ - name = "cargo display"; - supply_display = 1 - }, +/obj/machinery/status_display/supply /turf/closed/wall, /area/quartermaster/qm) "aQP" = ( @@ -23764,7 +23720,7 @@ /area/quartermaster/office) "aTT" = ( /obj/machinery/photocopier, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_y = 32 }, /obj/effect/turf_decal/tile/brown{ @@ -25366,7 +25322,6 @@ /obj/structure/cable/white{ icon_state = "4-8" }, -/mob/living/simple_animal/sloth/citrus, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -25377,6 +25332,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/mob/living/simple_animal/sloth/citrus, /turf/open/floor/plasteel, /area/quartermaster/qm) "aVU" = ( @@ -25489,7 +25445,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_x = 32 }, /obj/effect/turf_decal/tile/brown, @@ -25891,7 +25847,7 @@ /turf/open/floor/plasteel, /area/engine/atmos) "aWG" = ( -/obj/machinery/ai_status_display, +/obj/machinery/status_display/ai, /turf/closed/wall, /area/engine/atmos) "aWH" = ( @@ -26000,14 +25956,6 @@ }, /turf/open/floor/plasteel/white/corner, /area/engine/atmos) -"aWQ" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4 - }, -/turf/open/floor/plasteel/vault{ - dir = 5 - }, -/area/engine/atmos) "aWR" = ( /obj/machinery/meter{ name = "Mixed Air Tank In" @@ -26673,7 +26621,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "aXO" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -26690,7 +26638,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "aXQ" = ( /obj/machinery/door/airlock/security/glass{ @@ -26701,7 +26649,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "aXR" = ( /obj/structure/cable/white{ @@ -27470,7 +27418,7 @@ /turf/open/floor/plasteel, /area/quartermaster/storage) "aYW" = ( -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_y = -32 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -29703,7 +29651,7 @@ /obj/structure/closet/secure_closet/brig{ name = "Prisoner Locker" }, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_y = -32 }, /obj/machinery/light/small{ @@ -30994,7 +30942,6 @@ /area/crew_quarters/kitchen) "bfe" = ( /obj/machinery/deepfryer, -/mob/living/carbon/monkey/punpun, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -31005,6 +30952,7 @@ /obj/effect/turf_decal/tile/red{ dir = 8 }, +/mob/living/carbon/monkey/punpun, /turf/open/floor/plasteel, /area/crew_quarters/kitchen) "bff" = ( @@ -35482,7 +35430,7 @@ /turf/open/floor/plasteel/grimy, /area/crew_quarters/heads/hos) "bmx" = ( -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_x = 32; pixel_y = 32 }, @@ -37090,7 +37038,7 @@ /area/security/execution/transfer) "bph" = ( /obj/machinery/computer/secure_data, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_y = 32 }, /obj/machinery/camera{ @@ -40043,7 +39991,7 @@ /area/crew_quarters/heads/hos) "btD" = ( /obj/machinery/light, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_y = -32 }, /obj/item/radio/intercom{ @@ -41335,7 +41283,7 @@ /turf/open/floor/plasteel/dark, /area/security/nuke_storage) "bvR" = ( -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_y = 32 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on, @@ -41508,7 +41456,7 @@ /area/security/main) "bwi" = ( /obj/machinery/light, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_y = -32 }, /obj/machinery/camera{ @@ -41573,7 +41521,7 @@ /turf/open/floor/plating, /area/crew_quarters/heads/hos) "bwn" = ( -/obj/machinery/ai_status_display, +/obj/machinery/status_display/ai, /turf/closed/wall/r_wall, /area/ai_monitored/turret_protected/ai) "bwo" = ( @@ -42157,11 +42105,6 @@ "bxh" = ( /turf/open/floor/circuit/green, /area/security/nuke_storage) -"bxi" = ( -/turf/open/floor/plasteel/vault{ - dir = 5 - }, -/area/security/nuke_storage) "bxm" = ( /obj/machinery/door/firedoor, /obj/structure/cable/white{ @@ -42775,7 +42718,7 @@ /area/bridge) "byj" = ( /obj/structure/table/reinforced, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_y = 32 }, /obj/item/restraints/handcuffs, @@ -45294,11 +45237,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/hallway/primary/central) -"bBT" = ( -/turf/open/floor/plasteel/vault{ - dir = 4 - }, -/area/security/nuke_storage) "bBU" = ( /obj/machinery/airalarm{ dir = 1; @@ -45319,7 +45257,7 @@ /turf/open/floor/plasteel/dark, /area/security/nuke_storage) "bBV" = ( -/obj/machinery/status_display{ +/obj/machinery/status_display/evac{ pixel_y = -32 }, /obj/machinery/atmospherics/components/unary/vent_pump/on{ @@ -45660,11 +45598,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/circuit/green, /area/ai_monitored/turret_protected/ai) -"bCs" = ( -/turf/open/floor/plasteel/vault{ - dir = 5 - }, -/area/ai_monitored/turret_protected/ai) "bCt" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -45679,11 +45612,6 @@ }, /turf/open/floor/circuit/green, /area/ai_monitored/turret_protected/ai) -"bCv" = ( -/turf/open/floor/plasteel/vault{ - dir = 1 - }, -/area/ai_monitored/turret_protected/ai) "bCw" = ( /obj/effect/turf_decal/bot_white/right, /obj/effect/turf_decal/tile/neutral{ @@ -47748,7 +47676,7 @@ /area/storage/tech) "bEV" = ( /obj/item/twohanded/required/kirbyplants/random, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_x = 32 }, /obj/effect/turf_decal/tile/neutral{ @@ -50460,7 +50388,7 @@ /turf/open/floor/plasteel/grimy, /area/bridge) "bIT" = ( -/obj/machinery/ai_status_display, +/obj/machinery/status_display/ai, /turf/closed/wall, /area/bridge) "bIU" = ( @@ -50711,7 +50639,7 @@ /area/security/detectives_office) "bJm" = ( /obj/machinery/photocopier, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_y = 32 }, /obj/effect/turf_decal/tile/neutral{ @@ -51180,7 +51108,7 @@ "bJS" = ( /obj/machinery/cell_charger, /obj/structure/table/reinforced, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_y = 32 }, /obj/item/stock_parts/cell/high, @@ -51734,7 +51662,7 @@ /turf/open/floor/wood, /area/crew_quarters/heads/captain) "bKQ" = ( -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_y = 32 }, /obj/effect/turf_decal/tile/neutral{ @@ -52707,7 +52635,7 @@ /area/hallway/primary/port) "bMg" = ( /obj/item/twohanded/required/kirbyplants/random, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_x = -32 }, /obj/effect/turf_decal/tile/neutral{ @@ -53591,15 +53519,6 @@ }, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai) -"bNy" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/vault, -/area/ai_monitored/turret_protected/ai) -"bNz" = ( -/turf/open/floor/plasteel/vault{ - dir = 10 - }, -/area/ai_monitored/turret_protected/ai) "bNA" = ( /obj/machinery/light, /obj/effect/turf_decal/tile/neutral{ @@ -54356,7 +54275,7 @@ /area/bridge/meeting_room/council) "bOG" = ( /obj/machinery/announcement_system, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_x = -32 }, /obj/effect/turf_decal/tile/neutral{ @@ -54923,7 +54842,7 @@ /turf/closed/wall/r_wall, /area/ai_monitored/turret_protected/aisat_interior) "bPD" = ( -/obj/machinery/ai_status_display, +/obj/machinery/status_display/ai, /turf/closed/wall/r_wall, /area/ai_monitored/turret_protected/aisat_interior) "bPE" = ( @@ -55607,7 +55526,6 @@ /area/tcommsat/computer) "bQP" = ( /obj/structure/bed/dogbed/renault, -/mob/living/simple_animal/pet/fox/Renault, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -55618,6 +55536,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/mob/living/simple_animal/pet/fox/Renault, /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/captain) "bQQ" = ( @@ -56102,7 +56021,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_y = 32 }, /obj/effect/turf_decal/stripes/line{ @@ -56212,12 +56131,6 @@ }, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) -"bRJ" = ( -/obj/item/twohanded/required/kirbyplants/random, -/turf/open/floor/plasteel/vault{ - dir = 8 - }, -/area/ai_monitored/turret_protected/aisat_interior) "bRK" = ( /obj/machinery/teleport/hub, /obj/machinery/airalarm{ @@ -56233,7 +56146,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_y = 32 }, /obj/effect/turf_decal/stripes/line, @@ -56429,7 +56342,7 @@ "bSe" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_y = 32 }, /turf/open/floor/plasteel/grimy, @@ -56638,7 +56551,7 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "bSx" = ( -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_x = -32 }, /obj/structure/table/wood, @@ -57384,19 +57297,6 @@ }, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) -"bTE" = ( -/obj/structure/showcase/cyborg/old{ - dir = 8; - pixel_x = 9; - pixel_y = 2 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel/vault{ - dir = 10 - }, -/area/ai_monitored/turret_protected/aisat_interior) "bTF" = ( /obj/structure/window/reinforced{ dir = 1; @@ -59157,14 +59057,6 @@ }, /turf/open/floor/plasteel/dark, /area/aisat) -"bVS" = ( -/obj/structure/cable/white{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/vault{ - dir = 5 - }, -/area/aisat) "bVT" = ( /obj/structure/cable/white{ icon_state = "2-8" @@ -59349,7 +59241,6 @@ dir = 4; pixel_x = -30 }, -/mob/living/simple_animal/parrot/Poly, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -59360,6 +59251,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/mob/living/simple_animal/parrot/Poly, /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/chief) "bWg" = ( @@ -59796,7 +59688,7 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "bWO" = ( -/obj/machinery/ai_status_display, +/obj/machinery/status_display/ai, /turf/closed/wall, /area/hallway/primary/central) "bWP" = ( @@ -59966,7 +59858,7 @@ /obj/machinery/computer/communications{ dir = 4 }, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_x = -32 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -60313,10 +60205,6 @@ codes_txt = "patrol;next_patrol=hall12"; location = "hall11" }, -/mob/living/simple_animal/bot/secbot/beepsky{ - desc = "It's Officer Beepsky! Powered by a potato and a shot of whiskey."; - name = "Officer Beepsky" - }, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -60327,6 +60215,10 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/mob/living/simple_animal/bot/secbot/beepsky{ + desc = "It's Officer Beepsky! Powered by a potato and a shot of whiskey."; + name = "Officer Beepsky" + }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) "bXA" = ( @@ -60990,7 +60882,7 @@ /turf/open/floor/plasteel/dark, /area/engine/transit_tube) "bYp" = ( -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_y = -32 }, /obj/structure/transit_tube/station/reverse/flipped, @@ -61228,7 +61120,7 @@ /obj/machinery/computer/station_alert{ dir = 1 }, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_y = -32 }, /obj/effect/turf_decal/tile/red, @@ -61551,9 +61443,6 @@ }, /turf/open/floor/plasteel/white/telecomms, /area/tcommsat/server) -"bZh" = ( -/turf/open/floor/plasteel/vault/telecomms, -/area/tcommsat/server) "bZi" = ( /obj/structure/cable/white{ icon_state = "1-2" @@ -62098,7 +61987,7 @@ /area/ai_monitored/turret_protected/aisat_interior) "caa" = ( /obj/machinery/recharge_station, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_y = -32 }, /obj/effect/turf_decal/stripes/line{ @@ -62315,7 +62204,7 @@ pixel_y = 3 }, /obj/item/folder/yellow, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_y = -32 }, /obj/item/aicard, @@ -62638,11 +62527,6 @@ }, /turf/open/floor/plasteel/white/telecomms, /area/tcommsat/server) -"caV" = ( -/turf/open/floor/plasteel/vault/telecomms{ - dir = 5 - }, -/area/tcommsat/server) "caW" = ( /obj/machinery/light/small{ dir = 1 @@ -63654,14 +63538,6 @@ }, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) -"ccG" = ( -/obj/structure/cable/white{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/vault/telecomms{ - dir = 5 - }, -/area/tcommsat/server) "ccH" = ( /obj/structure/cable/white{ icon_state = "4-8" @@ -63711,14 +63587,6 @@ }, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) -"ccK" = ( -/obj/structure/cable/white{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/vault/telecomms{ - dir = 6 - }, -/area/tcommsat/server) "ccL" = ( /obj/structure/cable/white{ icon_state = "2-8" @@ -64159,7 +64027,7 @@ /turf/closed/wall/r_wall, /area/ai_monitored/turret_protected/ai_upload) "cdu" = ( -/obj/machinery/ai_status_display, +/obj/machinery/status_display/ai, /turf/closed/wall/r_wall, /area/ai_monitored/turret_protected/ai_upload) "cdv" = ( @@ -65107,12 +64975,6 @@ }, /turf/open/floor/plasteel/dark, /area/security/courtroom) -"ceN" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/vault{ - dir = 5 - }, -/area/security/courtroom) "ceO" = ( /obj/structure/chair{ dir = 4 @@ -66039,19 +65901,6 @@ }, /turf/open/floor/wood, /area/crew_quarters/heads/hop) -"cgi" = ( -/obj/structure/cable/white{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/vault/telecomms{ - dir = 10 - }, -/area/tcommsat/server) -"cgj" = ( -/turf/open/floor/plasteel/vault/telecomms{ - dir = 10 - }, -/area/tcommsat/server) "cgk" = ( /obj/machinery/atmospherics/pipe/simple/general/hidden, /obj/effect/turf_decal/tile/neutral{ @@ -66087,25 +65936,6 @@ }, /turf/open/floor/circuit/green/telecomms/mainframe, /area/tcommsat/server) -"cgn" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden, -/turf/open/floor/plasteel/vault/telecomms{ - dir = 6 - }, -/area/tcommsat/server) -"cgo" = ( -/turf/open/floor/plasteel/vault/telecomms{ - dir = 6 - }, -/area/tcommsat/server) -"cgp" = ( -/obj/structure/cable/white{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/vault/telecomms{ - dir = 6 - }, -/area/tcommsat/server) "cgq" = ( /obj/machinery/camera{ c_tag = "Telecomms - Chamber Starboard"; @@ -66210,7 +66040,7 @@ /area/crew_quarters/heads/captain/private) "cgz" = ( /obj/structure/table, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_x = -32 }, /obj/item/storage/box/donkpockets, @@ -67380,12 +67210,6 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/plasteel, /area/hallway/primary/central) -"cil" = ( -/obj/item/twohanded/required/kirbyplants/random, -/turf/open/floor/plasteel/vault{ - dir = 5 - }, -/area/security/courtroom) "cim" = ( /obj/structure/chair{ dir = 4 @@ -67829,7 +67653,7 @@ /area/security/brig) "ciP" = ( /obj/structure/closet/secure_closet/security/sec, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_y = -32 }, /obj/effect/turf_decal/bot, @@ -67892,14 +67716,6 @@ }, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload) -"ciU" = ( -/obj/structure/cable/white{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/vault{ - dir = 5 - }, -/area/ai_monitored/turret_protected/ai_upload) "ciV" = ( /obj/machinery/computer/upload/borg{ dir = 1 @@ -68032,7 +67848,7 @@ pixel_x = 3; pixel_y = 3 }, -/obj/item/book/manual/engineering_particle_accelerator, +/obj/item/book/manual/wiki/engineering_singulo_tesla, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, @@ -68047,7 +67863,7 @@ pixel_x = 3; pixel_y = 3 }, -/obj/item/book/manual/engineering_singularity_safety, +/obj/item/book/manual/wiki/engineering_singulo_tesla, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/engine/engineering) @@ -68440,11 +68256,6 @@ }, /turf/open/floor/plasteel/dark, /area/security/courtroom) -"cjV" = ( -/turf/open/floor/plasteel/vault{ - dir = 5 - }, -/area/security/courtroom) "cjX" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -69032,14 +68843,6 @@ /mob/living/simple_animal/pet/dog/corgi/Ian, /turf/open/floor/wood, /area/crew_quarters/heads/hop) -"ckZ" = ( -/obj/structure/cable/white{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/vault/telecomms{ - dir = 8 - }, -/area/tcommsat/server) "cla" = ( /obj/structure/sign/warning/electricshock{ pixel_y = -32 @@ -69056,12 +68859,6 @@ }, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) -"clb" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden, -/turf/open/floor/plasteel/vault/telecomms{ - dir = 8 - }, -/area/tcommsat/server) "clc" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall, @@ -69871,7 +69668,7 @@ /turf/open/floor/plasteel/grimy, /area/crew_quarters/heads/hop) "cmC" = ( -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_x = 32 }, /obj/item/twohanded/required/kirbyplants/random, @@ -73414,7 +73211,7 @@ dir = 1; name = "Jury" }, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_y = -32 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -76366,7 +76163,7 @@ /obj/machinery/suit_storage_unit/engine, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_y = 32 }, /obj/effect/turf_decal/stripes/line{ @@ -76484,7 +76281,7 @@ /obj/structure/table/wood, /obj/item/clipboard, /obj/item/folder, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_x = -32 }, /turf/open/floor/plasteel/dark, @@ -77255,7 +77052,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/structure/weightlifter, +/obj/structure/weightmachine/weightlifter, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -77286,7 +77083,7 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 1 }, -/obj/structure/stacklifter, +/obj/structure/weightmachine/stacklifter, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -77618,7 +77415,7 @@ /obj/structure/table/wood, /obj/item/taperecorder, /obj/item/camera, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_y = -32 }, /obj/effect/turf_decal/tile/neutral{ @@ -78567,7 +78364,7 @@ /turf/open/floor/plasteel/grimy, /area/bridge/showroom/corporate) "cBs" = ( -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_y = 32 }, /obj/machinery/camera{ @@ -80146,7 +79943,7 @@ /obj/structure/table, /obj/item/paper_bin, /obj/item/pen, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_x = -32 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -80156,7 +79953,7 @@ /turf/open/floor/plasteel, /area/crew_quarters/fitness/recreation) "cDK" = ( -/obj/structure/stacklifter, +/obj/structure/weightmachine/stacklifter, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -80185,7 +79982,7 @@ /turf/open/floor/plasteel, /area/crew_quarters/fitness/recreation) "cDN" = ( -/obj/structure/weightlifter, +/obj/structure/weightmachine/weightlifter, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -81620,7 +81417,7 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/eva) "cGg" = ( -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_y = -32 }, /obj/machinery/camera{ @@ -82283,7 +82080,7 @@ "cHt" = ( /obj/structure/reagent_dispensers/fueltank, /obj/effect/decal/cleanable/dirt, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_y = -32 }, /obj/effect/turf_decal/bot, @@ -87622,7 +87419,7 @@ /obj/structure/table/reinforced, /obj/item/book/manual/wiki/security_space_law, /obj/item/radio, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_y = 32 }, /obj/structure/reagent_dispensers/peppertank{ @@ -88935,7 +88732,7 @@ /turf/open/floor/plasteel, /area/security/checkpoint/medical) "cSO" = ( -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_y = 32 }, /obj/machinery/firealarm{ @@ -90400,7 +90197,7 @@ dir = 8 }, /obj/item/toy/katana, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_x = -32 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -94054,7 +93851,7 @@ /turf/open/floor/plasteel, /area/medical/chemistry) "dbi" = ( -/obj/machinery/ai_status_display, +/obj/machinery/status_display/ai, /turf/closed/wall, /area/medical/chemistry) "dbj" = ( @@ -95051,7 +94848,7 @@ /turf/open/floor/plasteel, /area/science/lab) "dcK" = ( -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_x = 32 }, /obj/machinery/light{ @@ -95732,7 +95529,7 @@ "ddU" = ( /obj/structure/filingcabinet/chestdrawer, /obj/effect/decal/cleanable/dirt, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_y = -32 }, /obj/effect/turf_decal/bot, @@ -97995,7 +97792,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/mob/living/simple_animal/cockroach, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -98006,6 +97802,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/mob/living/simple_animal/cockroach, /turf/open/floor/plasteel/dark, /area/crew_quarters/abandoned_gambling_den) "dhN" = ( @@ -101058,7 +100855,7 @@ pixel_y = 24 }, /obj/item/folder/white, -/obj/item/book/manual/medical_cloning, +/obj/item/book/manual/wiki/medical_cloning, /obj/effect/turf_decal/tile/blue{ dir = 4 }, @@ -101252,11 +101049,6 @@ }, /turf/open/floor/plasteel/dark, /area/medical/surgery) -"dnI" = ( -/turf/open/floor/plasteel/vault{ - dir = 5 - }, -/area/medical/surgery) "dnJ" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 @@ -101303,11 +101095,11 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/mob/living/simple_animal/cockroach, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, +/mob/living/simple_animal/cockroach, /turf/open/floor/plasteel, /area/maintenance/starboard/aft) "dnN" = ( @@ -102142,6 +101934,10 @@ name = "Cloning Lab"; req_access_txt = "5" }, +/obj/effect/mapping_helpers/airlock/unres{ + icon_state = "airlock_unres_helper"; + dir = 8 + }, /obj/structure/cable/white{ icon_state = "4-8" }, @@ -102655,7 +102451,7 @@ /area/science/explab) "dqn" = ( /obj/structure/table/reinforced, -/obj/item/book/manual/experimentor, +/obj/item/book/manual/wiki/experimentor, /obj/item/healthanalyzer, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -103032,7 +102828,7 @@ /area/maintenance/department/medical) "dqZ" = ( /obj/machinery/door/window/eastright, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_x = -32 }, /obj/effect/turf_decal/tile/neutral{ @@ -103132,6 +102928,10 @@ name = "Cloning Lab"; req_access_txt = "5" }, +/obj/effect/mapping_helpers/airlock/unres{ + icon_state = "airlock_unres_helper"; + dir = 8 + }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -103783,14 +103583,6 @@ pixel_x = 7; pixel_y = -38 }, -/obj/machinery/button/door{ - desc = "A remote control switch for the medbay foyer."; - id = "cloningfoyer"; - name = "Cloning Doors Control"; - normaldoorcontrol = 1; - pixel_x = -6; - pixel_y = -24 - }, /obj/machinery/camera{ c_tag = "Medbay - Cloning Lab"; network = list("ss13","medbay"); @@ -103871,14 +103663,15 @@ /area/medical/medbay/central) "dsG" = ( /obj/structure/table/glass, -/obj/item/wrench/medical, -/obj/item/clothing/neck/stethoscope, /obj/machinery/camera{ c_tag = "Medbay - Cryogenics"; network = list("ss13","medbay"); dir = 1; name = "medbay camera" }, +/obj/item/book/manual/wiki/medicine, +/obj/item/clothing/neck/stethoscope, +/obj/item/wrench/medical, /obj/effect/turf_decal/tile/blue{ dir = 1 }, @@ -104270,7 +104063,7 @@ /obj/machinery/computer/card/minor/rd{ dir = 8 }, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_x = 32 }, /obj/effect/turf_decal/bot, @@ -104749,7 +104542,7 @@ /area/science/research/abandoned) "duq" = ( /obj/structure/rack, -/obj/item/book/manual/robotics_cyborgs, +/obj/item/book/manual/wiki/robotics_cyborgs, /obj/item/storage/belt/utility, /obj/item/reagent_containers/glass/beaker/large, /obj/effect/decal/cleanable/dirt, @@ -104836,9 +104629,6 @@ /turf/open/floor/plasteel/dark, /area/science/explab) "duy" = ( -/mob/living/simple_animal/pet/dog/pug{ - name = "Swanson" - }, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -104849,6 +104639,9 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/mob/living/simple_animal/pet/dog/pug{ + name = "Swanson" + }, /turf/open/floor/plasteel/dark, /area/science/explab) "duz" = ( @@ -104914,12 +104707,6 @@ }, /turf/open/floor/plasteel/dark, /area/science/explab) -"duE" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/vault{ - dir = 5 - }, -/area/science/explab) "duF" = ( /obj/effect/turf_decal/delivery, /obj/machinery/airalarm/unlocked{ @@ -105371,7 +105158,6 @@ /obj/item/folder/blue, /obj/item/clothing/glasses/hud/health, /obj/item/radio/intercom{ - name = "Station Intercom"; pixel_y = 26 }, /obj/effect/turf_decal/tile/neutral{ @@ -105788,11 +105574,6 @@ }, /turf/open/floor/plasteel, /area/maintenance/port) -"dwd" = ( -/turf/open/floor/plasteel/vault{ - dir = 5 - }, -/area/science/explab) "dwe" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light, @@ -106709,7 +106490,6 @@ }, /area/crew_quarters/abandoned_gambling_den) "dxG" = ( -/mob/living/simple_animal/cockroach, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -106720,6 +106500,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/mob/living/simple_animal/cockroach, /turf/open/floor/plasteel/dark, /area/crew_quarters/abandoned_gambling_den) "dxH" = ( @@ -107306,7 +107087,7 @@ dir = 8; pixel_x = -24 }, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_y = -32 }, /obj/item/clothing/suit/straight_jacket, @@ -107362,7 +107143,7 @@ /turf/open/floor/plasteel/dark, /area/medical/surgery) "dyH" = ( -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_y = -32 }, /obj/machinery/atmospherics/components/unary/vent_pump/on{ @@ -107912,7 +107693,7 @@ /area/science/robotics/lab) "dzI" = ( /obj/structure/rack, -/obj/item/book/manual/robotics_cyborgs, +/obj/item/book/manual/wiki/robotics_cyborgs, /obj/item/storage/belt/utility/full, /obj/machinery/light{ dir = 1 @@ -108153,11 +107934,11 @@ /obj/machinery/light{ dir = 8 }, -/mob/living/simple_animal/pet/cat/Runtime, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, +/mob/living/simple_animal/pet/cat/Runtime, /turf/open/floor/plasteel, /area/crew_quarters/heads/cmo) "dAc" = ( @@ -108230,7 +108011,6 @@ /area/crew_quarters/heads/cmo) "dAg" = ( /obj/item/radio/intercom{ - name = "Station Intercom"; pixel_x = 26 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -108445,7 +108225,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_x = -32 }, /obj/machinery/atmospherics/components/unary/vent_pump/on{ @@ -108648,7 +108428,7 @@ /turf/open/floor/plasteel/white, /area/medical/genetics) "dAV" = ( -/obj/machinery/ai_status_display, +/obj/machinery/status_display/ai, /turf/closed/wall/r_wall, /area/medical/genetics) "dAW" = ( @@ -108818,6 +108598,9 @@ dir = 4 }, /obj/effect/turf_decal/bot, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, /turf/open/floor/plasteel, /area/crew_quarters/heads/cmo) "dBj" = ( @@ -109704,7 +109487,7 @@ /obj/machinery/computer/card/minor/cmo{ dir = 8 }, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_x = 32 }, /obj/effect/turf_decal/tile/neutral{ @@ -111386,7 +111169,7 @@ pixel_x = 3; pixel_y = 3 }, -/obj/item/book/manual/detective, +/obj/item/book/manual/wiki/detective, /obj/item/camera/detective, /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -112691,7 +112474,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_x = 32 }, /obj/effect/turf_decal/bot, @@ -112925,7 +112708,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_x = -32 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ @@ -112988,7 +112771,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/status_display{ +/obj/machinery/status_display/evac{ pixel_x = 32 }, /obj/effect/turf_decal/tile/blue{ @@ -113779,7 +113562,6 @@ /area/crew_quarters/heads/cmo) "dJj" = ( /obj/item/radio/intercom{ - name = "Station Intercom"; pixel_y = -26 }, /obj/machinery/camera{ @@ -118055,7 +117837,7 @@ /obj/machinery/computer/crew{ dir = 4 }, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_x = -32 }, /obj/effect/turf_decal/tile/blue{ @@ -119509,7 +119291,7 @@ /turf/open/floor/plasteel, /area/medical/virology) "dTj" = ( -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_x = 32 }, /obj/effect/turf_decal/tile/green, @@ -120583,7 +120365,6 @@ /area/medical/virology) "dVD" = ( /obj/effect/decal/cleanable/dirt, -/mob/living/carbon/monkey, /obj/effect/turf_decal/tile/green{ dir = 1 }, @@ -120593,6 +120374,7 @@ /obj/effect/turf_decal/tile/green{ dir = 8 }, +/mob/living/carbon/monkey, /turf/open/floor/plasteel/white, /area/medical/virology) "dVE" = ( @@ -120623,13 +120405,13 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/mob/living/carbon/monkey, /obj/effect/turf_decal/tile/green{ dir = 1 }, /obj/effect/turf_decal/tile/green{ dir = 4 }, +/mob/living/carbon/monkey, /turf/open/floor/plasteel/white, /area/medical/virology) "dVH" = ( @@ -121162,15 +120944,6 @@ }, /turf/open/floor/plasteel, /area/maintenance/port/aft) -"dWK" = ( -/obj/structure/cable/white{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/vault{ - dir = 8 - }, -/area/chapel/office) "dWL" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -122177,7 +121950,7 @@ /turf/open/floor/grass, /area/hallway/secondary/exit/departure_lounge) "dYH" = ( -/obj/machinery/ai_status_display, +/obj/machinery/status_display/ai, /turf/closed/wall, /area/hallway/secondary/exit/departure_lounge) "dYI" = ( @@ -124150,7 +123923,7 @@ /turf/open/floor/plasteel/dark, /area/chapel/main) "ecA" = ( -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_y = -32 }, /turf/open/floor/plasteel/grimy, @@ -125385,7 +125158,7 @@ "eeF" = ( /obj/structure/table/wood, /obj/item/storage/fancy/donut_box, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_x = 32 }, /turf/open/floor/carpet, @@ -126666,6 +126439,20 @@ /obj/machinery/door/airlock/research/glass/incinerator/toxmix_interior, /turf/open/floor/engine, /area/science/mixing) +"fFK" = ( +/obj/machinery/ore_silo, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/security/nuke_storage) "fGq" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/closed/wall/r_wall, @@ -126887,6 +126674,10 @@ }, /turf/open/floor/plasteel/dark, /area/medical/morgue) +"iQI" = ( +/obj/machinery/status_display/evac, +/turf/closed/wall, +/area/medical/medbay/central) "iTj" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 6 @@ -127591,15 +127382,6 @@ /obj/item/clothing/under/color/grey, /turf/open/floor/plating, /area/crew_quarters/abandoned_gambling_den) -"vqd" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/bodycontainer/morgue{ - dir = 2 - }, -/turf/open/floor/plasteel/vault{ - dir = 5 - }, -/area/medical/morgue) "vAb" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -171870,7 +171652,7 @@ dfD dhi diE dku -cNB +iQI cNz dbr dbr @@ -173412,7 +173194,7 @@ cNA dho diy dkx -cNB +iQI cNz dbr dbr @@ -173616,7 +173398,7 @@ bvT bvP byz bvP -bvP +fFK but aad bHq diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 479c42124f..d9f048e8c8 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -153,7 +153,7 @@ /obj/machinery/light/small{ dir = 8 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "aaB" = ( /obj/structure/cable/yellow{ @@ -162,7 +162,7 @@ /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-03" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "aaC" = ( /obj/structure/sink/kitchen{ @@ -179,7 +179,7 @@ icon_state = "1-2" }, /obj/item/twohanded/required/kirbyplants, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "aaE" = ( /obj/machinery/biogenerator, @@ -190,7 +190,7 @@ c_tag = "Prison Hydroponics"; network = list("ss13","prison") }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "aaF" = ( /obj/effect/spawner/structure/window/reinforced, @@ -205,7 +205,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "aaH" = ( /obj/structure/cable/yellow{ @@ -218,13 +218,13 @@ icon_state = "2-4" }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "aaI" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "aaJ" = ( /obj/item/reagent_containers/glass/bucket, @@ -235,7 +235,7 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/components/unary/vent_pump/on, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "aaK" = ( /obj/machinery/hydroponics/constructable, @@ -243,7 +243,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "aaL" = ( /obj/effect/spawner/structure/window/reinforced, @@ -268,7 +268,7 @@ /obj/machinery/hydroponics/constructable, /obj/item/cultivator, /obj/item/seeds/carrot, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "aaQ" = ( /obj/structure/cable/yellow{ @@ -276,14 +276,14 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/item/reagent_containers/glass/bucket, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "aaR" = ( /turf/open/floor/plasteel, /area/security/prison) "aaS" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "aaT" = ( /obj/machinery/hydroponics/constructable, @@ -292,7 +292,7 @@ dir = 8; pixel_x = 24 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "aaY" = ( /obj/structure/cable{ @@ -318,7 +318,7 @@ id_tag = "permahydro"; name = "Hydroponics Module" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "abc" = ( /obj/effect/spawner/structure/window/reinforced, @@ -381,7 +381,7 @@ /obj/structure/easel, /obj/item/canvas/twentythreeXtwentythree, /obj/item/canvas/twentythreeXtwentythree, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "abk" = ( /obj/structure/table, @@ -395,19 +395,19 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "abl" = ( /obj/structure/table, /obj/machinery/computer/libraryconsole/bookmanagement, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "abm" = ( /obj/machinery/computer/arcade, /obj/machinery/computer/security/telescreen/entertainment{ pixel_y = 32 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "abn" = ( /obj/machinery/newscaster{ @@ -423,14 +423,14 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "abp" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/yellow{ icon_state = "1-8" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "abq" = ( /obj/structure/holohoop{ @@ -537,14 +537,11 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "abD" = ( /obj/structure/chair/stool, -/turf/open/floor/plasteel/floorgrime, -/area/security/prison) -"abE" = ( -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "abF" = ( /obj/structure/table, @@ -567,16 +564,11 @@ /obj/item/toy/cards/deck, /turf/open/floor/plasteel, /area/security/prison) -"abH" = ( -/obj/structure/chair/stool, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/floorgrime, -/area/security/prison) "abI" = ( /obj/structure/cable/yellow{ icon_state = "2-4" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "abJ" = ( /obj/structure/window/reinforced, @@ -732,7 +724,7 @@ pixel_y = 6 }, /obj/item/clothing/head/chefhat, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "aca" = ( /obj/structure/table, @@ -760,7 +752,7 @@ name = "\improper sustenance vendor"; product_slogans = "Enjoy your meal.;Enough calories to support any worker." }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "acf" = ( /obj/effect/turf_decal/stripes/line, @@ -868,7 +860,7 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "acs" = ( /obj/structure/cable/yellow{ @@ -892,34 +884,34 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 9 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "acu" = ( /obj/machinery/holopad, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "acv" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "acw" = ( /obj/structure/cable/yellow{ icon_state = "1-8" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "acx" = ( /obj/machinery/airalarm{ dir = 8; pixel_x = 24 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "acy" = ( /obj/machinery/door/airlock/external{ @@ -1042,7 +1034,7 @@ /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-13" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "acH" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -1060,7 +1052,7 @@ dir = 1; network = list("ss13","prison") }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "acI" = ( /obj/structure/cable/yellow{ @@ -1069,7 +1061,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "acJ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -1081,14 +1073,14 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 2 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "acL" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 }, /obj/machinery/light, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "acM" = ( /obj/structure/table, @@ -1097,7 +1089,7 @@ pixel_y = 7 }, /obj/item/pen, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "acN" = ( /obj/structure/table/glass, @@ -1351,7 +1343,7 @@ name = "Cell 3" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "adc" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -1371,7 +1363,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/mapping_helpers/airlock/cyclelink_helper, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "ade" = ( /obj/machinery/door/poddoor/preopen{ @@ -1383,7 +1375,7 @@ name = "Cell 1" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "adf" = ( /obj/machinery/light/small{ @@ -1473,7 +1465,7 @@ c_tag = "Prison Cell 3"; network = list("ss13","prison") }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "adt" = ( /obj/structure/chair/stool, @@ -1487,7 +1479,7 @@ pixel_y = 25; specialfunctions = 4 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "adu" = ( /obj/structure/bed, @@ -1495,14 +1487,14 @@ c_tag = "Prison Cell 2"; network = list("ss13","prison") }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "adv" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "adw" = ( /obj/structure/chair/stool, @@ -1526,7 +1518,7 @@ c_tag = "Prison Cell 1"; network = list("ss13","prison") }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "ady" = ( /obj/structure/chair/stool, @@ -1540,7 +1532,7 @@ pixel_y = 25; specialfunctions = 4 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "adz" = ( /turf/open/floor/plating{ @@ -1693,7 +1685,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "adQ" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ @@ -1709,7 +1701,7 @@ id = "PCell 2"; pixel_x = -28 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "adS" = ( /obj/structure/cable/yellow{ @@ -1718,14 +1710,14 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 4 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "adT" = ( /obj/structure/table, /obj/item/paper, /obj/item/pen, /obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "adU" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, @@ -1733,7 +1725,7 @@ id = "PCell 1"; pixel_x = -28 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "adV" = ( /obj/item/folder/red, @@ -1906,7 +1898,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "aen" = ( /obj/machinery/door/airlock/security/glass{ @@ -1920,7 +1912,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "aeo" = ( /obj/machinery/door/airlock/security/glass{ @@ -1930,7 +1922,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "aep" = ( /obj/machinery/door/firedoor, @@ -3039,15 +3031,6 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "aga" = ( -/mob/living/simple_animal/bot/secbot{ - arrest_type = 1; - health = 45; - icon_state = "secbot1"; - idcheck = 1; - name = "Sergeant-at-Armsky"; - on = 1; - weaponscheck = 1 - }, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -3058,6 +3041,15 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/mob/living/simple_animal/bot/secbot{ + arrest_type = 1; + health = 45; + icon_state = "secbot1"; + idcheck = 1; + name = "Sergeant-at-Armsky"; + on = 1; + weaponscheck = 1 + }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "agb" = ( @@ -4673,11 +4665,6 @@ }, /turf/open/floor/plasteel/dark, /area/crew_quarters/fitness/recreation) -"aiT" = ( -/turf/open/floor/plasteel/vault{ - dir = 5 - }, -/area/crew_quarters/fitness/recreation) "aiU" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/effect/turf_decal/tile/neutral{ @@ -13139,10 +13126,7 @@ /area/quartermaster/miningoffice) "azl" = ( /obj/structure/closet/emcloset, -/obj/machinery/status_display{ - pixel_y = 32; - supply_display = 1 - }, +/obj/machinery/status_display/supply, /obj/effect/turf_decal/tile/brown{ dir = 1 }, @@ -13268,7 +13252,7 @@ name = "old sink"; pixel_y = 28 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "azt" = ( /obj/machinery/airalarm{ @@ -13280,7 +13264,7 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "azu" = ( /obj/structure/disposalpipe/segment{ @@ -13289,7 +13273,7 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "azv" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ @@ -13370,13 +13354,13 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 1 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/brig) "azE" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/brig) "azF" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ @@ -13385,7 +13369,7 @@ /obj/machinery/light/small{ dir = 4 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/brig) "azG" = ( /obj/machinery/flasher{ @@ -13395,7 +13379,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 1 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/brig) "azH" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ @@ -13405,7 +13389,7 @@ id = "Cell 3"; pixel_x = -28 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/brig) "azI" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -13456,24 +13440,24 @@ id = "holdingflash"; pixel_x = -25 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/brig) "azM" = ( /obj/structure/chair, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/brig) "azN" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/brig) "azO" = ( /obj/structure/chair, /obj/effect/landmark/event_spawn, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/brig) "azP" = ( /obj/structure/rack, @@ -13496,7 +13480,7 @@ /obj/item/restraints/handcuffs, /obj/item/restraints/handcuffs, /obj/item/restraints/handcuffs, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/brig) "azQ" = ( /obj/machinery/firealarm{ @@ -13983,10 +13967,10 @@ /obj/effect/turf_decal/loading_area{ dir = 4 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "aAL" = ( -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "aAM" = ( /obj/structure/closet/crate, @@ -13994,13 +13978,13 @@ lootcount = 3; name = "3maintenance loot spawner" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "aAN" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "aAO" = ( /obj/structure/closet/crate, @@ -14011,7 +13995,7 @@ lootcount = 3; name = "3maintenance loot spawner" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "aAP" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -14117,28 +14101,28 @@ "aAY" = ( /obj/structure/bed, /obj/item/bedsheet, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/brig) "aAZ" = ( /obj/structure/closet/secure_closet/brig{ id = "Cell 1"; name = "Cell 1 Locker" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/brig) "aBa" = ( /obj/structure/closet/secure_closet/brig{ id = "Cell 2"; name = "Cell 2 Locker" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/brig) "aBb" = ( /obj/structure/closet/secure_closet/brig{ id = "Cell 3"; name = "Cell 3 Locker" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/brig) "aBc" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -14186,13 +14170,13 @@ /obj/machinery/light/small{ dir = 8 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/brig) "aBg" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/brig) "aBh" = ( /obj/structure/cable/yellow{ @@ -14201,7 +14185,7 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 8 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/brig) "aBi" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -14211,7 +14195,7 @@ dir = 1; pixel_y = -22 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/brig) "aBj" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ @@ -14220,7 +14204,7 @@ /obj/machinery/light/small{ dir = 4 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/brig) "aBk" = ( /obj/structure/closet/secure_closet/detective, @@ -14609,13 +14593,13 @@ dir = 6 }, /obj/item/storage/box/donkpockets, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "aBZ" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "aCa" = ( /obj/structure/closet/crate/freezer, @@ -14623,7 +14607,7 @@ lootcount = 3; name = "3maintenance loot spawner" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "aCb" = ( /obj/structure/closet/crate, @@ -14631,7 +14615,7 @@ icon_state = "1-2" }, /obj/item/stack/ore/glass, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "aCc" = ( /obj/structure/rack, @@ -14644,11 +14628,12 @@ pixel_x = 24 }, /obj/effect/spawner/lootdrop/maintenance, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "aCd" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/bot_white/right, +/obj/machinery/ore_silo, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -14983,7 +14968,7 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/crew_quarters/dorms) "aCH" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ @@ -15196,7 +15181,7 @@ "aDk" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "aDl" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -15207,14 +15192,14 @@ lootcount = 3; name = "3maintenance loot spawner" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "aDm" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /obj/effect/landmark/start/cargo_technician, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "aDn" = ( /obj/item/stack/sheet/cardboard, @@ -15224,7 +15209,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "aDo" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ @@ -15233,7 +15218,7 @@ /obj/structure/light_construct/small{ dir = 4 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "aDp" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -15822,7 +15807,7 @@ /obj/machinery/light_switch{ pixel_y = 28 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "aEv" = ( /obj/machinery/computer/security/mining{ @@ -15874,7 +15859,7 @@ /obj/effect/turf_decal/loading_area{ dir = 1 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "aEB" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -15887,7 +15872,7 @@ pixel_y = -24; req_access_txt = "50" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "aED" = ( /obj/structure/closet/crate/internals, @@ -15901,7 +15886,7 @@ lootcount = 3; name = "3maintenance loot spawner" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "aEE" = ( /obj/machinery/power/apc{ @@ -15914,7 +15899,7 @@ icon_state = "0-8" }, /obj/effect/landmark/blobstart, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "aEF" = ( /obj/effect/spawner/structure/window/reinforced, @@ -16238,10 +16223,6 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/dorms) -"aFk" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel/floorgrime, -/area/crew_quarters/dorms) "aFl" = ( /turf/open/floor/plasteel, /area/crew_quarters/dorms) @@ -17717,10 +17698,7 @@ pixel_x = -28; pixel_y = 23 }, -/obj/machinery/status_display{ - pixel_y = 32; - supply_display = 1 - }, +/obj/machinery/status_display/supply, /obj/machinery/conveyor{ dir = 5; id = "QMLoad2" @@ -19484,7 +19462,7 @@ /area/crew_quarters/locker) "aLS" = ( /obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/crew_quarters/locker) "aLT" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -20674,9 +20652,6 @@ "aOu" = ( /turf/open/floor/plasteel, /area/crew_quarters/locker) -"aOv" = ( -/turf/open/floor/plasteel/floorgrime, -/area/crew_quarters/locker) "aOw" = ( /obj/structure/chair/stool{ pixel_y = 8 @@ -20697,7 +20672,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/crew_quarters/locker) "aOA" = ( /obj/structure/cable/yellow{ @@ -20809,7 +20784,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/hydroponics/garden) "aOJ" = ( /obj/structure/cable/yellow{ @@ -21332,7 +21307,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 5 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/crew_quarters/locker) "aPL" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ @@ -21648,10 +21623,7 @@ /obj/structure/table, /obj/item/clipboard, /obj/item/stamp/qm, -/obj/machinery/status_display{ - pixel_x = 32; - supply_display = 1 - }, +/obj/machinery/status_display/supply, /turf/open/floor/plasteel, /area/quartermaster/qm) "aQu" = ( @@ -21711,7 +21683,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_x = -32 }, /obj/machinery/flasher{ @@ -21893,7 +21865,7 @@ /obj/machinery/door/airlock{ name = "Locker Room" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/crew_quarters/locker) "aQQ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -21938,7 +21910,7 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 2 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/crew_quarters/locker) "aQU" = ( /obj/structure/cable/yellow{ @@ -22475,7 +22447,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/crew_quarters/locker) "aSd" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -22499,7 +22471,7 @@ /area/crew_quarters/locker) "aSh" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/crew_quarters/locker) "aSi" = ( /obj/structure/rack, @@ -22893,10 +22865,7 @@ /obj/structure/disposalpipe/trunk{ dir = 8 }, -/obj/machinery/status_display{ - pixel_x = 32; - supply_display = 1 - }, +/obj/machinery/status_display/supply /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -23120,7 +23089,7 @@ /obj/machinery/door/airlock{ name = "Locker Room" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/crew_quarters/locker) "aTv" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -24354,9 +24323,7 @@ }, /area/hallway/secondary/entry) "aVG" = ( -/obj/machinery/status_display{ - supply_display = 1 - }, +/obj/machinery/status_display/supply, /turf/closed/wall, /area/quartermaster/storage) "aVH" = ( @@ -24860,7 +24827,7 @@ /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/chief) "aWz" = ( -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_y = 32 }, /obj/machinery/computer/station_alert, @@ -24934,7 +24901,7 @@ /turf/open/space, /area/space/nearstation) "aWL" = ( -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_x = -32 }, /obj/machinery/light{ @@ -24977,7 +24944,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_x = 32 }, /turf/open/floor/circuit, @@ -25429,7 +25396,7 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 2 }, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_y = 32 }, /obj/effect/turf_decal/stripes/line{ @@ -25721,7 +25688,7 @@ /area/storage/tech) "aYk" = ( /obj/structure/rack, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_y = 31 }, /obj/effect/spawner/lootdrop/techstorage/medical, @@ -27077,10 +27044,7 @@ /area/hallway/primary/port) "baA" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/obj/machinery/status_display{ - pixel_y = 32; - supply_display = 1 - }, +/obj/machinery/status_display/supply, /obj/structure/table, /obj/item/folder/yellow, /obj/effect/turf_decal/tile/brown{ @@ -27191,15 +27155,15 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/turf_decal/tile/neutral{ + dir = 2 + }, /mob/living/simple_animal/bot/cleanbot{ auto_patrol = 1; icon_state = "cleanbot1"; mode = 0; name = "Mopficcer Sweepsky" }, -/obj/effect/turf_decal/tile/neutral{ - dir = 2 - }, /turf/open/floor/plasteel, /area/hallway/primary/central) "baK" = ( @@ -27963,10 +27927,7 @@ /area/quartermaster/office) "bbS" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/obj/machinery/status_display{ - pixel_y = 32; - supply_display = 1 - }, +/obj/machinery/status_display/supply, /obj/effect/turf_decal/tile/brown{ dir = 1 }, @@ -28470,7 +28431,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_x = -32 }, /turf/open/floor/circuit, @@ -28839,10 +28800,10 @@ pixel_x = 8; pixel_y = 30 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/janitor) "bdB" = ( -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/janitor) "bdC" = ( /obj/structure/closet/l3closet/janitor, @@ -28852,14 +28813,14 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/janitor) "bdD" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 9 }, /obj/machinery/vending/wardrobe/jani_wardrobe, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/janitor) "bdE" = ( /obj/structure/closet/firecloset, @@ -28912,7 +28873,7 @@ /turf/open/floor/carpet, /area/crew_quarters/heads/captain/private) "bdK" = ( -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_y = 32 }, /obj/structure/disposalpipe/segment{ @@ -29209,7 +29170,6 @@ "bej" = ( /obj/structure/filingcabinet/chestdrawer, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/mob/living/simple_animal/parrot/Poly, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -29220,6 +29180,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/mob/living/simple_animal/parrot/Poly, /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/chief) "bek" = ( @@ -29667,7 +29628,7 @@ /obj/machinery/light/small{ dir = 8 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/janitor) "bfk" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ @@ -29683,7 +29644,7 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/janitor) "bfm" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -29695,7 +29656,7 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/janitor) "bfn" = ( /obj/machinery/door/airlock/maintenance{ @@ -30425,10 +30386,7 @@ /turf/open/floor/plasteel, /area/quartermaster/sorting) "bgL" = ( -/obj/machinery/status_display{ - pixel_y = 32; - supply_display = 1 - }, +/obj/machinery/status_display/supply, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -30629,7 +30587,7 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/janitor) "bhb" = ( /obj/structure/cable/yellow{ @@ -30640,7 +30598,7 @@ name = "Wags-His-Tail"; real_name = "Wags-His-Tail" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/janitor) "bhc" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -30648,7 +30606,7 @@ icon_state = "1-8" }, /obj/effect/landmark/start/janitor, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/janitor) "bhd" = ( /obj/structure/sink{ @@ -30662,7 +30620,7 @@ dir = 4; pixel_x = 24 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/janitor) "bhe" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -30780,7 +30738,7 @@ /turf/open/floor/plasteel/dark, /area/bridge) "bho" = ( -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_y = 32 }, /obj/item/storage/toolbox/mechanical{ @@ -31351,7 +31309,7 @@ /obj/structure/chair/office/dark{ dir = 8 }, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_y = -32 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -31619,11 +31577,11 @@ /obj/item/grenade/chem_grenade/cleaner, /obj/item/grenade/chem_grenade/cleaner, /obj/item/grenade/chem_grenade/cleaner, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/janitor) "biT" = ( /obj/structure/janitorialcart, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/janitor) "biU" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ @@ -31643,7 +31601,7 @@ dir = 1 }, /obj/machinery/disposal/bin, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/janitor) "biW" = ( /obj/item/storage/box/lights/mixed, @@ -34727,7 +34685,7 @@ name = "Station Intercom (Captain)"; pixel_x = 28 }, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_y = 32 }, /obj/machinery/keycard_auth{ @@ -36348,7 +36306,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_y = 32 }, /obj/structure/transit_tube/curved{ @@ -36527,7 +36485,7 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat/foyer) "brX" = ( -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_y = 32 }, /obj/machinery/porta_turret/ai{ @@ -36593,10 +36551,10 @@ dir = 4; pixel_x = -22 }, -/mob/living/simple_animal/bot/floorbot, /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/mob/living/simple_animal/bot/floorbot, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) "bsb" = ( @@ -38358,7 +38316,7 @@ /area/tcommsat/computer) "bvz" = ( /obj/structure/table/wood, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_y = 31 }, /obj/item/flashlight/lamp, @@ -38823,7 +38781,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_y = 32 }, /obj/machinery/atmospherics/components/unary/vent_pump/on, @@ -39022,7 +38980,7 @@ receive_ore_updates = 1 }, /obj/structure/table, -/obj/item/book/manual/barman_recipes{ +/obj/item/book/manual/wiki/barman_recipes{ pixel_y = 5 }, /obj/item/reagent_containers/food/drinks/shaker, @@ -39590,7 +39548,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/crew_quarters/toilet/auxiliary) "bxP" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -39604,7 +39562,7 @@ name = "old sink"; pixel_y = 28 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/crew_quarters/toilet/auxiliary) "bxQ" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ @@ -39900,11 +39858,11 @@ /turf/open/floor/plasteel, /area/crew_quarters/bar) "byz" = ( -/mob/living/carbon/monkey/punpun, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ dir = 1 }, +/mob/living/carbon/monkey/punpun, /turf/open/floor/plasteel, /area/crew_quarters/bar) "byA" = ( @@ -40024,8 +39982,8 @@ dir = 4; pixel_x = 24 }, -/mob/living/simple_animal/bot/cleanbot, /obj/effect/turf_decal/tile/blue, +/mob/living/simple_animal/bot/cleanbot, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) "byN" = ( @@ -40494,7 +40452,7 @@ /obj/machinery/light/small{ dir = 8 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/crew_quarters/toilet/auxiliary) "bzB" = ( /obj/structure/mirror{ @@ -41241,10 +41199,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/crew_quarters/toilet/auxiliary) "bBn" = ( -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/crew_quarters/toilet/auxiliary) "bBo" = ( /obj/machinery/door/airlock{ @@ -41980,7 +41938,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/crew_quarters/toilet/auxiliary) "bCR" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -41993,14 +41951,14 @@ pixel_y = -24 }, /obj/structure/cable/yellow, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/crew_quarters/toilet/auxiliary) "bCS" = ( /obj/machinery/firealarm{ dir = 4; pixel_x = 24 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/crew_quarters/toilet/auxiliary) "bCV" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -42213,7 +42171,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_y = 32 }, /obj/effect/turf_decal/tile/neutral{ @@ -42692,7 +42650,7 @@ name = "Shower" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/crew_quarters/toilet/auxiliary) "bEu" = ( /obj/machinery/door/airlock{ @@ -43779,14 +43737,14 @@ specialfunctions = 4 }, /obj/item/soap/nanotrasen, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/crew_quarters/toilet/auxiliary) "bGm" = ( /obj/machinery/shower{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/crew_quarters/toilet/auxiliary) "bGp" = ( /obj/structure/cable/yellow{ @@ -44444,7 +44402,7 @@ /obj/machinery/light/small, /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/blood/gibs/old, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/crew_quarters/toilet/auxiliary) "bHO" = ( /obj/machinery/shower{ @@ -49089,12 +49047,6 @@ }, /turf/open/floor/plasteel, /area/teleporter) -"bRv" = ( -/obj/machinery/shieldwallgen, -/turf/open/floor/plasteel/vault{ - dir = 1 - }, -/area/teleporter) "bRw" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -53176,12 +53128,6 @@ /obj/structure/table/glass, /turf/open/floor/plasteel, /area/hallway/primary/central) -"bZr" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/hydrofloor, -/area/hallway/primary/central) "bZs" = ( /obj/item/cultivator, /obj/item/crowbar, @@ -53906,12 +53852,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) -"caI" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/hydrofloor, -/area/hallway/primary/central) "caJ" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical/glass{ @@ -54117,7 +54057,7 @@ icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "caZ" = ( /obj/structure/cable/yellow{ @@ -54128,7 +54068,7 @@ /obj/structure/sign/warning/deathsposal{ pixel_y = 32 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "cba" = ( /obj/machinery/power/smes{ @@ -54138,7 +54078,7 @@ /obj/structure/cable/yellow{ icon_state = "0-8" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "cbb" = ( /obj/machinery/door/window/northleft{ @@ -55071,14 +55011,14 @@ dir = 4 }, /obj/effect/decal/cleanable/cobweb, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "ccF" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 4; name = "plasma tank pump" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "ccG" = ( /obj/structure/sink/kitchen{ @@ -55092,7 +55032,7 @@ /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 10 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "ccH" = ( /obj/machinery/light{ @@ -55108,7 +55048,7 @@ pixel_y = 7 }, /obj/item/pen, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "ccI" = ( /obj/structure/cable/yellow{ @@ -55117,7 +55057,7 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 8 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "ccJ" = ( /obj/structure/disposalpipe/segment, @@ -55127,7 +55067,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "ccK" = ( /obj/structure/cable{ @@ -55139,7 +55079,7 @@ /obj/machinery/atmospherics/pipe/simple/dark/visible{ dir = 6 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "ccL" = ( /obj/machinery/atmospherics/pipe/simple/dark/visible{ @@ -55728,14 +55668,14 @@ name = "input gas connector port" }, /obj/machinery/portable_atmospherics/canister/oxygen, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "cea" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 4; name = "input port pump" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "ceb" = ( /obj/structure/disposalpipe/segment{ @@ -55748,14 +55688,14 @@ dir = 4 }, /obj/machinery/meter, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "cec" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "ced" = ( /obj/structure/disposalpipe/segment{ @@ -55764,7 +55704,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "cee" = ( /obj/structure/disposalpipe/segment{ @@ -55776,7 +55716,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "cef" = ( /obj/structure/sign/warning/fire{ @@ -55789,7 +55729,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "ceg" = ( /obj/effect/spawner/structure/window/reinforced, @@ -56440,7 +56380,7 @@ dir = 4; name = "input gas connector port" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "cfo" = ( /obj/structure/disposalpipe/segment, @@ -56448,7 +56388,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/general/visible, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "cfp" = ( /obj/effect/landmark/xeno_spawn, @@ -56456,13 +56396,13 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "cfq" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 4 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "cfr" = ( /obj/structure/cable{ @@ -56472,14 +56412,14 @@ dir = 4; name = "input port pump" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "cfs" = ( /obj/machinery/atmospherics/pipe/manifold/general/visible{ dir = 4 }, /obj/machinery/meter, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "cft" = ( /obj/effect/spawner/structure/window/reinforced, @@ -56720,14 +56660,14 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/mob/living/simple_animal/bot/cleanbot{ - name = "Scrubs, MD"; - on = 0 - }, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/mob/living/simple_animal/bot/cleanbot{ + name = "Scrubs, MD"; + on = 0 + }, /turf/open/floor/plasteel/white, /area/medical/storage) "cfO" = ( @@ -57073,14 +57013,14 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "cgu" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "cgv" = ( /obj/structure/disposalpipe/segment, @@ -57090,19 +57030,19 @@ /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 6 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "cgw" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 10 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "cgx" = ( /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "cgy" = ( /obj/machinery/telecomms/server/presets/service, @@ -57703,7 +57643,7 @@ }, /area/science/research) "chu" = ( -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_y = 32 }, /obj/structure/chair/stool, @@ -57803,7 +57743,7 @@ name = "Station Intercom (General)"; pixel_y = -29 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "chH" = ( /obj/structure/reagent_dispensers/watertank, @@ -57815,7 +57755,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 5 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "chI" = ( /obj/structure/disposalpipe/segment, @@ -57826,7 +57766,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "chJ" = ( /obj/structure/extinguisher_cabinet{ @@ -57839,7 +57779,7 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "chM" = ( /obj/structure/window/reinforced{ @@ -60358,7 +60298,7 @@ "cmU" = ( /obj/structure/table/reinforced, /obj/item/clipboard, -/obj/item/book/manual/experimentor, +/obj/item/book/manual/wiki/experimentor, /obj/effect/turf_decal/stripes/line{ dir = 2 }, @@ -61432,13 +61372,13 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/mob/living/simple_animal/pet/cat/Runtime, /obj/effect/turf_decal/tile/blue{ dir = 4 }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/mob/living/simple_animal/pet/cat/Runtime, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/heads/cmo) "coS" = ( @@ -63885,7 +63825,7 @@ /obj/item/storage/secure/safe{ pixel_x = 32 }, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_y = 32 }, /obj/effect/turf_decal/stripes/line{ @@ -67384,7 +67324,7 @@ /obj/structure/chair/stool{ pixel_y = 8 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "czI" = ( /obj/structure/sign/warning/securearea{ @@ -67525,7 +67465,7 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/aft) "czX" = ( -/obj/item/book/manual/medical_cloning{ +/obj/item/book/manual/wiki/medical_cloning{ pixel_y = 6 }, /obj/item/paper, @@ -68011,7 +67951,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/science/mixing) "cAK" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -68903,7 +68843,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/science/mixing) "cCF" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -69131,7 +69071,7 @@ pixel_y = 32 }, /obj/structure/rack, -/obj/item/book/manual/robotics_cyborgs{ +/obj/item/book/manual/wiki/robotics_cyborgs{ pixel_x = 2; pixel_y = 5 }, @@ -69820,7 +69760,7 @@ /obj/item/assembly/flash/handheld, /obj/item/assembly/flash/handheld, /obj/item/assembly/flash/handheld, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_x = 32 }, /obj/effect/turf_decal/delivery, @@ -71234,7 +71174,7 @@ /turf/open/floor/plating, /area/maintenance/aft) "cGQ" = ( -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/aft) "cGR" = ( /obj/structure/table, @@ -71246,7 +71186,7 @@ pixel_x = 4; pixel_y = 3 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/aft) "cGS" = ( /obj/structure/table, @@ -71259,7 +71199,7 @@ pixel_y = 2 }, /obj/effect/decal/cleanable/cobweb/cobweb2, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/aft) "cGT" = ( /obj/structure/disposalpipe/segment, @@ -71732,11 +71672,11 @@ pixel_x = -12; pixel_y = 2 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/aft) "cHG" = ( /obj/effect/decal/cleanable/oil, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/aft) "cHH" = ( /obj/structure/table, @@ -71751,7 +71691,7 @@ /obj/structure/sign/warning/biohazard{ pixel_x = 32 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/aft) "cHI" = ( /obj/structure/disposalpipe/segment{ @@ -72271,7 +72211,7 @@ /obj/structure/bed/roller, /obj/machinery/iv_drip, /obj/machinery/iv_drip, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/aft) "cIB" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, @@ -73871,7 +73811,7 @@ dir = 1; id = "incineratorturbine" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "cLD" = ( /obj/structure/disposalpipe/segment, @@ -75353,7 +75293,7 @@ /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) "cOs" = ( -/obj/machinery/ai_status_display, +/obj/machinery/status_display/ai, /turf/closed/wall, /area/hallway/secondary/exit/departure_lounge) "cOt" = ( @@ -80927,7 +80867,7 @@ /obj/structure/sign/poster/official/random{ pixel_y = 32 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "dhz" = ( /obj/structure/disposalpipe/segment{ @@ -80973,7 +80913,7 @@ /obj/structure/sign/poster/official/random{ pixel_y = -32 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "dhD" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -82731,7 +82671,7 @@ icon_state = "1-2" }, /obj/effect/landmark/event_spawn, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/brig) "dCk" = ( /obj/effect/turf_decal/stripes/line{ @@ -82803,7 +82743,7 @@ /area/storage/primary) "dCv" = ( /obj/effect/landmark/event_spawn, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/crew_quarters/locker) "dCw" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -84242,7 +84182,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "vLD" = ( /obj/structure/lattice, @@ -106574,8 +106514,8 @@ abC acr acE adb -abE -abE +aaR +aaR aem aeN afI @@ -106827,7 +106767,7 @@ aaa aax abl abD -abE +aaR aaI acF abe @@ -107083,7 +107023,7 @@ aaF aax aax abm -abE +aaR aaR aaI acG @@ -107340,7 +107280,7 @@ aaG aaP aax abn -abE +aaR abD acs acH @@ -108111,7 +108051,7 @@ aaJ aaS abc abp -abH +acc acc acv acK @@ -108626,12 +108566,12 @@ aax aax abr abJ -abE -abE -abE +aaR +aaR +aaR ade -abE -abE +aaR +aaR aeo aeV afP @@ -117144,7 +117084,7 @@ axC bbG aMY aOu -aOv +aOu aQR dCv aTw @@ -117400,7 +117340,7 @@ aJb axC bah aMY -aOv +aOu aOw aQR aOu @@ -118431,7 +118371,7 @@ aNa aOz aOu aQV -aOv +aOu aTt aUP aUM @@ -119459,7 +119399,7 @@ aNd aOD aPK aQV -aOv +aOu aTz aUM aUM @@ -119706,7 +119646,7 @@ aAe aBx aCD aDY -aFk +aJf aGH aHN aJf diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index ca5d2bc390..b88a3ae3fe 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -201,7 +201,7 @@ /area/bridge) "aav" = ( /obj/machinery/computer/cargo/request, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_y = 32 }, /obj/effect/turf_decal/tile/yellow{ @@ -2077,10 +2077,7 @@ /turf/open/floor/plating, /area/quartermaster/storage) "adp" = ( -/obj/machinery/status_display{ - name = "cargo display"; - supply_display = 1 - }, +/obj/machinery/status_display/supply, /turf/closed/wall, /area/quartermaster/storage) "adq" = ( @@ -2263,7 +2260,7 @@ /turf/open/floor/plasteel/dark, /area/bridge) "adO" = ( -/obj/machinery/ai_status_display, +/obj/machinery/status_display/ai, /turf/closed/wall/r_wall, /area/ai_monitored/nuke_storage) "adP" = ( @@ -2749,11 +2746,11 @@ "aeJ" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /obj/structure/bed/dogbed/ian, -/mob/living/simple_animal/pet/dog/corgi/Ian, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/mob/living/simple_animal/pet/dog/corgi/Ian, /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/hop) "aeK" = ( @@ -2833,11 +2830,7 @@ /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/hop) "aeP" = ( -/obj/machinery/status_display{ - name = "cargo display"; - pixel_x = -32; - supply_display = 1 - }, +/obj/machinery/status_display/supply, /obj/effect/turf_decal/loading_area, /turf/open/floor/plasteel, /area/quartermaster/storage) @@ -3228,7 +3221,7 @@ /obj/machinery/computer/secure_data{ dir = 8 }, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_x = 32 }, /obj/machinery/camera{ @@ -4059,7 +4052,10 @@ /area/bridge) "agX" = ( /obj/structure/table/reinforced, -/obj/item/aiModule/reset, +/obj/item/aiModule/reset{ + pixel_x = 3; + pixel_y = 3 + }, /obj/item/radio/intercom{ name = "Station Intercom"; pixel_x = -26 @@ -4067,6 +4063,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/item/aiModule/supplied/freeform, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -4387,7 +4384,7 @@ /turf/open/floor/plasteel/dark, /area/security/brig) "ahx" = ( -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_y = 32 }, /obj/machinery/light/small{ @@ -4550,7 +4547,7 @@ /obj/machinery/computer/card{ dir = 1 }, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_y = -32 }, /turf/open/floor/carpet, @@ -4607,11 +4604,10 @@ /turf/open/floor/plasteel/dark, /area/bridge) "ahP" = ( -/obj/structure/table/reinforced, -/obj/item/aiModule/supplied/freeform, /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/machinery/ore_silo, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -9230,11 +9226,11 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/effect/turf_decal/tile/red, /mob/living/simple_animal/bot/secbot/beepsky{ desc = "It's Officer Beepsky! Powered by a potato and a shot of whiskey."; name = "Officer Beepsky" }, -/obj/effect/turf_decal/tile/red, /turf/open/floor/plasteel, /area/security/brig) "apC" = ( @@ -13474,7 +13470,7 @@ /area/crew_quarters/bar/atrium) "awZ" = ( /obj/structure/table/wood, -/obj/item/book/manual/barman_recipes, +/obj/item/book/manual/wiki/barman_recipes, /obj/item/reagent_containers/food/drinks/shaker, /obj/item/reagent_containers/glass/rag, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -13593,7 +13589,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_y = 32 }, /obj/item/twohanded/required/kirbyplants{ @@ -14489,7 +14485,7 @@ /area/hallway/secondary/exit) "ayZ" = ( /obj/structure/chair, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_y = 32 }, /obj/structure/cable/white{ @@ -20114,7 +20110,7 @@ /turf/open/floor/plasteel, /area/hallway/primary/starboard) "aIZ" = ( -/obj/machinery/ai_status_display, +/obj/machinery/status_display/ai, /turf/closed/wall, /area/hallway/primary/starboard) "aJa" = ( @@ -21685,7 +21681,7 @@ /turf/open/floor/engine, /area/engine/engineering) "aLO" = ( -/obj/machinery/ai_status_display, +/obj/machinery/status_display/ai, /turf/closed/wall/r_wall, /area/engine/supermatter) "aLP" = ( @@ -22611,7 +22607,7 @@ /area/hallway/secondary/exit) "aNH" = ( /obj/structure/closet/crate, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_y = -32 }, /obj/effect/turf_decal/bot, @@ -22646,7 +22642,7 @@ /area/hallway/secondary/exit) "aNT" = ( /obj/machinery/announcement_system, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_x = -32 }, /obj/machinery/firealarm{ @@ -24149,7 +24145,7 @@ pixel_x = 3; pixel_y = 3 }, -/obj/item/book/manual/detective, +/obj/item/book/manual/wiki/detective, /obj/item/camera/detective, /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -25885,15 +25881,6 @@ }, /turf/open/floor/plasteel/dark, /area/medical/morgue) -"aUl" = ( -/obj/structure/cable/white{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/vault{ - dir = 5 - }, -/area/medical/morgue) "aUm" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/tile/neutral{ @@ -28735,7 +28722,7 @@ /turf/closed/wall/r_wall, /area/science/robotics/lab) "aZj" = ( -/obj/machinery/ai_status_display, +/obj/machinery/status_display/ai, /turf/closed/wall/r_wall, /area/science/robotics/lab) "aZk" = ( @@ -28841,7 +28828,7 @@ }, /area/library) "aZw" = ( -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_y = -32 }, /obj/machinery/atmospherics/components/unary/vent_pump/on{ @@ -29295,7 +29282,7 @@ /area/science/robotics/lab) "bad" = ( /obj/structure/rack, -/obj/item/book/manual/robotics_cyborgs, +/obj/item/book/manual/wiki/robotics_cyborgs, /obj/item/storage/belt/utility/full, /obj/item/circuitboard/mecha/ripley/main, /obj/item/circuitboard/mecha/ripley/peripherals, @@ -31318,7 +31305,7 @@ /obj/structure/table/reinforced, /obj/item/retractor, /obj/item/hemostat, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_x = 32 }, /obj/effect/turf_decal/bot, @@ -31732,7 +31719,7 @@ /obj/machinery/computer/secure_data{ dir = 8 }, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_x = 32 }, /obj/effect/turf_decal/tile/red{ @@ -31771,7 +31758,7 @@ /obj/machinery/computer/mech_bay_power_console{ dir = 1 }, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_y = -32 }, /turf/open/floor/circuit/green, @@ -32837,7 +32824,7 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_x = 32 }, /obj/effect/turf_decal/tile/neutral{ @@ -32929,11 +32916,6 @@ }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) -"bgn" = ( -/turf/open/floor/plasteel/vault{ - dir = 1 - }, -/area/science/xenobiology) "bgo" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/white{ @@ -32971,11 +32953,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/science/xenobiology) -"bgt" = ( -/turf/open/floor/plasteel/vault{ - dir = 4 - }, -/area/science/xenobiology) "bgu" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -33270,7 +33247,7 @@ /turf/open/floor/plasteel, /area/hallway/secondary/entry) "bgT" = ( -/obj/machinery/ai_status_display, +/obj/machinery/status_display/ai, /turf/closed/wall, /area/hallway/secondary/entry) "bgU" = ( @@ -33403,11 +33380,6 @@ }, /turf/open/floor/plasteel/white, /area/science/xenobiology) -"bhf" = ( -/turf/open/floor/plasteel/vault{ - dir = 8 - }, -/area/science/xenobiology) "bhg" = ( /turf/open/floor/circuit/green, /area/science/xenobiology) @@ -34640,7 +34612,7 @@ "bjk" = ( /obj/structure/table/wood, /obj/item/storage/fancy/donut_box, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_x = 32 }, /turf/open/floor/plasteel/grimy, @@ -36218,7 +36190,7 @@ /area/tcommsat/server) "buN" = ( /obj/machinery/announcement_system, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_x = 32 }, /turf/open/floor/circuit/telecomms/mainframe, @@ -37510,7 +37482,7 @@ /turf/open/floor/plasteel, /area/hallway/primary/starboard) "fgG" = ( -/obj/machinery/ai_status_display, +/obj/machinery/status_display/ai, /turf/closed/wall, /area/crew_quarters/lounge) "fjs" = ( @@ -39831,10 +39803,7 @@ /turf/closed/wall/rust, /area/quartermaster/storage) "swM" = ( -/obj/machinery/status_display{ - name = "cargo display"; - supply_display = 1 - }, +/obj/machinery/status_display/supply, /turf/closed/wall/rust, /area/quartermaster/storage) "swN" = ( @@ -41525,7 +41494,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_y = 32 }, /obj/effect/turf_decal/delivery, @@ -41611,7 +41580,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_y = 32 }, /obj/effect/turf_decal/stripes/line{ @@ -42332,7 +42301,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_y = 32 }, /obj/effect/turf_decal/tile/neutral, diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 68c9beeb94..2dcd45e2fc 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -139,7 +139,7 @@ /obj/structure/cable/yellow{ icon_state = "0-8" }, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_y = 32 }, /turf/open/floor/circuit, @@ -350,7 +350,7 @@ id = "AI"; pixel_y = 20 }, -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_y = 37 }, /turf/open/floor/circuit, @@ -1927,13 +1927,7 @@ dir = 1 }, /obj/item/toy/plush/slimeplushie, -/turf/open/floor/plasteel/floorgrime, -/area/security/prison) -"agJ" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 8 - }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "agK" = ( /obj/machinery/light/small{ @@ -1951,7 +1945,7 @@ dir = 8 }, /obj/structure/chair, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "agL" = ( /obj/structure/bed, @@ -1970,7 +1964,7 @@ dir = 1 }, /obj/item/toy/plush/lizardplushie, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "agM" = ( /obj/structure/cable{ @@ -1979,7 +1973,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "agN" = ( /obj/machinery/light/small{ @@ -1997,7 +1991,7 @@ dir = 8 }, /obj/structure/chair, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "agO" = ( /obj/structure/sink{ @@ -2060,17 +2054,13 @@ pixel_x = -28 }, /obj/machinery/atmospherics/components/unary/vent_pump/on, -/turf/open/floor/plasteel/floorgrime, -/area/security/prison) -"agX" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "agY" = ( /obj/structure/table, /obj/item/paper, /obj/item/pen, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "agZ" = ( /obj/machinery/flasher{ @@ -2078,14 +2068,14 @@ pixel_x = -28 }, /obj/machinery/atmospherics/components/unary/vent_pump/on, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "aha" = ( /obj/structure/cable{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "ahb" = ( /obj/structure/toilet{ @@ -2176,7 +2166,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "ahn" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ @@ -2202,7 +2192,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/prison) "ahq" = ( /turf/open/floor/plasteel/showroomfloor, @@ -6500,7 +6490,7 @@ /turf/open/floor/plasteel/dark, /area/security/brig) "aqD" = ( -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_y = 32 }, /turf/open/floor/plasteel/dark, @@ -7017,7 +7007,7 @@ /turf/open/floor/plasteel/dark, /area/bridge) "arO" = ( -/obj/machinery/ai_status_display{ +/obj/machinery/status_display/ai{ pixel_y = 32 }, /obj/structure/table/glass, @@ -7118,6 +7108,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 }, +/obj/machinery/ore_silo, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -8332,10 +8323,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, -/turf/open/floor/plasteel/floorgrime, -/area/security/brig) -"auy" = ( -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/brig) "auz" = ( /obj/machinery/light/small{ @@ -8344,11 +8332,11 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 1 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/brig) "auA" = ( /obj/effect/landmark/event_spawn, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/security/brig) "auB" = ( /obj/machinery/light{ @@ -10175,7 +10163,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 9 }, -/obj/structure/stacklifter, +/obj/structure/weightmachine/stacklifter, /turf/open/floor/plasteel, /area/crew_quarters/fitness/recreation) "ayw" = ( @@ -10698,7 +10686,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 }, -/obj/structure/weightlifter, +/obj/structure/weightmachine/weightlifter, /turf/open/floor/plasteel, /area/crew_quarters/fitness/recreation) "azE" = ( @@ -15968,10 +15956,7 @@ id = "packageSort2" }, /obj/effect/spawner/lootdrop/maintenance, -/obj/machinery/status_display{ - pixel_y = 30; - supply_display = 1 - }, +/obj/machinery/status_display/supply, /turf/open/floor/plating, /area/quartermaster/sorting) "aMj" = ( @@ -16042,7 +16027,7 @@ /obj/structure/cable{ icon_state = "2-4" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "aMq" = ( /obj/effect/spawner/lootdrop/maintenance, @@ -16052,7 +16037,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "aMr" = ( /obj/structure/closet/crate, @@ -16062,7 +16047,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "aMs" = ( /obj/structure/disposalpipe/segment{ @@ -16074,7 +16059,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "aMt" = ( /obj/structure/closet/cardboard, @@ -16091,7 +16076,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "aMu" = ( /obj/item/cigbutt/cigarbutt, @@ -16101,7 +16086,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "aMv" = ( /obj/structure/disposalpipe/segment{ @@ -16117,7 +16102,7 @@ /obj/structure/cable{ icon_state = "0-8" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "aMw" = ( /obj/structure/disposalpipe/segment{ @@ -16670,20 +16655,20 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "aNO" = ( -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "aNP" = ( /obj/structure/closet/crate, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "aNQ" = ( /obj/structure/extinguisher_cabinet{ pixel_x = 27 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "aNR" = ( /obj/structure/cable{ @@ -17164,33 +17149,33 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "aOZ" = ( /obj/item/stack/sheet/cardboard, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "aPa" = ( /obj/structure/closet/crate, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "aPb" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "aPc" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "aPd" = ( /obj/effect/spawner/structure/window/reinforced, @@ -17537,27 +17522,27 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "aQd" = ( /obj/item/flashlight, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "aQe" = ( /obj/effect/spawner/lootdrop/maintenance, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "aQf" = ( /obj/structure/closet/crate{ icon_state = "crateopen" }, /obj/effect/spawner/lootdrop/maintenance, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "aQg" = ( /obj/structure/closet/crate/medical, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "aQj" = ( /obj/structure/disposalpipe/sorting/mail/flip{ @@ -18068,7 +18053,7 @@ /area/quartermaster/warehouse) "aRq" = ( /obj/structure/closet/crate/internals, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/quartermaster/warehouse) "aRs" = ( /obj/structure/disposalpipe/segment, @@ -18895,10 +18880,7 @@ /turf/open/floor/plating, /area/quartermaster/storage) "aTo" = ( -/obj/machinery/status_display{ - pixel_y = 30; - supply_display = 1 - }, +/obj/machinery/status_display/supply, /obj/machinery/conveyor{ dir = 4; id = "QMLoad" @@ -19180,9 +19162,6 @@ }, /turf/open/floor/plasteel, /area/hydroponics) -"aTV" = ( -/turf/open/floor/plasteel/hydrofloor, -/area/hydroponics) "aTW" = ( /obj/structure/table, /obj/item/reagent_containers/spray/plantbgone{ @@ -19641,11 +19620,6 @@ }, /turf/open/floor/plasteel, /area/hydroponics) -"aUV" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/hydrofloor, -/area/hydroponics) "aUW" = ( /obj/structure/table, /obj/machinery/reagentgrinder, @@ -20366,12 +20340,7 @@ /turf/open/floor/plasteel/dark, /area/quartermaster/office) "aWw" = ( -/obj/machinery/status_display{ - dir = 8; - layer = 4; - pixel_x = 32; - supply_display = 1 - }, +/obj/machinery/status_display/supply, /obj/effect/turf_decal/tile/brown, /obj/effect/turf_decal/tile/brown{ dir = 4 @@ -21167,7 +21136,7 @@ /area/crew_quarters/bar) "aYf" = ( /obj/structure/table/reinforced, -/obj/item/book/manual/barman_recipes, +/obj/item/book/manual/wiki/barman_recipes, /obj/item/reagent_containers/glass/rag, /obj/effect/turf_decal/tile/red{ dir = 1 @@ -21793,12 +21762,7 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "aZj" = ( -/obj/machinery/status_display{ - dir = 4; - layer = 4; - pixel_x = -32; - supply_display = 1 - }, +/obj/machinery/status_display/supply, /obj/machinery/computer/bounty{ dir = 4 }, @@ -22098,10 +22062,10 @@ /obj/machinery/airalarm{ pixel_y = 24 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/janitor) "aZP" = ( -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/janitor) "aZQ" = ( /obj/structure/reagent_dispensers/watertank, @@ -22113,7 +22077,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/janitor) "aZR" = ( /obj/machinery/hydroponics/constructable, @@ -22625,7 +22589,7 @@ /obj/structure/cable{ icon_state = "2-4" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/janitor) "baY" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ @@ -22634,7 +22598,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/janitor) "baZ" = ( /obj/structure/closet/l3closet/janitor, @@ -22646,7 +22610,7 @@ /obj/structure/cable{ icon_state = "1-8" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/janitor) "bba" = ( /obj/machinery/holopad, @@ -23013,7 +22977,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/janitor) "bbY" = ( /obj/machinery/camera{ @@ -23021,7 +22985,7 @@ dir = 8 }, /obj/machinery/vending/wardrobe/jani_wardrobe, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/janitor) "bbZ" = ( /obj/machinery/seed_extractor, @@ -23498,13 +23462,13 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/janitor) "bdh" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 8 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/janitor) "bdi" = ( /obj/item/reagent_containers/glass/bucket, @@ -23517,7 +23481,7 @@ dir = 9; pixel_x = 22 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/janitor) "bdj" = ( /obj/effect/turf_decal/tile/green, @@ -23835,14 +23799,14 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/janitor) "bed" = ( /obj/structure/table, /obj/item/restraints/legcuffs/beartrap, /obj/item/restraints/legcuffs/beartrap, /obj/item/reagent_containers/spray/cleaner, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/janitor) "bee" = ( /obj/structure/table, @@ -23855,7 +23819,7 @@ pixel_x = 24 }, /obj/item/clothing/head/crown, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/janitor) "bef" = ( /obj/effect/turf_decal/tile/neutral{ @@ -24156,12 +24120,7 @@ /turf/closed/wall, /area/science/robotics/mechbay) "beJ" = ( -/obj/machinery/status_display{ - dir = 4; - layer = 4; - pixel_x = -32; - supply_display = 1 - }, +/obj/machinery/status_display/ai, /obj/structure/filingcabinet, /obj/effect/turf_decal/tile/brown{ dir = 1 @@ -24351,7 +24310,7 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/janitor) "bfj" = ( /obj/machinery/hydroponics/constructable, @@ -24930,7 +24889,7 @@ /obj/effect/decal/cleanable/robot_debris{ icon_state = "gib3" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/science/robotics/mechbay) "bgF" = ( /obj/structure/cable{ @@ -26958,7 +26917,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/item/book/manual/experimentor, +/obj/item/book/manual/wiki/experimentor, /turf/open/floor/engine, /area/science/explab) "blT" = ( @@ -28880,7 +28839,7 @@ /area/hallway/primary/aft) "bqg" = ( /obj/structure/table, -/obj/item/book/manual/robotics_cyborgs{ +/obj/item/book/manual/wiki/robotics_cyborgs{ pixel_x = 2; pixel_y = 5 }, @@ -30509,7 +30468,7 @@ /obj/structure/sign/departments/xenobio{ pixel_x = -32 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/science/xenobiology) "btB" = ( /obj/structure/cable{ @@ -30518,7 +30477,7 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 4 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/science/xenobiology) "btE" = ( /obj/structure/disposalpipe/segment{ @@ -30556,7 +30515,7 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/science/xenobiology) "btK" = ( /obj/docking_port/stationary{ @@ -30680,7 +30639,7 @@ /area/medical/genetics) "btX" = ( /obj/structure/table, -/obj/item/book/manual/medical_cloning{ +/obj/item/book/manual/wiki/medical_cloning{ pixel_y = 6 }, /obj/structure/disposalpipe/segment, @@ -32005,7 +31964,7 @@ /area/medical/chemistry) "bxa" = ( /obj/structure/table/glass, -/obj/item/book/manual/research_and_development, +/obj/item/book/manual/wiki/research_and_development, /obj/item/disk/tech_disk, /obj/item/disk/design_disk, /turf/open/floor/plasteel/dark, @@ -34026,13 +33985,13 @@ /obj/structure/cable{ icon_state = "4-8" }, -/mob/living/simple_animal/pet/cat/Runtime, /obj/effect/turf_decal/tile/blue{ dir = 4 }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/mob/living/simple_animal/pet/cat/Runtime, /turf/open/floor/plasteel/white, /area/crew_quarters/heads/cmo) "bBi" = ( @@ -36147,10 +36106,7 @@ /obj/item/folder/white, /obj/item/pen, /obj/item/stamp/rd, -/obj/machinery/status_display{ - pixel_y = -30; - supply_display = 0 - }, +/obj/machinery/status_display/ai, /obj/machinery/camera{ c_tag = "Research Director's Office"; dir = 1; @@ -43887,13 +43843,13 @@ /obj/item/folder/yellow, /obj/item/paper/monitorkey, /obj/item/pen, -/mob/living/simple_animal/parrot/Poly, /obj/effect/turf_decal/tile/yellow{ dir = 1 }, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/mob/living/simple_animal/parrot/Poly, /turf/open/floor/plasteel, /area/crew_quarters/heads/chief) "bVE" = ( @@ -44580,7 +44536,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/department/engine) "bXe" = ( /obj/structure/cable{ @@ -45888,7 +45844,7 @@ /obj/machinery/light/small{ dir = 1 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/department/engine) "cad" = ( /obj/structure/window/reinforced, @@ -46277,12 +46233,12 @@ /turf/open/floor/plasteel, /area/engine/engineering) "cbg" = ( -/obj/item/book/manual/engineering_singularity_safety{ +/obj/item/book/manual/wiki/engineering_singulo_tesla{ pixel_x = 3; pixel_y = 3 }, /obj/item/book/manual/wiki/engineering_guide, -/obj/item/book/manual/engineering_particle_accelerator{ +/obj/item/book/manual/wiki/engineering_singulo_tesla{ pixel_x = -3; pixel_y = -3 }, @@ -47758,9 +47714,6 @@ /obj/machinery/door/airlock/external, /turf/open/floor/plating, /area/chapel/main/monastery) -"cfK" = ( -/turf/open/floor/plasteel/asteroid, -/area/chapel/asteroid/monastery) "cfL" = ( /obj/structure/flora/ausbushes/fernybush, /obj/machinery/camera{ @@ -47908,14 +47861,6 @@ }, /turf/open/floor/plasteel/dark, /area/chapel/main/monastery) -"cgi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel/vault{ - dir = 8 - }, -/area/chapel/main/monastery) "cgj" = ( /obj/structure/flora/ausbushes/ywflowers, /obj/structure/flora/ausbushes/ppflowers, @@ -48366,12 +48311,6 @@ /obj/structure/reagent_dispensers/watertank/high, /turf/open/floor/plasteel, /area/chapel/main/monastery) -"cia" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/vault{ - dir = 8 - }, -/area/chapel/main/monastery) "cib" = ( /obj/structure/flora/ausbushes/ppflowers, /turf/open/floor/grass, @@ -49933,7 +49872,7 @@ /turf/open/floor/plasteel/showroomfloor, /area/security/main) "cnT" = ( -/obj/structure/weightlifter, +/obj/structure/weightmachine/weightlifter, /turf/open/floor/plasteel/showroomfloor, /area/security/main) "cnV" = ( @@ -50754,11 +50693,6 @@ }, /turf/open/floor/plasteel/dark, /area/chapel/dock) -"cqI" = ( -/turf/open/floor/plasteel/vault{ - dir = 8 - }, -/area/chapel/dock) "cqS" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -51500,14 +51434,6 @@ /obj/machinery/vending/wardrobe/chap_wardrobe, /turf/open/floor/carpet, /area/chapel/office) -"cua" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel/vault{ - dir = 8 - }, -/area/chapel/main/monastery) "cuc" = ( /obj/machinery/light, /obj/machinery/camera{ @@ -51970,12 +51896,6 @@ }, /turf/open/floor/plasteel/dark, /area/chapel/main/monastery) -"cvv" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/turf/open/floor/plasteel/vault{ - dir = 8 - }, -/area/chapel/main/monastery) "cvw" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 1 @@ -52149,14 +52069,6 @@ }, /turf/open/floor/plasteel/dark, /area/chapel/main/monastery) -"cvL" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel/vault{ - dir = 5 - }, -/area/chapel/main/monastery) "cvM" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-10" @@ -52981,11 +52893,6 @@ }, /turf/open/floor/plasteel/dark, /area/library) -"cAh" = ( -/turf/open/floor/plasteel/vault{ - dir = 5 - }, -/area/library) "cAi" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/tile/neutral{ @@ -54589,7 +54496,7 @@ /obj/structure/cable{ icon_state = "1-8" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/department/engine) "fAx" = ( /obj/structure/cable{ @@ -55092,7 +54999,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/science/xenobiology) "gIG" = ( /obj/effect/turf_decal/tile/purple{ @@ -56147,7 +56054,7 @@ /obj/structure/closet, /obj/effect/spawner/lootdrop/maintenance, /obj/item/kitchen/knife, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/department/engine) "jPo" = ( /obj/structure/chair, @@ -56343,7 +56250,7 @@ /obj/structure/chair{ dir = 4 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/department/engine) "ksf" = ( /obj/item/stack/tile/carpet, @@ -56608,7 +56515,7 @@ /turf/open/floor/plating, /area/maintenance/department/security/brig) "kRq" = ( -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/department/engine) "kRK" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible, @@ -56802,7 +56709,7 @@ /turf/open/floor/plasteel/dark, /area/science/xenobiology) "lGp" = ( -/obj/structure/weightlifter, +/obj/structure/weightmachine/weightlifter, /turf/open/floor/plasteel/dark, /area/security/prison) "lGv" = ( @@ -57144,7 +57051,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 1 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/science/xenobiology) "mwg" = ( /obj/structure/closet/crate{ @@ -58068,7 +57975,7 @@ /obj/structure/closet, /obj/effect/decal/cleanable/blood/old, /obj/item/stack/sheet/mineral/wood, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/department/engine) "oGm" = ( /obj/structure/disposalpipe/segment{ @@ -58620,7 +58527,7 @@ pixel_y = -32 }, /obj/structure/barricade/wooden, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/maintenance/department/engine) "qar" = ( /obj/structure/chair/office/light{ @@ -58686,7 +58593,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/science/xenobiology) "qdj" = ( /obj/structure/disposalpipe/segment, @@ -60382,7 +60289,7 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 1 }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/science/xenobiology) "uXH" = ( /obj/structure/cable{ @@ -60431,7 +60338,7 @@ name = "Containment Pen"; req_access_txt = "55" }, -/turf/open/floor/plasteel/floorgrime, +/turf/open/floor/plasteel, /area/science/xenobiology) "vhk" = ( /obj/structure/chair, @@ -81732,8 +81639,8 @@ afD aga aga agz -agJ -agX +aie +aiH ahm ahD aib @@ -82523,7 +82430,7 @@ aqm aon asv atw -auy +aon avt awJ axG