diff --git a/.github/workflows/autobuild_tgui.yml b/.github/workflows/autobuild_tgui.yml index 08da0f545d3..b680139f74a 100644 --- a/.github/workflows/autobuild_tgui.yml +++ b/.github/workflows/autobuild_tgui.yml @@ -33,4 +33,4 @@ jobs: - name: Push Artifacts uses: ad-m/github-push-action@master with: - github_token: ${{ secrets.GITHUB_TOKEN }} + github_token: ${{ secrets.GITHUB_MASTER_KEY }} diff --git a/.github/workflows/compile_changelogs.yml b/.github/workflows/compile_changelogs.yml new file mode 100644 index 00000000000..4894870752b --- /dev/null +++ b/.github/workflows/compile_changelogs.yml @@ -0,0 +1,36 @@ +name: Compile changelogs + +on: + schedule: + - cron: "0 0 * * *" + +jobs: + compile: + name: "Compile changelogs" + runs-on: ubuntu-latest + steps: + - name: "Setup python" + uses: actions/setup-python@v1 + with: + python-version: '3.x' + - name: "Install deps" + run: | + python -m pip install --upgrade pip + python -m pip install pyyaml + - name: "Checkout" + uses: actions/checkout@v1 + with: + fetch-depth: 25 + - name: "Compile" + run: | + python tools/ss13_genchangelog.py html/changelog.html html/changelogs + - name: Commit + run: | + git config --local user.email "action@github.com" + git config --local user.name "Changelogs" + git pull origin master + git commit -m "Automatic changelog compile [ci skip]" -a || true + - name: "Push" + uses: ad-m/github-push-action@master + with: + github_token: ${{ secrets.GITHUB_MASTER_KEY }} diff --git a/Dockerfile b/Dockerfile index 952e27eb562..50d5316df56 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM tgstation/byond:513.1490 as base +FROM tgstation/byond:513.1503 as base FROM base as build_base diff --git a/SQL/database_changelog.txt b/SQL/database_changelog.txt index 680acb2ae08..f84268b8a34 100644 --- a/SQL/database_changelog.txt +++ b/SQL/database_changelog.txt @@ -1,13 +1,32 @@ Any time you make a change to the schema files, remember to increment the database schema version. Generally increment the minor number, major should be reserved for significant changes to the schema. Both values go up to 255. -The latest database version is 5.6; The query to update the schema revision table is: +The latest database version is 5.7; The query to update the schema revision table is: -INSERT INTO `schema_revision` (`major`, `minor`) VALUES (5, 6); +INSERT INTO `schema_revision` (`major`, `minor`) VALUES (5, 7); or -INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (5, 6); +INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (5, 7); In any query remember to add a prefix to the table names if you use one. +----------------------------------------------------- + +Version 5.7, 10 January 2020 by Atlanta-Ned +Added ticket table for tracking ahelp tickets in the database. + +DROP TABLE IF EXISTS `ticket`; +CREATE TABLE `ticket` ( + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `server_ip` int(10) unsigned NOT NULL, + `server_port` smallint(5) unsigned NOT NULL, + `round_id` int(11) unsigned NOT NULL, + `ticket` smallint(11) unsigned NOT NULL, + `action` varchar(20) NOT NULL DEFAULT 'Message', + `message` text NOT NULL, + `timestamp` datetime NOT NULL, + `recipient` varchar(32) DEFAULT NULL, + `sender` varchar(32) DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; ----------------------------------------------------- diff --git a/SQL/tgstation_schema.sql b/SQL/tgstation_schema.sql index 7a5db181e84..a9b2c65fef1 100644 --- a/SQL/tgstation_schema.sql +++ b/SQL/tgstation_schema.sql @@ -537,6 +537,24 @@ CREATE TABLE `achievement_metadata` ( PRIMARY KEY (`achievement_key`) ) ENGINE=InnoDB; +-- +-- Table structure for table `ticket` +-- +DROP TABLE IF EXISTS `ticket`; +CREATE TABLE `ticket` ( + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `server_ip` int(10) unsigned NOT NULL, + `server_port` smallint(5) unsigned NOT NULL, + `round_id` int(11) unsigned NOT NULL, + `ticket` smallint(11) unsigned NOT NULL, + `action` varchar(20) NOT NULL DEFAULT 'Message', + `message` text NOT NULL, + `timestamp` datetime NOT NULL, + `recipient` varchar(32) DEFAULT NULL, + `sender` varchar(32) DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + /*!40101 SET SQL_MODE=@OLD_SQL_MODE */; /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; /*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; diff --git a/SQL/tgstation_schema_prefixed.sql b/SQL/tgstation_schema_prefixed.sql index 3122bab69fb..845a23ea7d1 100644 --- a/SQL/tgstation_schema_prefixed.sql +++ b/SQL/tgstation_schema_prefixed.sql @@ -537,6 +537,24 @@ CREATE TABLE `SS13_achievement_metadata` ( PRIMARY KEY (`achievement_key`) ) ENGINE=InnoDB; +-- +-- Table structure for table `SS13_ticket` +-- +DROP TABLE IF EXISTS `SS13_ticket`; +CREATE TABLE `SS13_ticket` ( + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `server_ip` int(10) unsigned NOT NULL, + `server_port` smallint(5) unsigned NOT NULL, + `round_id` int(11) unsigned NOT NULL, + `ticket` smallint(11) unsigned NOT NULL, + `action` varchar(20) NOT NULL DEFAULT 'Message', + `message` text NOT NULL, + `timestamp` datetime NOT NULL, + `recipient` varchar(32) DEFAULT NULL, + `sender` varchar(32) DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + /*!40101 SET SQL_MODE=@OLD_SQL_MODE */; /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; /*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; diff --git a/SpacemanDMM.toml b/SpacemanDMM.toml new file mode 100644 index 00000000000..b8274722546 --- /dev/null +++ b/SpacemanDMM.toml @@ -0,0 +1,2 @@ +[langserver] +dreamchecker = true diff --git a/_maps/RandomRuins/LavaRuins/kinggoatboss.dmm b/_maps/RandomRuins/LavaRuins/kinggoatboss.dmm new file mode 100644 index 00000000000..36e1ec4b965 --- /dev/null +++ b/_maps/RandomRuins/LavaRuins/kinggoatboss.dmm @@ -0,0 +1,268 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/open/floor/plating/asteroid/basalt/lava_land_surface, +/area/lavaland/surface/outdoors/explored) +"b" = ( +/turf/closed/wall/mineral/silver, +/area/ruin/powered) +"c" = ( +/turf/closed/wall/mineral/gold, +/area/ruin/powered) +"d" = ( +/obj/structure/mineral_door/transparent/diamond{ + sheetAmount = 1 + }, +/turf/open/floor/mineral/silver, +/area/ruin/powered) +"e" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/mineral/gold, +/area/ruin/powered) +"f" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/mineral/gold, +/area/ruin/powered) +"g" = ( +/turf/open/floor/mineral/diamond, +/area/ruin/powered) +"k" = ( +/obj/structure/ladder/unbreakable{ + desc = "This seems to be the ladder to the King of Goats lair. Looks to be a one way trip..."; + id = "goatlayer"; + name = "Ladder to the King of Goats Lair" + }, +/turf/open/floor/mineral/gold, +/area/ruin/powered) +"q" = ( +/obj/effect/mob_spawn/human/miner{ + assignedrole = "null"; + desc = "Seems this miner tried to cheese the arena using bluespace crystals. Did not turn out well"; + mob_gender = "female"; + mob_name = "Lyna Lavas"; + name = "Lyna Lavas" + }, +/obj/item/stack/ore/bluespace_crystal, +/obj/effect/decal/cleanable/blood/old, +/turf/open/floor/mineral/gold, +/area/ruin/powered) +"r" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/mineral/gold, +/area/ruin/powered) +"s" = ( +/obj/item/paper/crumpled{ + info = "Lest ye be prepared, abandon all hope ye who enter here."; + name = "Wise Man's Warning." + }, +/obj/effect/decal/remains/human, +/turf/open/floor/mineral/diamond, +/area/ruin/powered) +"t" = ( +/obj/machinery/light, +/turf/open/floor/mineral/gold, +/area/ruin/powered) +"H" = ( +/turf/open/floor/mineral/gold, +/area/ruin/powered) + +(1,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(2,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(3,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(4,1,1) = {" +a +a +a +b +b +c +d +c +b +b +a +a +a +"} +(5,1,1) = {" +a +a +a +b +q +f +H +f +H +b +a +a +a +"} +(6,1,1) = {" +a +a +a +c +e +g +g +g +t +c +a +a +a +"} +(7,1,1) = {" +a +a +a +d +H +g +k +s +H +d +a +a +a +"} +(8,1,1) = {" +a +a +a +c +e +g +g +g +t +c +a +a +a +"} +(9,1,1) = {" +a +a +a +b +H +r +H +r +H +b +a +a +a +"} +(10,1,1) = {" +a +a +a +b +b +c +d +c +b +b +a +a +a +"} +(11,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(12,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(13,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +"} diff --git a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm index 594ba7b697f..5cacb35367b 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm @@ -66,7 +66,7 @@ /area/ruin/powered/beach) "ao" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/effect/turf_decal/sand, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm b/_maps/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm index 291a55cb511..8c4715da5e6 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm @@ -1210,12 +1210,16 @@ wet = 16 }, /area/ruin/powered/clownplanet) +"eE" = ( +/obj/effect/mapping_helpers/no_lava, +/turf/closed/wall/r_wall, +/area/ruin/powered/clownplanet) "eX" = ( /obj/effect/mapping_helpers/no_lava, /turf/open/floor/noslip{ initial_gas_mix = "LAVALAND_ATMOS" }, -/area/lavaland/surface/outdoors/explored) +/area/ruin/powered/clownplanet) "gX" = ( /obj/effect/mapping_helpers/no_lava, /turf/open/chasm/lavaland, @@ -1241,7 +1245,7 @@ /turf/open/floor/noslip{ initial_gas_mix = "LAVALAND_ATMOS" }, -/area/lavaland/surface/outdoors/explored) +/area/ruin/powered/clownplanet) "Hj" = ( /obj/effect/decal/cleanable/food/pie_smudge, /obj/effect/turf_decal/tile/yellow{ @@ -1291,6 +1295,13 @@ /obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/ruin/powered/clownplanet) +"RW" = ( +/obj/effect/mapping_helpers/no_lava, +/mob/living/simple_animal/hostile/retaliate/clown, +/turf/open/floor/noslip{ + initial_gas_mix = "LAVALAND_ATMOS" + }, +/area/ruin/powered/clownplanet) "TD" = ( /obj/structure/disposalpipe/trunk, /obj/structure/disposaloutlet{ @@ -1307,7 +1318,7 @@ /turf/open/floor/noslip{ initial_gas_mix = "LAVALAND_ATMOS" }, -/area/lavaland/surface/outdoors/explored) +/area/ruin/powered/clownplanet) "XO" = ( /obj/effect/mapping_helpers/no_lava, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, @@ -1322,6 +1333,7 @@ "YI" = ( /obj/machinery/light/small, /obj/effect/mapping_helpers/no_lava, +/mob/living/simple_animal/hostile/retaliate/clown, /turf/open/floor/noslip{ initial_gas_mix = "LAVALAND_ATMOS" }, @@ -1703,7 +1715,7 @@ cc "} (12,1,1) = {" aa -Mv +XO cc ye ap @@ -1736,8 +1748,8 @@ ye cc "} (13,1,1) = {" -XO -Mv +eE +eE cc ye cc @@ -1770,7 +1782,7 @@ ye cc "} (14,1,1) = {" -XO +eE Xm cc cc @@ -1805,7 +1817,7 @@ cc "} (15,1,1) = {" eX -eX +RW LH ch ch @@ -1838,7 +1850,7 @@ ye cc "} (16,1,1) = {" -eX +RW CB YI cc @@ -1873,7 +1885,7 @@ cc "} (17,1,1) = {" eX -eX +RW TD ch ch @@ -1906,8 +1918,8 @@ ye cc "} (18,1,1) = {" -XO -eX +eE +RW cc cc ye @@ -1940,8 +1952,8 @@ ye cc "} (19,1,1) = {" -XO -Mv +eE +eE cc ye ye @@ -2043,7 +2055,7 @@ cc "} (22,1,1) = {" aa -Mv +XO cc ye aq diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_elephant_graveyard.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_elephant_graveyard.dmm index 9349d866eea..e349ecbeb47 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_elephant_graveyard.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_elephant_graveyard.dmm @@ -53,11 +53,6 @@ /obj/structure/cable, /turf/open/floor/plating/asteroid/basalt/wasteland, /area/ruin/unpowered/elephant_graveyard) -"am" = ( -/obj/structure/cable, -/obj/structure/cable, -/turf/open/floor/plating/asteroid/basalt/wasteland, -/area/ruin/unpowered/elephant_graveyard) "an" = ( /obj/item/reagent_containers/food/snacks/deadmouse, /obj/item/assembly/mousetrap, @@ -366,7 +361,6 @@ /area/ruin/unpowered/elephant_graveyard) "bw" = ( /obj/structure/cable, -/obj/structure/cable, /obj/machinery/power/floodlight, /turf/open/floor/plating/asteroid/basalt/wasteland, /area/ruin/unpowered/elephant_graveyard) @@ -522,7 +516,6 @@ /area/ruin/unpowered/elephant_graveyard) "cb" = ( /obj/structure/cable, -/obj/structure/cable, /obj/item/reagent_containers/glass/bottle/frostoil{ desc = "A small bottle. Contains cold sauce. There's a label on here: APPLY ON SEVERE BURNS."; volume = 10 @@ -1258,7 +1251,7 @@ bf bf aE bf -am +al aq as az @@ -1346,7 +1339,7 @@ al al al al -am +al al cA bf diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm index 56b94cd255e..598dbe77c56 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm @@ -1,43 +1,207 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( +"aa" = ( /turf/closed/mineral/volcanic/lava_land_surface, /area/lavaland/surface/outdoors) -"b" = ( +"ab" = ( /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) -"d" = ( +"ac" = ( +/turf/closed/wall/r_wall, +/area/ruin/powered/seedvault) +"ad" = ( +/obj/machinery/vending/hydronutrients, +/obj/effect/turf_decal/trimline/green/filled/line, +/turf/open/floor/plasteel/dark, +/area/ruin/powered/seedvault) +"ae" = ( +/obj/machinery/smartfridge, +/obj/effect/turf_decal/trimline/green/filled/line, +/turf/open/floor/plasteel/dark, +/area/ruin/powered/seedvault) +"af" = ( +/obj/machinery/vending/hydroseeds, +/obj/effect/turf_decal/trimline/green/filled/line, +/turf/open/floor/plasteel/dark, +/area/ruin/powered/seedvault) +"ag" = ( +/obj/item/storage/toolbox/syndicate, /obj/structure/table/wood, -/obj/item/lighter, -/obj/item/lighter, -/obj/item/storage/fancy/rollingpapers, -/obj/item/storage/fancy/rollingpapers, -/obj/item/storage/fancy/rollingpapers, -/obj/item/storage/fancy/rollingpapers, +/obj/effect/turf_decal/trimline/green/filled/line, +/turf/open/floor/plasteel/dark, +/area/ruin/powered/seedvault) +"ah" = ( /turf/open/floor/plasteel/freezer, /area/ruin/powered/seedvault) -"e" = ( +"ai" = ( +/obj/item/reagent_containers/glass/beaker/bluespace, +/obj/item/reagent_containers/glass/beaker/bluespace, +/obj/item/reagent_containers/glass/beaker/bluespace, +/obj/item/reagent_containers/glass/beaker/bluespace, /obj/structure/table/wood, -/obj/item/storage/box/disks_plantgene, -/turf/open/floor/plasteel/freezer, +/obj/effect/turf_decal/trimline/green/filled/line, +/turf/open/floor/plasteel/dark, /area/ruin/powered/seedvault) -"f" = ( -/obj/machinery/plantgenes/seedvault{ - pixel_y = 6 +"aj" = ( +/obj/structure/table/wood, +/obj/item/gun/energy/floragun, +/obj/item/gun/energy/floragun, +/obj/item/gun/energy/floragun, +/obj/item/gun/energy/floragun, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/effect/turf_decal/trimline/green/filled/line, +/turf/open/floor/plasteel/dark, +/area/ruin/powered/seedvault) +"ak" = ( +/obj/effect/mob_spawn/human/seed_vault, +/obj/machinery/light{ + dir = 1 }, -/obj/structure/table/wood, /turf/open/floor/plasteel/freezer, /area/ruin/powered/seedvault) -"g" = ( -/obj/structure/table/wood, -/obj/machinery/smartfridge/disks{ +"al" = ( +/turf/open/floor/plasteel/dark, +/area/ruin/powered/seedvault) +"am" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/ruin/powered/seedvault) +"an" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/ruin/powered/seedvault) +"ao" = ( +/obj/structure/loom, +/turf/open/floor/plasteel/dark, +/area/ruin/powered/seedvault) +"ap" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/mob_spawn/human/seed_vault, +/turf/open/floor/plasteel/freezer, +/area/ruin/powered/seedvault) +"aq" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/mob_spawn/human/seed_vault, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/turf/open/floor/plasteel/freezer, +/area/ruin/powered/seedvault) +"ar" = ( +/obj/structure/closet/crate/hydroponics, +/obj/item/clothing/under/rank/civilian/hydroponics, +/obj/item/clothing/under/rank/civilian/hydroponics, +/obj/item/clothing/under/rank/civilian/hydroponics, +/obj/item/clothing/under/rank/civilian/hydroponics, +/obj/effect/decal/cleanable/cobweb, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/ruin/powered/seedvault) +"as" = ( +/obj/machinery/door/airlock/glass_large, +/turf/open/floor/plasteel/freezer, +/area/ruin/powered/seedvault) +"at" = ( +/obj/structure/closet/crate/hydroponics, +/obj/item/cultivator, +/obj/item/cultivator, +/obj/item/cultivator, +/obj/item/cultivator, +/obj/item/shovel/spade, +/obj/item/shovel/spade, +/obj/item/shovel/spade, +/obj/item/shovel/spade, +/obj/item/hatchet, +/obj/item/hatchet, +/obj/item/hatchet, +/obj/item/hatchet, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/ruin/powered/seedvault) +"au" = ( +/obj/machinery/door/airlock/titanium, +/turf/open/floor/vault, +/area/ruin/powered/seedvault) +"av" = ( +/obj/machinery/door/airlock/external, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/turf/open/floor/plasteel/dark, +/area/ruin/powered/seedvault) +"aw" = ( +/obj/machinery/reagentgrinder{ + pixel_y = 5 + }, +/obj/structure/table/glass, +/obj/effect/turf_decal/trimline/green/filled/end, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/plasteel/dark, +/area/ruin/powered/seedvault) +"ax" = ( +/obj/structure/reagent_dispensers/watertank/high, +/obj/effect/turf_decal/trimline/green/line{ + dir = 9 + }, +/obj/effect/turf_decal/trimline/green/filled/corner, +/turf/open/floor/plasteel/dark, +/area/ruin/powered/seedvault) +"ay" = ( +/obj/structure/reagent_dispensers/watertank/high, +/obj/effect/turf_decal/trimline/green/line{ + dir = 5 + }, +/obj/effect/turf_decal/trimline/green/filled/corner{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/ruin/powered/seedvault) +"az" = ( +/obj/structure/closet/crate/hydroponics, +/obj/item/soap/homemade, +/obj/item/soap/homemade, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 6 + }, +/turf/open/floor/plasteel/dark, +/area/ruin/powered/seedvault) +"aA" = ( +/turf/open/floor/vault, +/area/ruin/powered/seedvault) +"aB" = ( +/obj/effect/spawner/lootdrop/seed_vault, +/obj/structure/closet/crate/hydroponics, +/obj/effect/spawner/lootdrop/seed_vault, +/obj/effect/spawner/lootdrop/seed_vault, +/obj/item/vending_refill/hydronutrients, +/obj/item/vending_refill/hydroseeds, +/turf/open/floor/vault, +/area/ruin/powered/seedvault) +"aC" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = -12; pixel_y = 2 }, -/turf/open/floor/plasteel/freezer, +/obj/machinery/light, +/turf/open/floor/plasteel/dark, /area/ruin/powered/seedvault) -"h" = ( -/turf/open/floor/plasteel/freezer, +"aD" = ( +/obj/structure/sink{ + dir = 8; + pixel_x = 11 + }, +/obj/machinery/light, +/turf/open/floor/plasteel/dark, /area/ruin/powered/seedvault) -"i" = ( +"aE" = ( /obj/structure/closet/crate/hydroponics, /obj/structure/beebox, /obj/item/melee/flyswatter, @@ -47,669 +211,932 @@ /obj/item/queen_bee/bought, /obj/item/clothing/head/beekeeper_head, /obj/item/clothing/suit/beekeeper_suit, -/turf/open/floor/plasteel/freezer, -/area/ruin/powered/seedvault) -"j" = ( -/obj/structure/shuttle/engine/propulsion{ +/obj/machinery/light{ dir = 8 }, -/turf/open/floor/plating/asteroid/basalt/lava_land_surface, -/area/lavaland/surface/outdoors) -"k" = ( -/obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/seed_vault, +/turf/open/floor/vault, +/area/ruin/powered/seedvault) +"aF" = ( +/obj/structure/table/wood, +/obj/item/lighter, +/obj/item/lighter, +/obj/item/storage/fancy/rollingpapers, +/obj/item/storage/fancy/rollingpapers, +/obj/item/storage/fancy/rollingpapers, +/obj/item/storage/fancy/rollingpapers, +/turf/open/floor/plasteel/dark, +/area/ruin/powered/seedvault) +"aG" = ( +/turf/closed/mineral/volcanic/lava_land_surface, +/area/ruin/powered/seedvault) +"aH" = ( +/obj/machinery/door/airlock/vault, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/freezer, /area/ruin/powered/seedvault) -"l" = ( -/obj/machinery/door/airlock, -/turf/open/floor/plasteel/freezer, -/area/ruin/powered/seedvault) -"m" = ( -/obj/machinery/door/airlock/external, -/obj/structure/fans/tiny, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 +"aI" = ( +/obj/machinery/light{ + dir = 1 }, -/turf/open/floor/plasteel/freezer, +/turf/open/floor/vault, /area/ruin/powered/seedvault) -"n" = ( -/obj/machinery/smartfridge, -/turf/open/floor/plasteel/freezer, +"aJ" = ( +/obj/structure/reagent_dispensers/watertank/high, +/obj/effect/turf_decal/trimline/green/line{ + dir = 10 + }, +/obj/effect/turf_decal/trimline/green/filled/corner{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, /area/ruin/powered/seedvault) -"o" = ( -/obj/structure/closet/crate/hydroponics, -/obj/item/cultivator, -/obj/item/cultivator, -/obj/item/cultivator, -/obj/item/cultivator, -/obj/item/shovel/spade, -/obj/item/shovel/spade, -/obj/item/shovel/spade, -/obj/item/shovel/spade, -/obj/item/hatchet, -/obj/item/hatchet, -/obj/item/hatchet, -/obj/item/hatchet, -/turf/open/floor/plasteel/freezer, -/area/ruin/powered/seedvault) -"p" = ( -/obj/machinery/hydroponics/constructable, -/turf/open/floor/plasteel/freezer, -/area/ruin/powered/seedvault) -"q" = ( -/obj/item/hatchet, -/obj/item/storage/bag/plants, -/obj/item/reagent_containers/glass/bucket, -/obj/structure/table/wood, -/turf/open/floor/plasteel/freezer, -/area/ruin/powered/seedvault) -"r" = ( -/obj/structure/table/wood, -/obj/item/storage/bag/plants, -/obj/item/storage/bag/plants, -/obj/item/storage/bag/plants, -/obj/item/storage/bag/plants, -/turf/open/floor/plasteel/freezer, -/area/ruin/powered/seedvault) -"s" = ( -/obj/structure/table/wood, -/obj/item/gun/energy/floragun, -/obj/item/gun/energy/floragun, -/obj/item/gun/energy/floragun, -/obj/item/gun/energy/floragun, -/obj/item/storage/box/disks_plantgene, -/turf/open/floor/plasteel/freezer, -/area/ruin/powered/seedvault) -"t" = ( -/obj/effect/mob_spawn/human/seed_vault, -/turf/open/floor/plasteel/freezer, -/area/ruin/powered/seedvault) -"u" = ( +"aK" = ( /obj/structure/sink{ dir = 8; + pixel_x = 11 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ruin/powered/seedvault) +"aL" = ( +/obj/structure/table/wood, +/obj/item/storage/box/disks_plantgene, +/obj/item/storage/box/disks_plantgene, +/obj/item/storage/box/disks_plantgene, +/turf/open/floor/vault, +/area/ruin/powered/seedvault) +"aM" = ( +/obj/structure/table/wood, +/obj/machinery/smartfridge/disks{ + pixel_y = 2 + }, +/turf/open/floor/vault, +/area/ruin/powered/seedvault) +"aN" = ( +/turf/open/floor/mineral/titanium/blue, +/area/ruin/powered/seedvault) +"aO" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/reagent_dispensers/watertank/high, +/obj/effect/turf_decal/trimline/green/line{ + dir = 6 + }, +/obj/effect/turf_decal/trimline/green/filled/corner{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ruin/powered/seedvault) +"aP" = ( +/obj/machinery/plantgenes/seedvault{ + pixel_y = 6 + }, +/obj/structure/table/wood, +/turf/open/floor/vault, +/area/ruin/powered/seedvault) +"aQ" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/freezer, +/area/ruin/powered/seedvault) +"aR" = ( +/obj/machinery/door/airlock/vault, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ruin/powered/seedvault) +"aS" = ( +/obj/structure/table/wood, +/obj/item/storage/bag/plants, +/obj/item/storage/bag/plants, +/obj/item/storage/bag/plants, +/obj/item/storage/bag/plants, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ruin/powered/seedvault) +"aT" = ( +/obj/item/reagent_containers/glass/bucket, +/obj/structure/table/wood, +/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 5 + }, +/turf/open/floor/plasteel/dark, +/area/ruin/powered/seedvault) +"aU" = ( +/obj/machinery/light, +/turf/open/floor/plasteel/freezer, +/area/ruin/powered/seedvault) +"aV" = ( +/obj/effect/turf_decal/trimline/green/line, +/obj/effect/turf_decal/trimline/green/line{ + dir = 1 + }, +/obj/structure/table/reinforced, +/turf/open/floor/mineral/plastitanium, +/area/ruin/powered/seedvault) +"aW" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/open/floor/mineral/titanium/blue, +/area/ruin/powered/seedvault) +"aX" = ( +/obj/structure/closet/crate/hydroponics, +/obj/structure/beebox, +/obj/item/melee/flyswatter, +/obj/item/honey_frame, +/obj/item/honey_frame, +/obj/item/honey_frame, +/obj/item/queen_bee/bought, +/obj/item/clothing/head/beekeeper_head, +/obj/item/clothing/suit/beekeeper_suit, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/vault, +/area/ruin/powered/seedvault) +"aY" = ( +/obj/effect/decal/cleanable/food/plant_smudge, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, +/turf/open/floor/vault, +/area/ruin/powered/seedvault) +"aZ" = ( +/obj/structure/sink{ + dir = 4; pixel_x = -12; pixel_y = 2 }, -/turf/open/floor/plasteel/freezer, -/area/ruin/powered/seedvault) -"v" = ( -/obj/machinery/vending/hydronutrients, -/turf/open/floor/plasteel/freezer, -/area/ruin/powered/seedvault) -"w" = ( -/obj/machinery/vending/hydroseeds, -/turf/open/floor/plasteel/freezer, -/area/ruin/powered/seedvault) -"x" = ( -/obj/machinery/reagentgrinder{ - pixel_y = 5 +/obj/machinery/light{ + dir = 1 }, -/obj/structure/table/glass, -/obj/item/reagent_containers/glass/beaker/bluespace, -/obj/item/reagent_containers/glass/beaker/bluespace, -/obj/item/reagent_containers/glass/beaker/bluespace, -/obj/item/reagent_containers/glass/beaker/bluespace, -/turf/open/floor/plasteel/freezer, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/plasteel/dark, /area/ruin/powered/seedvault) -"y" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 11 - }, -/turf/open/floor/plasteel/freezer, -/area/ruin/powered/seedvault) -"z" = ( -/obj/machinery/door/airlock/external, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ +"ba" = ( +/obj/effect/turf_decal/trimline/green/line{ dir = 4 }, -/turf/open/floor/plasteel/freezer, +/obj/effect/turf_decal/trimline/green/line{ + dir = 8 + }, +/obj/structure/table/reinforced, +/turf/open/floor/mineral/plastitanium, /area/ruin/powered/seedvault) -"B" = ( -/obj/structure/disposalpipe/trunk, -/obj/machinery/disposal/bin, -/turf/open/floor/plasteel/freezer, +"bb" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/mineral/titanium/blue, /area/ruin/powered/seedvault) -"C" = ( -/obj/machinery/seed_extractor, -/turf/open/floor/plasteel/freezer, +"bc" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/hydroponics/constructable, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/trimline/green/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/green/line{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium, /area/ruin/powered/seedvault) -"D" = ( -/obj/machinery/biogenerator, -/turf/open/floor/plasteel/freezer, -/area/ruin/powered/seedvault) -"E" = ( +"bd" = ( /obj/machinery/chem_dispenser/mutagensaltpeter, -/turf/open/floor/plasteel/freezer, +/obj/effect/turf_decal/trimline/green/corner, +/obj/effect/turf_decal/trimline/green/line{ + dir = 9 + }, +/turf/open/floor/mineral/plastitanium, /area/ruin/powered/seedvault) -"F" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel/freezer, +"be" = ( +/obj/effect/turf_decal/trimline/green/line, +/obj/effect/turf_decal/trimline/green/line{ + dir = 1 + }, +/turf/open/floor/mineral/plastitanium, /area/ruin/powered/seedvault) -"G" = ( -/obj/structure/closet/crate/hydroponics, -/obj/item/clothing/under/rank/civilian/hydroponics, -/obj/item/clothing/under/rank/civilian/hydroponics, -/obj/item/clothing/under/rank/civilian/hydroponics, -/obj/item/clothing/under/rank/civilian/hydroponics, -/turf/open/floor/plasteel/freezer, -/area/ruin/powered/seedvault) -"H" = ( -/obj/machinery/chem_master/condimaster, -/turf/open/floor/plasteel/freezer, -/area/ruin/powered/seedvault) -"I" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/glass/bucket, -/obj/item/reagent_containers/glass/bucket, -/obj/item/reagent_containers/glass/bucket, -/obj/item/reagent_containers/glass/bucket, -/turf/open/floor/plasteel/freezer, -/area/ruin/powered/seedvault) -"J" = ( -/obj/item/storage/toolbox/syndicate, -/obj/structure/table/wood, -/turf/open/floor/plasteel/freezer, -/area/ruin/powered/seedvault) -"L" = ( -/obj/structure/disposalpipe/segment{ +"bf" = ( +/obj/machinery/biogenerator, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/trimline/green/corner{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/green/line{ dir = 5 }, -/turf/open/floor/plating/asteroid/basalt/lava_land_surface, -/area/lavaland/surface/outdoors) -"M" = ( +/turf/open/floor/mineral/plastitanium, +/area/ruin/powered/seedvault) +"bg" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/hydroponics/constructable, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/effect/turf_decal/trimline/green/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/green/line{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium, +/area/ruin/powered/seedvault) +"bh" = ( +/obj/machinery/hydroponics/constructable, +/obj/effect/turf_decal/trimline/green/line{ + dir = 6 + }, +/turf/open/floor/mineral/plastitanium, +/area/ruin/powered/seedvault) +"bi" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/green/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/green/line{ + dir = 8 + }, +/obj/structure/table/reinforced, +/turf/open/floor/mineral/plastitanium, +/area/ruin/powered/seedvault) +"bj" = ( +/obj/machinery/hydroponics/constructable, +/obj/effect/turf_decal/trimline/green/line{ + dir = 10 + }, +/turf/open/floor/mineral/plastitanium, +/area/ruin/powered/seedvault) +"bk" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/mineral/titanium/blue, +/area/ruin/powered/seedvault) +"bl" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/hydroponics/constructable, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/trimline/green/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/green/line{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium, +/area/ruin/powered/seedvault) +"bm" = ( /obj/structure/disposalpipe/trunk{ dir = 8 }, -/turf/open/floor/plating/asteroid/basalt/lava_land_surface, -/area/lavaland/surface/outdoors) -"N" = ( -/obj/structure/table/wood, -/obj/item/storage/box/disks_plantgene, +/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/disposaloutlet, +/obj/structure/flora/ausbushes/fullgrass, /obj/machinery/light{ dir = 1 }, -/turf/open/floor/plasteel/freezer, +/turf/open/floor/plating/grass/lavaland, /area/ruin/powered/seedvault) -"O" = ( -/obj/machinery/light{ +"bn" = ( +/obj/structure/window/spawner/east, +/obj/structure/flora/ausbushes/palebush, +/obj/structure/flora/ausbushes/ppflowers, +/turf/open/floor/plating/grass/lavaland, +/area/ruin/powered/seedvault) +"bo" = ( +/obj/machinery/chem_master/condimaster, +/obj/effect/turf_decal/trimline/green/corner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/green/line{ + dir = 10 + }, +/turf/open/floor/mineral/plastitanium, +/area/ruin/powered/seedvault) +"bp" = ( +/obj/machinery/seed_extractor, +/obj/effect/turf_decal/trimline/green/corner{ dir = 1 }, -/turf/open/floor/plasteel/freezer, +/obj/effect/turf_decal/trimline/green/line{ + dir = 6 + }, +/turf/open/floor/mineral/plastitanium, /area/ruin/powered/seedvault) -"P" = ( +"bq" = ( +/obj/machinery/light{ + dir = 4 + }, /obj/machinery/hydroponics/constructable, -/obj/machinery/light{ - dir = 1 - }, -/turf/open/floor/plasteel/freezer, -/area/ruin/powered/seedvault) -"Q" = ( -/turf/closed/wall/r_wall, -/area/ruin/powered/seedvault) -"R" = ( -/obj/machinery/light{ +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/trimline/green/line{ dir = 8 }, -/turf/open/floor/plasteel/freezer, +/obj/effect/turf_decal/trimline/green/line{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium, /area/ruin/powered/seedvault) -"S" = ( -/obj/machinery/light{ +"br" = ( +/obj/structure/flora/ausbushes/sunnybush, +/obj/structure/flora/grass/jungle/b, +/turf/open/floor/plating/grass/lavaland, +/area/ruin/powered/seedvault) +"bs" = ( +/obj/structure/window/spawner/east, +/obj/structure/flora/ausbushes/sparsegrass, +/turf/open/floor/plating/grass/lavaland, +/area/ruin/powered/seedvault) +"bt" = ( +/obj/structure/window/spawner, +/obj/structure/flora/ausbushes/ppflowers, +/obj/structure/flora/ausbushes/genericbush, +/obj/structure/flora/ausbushes/brflowers, +/turf/open/floor/plating/grass/lavaland, +/area/ruin/powered/seedvault) +"bu" = ( +/obj/structure/window/spawner/east, +/obj/structure/flora/ausbushes/fernybush, +/obj/structure/flora/ausbushes/ywflowers, +/obj/structure/flora/ausbushes/sparsegrass, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/plating/grass/lavaland, +/area/ruin/powered/seedvault) +"bv" = ( +/obj/machinery/light, +/obj/machinery/hydroponics/constructable, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/trimline/green/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/green/line, +/turf/open/floor/mineral/plastitanium, +/area/ruin/powered/seedvault) +"bw" = ( +/obj/machinery/light, +/obj/machinery/hydroponics/constructable, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/trimline/green/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/green/line, +/turf/open/floor/mineral/plastitanium, +/area/ruin/powered/seedvault) +"bx" = ( +/obj/effect/decal/cleanable/glass, +/turf/open/floor/plating/asteroid/basalt/lava_land_surface, +/area/lavaland/surface/outdoors) +"by" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/closed/wall/r_wall, +/area/ruin/powered/seedvault) +"bz" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/mineral/titanium/blue, +/area/ruin/powered/seedvault) +"bA" = ( +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/closed/wall/r_wall, +/area/ruin/powered/seedvault) +"bB" = ( +/obj/machinery/hydroponics/constructable, +/obj/effect/turf_decal/trimline/green/line{ + dir = 5 + }, +/turf/open/floor/mineral/plastitanium, +/area/ruin/powered/seedvault) +"bC" = ( +/obj/machinery/hydroponics/constructable, +/obj/effect/turf_decal/trimline/green/line{ + dir = 9 + }, +/turf/open/floor/mineral/plastitanium, +/area/ruin/powered/seedvault) +"bD" = ( +/turf/closed/wall/r_wall, +/area/lavaland/surface/outdoors) +"ca" = ( +/obj/machinery/atmospherics/components/unary/tank/air{ dir = 4 }, /turf/open/floor/plasteel/freezer, /area/ruin/powered/seedvault) -"U" = ( -/obj/machinery/light, +"oR" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 10 + }, /turf/open/floor/plasteel/freezer, /area/ruin/powered/seedvault) -"V" = ( -/obj/structure/disposalpipe/segment, -/turf/closed/wall/r_wall, +"pW" = ( +/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, +/turf/open/floor/plasteel/freezer, /area/ruin/powered/seedvault) -"X" = ( -/obj/machinery/hydroponics/constructable, +"qQ" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/turf/open/floor/plasteel/freezer, +/area/ruin/powered/seedvault) +"sv" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/vault, +/area/ruin/powered/seedvault) +"Bb" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/freezer, +/area/ruin/powered/seedvault) +"DA" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/mineral/titanium/blue, +/area/ruin/powered/seedvault) +"Eu" = ( /obj/machinery/light, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/freezer, +/area/ruin/powered/seedvault) +"KF" = ( +/obj/machinery/door/airlock/titanium, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/vault, +/area/ruin/powered/seedvault) +"PH" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/freezer, +/area/ruin/powered/seedvault) +"Uz" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, +/turf/open/floor/mineral/titanium/blue, +/area/ruin/powered/seedvault) +"Vn" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/plasteel/freezer, /area/ruin/powered/seedvault) (1,1,1) = {" -a -a -a -a -a -a -a -Q -Q -Q -Q -Q -Q -a -a -a -a -a -b -b +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ab +ab "} (2,1,1) = {" -a -a -a -a -a -a -a -Q -t -t -t -t -Q -a -a -a -a -a -b -b +aa +aa +aa +aa +ab +ab +aa +aa +aa +aa +aa +aa +ab +aa +aa +aa +aa +aa +aa +ab "} (3,1,1) = {" -b -a -a -a -a -a -Q -Q -O -h -h -U -Q -Q -a -a -a -b -a -b +aa +ac +ac +ac +ac +ac +ac +aa +aa +aa +aa +ab +ab +ab +aa +aa +aa +ab +ab +ab "} (4,1,1) = {" -b -a -a -Q -Q -Q -Q -Q -Q -l -l -Q -Q -Q -Q -a -a -a -a -a +aa +ac +ak +ah +ac +ca +ac +ac +ac +ac +ab +ab +ab +ab +ab +ab +ab +ab +aa +aa "} (5,1,1) = {" -a -a -Q -Q -k -Q -n -R -u -h -h -u -R -u -Q -a -a -a -a -a +aa +ac +ap +ah +as +PH +aQ +av +al +aR +ab +ab +ab +ab +ab +aa +aa +aa +aa +aa "} (6,1,1) = {" -a -a -Q -d -h -Q -o -h -h -h -h -h -h -G -Q -a -a -a -a -a +aa +ac +ap +Vn +Bb +qQ +ah +av +am +aR +ab +ab +ac +ac +ac +ac +ac +aa +aa +aa "} (7,1,1) = {" -a -a -Q -N -h -Q -P -h -p -h -h -p -h -X -Q -a -a -a -a -a +aa +ac +aq +ah +ac +PH +aU +ac +ac +ac +ac +ac +ac +bc +bc +bc +ac +ac +bD +aa "} (8,1,1) = {" -b -a -Q -e -h -l -h -h -v -h -h -B -F -F -V -L -a -a -a -a +aa +ac +ac +ac +ac +PH +ah +aS +ac +aG +ac +bh +aN +aN +aN +aN +aN +bB +ac +aa "} (9,1,1) = {" -b -a -Q -f -h -Q -p -h -n -h -h -C -h -k -Q -M -a -a -a -a +ac +ac +ar +at +az +PH +ah +aT +ac +ac +ac +bb +bb +aN +aN +aN +aN +aN +ac +ac "} (10,1,1) = {" -a -a -Q -g -h -Q -p -h -w -h -h -D -h -p -Q -b -a -a -a -a +ac +ad +al +al +al +PH +ah +al +aC +ac +aZ +bb +aN +bd +ba +bo +aN +aN +bv +ac "} (11,1,1) = {" -a -a -Q -h -h -Q -q -h -x -h -h -E -h -H -Q -a -a -a -a -a +ac +ae +al +Vn +Bb +pW +Bb +Bb +Bb +aH +Bb +DA +Uz +aV +aW +be +aN +aN +bw +ac "} (12,1,1) = {" -b -a -Q -O -h -Q -P -h -h -h -h -h -h -X -Q -a -a -a -a -a +ac +af +am +al +al +PH +ah +al +aD +ac +aK +bb +aN +bf +bi +bp +aN +aN +bv +ac "} (13,1,1) = {" -a -a -Q -i -h -Q -r -h -h -p -p -h -h -I -Q -a -a -a -a -a +ac +ac +ac +aw +al +PH +ah +aF +ac +ac +ac +aN +aN +aN +bz +aN +aN +aN +ac +ac "} (14,1,1) = {" -a -a -Q -Q -i -Q -s -S -y -h -h -y -S -J -Q -a -a -a -a -a +ac +ag +an +al +al +PH +ah +ah +au +aA +ac +bj +aN +bb +bk +aN +bb +bC +ac +aa "} (15,1,1) = {" -a -a -b -Q -Q -Q -Q -Q -Q -z -z -Q -Q -Q -Q -a -a -a -a -a +ac +ai +al +Vn +Bb +qQ +ah +aF +ac +aA +ac +ac +ac +bg +bl +bq +ac +ac +ac +aa "} (16,1,1) = {" -b -a -b -j -Q -j -Q -j -Q -h -h -Q -j -Q -j -a -a -a -a -a +ac +aj +al +al +al +Eu +ac +ac +ac +aI +aA +aL +ac +by +bA +ac +ac +ab +ab +aa "} (17,1,1) = {" -a -a -a -a -a -a -a -a -Q -m -m -Q -b -b -b -a -a -a -b -b +ac +ac +ao +al +al +PH +ac +aX +aE +aA +aA +aP +ac +bm +br +bt +ab +ab +aa +aa "} (18,1,1) = {" -a -a -a -b -b -b -b -b -b -b -b -b -b -b -b -a -a -a -b -b +aa +ac +ac +ax +aJ +oR +KF +sv +sv +aY +aM +ac +ac +bn +bs +bu +bx +ab +ab +ab "} (19,1,1) = {" -a -a -a -a -b -b -a -b -b -b -b -b -b -b -a -a -a -b -b -b +aa +aa +ac +ay +aO +ah +ac +aB +aB +aB +ac +ac +aa +aa +aa +aa +ab +ab +ab +ab "} (20,1,1) = {" -a -a -a -b -b -b -a -b -b -b -b -b -b -b -a -a -a -b -b -a +aa +aa +ac +ac +ac +ac +ac +ac +ac +ac +ac +aa +aa +aa +aa +aa +aa +ab +ab +aa "} diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm index 5a1ccd7600f..13db62ea112 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm @@ -2035,7 +2035,7 @@ pixel_x = -24 }, /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, @@ -2607,7 +2607,7 @@ pixel_y = 18 }, /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/machinery/light/small{ @@ -4634,7 +4634,7 @@ /area/ruin/unpowered/syndicate_lava_base/medbay) "mf" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/machinery/airalarm/syndicate{ diff --git a/_maps/RandomRuins/SpaceRuins/DJstation.dmm b/_maps/RandomRuins/SpaceRuins/DJstation.dmm index 18b3fa6541c..3a9283c141b 100644 --- a/_maps/RandomRuins/SpaceRuins/DJstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/DJstation.dmm @@ -314,7 +314,7 @@ /area/ruin/space/djstation) "be" = ( /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, diff --git a/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm b/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm index ba317a2263b..670864f7d0a 100644 --- a/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm +++ b/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm @@ -3,11 +3,7 @@ /turf/template_noop, /area/template_noop) "ab" = ( -/obj/machinery/power/shieldwallgen{ - active = 2; - anchored = 1; - power = 1 - }, +/obj/machinery/power/shieldwallgen/anchored, /obj/structure/cable, /turf/open/floor/plating/airless, /area/ruin/space/has_grav/abandonedzoo) @@ -153,11 +149,7 @@ /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/abandonedzoo) "aE" = ( -/obj/machinery/power/shieldwallgen{ - active = 2; - anchored = 1; - power = 1 - }, +/obj/machinery/power/shieldwallgen/anchored, /obj/structure/cable, /turf/open/floor/plating, /area/ruin/space/has_grav/abandonedzoo) @@ -248,7 +240,6 @@ /obj/machinery/power/apc/unlocked{ dir = 8; environ = 0; - equipment = 0; lighting = 0; name = "Worn-out APC"; pixel_x = -25 @@ -367,11 +358,8 @@ /turf/open/floor/plasteel/dark/side, /area/ruin/space/has_grav/abandonedzoo) "bf" = ( -/obj/machinery/power/smes/magical{ - desc = "A high-capacity superconducting magnetic energy storage (SMES) unit."; - name = "power storage unit" - }, /obj/structure/cable, +/obj/machinery/power/smes/engineering, /turf/open/floor/plasteel/dark/side, /area/ruin/space/has_grav/abandonedzoo) "bg" = ( @@ -435,13 +423,13 @@ /turf/open/floor/plasteel/dark/side, /area/ruin/space/has_grav/abandonedzoo) "bs" = ( -/obj/machinery/power/shieldwallgen, /obj/structure/cable, +/obj/machinery/power/shieldwallgen/anchored, /turf/open/floor/plating, /area/ruin/space/has_grav/abandonedzoo) "bt" = ( -/obj/machinery/power/shieldwallgen, /obj/structure/cable, +/obj/machinery/power/shieldwallgen/anchored, /turf/open/floor/plating/airless, /area/ruin/space/has_grav/abandonedzoo) "bu" = ( @@ -496,6 +484,7 @@ /area/ruin/space/has_grav/abandonedzoo) "bD" = ( /obj/item/clothing/mask/facehugger/dead, +/obj/structure/alien/weeds, /turf/open/floor/plating/airless, /area/ruin/space/has_grav/abandonedzoo) "bE" = ( @@ -654,7 +643,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plating, /area/ruin/space/has_grav/abandonedzoo) "wF" = ( /obj/machinery/door/airlock/hatch{ @@ -690,6 +679,11 @@ "KN" = ( /turf/template_noop, /area/space/nearstation) +"Ng" = ( +/obj/structure/alien/weeds, +/obj/structure/alien/weeds/node, +/turf/open/floor/plating/airless, +/area/ruin/space/has_grav/abandonedzoo) (1,1,1) = {" ab @@ -979,7 +973,7 @@ bl at ac bB -bB +Ng bD bH ac @@ -1002,7 +996,7 @@ ac bC bH bH -bX +bB bT aa "} @@ -1022,7 +1016,7 @@ aL aD bD bB -bX +Ng bO bU bW @@ -1043,7 +1037,7 @@ aQ ac bB bB -bX +bB bX bP aa diff --git a/_maps/RandomRuins/SpaceRuins/cloning_facility.dmm b/_maps/RandomRuins/SpaceRuins/cloning_facility.dmm deleted file mode 100644 index 26bb9bf35af..00000000000 --- a/_maps/RandomRuins/SpaceRuins/cloning_facility.dmm +++ /dev/null @@ -1,595 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/turf/template_noop, -/area/template_noop) -"b" = ( -/turf/closed/wall/r_wall, -/area/ruin/space/has_grav/powered/ancient_shuttle) -"c" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/fulltile, -/turf/open/floor/plasteel, -/area/ruin/space/has_grav/powered/ancient_shuttle) -"d" = ( -/turf/closed/wall/r_wall/rust, -/area/ruin/space/has_grav/powered/ancient_shuttle) -"e" = ( -/obj/machinery/defibrillator_mount/loaded, -/turf/closed/wall/r_wall, -/area/ruin/space/has_grav/powered/ancient_shuttle) -"f" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/fulltile, -/turf/open/floor/plasteel/airless, -/area/ruin/space/has_grav/powered/ancient_shuttle) -"g" = ( -/obj/structure/table, -/obj/item/flashlight/lamp, -/obj/effect/decal/cleanable/cobweb, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/ruin/space/has_grav/powered/ancient_shuttle) -"h" = ( -/obj/structure/table, -/obj/item/pen, -/obj/item/paper/fluff/ruins/exp_cloning/log, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/ruin/space/has_grav/powered/ancient_shuttle) -"i" = ( -/obj/machinery/dna_scannernew, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/ruin/space/has_grav/powered/ancient_shuttle) -"j" = ( -/obj/machinery/computer/prototype_cloning, -/obj/machinery/light{ - dir = 1 - }, -/obj/item/paper/fluff/ruins/exp_cloning/manual, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/ruin/space/has_grav/powered/ancient_shuttle) -"k" = ( -/obj/machinery/clonepod/experimental, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/ruin/space/has_grav/powered/ancient_shuttle) -"l" = ( -/obj/effect/decal/cleanable/vomit/old, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/ruin/space/has_grav/powered/ancient_shuttle) -"m" = ( -/obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/ruin/space/has_grav/powered/ancient_shuttle) -"n" = ( -/obj/structure/sign/nanotrasen, -/turf/closed/wall, -/area/ruin/space/has_grav/powered/ancient_shuttle) -"o" = ( -/obj/machinery/vending/snack/teal, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/airless, -/area/ruin/space/has_grav/powered/ancient_shuttle) -"p" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/airless, -/area/ruin/space/has_grav/powered/ancient_shuttle) -"q" = ( -/obj/structure/sign/directions/science{ - dir = 8 - }, -/turf/closed/wall/r_wall, -/area/ruin/space/has_grav/powered/ancient_shuttle) -"r" = ( -/obj/effect/decal/remains/human, -/obj/effect/decal/cleanable/blood/old, -/turf/open/floor/plasteel, -/area/ruin/space/has_grav/powered/ancient_shuttle) -"s" = ( -/obj/machinery/iv_drip, -/turf/open/floor/plasteel, -/area/ruin/space/has_grav/powered/ancient_shuttle) -"t" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/bed, -/obj/item/bedsheet/medical, -/turf/open/floor/plasteel, -/area/ruin/space/has_grav/powered/ancient_shuttle) -"u" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/ruin/space/has_grav/powered/ancient_shuttle) -"v" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/ruin/space/has_grav/powered/ancient_shuttle) -"w" = ( -/obj/structure/chair{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/ruin/space/has_grav/powered/ancient_shuttle) -"x" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/ruin/space/has_grav/powered/ancient_shuttle) -"y" = ( -/obj/structure/chair{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/ruin/space/has_grav/powered/ancient_shuttle) -"z" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/turf/open/floor/plasteel/white, -/area/ruin/space/has_grav/powered/ancient_shuttle) -"A" = ( -/obj/structure/sign/departments/science, -/turf/closed/wall, -/area/ruin/space/has_grav/powered/ancient_shuttle) -"B" = ( -/turf/open/floor/plasteel/airless, -/area/ruin/space/has_grav/powered/ancient_shuttle) -"C" = ( -/turf/open/floor/plating/airless, -/area/space/nearstation) -"D" = ( -/obj/structure/chair/comfy{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/ruin/space/has_grav/powered/ancient_shuttle) -"E" = ( -/turf/open/floor/plasteel, -/area/ruin/space/has_grav/powered/ancient_shuttle) -"F" = ( -/obj/machinery/door/airlock/research/glass, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plasteel, -/area/ruin/space/has_grav/powered/ancient_shuttle) -"G" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plasteel, -/area/ruin/space/has_grav/powered/ancient_shuttle) -"H" = ( -/obj/machinery/door/airlock/research/glass, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/ruin/space/has_grav/powered/ancient_shuttle) -"I" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/ruin/space/has_grav/powered/ancient_shuttle) -"J" = ( -/turf/open/floor/plasteel/white, -/area/ruin/space/has_grav/powered/ancient_shuttle) -"K" = ( -/obj/machinery/door/airlock/research/glass, -/turf/open/floor/plasteel/airless, -/area/ruin/space/has_grav/powered/ancient_shuttle) -"L" = ( -/turf/open/floor/plating/airless{ - icon_state = "platingdmg1" - }, -/area/space/nearstation) -"M" = ( -/obj/structure/fluff/broken_flooring{ - dir = 8; - icon_state = "plating"; - name = "broken plating" - }, -/turf/template_noop, -/area/space/nearstation) -"N" = ( -/obj/item/book/random/triple, -/turf/open/floor/plasteel, -/area/ruin/space/has_grav/powered/ancient_shuttle) -"O" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/bookcase/random/fiction, -/turf/open/floor/plasteel, -/area/ruin/space/has_grav/powered/ancient_shuttle) -"P" = ( -/obj/structure/table/glass, -/obj/machinery/light, -/obj/structure/bedsheetbin, -/turf/open/floor/plasteel/white, -/area/ruin/space/has_grav/powered/ancient_shuttle) -"Q" = ( -/obj/structure/table/glass, -/turf/open/floor/plasteel/white, -/area/ruin/space/has_grav/powered/ancient_shuttle) -"R" = ( -/obj/structure/table/glass, -/obj/item/storage/firstaid/regular, -/obj/item/healthanalyzer{ - desc = "A prototype hand-held body scanner able to distinguish vital signs of the subject."; - name = "prototype health analyzer" - }, -/turf/open/floor/plasteel/white, -/area/ruin/space/has_grav/powered/ancient_shuttle) -"S" = ( -/obj/structure/table/glass, -/obj/item/storage/box/syringes, -/turf/open/floor/plasteel/white, -/area/ruin/space/has_grav/powered/ancient_shuttle) -"T" = ( -/turf/closed/wall, -/area/ruin/space/has_grav/powered/ancient_shuttle) -"U" = ( -/turf/open/floor/plating/airless{ - icon_state = "platingdmg2" - }, -/area/space/nearstation) -"V" = ( -/turf/closed/wall/r_wall/rust, -/area/space/nearstation) - -(1,1,1) = {" -a -a -a -a -a -a -a -a -a -"} -(2,1,1) = {" -a -a -a -a -a -a -a -a -a -"} -(3,1,1) = {" -a -a -c -c -c -c -c -a -a -"} -(4,1,1) = {" -a -a -c -r -D -N -c -a -a -"} -(5,1,1) = {" -a -a -c -s -E -E -c -a -a -"} -(6,1,1) = {" -a -a -d -t -E -O -d -a -a -"} -(7,1,1) = {" -a -a -d -b -F -d -d -a -a -"} -(8,1,1) = {" -a -a -a -b -G -b -a -a -a -"} -(9,1,1) = {" -a -a -d -d -H -b -b -a -a -"} -(10,1,1) = {" -a -b -b -u -I -I -c -a -a -"} -(11,1,1) = {" -a -c -g -v -J -J -c -a -a -"} -(12,1,1) = {" -a -c -h -w -J -J -d -a -a -"} -(13,1,1) = {" -a -d -i -x -J -P -b -a -a -"} -(14,1,1) = {" -a -b -j -y -J -Q -c -a -a -"} -(15,1,1) = {" -a -b -k -x -J -R -c -a -a -"} -(16,1,1) = {" -a -e -l -x -J -S -d -a -a -"} -(17,1,1) = {" -a -d -m -z -J -J -d -a -a -"} -(18,1,1) = {" -a -d -n -A -K -T -b -a -a -"} -(19,1,1) = {" -a -f -o -B -p -C -V -a -a -"} -(20,1,1) = {" -a -f -p -p -C -U -M -a -a -"} -(21,1,1) = {" -a -d -q -C -L -M -a -a -a -"} -(22,1,1) = {" -a -a -b -f -M -a -a -a -a -"} -(23,1,1) = {" -a -a -a -a -a -a -a -a -a -"} diff --git a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm index b763b86409e..bdd916d14a9 100644 --- a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm +++ b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm @@ -689,7 +689,7 @@ /area/ruin/space/has_grav/deepstorage/hydroponics) "bR" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /turf/open/floor/plasteel, @@ -1129,7 +1129,7 @@ "cO" = ( /obj/machinery/atmospherics/pipe/simple/supplymain/hidden, /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/structure/mirror{ diff --git a/_maps/RandomRuins/SpaceRuins/kinggoatarena.dmm b/_maps/RandomRuins/SpaceRuins/kinggoatarena.dmm new file mode 100644 index 00000000000..2473abd136f --- /dev/null +++ b/_maps/RandomRuins/SpaceRuins/kinggoatarena.dmm @@ -0,0 +1,475 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/closed/indestructible/riveted/uranium, +/area/ruin/powered/kinggoat_arena) +"b" = ( +/turf/open/indestructible/diamond, +/area/ruin/powered/kinggoat_arena) +"c" = ( +/obj/structure/chair/bronze, +/mob/living/simple_animal/hostile/megafauna/king, +/turf/open/indestructible/diamond, +/area/ruin/powered/kinggoat_arena) +"d" = ( +/mob/living/simple_animal/hostile/retaliate/goat/guard/pope, +/turf/open/indestructible/diamond, +/area/ruin/powered/kinggoat_arena) +"e" = ( +/obj/effect/portal/permanent/one_way/destroy{ + id = "king goat arena"; + name = "king goat arena portal"; + teleport_channel = "free" + }, +/turf/open/indestructible/diamond, +/area/ruin/powered/kinggoat_arena) +"f" = ( +/mob/living/simple_animal/hostile/retaliate/goose{ + desc = "If you are alive and reading this you should not be in this room and should prob tell a admin how you got here."; + name = "The Paradox Goose" + }, +/turf/open/indestructible/diamond, +/area/ruin/powered/kinggoat_arena) +"g" = ( +/obj/structure/ladder/unbreakable{ + desc = "This seems to be the ladder to the King of Goats' lair. Looks to be a one way trip..."; + height = 1; + id = "goatlayer"; + name = "Ladder to the King of Goats Lair" + }, +/turf/open/indestructible/gold, +/area/ruin/powered/kinggoat_arena) +"h" = ( +/turf/open/indestructible/gold, +/area/ruin/powered/kinggoat_arena) +"i" = ( +/obj/machinery/door/airlock/gold/glass{ + desc = "Once you go in the portal past this door there is no going back..."; + name = "POINT OF NO RETURN" + }, +/turf/open/indestructible/gold, +/area/ruin/powered/kinggoat_arena) +"j" = ( +/obj/effect/portal/permanent/one_way/keep{ + id = "king goat arena"; + name = "king goat arena portal"; + teleport_channel = "free" + }, +/turf/open/indestructible/gold, +/area/ruin/powered/kinggoat_arena) + +(1,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(2,1,1) = {" +a +b +b +b +b +b +b +b +b +b +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +a +g +a +"} +(3,1,1) = {" +a +b +b +b +b +b +b +b +b +b +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +a +h +a +"} +(4,1,1) = {" +a +b +b +b +b +b +b +b +b +b +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +a +h +a +"} +(5,1,1) = {" +a +b +b +b +b +b +b +b +b +b +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +a +h +a +"} +(6,1,1) = {" +a +b +b +b +b +b +b +b +b +b +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +a +h +a +"} +(7,1,1) = {" +a +c +b +b +b +b +b +b +b +e +a +b +b +b +b +b +b +b +b +f +b +b +b +b +b +b +b +a +h +a +"} +(8,1,1) = {" +a +d +b +b +b +b +b +b +b +b +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +a +h +a +"} +(9,1,1) = {" +a +b +b +b +b +b +b +b +b +b +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +a +h +a +"} +(10,1,1) = {" +a +b +b +b +b +b +b +b +b +b +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +a +h +a +"} +(11,1,1) = {" +a +b +b +b +b +b +b +b +b +b +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +a +i +a +"} +(12,1,1) = {" +a +b +b +b +b +b +b +b +b +b +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +a +j +a +"} +(13,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} diff --git a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm index 41d62b305ec..27e69a18d86 100644 --- a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm @@ -166,7 +166,7 @@ /area/ruin/space/has_grav/listeningstation) "ar" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/structure/toilet{ @@ -1071,7 +1071,7 @@ /area/ruin/space/has_grav/listeningstation) "bB" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/machinery/iv_drip, diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm index 05e8b788295..c068a86e7cd 100644 --- a/_maps/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/oldstation.dmm @@ -1769,7 +1769,6 @@ }, /obj/structure/cable, /obj/machinery/light_switch{ - pixel_x = 0; pixel_y = 26 }, /turf/open/floor/plasteel/white, @@ -2047,7 +2046,6 @@ /obj/machinery/light/small, /obj/effect/turf_decal/tile/green, /obj/machinery/light_switch{ - pixel_x = 0; pixel_y = -26 }, /turf/open/floor/plasteel, @@ -2069,6 +2067,7 @@ /obj/machinery/door/airlock/maintenance_hatch, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plating, /area/ruin/space/has_grav/ancientstation/hydroponics) "fn" = ( @@ -3421,6 +3420,9 @@ }, /obj/machinery/door/firedoor, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/ancientstation/rnd) "it" = ( @@ -3992,6 +3994,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/ancientstation/deltacorridor) "jt" = ( @@ -4167,7 +4172,6 @@ /area/ruin/space/has_grav/ancientstation/proto) "jO" = ( /obj/machinery/light/small/broken{ - icon_state = "bulb-broken"; dir = 1 }, /turf/open/floor/plating/airless, @@ -4331,7 +4335,6 @@ dir = 1 }, /obj/machinery/light_switch{ - pixel_x = 0; pixel_y = 26 }, /turf/open/floor/plasteel/white, @@ -4588,11 +4591,9 @@ "kK" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer3{ - icon_state = "pipe11-3"; dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/visible{ - icon_state = "pipe11-2"; dir = 4 }, /obj/effect/turf_decal/tile/yellow{ @@ -4605,7 +4606,6 @@ /area/ruin/space/has_grav/ancientstation/atmo) "kL" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer3{ - icon_state = "pipe11-3"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -4687,7 +4687,6 @@ "kW" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/yellow/visible{ - icon_state = "pipe11-2"; dir = 5 }, /turf/open/floor/plasteel, @@ -5046,7 +5045,6 @@ pixel_x = -23 }, /obj/machinery/light_switch{ - pixel_x = 0; pixel_y = 26 }, /turf/open/floor/plasteel, @@ -5403,7 +5401,6 @@ /obj/item/tank/internals/oxygen, /obj/item/tank/internals/oxygen, /obj/machinery/light_switch{ - pixel_x = 0; pixel_y = -26 }, /turf/open/floor/plasteel, @@ -5709,11 +5706,9 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/supply/visible{ - icon_state = "pipe11-2"; dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer3{ - icon_state = "pipe11-3"; dir = 8 }, /obj/item/stack/rods, @@ -5756,7 +5751,6 @@ "ny" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/scrubbers/visible/layer3{ - icon_state = "manifold-3"; dir = 4 }, /obj/effect/turf_decal/tile/yellow{ @@ -5770,7 +5764,6 @@ "nz" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer3{ - icon_state = "pipe11-3"; dir = 1 }, /obj/machinery/firealarm{ @@ -5795,7 +5788,6 @@ "nB" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/portables_connector/visible/layer3{ - icon_state = "connector_map-3"; dir = 1 }, /obj/machinery/portable_atmospherics/canister, @@ -5820,7 +5812,6 @@ /obj/item/retractor, /obj/item/surgical_drapes, /obj/machinery/light/small/broken{ - icon_state = "bulb-broken"; dir = 8 }, /obj/effect/turf_decal/tile/blue{ @@ -5999,7 +5990,6 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/tracks{ - icon_state = "tracks"; dir = 1 }, /mob/living/simple_animal/hostile/alien, @@ -6052,7 +6042,6 @@ dir = 9 }, /obj/effect/decal/cleanable/blood/tracks{ - icon_state = "tracks"; dir = 4 }, /turf/open/floor/plasteel, @@ -6222,7 +6211,6 @@ }, /obj/effect/decal/cleanable/cobweb, /obj/machinery/light/small/broken{ - icon_state = "bulb-broken"; dir = 8 }, /obj/effect/turf_decal/tile/blue{ @@ -6255,7 +6243,6 @@ /obj/structure/table, /obj/item/tank/internals/oxygen, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/effect/turf_decal/tile/yellow{ dir = 1 }, @@ -6408,7 +6395,6 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/machinery/light/broken{ - icon_state = "tube-broken"; dir = 8 }, /turf/open/floor/plating/airless, @@ -6646,7 +6632,6 @@ dir = 8 }, /obj/machinery/atmospherics/components/unary/outlet_injector/on{ - icon_state = "inje_map-2"; dir = 8 }, /obj/machinery/light/small{ @@ -6872,7 +6857,6 @@ name = "Plasma Canister Storage" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer3{ - icon_state = "pipe11-3"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -6998,7 +6982,6 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer3{ - icon_state = "pipe11-3"; dir = 8 }, /turf/open/floor/plasteel, @@ -7023,7 +7006,6 @@ "DJ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light_switch{ - pixel_x = 0; pixel_y = -26 }, /turf/open/floor/plasteel, @@ -7061,7 +7043,6 @@ dir = 8 }, /obj/machinery/atmospherics/components/unary/portables_connector/visible/layer3{ - icon_state = "connector_map-3"; dir = 1 }, /turf/open/floor/plasteel/airless, @@ -7153,7 +7134,6 @@ dir = 4 }, /obj/effect/decal/cleanable/blood/tracks{ - icon_state = "tracks"; dir = 4 }, /turf/open/floor/plasteel, @@ -7201,7 +7181,6 @@ dir = 8 }, /obj/machinery/atmospherics/components/unary/outlet_injector/on{ - icon_state = "inje_map-2"; dir = 8 }, /obj/machinery/light/small, @@ -7225,7 +7204,6 @@ dir = 4 }, /obj/effect/decal/cleanable/blood/tracks{ - icon_state = "tracks"; dir = 4 }, /turf/open/floor/plasteel, @@ -7261,7 +7239,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/visible/layer3{ - icon_state = "manifold-3"; dir = 8 }, /obj/effect/turf_decal/tile/yellow{ @@ -7489,7 +7466,6 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/tracks{ - icon_state = "tracks"; dir = 5 }, /turf/open/floor/plasteel, @@ -7511,7 +7487,6 @@ "Su" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light_switch{ - pixel_x = 0; pixel_y = 26 }, /turf/open/floor/plasteel/cafeteria, @@ -7588,7 +7563,6 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/yellow/visible, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer3{ - icon_state = "pipe11-3"; dir = 8 }, /turf/open/floor/plasteel, @@ -7601,7 +7575,6 @@ "Vm" = ( /obj/machinery/portable_atmospherics/canister/toxins, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer3{ - icon_state = "pipe11-3"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -7699,7 +7672,6 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/tracks{ - icon_state = "tracks"; dir = 6 }, /turf/open/floor/plasteel, @@ -7728,7 +7700,6 @@ dir = 4 }, /obj/effect/decal/cleanable/blood/tracks{ - icon_state = "tracks"; dir = 8 }, /turf/open/floor/plasteel, @@ -7757,7 +7728,6 @@ /area/ruin/space/has_grav/ancientstation/atmo) "Zg" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer3{ - icon_state = "pipe11-3"; dir = 8 }, /obj/effect/decal/cleanable/dirt, diff --git a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm index 601e77fca40..f59604d5c8c 100644 --- a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm +++ b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm @@ -412,7 +412,7 @@ /area/ruin/space/has_grav/hotel) "bM" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/structure/mirror{ @@ -455,7 +455,7 @@ /area/ruin/space/has_grav/hotel/guestroom/room_3) "bS" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/structure/mirror{ @@ -498,7 +498,7 @@ /area/ruin/space/has_grav/hotel/guestroom/room_4) "bY" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/structure/mirror{ @@ -541,7 +541,7 @@ /area/ruin/space/has_grav/hotel/guestroom/room_5) "ce" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/structure/mirror{ @@ -937,7 +937,7 @@ /area/ruin/space/has_grav/hotel/guestroom/room_2) "dm" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/structure/mirror{ @@ -994,7 +994,7 @@ /area/ruin/space/has_grav/hotel/guestroom/room_1) "du" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/structure/mirror{ @@ -1698,7 +1698,7 @@ /area/ruin/space/has_grav/hotel/dock) "fP" = ( /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, diff --git a/_maps/RandomZLevels/Academy.dmm b/_maps/RandomZLevels/Academy.dmm index 572a6cc2bc5..7fa61edd43b 100644 --- a/_maps/RandomZLevels/Academy.dmm +++ b/_maps/RandomZLevels/Academy.dmm @@ -2136,7 +2136,7 @@ /area/awaymission/academy/academyaft) "iv" = ( /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, @@ -2168,7 +2168,7 @@ /area/awaymission/academy/academyaft) "iA" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /turf/open/floor/plasteel/cafeteria, diff --git a/_maps/RandomZLevels/SnowCabin.dmm b/_maps/RandomZLevels/SnowCabin.dmm index 52f7a32a771..5ce6328c03e 100644 --- a/_maps/RandomZLevels/SnowCabin.dmm +++ b/_maps/RandomZLevels/SnowCabin.dmm @@ -104,7 +104,7 @@ /area/awaymission/cabin) "as" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/structure/mirror{ @@ -114,7 +114,7 @@ /area/awaymission/cabin) "at" = ( /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, @@ -537,7 +537,7 @@ /area/awaymission/cabin) "bG" = ( /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, @@ -556,7 +556,7 @@ /area/awaymission/cabin) "bJ" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /turf/open/floor/plasteel/freezer, diff --git a/_maps/RandomZLevels/moonoutpost19.dmm b/_maps/RandomZLevels/moonoutpost19.dmm index 586dcbcc6a8..295e1a3a926 100644 --- a/_maps/RandomZLevels/moonoutpost19.dmm +++ b/_maps/RandomZLevels/moonoutpost19.dmm @@ -2969,7 +2969,7 @@ /area/awaymission/moonoutpost19/research) "gr" = ( /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, @@ -3751,7 +3751,7 @@ /area/awaymission/moonoutpost19/arrivals) "hS" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/structure/urinal{ @@ -3940,7 +3940,7 @@ /area/awaymission/moonoutpost19/arrivals) "ik" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/structure/mirror{ @@ -4222,7 +4222,7 @@ /area/awaymission/moonoutpost19/research) "iN" = ( /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, diff --git a/_maps/RandomZLevels/research.dmm b/_maps/RandomZLevels/research.dmm index 509d6e3bb43..12142a93c54 100644 --- a/_maps/RandomZLevels/research.dmm +++ b/_maps/RandomZLevels/research.dmm @@ -2891,7 +2891,7 @@ name = "Geneticist"; oxy_damage = 55; suit = /obj/item/clothing/suit/toggle/labcoat/genetics; - uniform = /obj/item/clothing/under/rank/medical/geneticist + uniform = /obj/item/clothing/under/rank/rnd/geneticist }, /obj/effect/decal/cleanable/blood, /obj/effect/turf_decal/tile/purple{ @@ -3870,7 +3870,7 @@ name = "Geneticist"; oxy_damage = 55; suit = /obj/item/clothing/suit/toggle/labcoat/genetics; - uniform = /obj/item/clothing/under/rank/medical/geneticist + uniform = /obj/item/clothing/under/rank/rnd/geneticist }, /obj/effect/decal/cleanable/blood, /obj/effect/turf_decal/tile/purple{ @@ -3890,7 +3890,7 @@ pixel_x = -32 }, /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, @@ -4208,7 +4208,7 @@ /area/awaymission/research/interior/medbay) "jg" = ( /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, @@ -4709,7 +4709,7 @@ name = "Geneticist"; oxy_damage = 55; suit = /obj/item/clothing/suit/toggle/labcoat/genetics; - uniform = /obj/item/clothing/under/rank/medical/geneticist + uniform = /obj/item/clothing/under/rank/rnd/geneticist }, /obj/effect/decal/cleanable/blood, /obj/effect/turf_decal/tile/blue{ @@ -5585,7 +5585,7 @@ name = "Geneticist"; oxy_damage = 55; suit = /obj/item/clothing/suit/toggle/labcoat/genetics; - uniform = /obj/item/clothing/under/rank/medical/geneticist + uniform = /obj/item/clothing/under/rank/rnd/geneticist }, /turf/open/floor/mineral/titanium/blue, /area/awaymission/research/exterior) diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm index b02e3764549..21b7920d961 100644 --- a/_maps/RandomZLevels/snowdin.dmm +++ b/_maps/RandomZLevels/snowdin.dmm @@ -2887,7 +2887,7 @@ /area/awaymission/snowdin/post/hydro) "gL" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -4212,7 +4212,7 @@ pixel_y = 5 }, /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/effect/turf_decal/tile/green, @@ -4646,7 +4646,7 @@ /area/awaymission/snowdin/post/dorm) "kC" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /turf/open/floor/plasteel/showroomfloor, @@ -5583,7 +5583,7 @@ /area/awaymission/snowdin/post/hydro) "mv" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /turf/open/floor/plating{ @@ -8235,7 +8235,7 @@ /area/awaymission/snowdin/post/cavern2) "tc" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /turf/open/floor/plasteel/showroomfloor, @@ -8901,7 +8901,7 @@ /area/awaymission/snowdin/post/cavern1) "vw" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /turf/open/floor/plasteel/showroomfloor, diff --git a/_maps/RandomZLevels/spacebattle.dmm b/_maps/RandomZLevels/spacebattle.dmm index d4926a8a19f..eadb2d9ae34 100644 --- a/_maps/RandomZLevels/spacebattle.dmm +++ b/_maps/RandomZLevels/spacebattle.dmm @@ -2222,7 +2222,7 @@ /area/awaymission/spacebattle/cruiser) "io" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /turf/open/floor/plasteel/freezer, diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm index d051cec219f..dd89b39ec47 100644 --- a/_maps/RandomZLevels/undergroundoutpost45.dmm +++ b/_maps/RandomZLevels/undergroundoutpost45.dmm @@ -8474,7 +8474,7 @@ pixel_x = 28 }, /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/effect/decal/cleanable/dirt, @@ -8594,7 +8594,7 @@ "qm" = ( /obj/machinery/light/small, /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -11 }, /obj/structure/mirror{ @@ -8701,7 +8701,7 @@ /area/awaymission/undergroundoutpost45/crew_quarters) "qx" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/effect/decal/cleanable/dirt, @@ -9056,7 +9056,7 @@ pixel_x = 28 }, /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /turf/open/floor/plasteel/freezer{ @@ -12250,7 +12250,7 @@ /area/awaymission/undergroundoutpost45/engineering) "wL" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/machinery/light/small, diff --git a/_maps/_basemap.dm b/_maps/_basemap.dm index 7cc4a554ee8..33f8e198771 100644 --- a/_maps/_basemap.dm +++ b/_maps/_basemap.dm @@ -6,6 +6,7 @@ #ifdef ALL_MAPS #include "map_files\Mining\Lavaland.dmm" #include "map_files\debug\runtimestation.dmm" + #include "map_files\debug\multiz.dmm" #include "map_files\Deltastation\DeltaStation2.dmm" #include "map_files\KiloStation\KiloStation.dmm" #include "map_files\MetaStation\MetaStation.dmm" diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 24d8125068d..829e86d99a0 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -779,6 +779,7 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/start/prisoner, /turf/open/floor/plasteel, /area/security/prison) "abN" = ( @@ -957,7 +958,7 @@ name = "Unisex Restroom" }, /turf/open/floor/plasteel/freezer, -/area/security/prison) +/area/security/prison/toilet) "aci" = ( /obj/vehicle/ridden/secway, /turf/open/floor/plasteel/dark, @@ -1177,11 +1178,12 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, +/obj/effect/landmark/start/prisoner, /turf/open/floor/plasteel, /area/security/prison) "acK" = ( /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, @@ -1189,7 +1191,7 @@ dir = 4 }, /turf/open/floor/plasteel/freezer, -/area/security/prison) +/area/security/prison/toilet) "acL" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -1366,7 +1368,7 @@ dir = 1 }, /turf/open/floor/plasteel/freezer, -/area/security/prison) +/area/security/prison/toilet) "adg" = ( /obj/machinery/button/door{ id = "armory"; @@ -1746,6 +1748,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/firedoor, /obj/structure/cable, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel, /area/engine/engineering) "adX" = ( @@ -5166,6 +5169,11 @@ }, /turf/open/floor/plasteel/dark, /area/security/brig) +"akV" = ( +/obj/structure/cable, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "akW" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/security/glass{ @@ -5200,6 +5208,21 @@ }, /turf/open/floor/plasteel, /area/security/brig) +"akY" = ( +/obj/structure/table, +/obj/item/circuitboard/machine/chem_dispenser/drinks, +/turf/open/floor/wood, +/area/maintenance/port/aft) +"akZ" = ( +/obj/item/stack/sheet/metal/five, +/turf/open/floor/plating, +/area/maintenance/port/aft) +"ala" = ( +/obj/machinery/door/window/eastright{ + name = "Bar Access" + }, +/turf/open/floor/wood, +/area/maintenance/port/aft) "alb" = ( /obj/structure/chair{ dir = 4; @@ -5255,6 +5278,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) +"alg" = ( +/obj/structure/sign/poster/contraband/random{ + pixel_y = 32 + }, +/turf/open/floor/wood, +/area/maintenance/port/aft) "alh" = ( /obj/machinery/door/airlock/external{ name = "Solar Maintenance"; @@ -5329,6 +5358,12 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/security/processing) +"als" = ( +/obj/structure/mineral_door/wood{ + name = "Maintenance Bar" + }, +/turf/open/floor/wood, +/area/maintenance/port/aft) "alt" = ( /obj/structure/reagent_dispensers/peppertank, /turf/closed/wall/r_wall, @@ -5347,6 +5382,10 @@ }, /turf/open/floor/plasteel/dark, /area/ai_monitored/nuke_storage) +"alv" = ( +/obj/structure/table/wood, +/turf/open/floor/wood, +/area/maintenance/port/aft) "alw" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 @@ -5481,6 +5520,10 @@ }, /turf/open/floor/plasteel, /area/security/courtroom) +"alK" = ( +/obj/machinery/vending/boozeomat/all_access, +/turf/closed/wall, +/area/maintenance/port/aft) "alL" = ( /obj/structure/disposalpipe/segment, /obj/machinery/power/apc{ @@ -5505,6 +5548,13 @@ /obj/structure/cable, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) +"alN" = ( +/obj/structure/light_construct{ + dir = 8 + }, +/mob/living/simple_animal/hostile/retaliate/goose/vomit, +/turf/open/floor/wood, +/area/maintenance/port/aft) "alO" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -5530,6 +5580,14 @@ /obj/structure/cable, /turf/open/floor/plating, /area/maintenance/solars/port/fore) +"alT" = ( +/obj/structure/rack, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/turf/open/floor/plating, +/area/maintenance/port/aft) "alU" = ( /turf/closed/wall, /area/maintenance/port/fore) @@ -5740,8 +5798,9 @@ /turf/open/floor/plasteel/dark, /area/security/courtroom) "amu" = ( -/mob/living/simple_animal/hostile/retaliate/goose/vomit, -/turf/open/floor/wood, +/turf/open/floor/wood{ + icon_state = "wood-broken6" + }, /area/maintenance/port/aft) "amv" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, @@ -5779,12 +5838,17 @@ "amA" = ( /turf/open/floor/plating, /area/maintenance/solars/port/fore) +"amB" = ( +/turf/open/floor/wood{ + icon_state = "wood-broken7" + }, +/area/maintenance/port/aft) "amC" = ( /turf/open/floor/plating, /area/maintenance/port/fore) "amD" = ( /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, @@ -5825,6 +5889,18 @@ /obj/item/trash/plate, /turf/open/floor/plating, /area/maintenance/port/fore) +"amI" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/port/aft) +"amJ" = ( +/obj/machinery/atmospherics/pipe/simple/general/hidden{ + dir = 4 + }, +/turf/closed/wall, +/area/maintenance/port/aft) "amK" = ( /obj/structure/sign/warning/docking, /turf/closed/wall, @@ -5863,6 +5939,18 @@ }, /turf/open/floor/plasteel/showroomfloor, /area/security/warden) +"amO" = ( +/obj/structure/piano{ + icon_state = "piano" + }, +/turf/open/floor/wood, +/area/maintenance/port/aft) +"amP" = ( +/obj/structure/chair/wood{ + dir = 8 + }, +/turf/open/floor/wood, +/area/maintenance/port/aft) "amQ" = ( /obj/machinery/door/poddoor/preopen{ id = "Secure Gate"; @@ -5872,6 +5960,23 @@ /obj/structure/cable, /turf/open/floor/plating, /area/security/brig) +"amR" = ( +/obj/structure/light_construct, +/obj/structure/sign/poster/contraband/random{ + pixel_y = -32 + }, +/turf/open/floor/wood{ + icon_state = "wood-broken5" + }, +/area/maintenance/port/aft) +"amS" = ( +/obj/item/stack/cable_coil{ + amount = 7; + pixel_x = -3; + pixel_y = 3 + }, +/turf/open/floor/plating, +/area/maintenance/port/aft) "amT" = ( /obj/structure/table/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -5946,6 +6051,7 @@ dir = 8 }, /obj/structure/cable, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel, /area/security/brig) "amY" = ( @@ -6014,6 +6120,14 @@ /obj/structure/cable, /turf/open/floor/plating, /area/maintenance/solars/port/fore) +"ani" = ( +/obj/machinery/computer/security/telescreen/entertainment{ + pixel_y = -32 + }, +/turf/open/floor/wood{ + icon_state = "wood-broken6" + }, +/area/maintenance/port/aft) "anj" = ( /obj/machinery/atmospherics/pipe/manifold/supplymain/hidden{ dir = 8 @@ -6057,6 +6171,24 @@ }, /turf/open/floor/plating, /area/maintenance/port/fore) +"anq" = ( +/obj/structure/chair/wood{ + dir = 4 + }, +/turf/open/floor/wood, +/area/maintenance/port/aft) +"anr" = ( +/obj/structure/table/wood/poker, +/obj/item/toy/cards/deck/cas{ + pixel_x = 5; + pixel_y = 10 + }, +/obj/item/toy/cards/deck/cas/black{ + pixel_x = -7; + pixel_y = 0 + }, +/turf/open/floor/wood, +/area/maintenance/port/aft) "ans" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 @@ -6151,6 +6283,13 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/fore) +"anB" = ( +/obj/item/chair/wood, +/obj/structure/sign/poster/contraband/random{ + pixel_x = 32 + }, +/turf/open/floor/wood, +/area/maintenance/port/aft) "anC" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -9903,10 +10042,24 @@ /turf/open/floor/plating, /area/maintenance/fore) "ayK" = ( -/obj/structure/closet/crate/rcd, /obj/machinery/camera/motion{ c_tag = "EVA Motion Sensor" }, +/obj/structure/rack, +/obj/item/grenade/chem_grenade/smart_metal_foam{ + pixel_x = -4; + pixel_y = 6 + }, +/obj/item/grenade/chem_grenade/smart_metal_foam{ + pixel_x = 4; + pixel_y = 2 + }, +/obj/item/grenade/chem_grenade/smart_metal_foam{ + pixel_x = 8 + }, +/obj/item/grenade/chem_grenade/smart_metal_foam{ + pixel_y = 4 + }, /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/eva) "ayL" = ( @@ -11287,7 +11440,7 @@ /area/maintenance/starboard/fore) "aCm" = ( /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, @@ -11684,10 +11837,6 @@ /obj/item/radio/intercom{ pixel_y = 20 }, -/obj/item/multitool, -/obj/item/multitool{ - pixel_x = 4 - }, /turf/open/floor/plasteel, /area/storage/primary) "aDo" = ( @@ -11861,12 +12010,12 @@ /area/crew_quarters/dorms) "aDL" = ( /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, @@ -12816,7 +12965,7 @@ /area/ai_monitored/storage/eva) "aGk" = ( /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, @@ -12987,6 +13136,18 @@ /obj/structure/cable, /turf/open/floor/plating, /area/maintenance/starboard/fore) +"aGC" = ( +/obj/machinery/button/door{ + id = "xenobio5"; + layer = 3.3; + name = "Xenobio Pen 5 Blast Doors"; + pixel_y = 4; + req_access_txt = "55" + }, +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/science/xenobiology) "aGD" = ( /obj/structure/table/wood, /obj/structure/mirror{ @@ -13368,6 +13529,7 @@ "aHG" = ( /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door/airlock/vault{ + name = "Vault"; req_access_txt = "53" }, /obj/effect/turf_decal/tile/neutral{ @@ -13381,6 +13543,7 @@ dir = 8 }, /obj/structure/cable, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel/dark, /area/ai_monitored/nuke_storage) "aHH" = ( @@ -13512,6 +13675,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel, /area/crew_quarters/dorms) "aHU" = ( @@ -13519,7 +13683,7 @@ dir = 1 }, /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, @@ -14380,6 +14544,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel, /area/storage/primary) "aKa" = ( @@ -15733,6 +15898,7 @@ name = "Chapel Office"; req_access_txt = "22" }, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel/dark, /area/chapel/office) "aNX" = ( @@ -16062,6 +16228,7 @@ req_access_txt = "25" }, /obj/structure/disposalpipe/segment, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/wood, /area/crew_quarters/bar) "aOP" = ( @@ -16101,7 +16268,7 @@ /area/hallway/secondary/exit) "aOV" = ( /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, @@ -16311,6 +16478,7 @@ "aPD" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel, /area/crew_quarters/locker) "aPE" = ( @@ -16802,6 +16970,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel, /area/storage/tools) "aRg" = ( @@ -17114,6 +17283,7 @@ name = "Private Study"; req_access_txt = "37" }, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/engine/cult, /area/library) "aRR" = ( @@ -17698,14 +17868,6 @@ /obj/structure/table, /turf/open/floor/plasteel, /area/crew_quarters/locker) -"aTA" = ( -/obj/structure/table, -/obj/item/storage/toolbox/mechanical{ - pixel_x = -2; - pixel_y = -1 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/locker) "aTB" = ( /obj/structure/chair/stool{ pixel_y = 8 @@ -17714,10 +17876,6 @@ /area/crew_quarters/locker) "aTC" = ( /obj/structure/table, -/obj/item/storage/toolbox/mechanical{ - pixel_x = -2; - pixel_y = -1 - }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/crew_quarters/locker) @@ -18867,6 +19025,7 @@ req_access_txt = "19" }, /obj/structure/cable, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel, /area/bridge) "aWK" = ( @@ -19460,6 +19619,13 @@ /obj/structure/cable, /turf/open/floor/plating, /area/maintenance/port) +"aYb" = ( +/obj/machinery/camera/autoname{ + icon_state = "camera"; + dir = 8 + }, +/turf/open/floor/engine, +/area/science/xenobiology) "aYc" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 @@ -19755,6 +19921,7 @@ /obj/effect/turf_decal/tile/bar{ dir = 1 }, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel, /area/crew_quarters/kitchen) "aYL" = ( @@ -19951,7 +20118,7 @@ /area/vacant_room/office) "aZo" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/machinery/atmospherics/components/unary/vent_pump/on{ @@ -20277,7 +20444,7 @@ /area/crew_quarters/kitchen) "bal" = ( /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, @@ -20363,7 +20530,7 @@ /area/library) "baw" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/structure/mirror{ @@ -20531,6 +20698,7 @@ name = "Detective's Office"; req_access_txt = "4" }, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel/grimy, /area/security/detectives_office) "baX" = ( @@ -21183,7 +21351,7 @@ /area/bridge/meeting_room) "bcO" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /turf/open/floor/plasteel/freezer, @@ -21516,6 +21684,7 @@ req_access_txt = "6" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel/dark, /area/medical/morgue) "bdO" = ( @@ -23006,6 +23175,7 @@ name = "Research Division Access"; req_access_txt = "47" }, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel/white, /area/science/research) "bhC" = ( @@ -23546,7 +23716,7 @@ c_tag = "Research Division Access" }, /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/effect/turf_decal/stripes/line{ @@ -24689,7 +24859,7 @@ /area/science/robotics/lab) "blH" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on, @@ -25001,7 +25171,7 @@ /area/crew_quarters/heads/captain) "bmC" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/structure/mirror{ @@ -25206,7 +25376,7 @@ "bmX" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/closed/wall/r_wall, -/area/medical/genetics) +/area/medical/medbay/zone2) "bmY" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -25218,7 +25388,7 @@ dir = 4 }, /turf/closed/wall/r_wall, -/area/medical/genetics) +/area/science/genetics) "bna" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -25641,6 +25811,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "bof" = ( @@ -25720,7 +25891,7 @@ /area/medical/medbay/central) "bon" = ( /turf/closed/wall/r_wall, -/area/medical/genetics) +/area/science/genetics) "boo" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 @@ -26199,7 +26370,7 @@ "bpE" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/medical/genetics) +/area/science/genetics) "bpF" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/southleft{ @@ -26213,38 +26384,23 @@ /area/medical/pharmacy) "bpG" = ( /obj/machinery/power/apc{ - areastring = "/area/medical/genetics"; dir = 1; - name = "Genetics APC"; + name = "Ward APC"; pixel_y = 23 }, /obj/structure/cable, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"bpH" = ( -/obj/structure/table/glass, -/obj/item/folder/white, -/obj/item/radio/headset/headset_medsci, -/obj/machinery/requests_console{ - department = "Genetics"; - name = "Genetics Requests Console"; - pixel_y = 30 - }, -/obj/item/storage/pill_bottle/mutadone, -/obj/item/storage/pill_bottle/mannitol, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"bpI" = ( -/obj/machinery/dna_scannernew, /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) +"bpH" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/structure/closet/wardrobe/pjs, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "bpJ" = ( /obj/machinery/light{ dir = 1 @@ -26252,18 +26408,27 @@ /obj/machinery/airalarm{ pixel_y = 23 }, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"bpK" = ( -/mob/living/carbon/monkey, -/turf/open/floor/plasteel, -/area/medical/genetics) -"bpL" = ( -/obj/structure/window/reinforced{ - dir = 8 +/obj/effect/turf_decal/tile/blue{ + dir = 1 }, -/turf/open/floor/plasteel, -/area/medical/genetics) +/obj/structure/closet/wardrobe/mixed, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) +"bpK" = ( +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/structure/closet/wardrobe/pjs, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) +"bpL" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/structure/closet/wardrobe/mixed, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "bpM" = ( /obj/structure/disposalpipe/segment, /obj/machinery/smartfridge/chemistry, @@ -26389,8 +26554,15 @@ /turf/open/floor/plasteel, /area/science/robotics/lab) "bqe" = ( -/turf/closed/wall/r_wall, -/area/science/explab) +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/science/genetics) "bqf" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -26736,43 +26908,22 @@ /area/medical/medbay/central) "bqZ" = ( /obj/structure/cable, +/obj/structure/bed, +/obj/item/bedsheet/medical, /turf/open/floor/plasteel/white, -/area/medical/genetics) -"bra" = ( -/obj/structure/table/glass, -/obj/item/storage/box/rxglasses, -/turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "brb" = ( -/obj/machinery/computer/scan_consolenew{ - dir = 8 - }, /obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, +/obj/structure/table, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "brc" = ( -/obj/structure/chair/office/light{ - dir = 4 - }, -/obj/effect/landmark/start/geneticist, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "brd" = ( -/turf/open/floor/plasteel, -/area/medical/genetics) -"bre" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/mob/living/carbon/monkey, -/turf/open/floor/plasteel, -/area/medical/genetics) +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "brg" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -26808,7 +26959,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/structure/cable, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "brm" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 8 @@ -26844,13 +26995,12 @@ /turf/open/floor/plasteel, /area/science/robotics/lab) "brr" = ( -/obj/machinery/door/firedoor/heavy, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/effect/spawner/structure/window, +/obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/science/explab) +/area/science/genetics) "brs" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/eastright{ @@ -26866,7 +27016,6 @@ }, /obj/item/folder/white, /obj/item/pen, -/obj/item/relic, /turf/open/floor/plating, /area/science/robotics/lab) "brt" = ( @@ -26883,21 +27032,24 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/science/genetics) +"brv" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 1 }, -/turf/open/floor/plasteel/white, -/area/science/explab) -"brv" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/chair/office/light{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/structure/cable, +/obj/effect/landmark/start/geneticist, /turf/open/floor/plasteel/white, -/area/science/explab) +/area/science/genetics) "brx" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -26910,8 +27062,8 @@ /area/science/research) "bry" = ( /obj/machinery/door/airlock/maintenance{ - name = "Experimentation Lab Maintenance"; - req_access_txt = "47" + name = "Genetics Lab Maintenance"; + req_access_txt = "47, 9" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -26929,15 +27081,13 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/structure/table, -/obj/item/paper_bin{ - pixel_y = 6 - }, -/obj/item/pen, -/obj/item/hand_labeler, /obj/structure/cable, +/obj/structure/extinguisher_cabinet{ + pixel_y = 30 + }, +/obj/machinery/computer/scan_consolenew, /turf/open/floor/plasteel/white, -/area/science/explab) +/area/science/genetics) "brE" = ( /obj/machinery/door/airlock/maintenance{ req_one_access_txt = "8;12" @@ -27246,18 +27396,18 @@ "bsu" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical/glass{ - id_tag = "GeneticsDoor"; - name = "Genetics"; - req_access_txt = "5; 68" + name = "Ward"; + req_access_txt = "5" }, -/obj/effect/mapping_helpers/airlock/unres, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "bsv" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable, +/obj/structure/bed, +/obj/item/bedsheet/medical, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "bsw" = ( /obj/machinery/door/airlock/research{ name = "Robotics Lab"; @@ -27274,6 +27424,7 @@ dir = 4 }, /obj/structure/cable, +/obj/effect/landmark/start/paramedic, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "bsz" = ( @@ -27297,29 +27448,14 @@ }, /area/science/research) "bsH" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/closed/wall/r_wall, -/area/science/explab) -"bsK" = ( -/obj/structure/table/glass, -/obj/item/storage/box/disks{ - pixel_x = 2; - pixel_y = 2 +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 5 }, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/science/genetics) "bsL" = ( /turf/open/floor/plasteel/white, -/area/medical/genetics) -"bsN" = ( -/obj/machinery/door/window/westleft{ - name = "Monkey Pen"; - req_access_txt = "9" - }, -/turf/open/floor/plasteel, -/area/medical/genetics) +/area/science/genetics) "bsO" = ( /obj/structure/bodycontainer/morgue, /turf/open/floor/plasteel/dark, @@ -27431,18 +27567,10 @@ }, /turf/open/floor/plasteel/white, /area/science/research) -"bti" = ( -/obj/structure/closet/secure_closet/personal/patient, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"btk" = ( -/obj/structure/closet/wardrobe/white, -/turf/open/floor/plasteel/white, -/area/medical/genetics) "btl" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "btm" = ( /obj/structure/disposalpipe/sorting/mail/flip{ dir = 2; @@ -27451,7 +27579,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/science/research) "btn" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -27472,7 +27600,7 @@ dir = 8 }, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/science/research) "btp" = ( /turf/open/floor/plating, /area/maintenance/starboard) @@ -27679,6 +27807,7 @@ req_access_txt = "17" }, /obj/structure/cable, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel, /area/teleporter) "btO" = ( @@ -27772,7 +27901,7 @@ /area/medical/medbay/central) "bua" = ( /turf/closed/wall, -/area/medical/genetics) +/area/medical/medbay/zone2) "bub" = ( /obj/machinery/light, /obj/item/radio/intercom{ @@ -27817,25 +27946,6 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/heads/hop) -"buf" = ( -/obj/machinery/computer/scan_consolenew{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"bug" = ( -/obj/structure/chair/office/light{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/medical/genetics) "bui" = ( /obj/machinery/airalarm{ dir = 1; @@ -27865,19 +27975,21 @@ dir = 4 }, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "bum" = ( /obj/machinery/holopad, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "bun" = ( /obj/structure/disposalpipe/segment{ dir = 6 }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/structure/cable, +/obj/structure/bed, +/obj/item/bedsheet/medical, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "buo" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -27885,12 +27997,11 @@ /turf/open/floor/plasteel/white, /area/science/research) "buq" = ( -/obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/plating, -/area/medical/genetics) +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "bur" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -27899,8 +28010,9 @@ dir = 4 }, /obj/structure/cable, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/science/genetics) "but" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -27911,11 +28023,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "buu" = ( +/obj/machinery/vending/wardrobe/gene_wardrobe, /obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel/white, -/area/science/explab) +/turf/open/floor/plasteel/dark, +/area/science/genetics) "bux" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -27923,13 +28036,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, /obj/structure/cable, +/obj/effect/turf_decal/tile/blue, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "buy" = ( /obj/structure/disposalpipe/sorting/mail{ sortType = 23 @@ -27937,7 +28047,7 @@ /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, /obj/structure/cable, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/science/research) "buz" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, @@ -27989,19 +28099,16 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/machinery/door/airlock/research{ - name = "Genetics Research Access"; - req_access_txt = "9" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, /obj/structure/cable, +/obj/machinery/door/airlock/medical{ + name = "Ward"; + req_access_txt = "5" + }, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "buH" = ( /obj/machinery/door/airlock/research{ - name = "Genetics Research Access"; + name = "Research Access"; req_access_txt = "47" }, /obj/structure/disposalpipe/segment{ @@ -28010,9 +28117,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, /obj/structure/cable, /turf/open/floor/plasteel/white, /area/science/research) @@ -28039,7 +28143,7 @@ }, /obj/structure/cable, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/science/research) "buM" = ( /obj/machinery/keycard_auth{ pixel_x = -24 @@ -28260,85 +28364,52 @@ /turf/open/floor/plasteel/white, /area/medical/sleeper) "bvn" = ( -/obj/machinery/shower{ - pixel_y = 18 +/obj/item/twohanded/required/kirbyplants/random, +/obj/effect/turf_decal/tile/blue{ + dir = 1 }, -/obj/structure/mirror{ - pixel_x = -28 - }, -/obj/structure/window/reinforced{ - dir = 4; - layer = 2.9 - }, -/turf/open/floor/plasteel/dark, -/area/medical/genetics) +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "bvo" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 }, -/obj/structure/chair, -/obj/effect/landmark/start/geneticist, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "bvp" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/science/genetics) "bvr" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "bvs" = ( -/obj/machinery/dna_scannernew, /obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, +/obj/structure/bedsheetbin, +/obj/structure/table, /turf/open/floor/plasteel/white, -/area/medical/genetics) -"bvt" = ( -/obj/machinery/door/airlock/research/glass{ - name = "Genetics Research"; - req_access_txt = "5; 9; 68" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "bvu" = ( -/obj/structure/window/reinforced, -/mob/living/carbon/monkey, -/turf/open/floor/plasteel, -/area/medical/genetics) -"bvv" = ( -/obj/structure/window/reinforced{ - dir = 8 +/obj/effect/turf_decal/tile/blue, +/obj/machinery/light{ + dir = 4 }, -/obj/structure/window/reinforced, -/turf/open/floor/plasteel, -/area/medical/genetics) +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "bvw" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "bvx" = ( /turf/closed/wall/r_wall, /area/science/research) "bvy" = ( -/obj/machinery/camera{ - c_tag = "Genetics Research"; - dir = 1; - network = list("ss13","medbay") - }, /obj/machinery/firealarm{ dir = 1; pixel_y = -24 @@ -28346,12 +28417,10 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, +/obj/effect/turf_decal/tile/blue, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "bvz" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -28360,14 +28429,14 @@ }, /obj/structure/cable, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/science/research) "bvA" = ( /obj/structure/sign/warning/securearea, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/closed/wall/r_wall, -/area/medical/genetics) +/area/medical/medbay/zone2) "bvB" = ( /obj/machinery/camera{ c_tag = "Genetics Access"; @@ -28379,7 +28448,7 @@ dir = 4 }, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/science/research) "bvC" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -28451,9 +28520,6 @@ /obj/structure/table, /turf/open/floor/plasteel, /area/security/checkpoint/supply) -"bvO" = ( -/turf/open/floor/plasteel/white, -/area/science/explab) "bvQ" = ( /obj/machinery/atmospherics/pipe/manifold/general/visible{ dir = 8 @@ -28795,12 +28861,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) -"bwL" = ( -/obj/machinery/door/window/eastleft{ - name = "Cloning Recovery" - }, -/turf/open/floor/plasteel/dark, -/area/medical/genetics) "bwM" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 @@ -29107,6 +29167,7 @@ }, /obj/structure/disposalpipe/segment, /obj/structure/cable, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel, /area/crew_quarters/heads/hop) "bxH" = ( @@ -29153,7 +29214,7 @@ /area/security/checkpoint/auxiliary) "bxN" = ( /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, @@ -29222,12 +29283,6 @@ /obj/structure/cable, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/heads/hor) -"bxX" = ( -/obj/machinery/door/window/eastright{ - name = "Cloning Recovery" - }, -/turf/open/floor/plasteel/dark, -/area/medical/genetics) "bxY" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -29286,9 +29341,10 @@ /turf/open/floor/plasteel, /area/quartermaster/qm) "bye" = ( -/obj/structure/sign/warning/securearea, -/turf/closed/wall/r_wall, -/area/medical/genetics) +/obj/structure/closet/wardrobe/white, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "byf" = ( /turf/closed/wall/r_wall, /area/science/server) @@ -29803,52 +29859,33 @@ /turf/open/floor/plating, /area/maintenance/aft) "bzl" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/machinery/computer/cloning{ - dir = 1 - }, /obj/machinery/light, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"bzm" = ( +/obj/effect/turf_decal/tile/blue, /obj/structure/table, -/obj/item/storage/box/rxglasses{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/box/bodybags, -/obj/item/pen, +/obj/effect/spawner/lootdrop/donkpockets, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) +"bzm" = ( /obj/machinery/firealarm{ - pixel_y = -24 + dir = 1; + pixel_y = -26 }, +/obj/structure/closet/wardrobe/white, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) +"bzn" = ( /obj/machinery/camera{ - c_tag = "Genetics Cloning Lab"; + c_tag = "Ward Port"; dir = 1; network = list("ss13","medbay") }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, /obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"bzn" = ( -/obj/machinery/dna_scannernew, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ +/obj/structure/chair{ dir = 8 }, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "bzo" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ @@ -29857,24 +29894,9 @@ /obj/machinery/light_switch{ pixel_y = -28 }, +/obj/effect/turf_decal/tile/blue, /turf/open/floor/plasteel/white, -/area/medical/genetics) -"bzp" = ( -/obj/structure/closet/secure_closet/personal/patient, -/obj/machinery/light, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"bzq" = ( -/obj/structure/closet/secure_closet/medical1, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"bzr" = ( -/obj/item/radio/intercom{ - pixel_y = -29 - }, -/obj/machinery/vending/wardrobe/gene_wardrobe, -/turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "bzs" = ( /turf/closed/wall, /area/maintenance/aft) @@ -30061,8 +30083,14 @@ /turf/open/floor/plasteel/white, /area/crew_quarters/heads/hor) "bzO" = ( -/turf/open/floor/engine, -/area/science/explab) +/obj/structure/table/glass, +/obj/item/paper_bin{ + pixel_x = -2; + pixel_y = 5 + }, +/obj/item/pen, +/turf/open/floor/plasteel/dark, +/area/science/genetics) "bzP" = ( /obj/machinery/computer/cargo{ dir = 4 @@ -30461,9 +30489,10 @@ /turf/open/floor/plasteel, /area/hallway/primary/aft) "bAR" = ( -/obj/machinery/rnd/experimentor, -/turf/open/floor/engine, -/area/science/explab) +/obj/structure/table/glass, +/obj/item/storage/box/rxglasses, +/turf/open/floor/plasteel/dark, +/area/science/genetics) "bAS" = ( /obj/machinery/camera{ c_tag = "Quartermaster's Office"; @@ -31067,12 +31096,15 @@ dir = 1; network = list("ss13","rd") }, -/obj/machinery/light, /obj/structure/sign/warning/nosmoking{ pixel_y = -32 }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/mob/living/carbon/monkey, /turf/open/floor/engine, -/area/science/explab) +/area/science/genetics) "bCm" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 5 @@ -31923,13 +31955,10 @@ /turf/open/floor/engine, /area/science/xenobiology) "bEn" = ( -/obj/machinery/camera{ - c_tag = "Xenobiology Test Chamber"; - network = list("xeno","rd") - }, /obj/machinery/light{ dir = 1 }, +/obj/machinery/camera/autoname, /turf/open/floor/engine, /area/science/xenobiology) "bEo" = ( @@ -32138,6 +32167,7 @@ dir = 4 }, /obj/structure/cable, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plating, /area/storage/tech) "bFf" = ( @@ -32294,7 +32324,7 @@ /area/medical/sleeper) "bFA" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/machinery/requests_console{ @@ -33535,7 +33565,7 @@ /area/medical/virology) "bIK" = ( /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, @@ -33571,13 +33601,27 @@ /area/science/xenobiology) "bIO" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, +/obj/machinery/computer/camera_advanced/xenobio{ + icon_state = "computer"; + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4; + layer = 2.9 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel/white, /area/science/xenobiology) "bIP" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/structure/chair/comfy/black, +/obj/structure/chair/comfy/black{ + dir = 8 + }, /turf/open/floor/plasteel/white, /area/science/xenobiology) "bIQ" = ( @@ -33913,6 +33957,7 @@ id = "misclab"; name = "test chamber blast door" }, +/obj/machinery/atmospherics/pipe/simple/general/visible, /turf/open/floor/engine, /area/science/xenobiology) "bJN" = ( @@ -33925,14 +33970,6 @@ }, /turf/open/floor/plasteel, /area/science/misc_lab) -"bJP" = ( -/obj/machinery/vending/boozeomat/all_access, -/obj/effect/turf_decal/tile/bar, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/maintenance/port/aft) "bJQ" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -34325,9 +34362,12 @@ /turf/open/floor/plasteel, /area/engine/atmos) "bKW" = ( -/obj/item/wrench, /obj/effect/turf_decal/stripes/line, /obj/structure/cable, +/obj/machinery/camera/autoname{ + icon_state = "camera"; + dir = 5 + }, /turf/open/floor/plasteel, /area/science/xenobiology) "bKX" = ( @@ -34375,11 +34415,13 @@ req_access_txt = "55" }, /obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/simple/general/visible, /turf/open/floor/plasteel, /area/science/xenobiology) "bLb" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/cable, +/obj/item/wrench, /turf/open/floor/plasteel, /area/science/xenobiology) "bLc" = ( @@ -34394,7 +34436,7 @@ /area/science/xenobiology) "bLd" = ( /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, @@ -34712,6 +34754,7 @@ /area/medical/medbay/central) "bLX" = ( /obj/machinery/atmospherics/pipe/manifold4w/scrubbers, +/obj/effect/landmark/start/paramedic, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "bLY" = ( @@ -34773,18 +34816,37 @@ /turf/open/floor/plasteel/white, /area/science/xenobiology) "bMl" = ( -/obj/machinery/processor/slime, /obj/effect/turf_decal/stripes/line, +/obj/item/radio/intercom{ + pixel_y = 23 + }, +/obj/structure/table/glass, +/obj/item/storage/box/beakers{ + pixel_x = 2; + pixel_y = 7 + }, +/obj/item/storage/box/syringes{ + pixel_y = 5 + }, +/obj/item/reagent_containers/glass/beaker/large{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/reagent_containers/dropper, +/obj/item/reagent_containers/dropper, /turf/open/floor/plasteel, /area/science/xenobiology) "bMm" = ( -/obj/machinery/monkey_recycler, /obj/machinery/firealarm{ pixel_y = 24 }, /obj/effect/turf_decal/stripes/line{ dir = 10 }, +/obj/machinery/portable_atmospherics/canister/bz, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 8 + }, /turf/open/floor/plasteel, /area/science/xenobiology) "bMn" = ( @@ -34797,26 +34859,46 @@ pixel_y = 5 }, /obj/effect/turf_decal/stripes/line, +/obj/item/stack/sheet/mineral/plasma{ + pixel_y = 4 + }, +/obj/item/stack/sheet/mineral/plasma{ + pixel_y = 4 + }, +/obj/item/stack/sheet/mineral/plasma{ + pixel_y = 4 + }, +/obj/item/stack/sheet/mineral/plasma{ + pixel_y = 4 + }, /turf/open/floor/plasteel, /area/science/xenobiology) "bMo" = ( -/obj/machinery/smartfridge/extract/preloaded, /obj/effect/turf_decal/stripes/line, +/obj/machinery/requests_console{ + department = "Science"; + departmentType = 2; + name = "Science Requests Console"; + pixel_y = 27; + receive_ore_updates = 1 + }, +/obj/machinery/chem_master, /turf/open/floor/plasteel, /area/science/xenobiology) "bMp" = ( -/obj/structure/closet/l3closet/scientist, /obj/machinery/light_switch{ pixel_y = 28 }, -/obj/item/extinguisher, /obj/effect/turf_decal/stripes/line, +/obj/machinery/monkey_recycler, /turf/open/floor/plasteel, /area/science/xenobiology) "bMq" = ( -/obj/structure/closet/l3closet/scientist, -/obj/item/extinguisher, /obj/effect/turf_decal/stripes/line, +/obj/structure/table/glass, +/obj/item/slime_scanner, +/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/glasses/science, /turf/open/floor/plasteel, /area/science/xenobiology) "bMr" = ( @@ -35257,6 +35339,7 @@ name = "Cargo Office"; req_access_txt = "50" }, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel, /area/quartermaster/office) "bNL" = ( @@ -35525,13 +35608,6 @@ }, /turf/open/floor/plasteel, /area/science/misc_lab) -"bOz" = ( -/obj/structure/chair/stool, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/science/xenobiology) "bOB" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 4 @@ -35893,7 +35969,7 @@ dir = 8; pixel_x = 24 }, -/obj/structure/closet/l3closet, +/obj/structure/closet/l3closet/virology, /obj/machinery/light{ dir = 4 }, @@ -35942,15 +36018,16 @@ /area/medical/virology) "bPx" = ( /obj/machinery/disposal/bin, -/obj/structure/sign/warning/deathsposal{ - pixel_y = -32 - }, /obj/structure/disposalpipe/trunk{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/structure/sign/warning/deathsposal{ + pixel_x = -31; + pixel_y = 0 + }, /turf/open/floor/plasteel, /area/science/xenobiology) "bPy" = ( @@ -35958,23 +36035,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/structure/chair/comfy/black, +/obj/structure/chair/comfy/black{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/science/xenobiology) "bPz" = ( -/obj/structure/table/glass, -/obj/item/storage/box/beakers{ - pixel_x = 2; - pixel_y = 7 - }, -/obj/item/storage/box/syringes{ - pixel_y = 5 - }, -/obj/item/storage/box/monkeycubes{ - pixel_x = 2; - pixel_y = -2 - }, -/obj/item/storage/box/monkeycubes, /obj/machinery/light, /obj/structure/disposalpipe/segment{ dir = 4 @@ -35982,22 +36048,39 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/machinery/smartfridge/extract/preloaded, /turf/open/floor/plasteel, /area/science/xenobiology) "bPA" = ( -/obj/machinery/computer/camera_advanced/xenobio{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/structure/table/glass, +/obj/item/storage/box/monkeycubes, +/obj/machinery/button/door{ + name = "Containment Blast Doors"; + pixel_x = 1; + pixel_y = -26; + req_access_txt = "55"; + id = "xenobiomain" + }, /turf/open/floor/plasteel, /area/science/xenobiology) "bPB" = ( /obj/structure/table/glass, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/structure/window/reinforced{ + dir = 4; + layer = 2.9 + }, /obj/item/paper_bin{ pixel_y = 4 }, @@ -36008,12 +36091,6 @@ /obj/item/pen{ pixel_x = -4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, /turf/open/floor/plasteel, /area/science/xenobiology) "bPC" = ( @@ -36033,71 +36110,38 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/machinery/portable_atmospherics/canister/bz, +/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on{ + dir = 8 + }, /turf/open/floor/plasteel, /area/science/xenobiology) "bPG" = ( -/obj/machinery/chem_master, -/obj/item/radio/intercom{ - pixel_y = -29 - }, /obj/machinery/light, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/structure/reagent_dispensers/watertank, +/obj/machinery/camera/autoname{ + icon_state = "camera"; + dir = 1 + }, /turf/open/floor/plasteel, /area/science/xenobiology) "bPH" = ( -/obj/machinery/requests_console{ - department = "Science"; - departmentType = 2; - name = "Science Requests Console"; - pixel_y = -30; - receive_ore_updates = 1 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/table/reinforced, -/obj/item/slime_scanner, -/obj/item/clothing/gloves/color/latex, -/obj/item/clothing/glasses/science, -/turf/open/floor/plasteel, -/area/science/xenobiology) -"bPI" = ( -/obj/structure/reagent_dispensers/watertank, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/structure/rack, +/obj/item/clothing/suit/hooded/wintercoat, +/obj/item/clothing/shoes/winterboots, /turf/open/floor/plasteel, /area/science/xenobiology) "bPJ" = ( -/obj/structure/table/glass, -/obj/item/stack/sheet/mineral/plasma{ - pixel_y = 4 - }, -/obj/item/stack/sheet/mineral/plasma{ - pixel_y = 4 - }, -/obj/item/stack/sheet/mineral/plasma{ - pixel_y = 4 - }, -/obj/item/stack/sheet/mineral/plasma{ - pixel_y = 4 - }, -/obj/item/reagent_containers/glass/beaker{ - pixel_x = 8; - pixel_y = 2 - }, -/obj/item/reagent_containers/glass/beaker/large{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/reagent_containers/dropper, /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/item/reagent_containers/dropper, +/obj/structure/closet/l3closet/scientist, +/obj/item/extinguisher, /turf/open/floor/plasteel, /area/science/xenobiology) "bPK" = ( @@ -36135,10 +36179,6 @@ }, /turf/open/floor/plasteel, /area/tcommsat/computer) -"bPR" = ( -/obj/effect/decal/cleanable/robot_debris/old, -/turf/open/floor/wood, -/area/maintenance/port/aft) "bPS" = ( /turf/open/floor/wood, /area/maintenance/port/aft) @@ -36147,20 +36187,6 @@ icon_state = "wood-broken" }, /area/maintenance/port/aft) -"bPU" = ( -/obj/item/shard, -/turf/open/floor/plating, -/area/maintenance/port/aft) -"bPV" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Maint Bar Access"; - req_access_txt = "12" - }, -/obj/structure/barricade/wooden{ - name = "wooden barricade (CLOSED)" - }, -/turf/open/floor/plating, -/area/maintenance/port/aft) "bPW" = ( /obj/effect/decal/cleanable/oil, /turf/open/floor/plating, @@ -36170,11 +36196,6 @@ /obj/effect/decal/cleanable/cobweb, /turf/open/floor/plating, /area/maintenance/port/aft) -"bPY" = ( -/obj/structure/girder, -/obj/structure/grille/broken, -/turf/open/floor/plating, -/area/maintenance/port/aft) "bPZ" = ( /obj/structure/chair{ dir = 1 @@ -36415,7 +36436,7 @@ /turf/open/floor/plasteel/white, /area/medical/virology) "bQH" = ( -/obj/structure/closet/l3closet, +/obj/structure/closet/l3closet/virology, /obj/effect/turf_decal/stripes/line{ dir = 6 }, @@ -36441,6 +36462,10 @@ }, /obj/effect/turf_decal/stripes/line, /obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + id = "xenobiomain"; + name = "containment blast door" + }, /turf/open/floor/plasteel/white, /area/science/xenobiology) "bQM" = ( @@ -36449,22 +36474,26 @@ dir = 1 }, /obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/machinery/door/poddoor/preopen{ + id = "xenobiomain"; + name = "containment blast door" + }, /turf/open/floor/plasteel/white, /area/science/xenobiology) "bQN" = ( /obj/machinery/door/firedoor, -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/camera{ - c_tag = "Xenobiology North"; - dir = 8; - network = list("ss13","rd") - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, /obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/door/poddoor/preopen{ + id = "xenobiomain"; + name = "containment blast door" + }, /turf/open/floor/plasteel/white, /area/science/xenobiology) "bQO" = ( @@ -36522,10 +36551,6 @@ /obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating, /area/maintenance/port/aft) -"bRh" = ( -/obj/effect/spawner/lootdrop/maintenance/three, -/turf/open/floor/plating, -/area/maintenance/port/aft) "bRi" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 @@ -36821,17 +36846,23 @@ /turf/open/floor/plasteel, /area/security/checkpoint/engineering) "bRT" = ( -/obj/structure/disposalpipe/trunk{ +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4; + external_pressure_bound = 140; + name = "killroom vent"; + pressure_checks = 0 + }, +/obj/machinery/camera/autoname{ + icon_state = "camera"; dir = 4 }, -/obj/structure/disposaloutlet, -/turf/open/floor/engine, +/turf/open/floor/plasteel/freezer, /area/science/xenobiology) "bRU" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/general/visible{ + dir = 1 }, -/turf/open/floor/engine, +/turf/open/floor/plasteel/freezer, /area/science/xenobiology) "bRV" = ( /obj/machinery/disposal/bin, @@ -36844,40 +36875,26 @@ }, /turf/open/floor/plasteel, /area/science/xenobiology) -"bRW" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/poddoor/preopen{ - id = "xenobio3"; - name = "containment blast door" - }, -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable, -/turf/open/floor/engine, -/area/science/xenobiology) "bRY" = ( -/obj/structure/window/reinforced, -/obj/structure/table/reinforced, /obj/machinery/button/door{ - id = "xenobio8"; - name = "Containment Blast Doors"; + id = "xenobio11"; + layer = 3.3; + name = "Xenobio Pen 11 Blast Doors"; pixel_y = 4; req_access_txt = "55" }, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/turf/open/floor/plasteel, +/obj/structure/cable, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, /area/science/xenobiology) "bSa" = ( +/obj/structure/cable, /obj/machinery/door/poddoor/preopen{ - id = "xenobio8"; - name = "containment blast door" + id = "xenobio11"; + name = "Xenobio Pen 11 Blast Door" }, /obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable, -/turf/open/floor/engine, +/turf/open/floor/plating, /area/science/xenobiology) "bSc" = ( /obj/structure/table, @@ -37136,6 +37153,18 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/engine/atmos) +"bSO" = ( +/obj/machinery/button/door{ + id = "xenobio7"; + layer = 3.3; + name = "Xenobio Pen 7 Blast Doors"; + pixel_y = 4; + req_access_txt = "55" + }, +/obj/structure/cable, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/science/xenobiology) "bSP" = ( /obj/machinery/atmospherics/pipe/manifold/cyan/visible{ dir = 4 @@ -37232,32 +37261,20 @@ /turf/open/floor/plasteel/white, /area/medical/virology) "bTa" = ( -/obj/machinery/door/window/northleft{ - dir = 4; - name = "Containment Pen"; - req_access_txt = "55" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/delivery, +/obj/structure/sign/warning/coldtemp, +/obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/science/xenobiology) "bTb" = ( -/obj/machinery/door/window/northleft{ - base_state = "right"; - dir = 8; - icon_state = "right"; - name = "Containment Pen"; - req_access_txt = "55" +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{ + name = "killroom vent"; + icon_state = "vent_map_siphon_on-2"; + dir = 1; + external_pressure_bound = 120 }, -/obj/machinery/door/poddoor/preopen{ - id = "xenobio3"; - name = "containment blast door" - }, -/obj/structure/cable, -/turf/open/floor/engine, +/obj/machinery/light, +/turf/open/floor/plasteel/freezer, /area/science/xenobiology) "bTc" = ( /obj/structure/disposalpipe/segment, @@ -37269,27 +37286,26 @@ base_state = "right"; dir = 8; icon_state = "right"; - name = "Containment Pen"; + name = "Containment Pen 11"; req_access_txt = "55" }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, /obj/effect/turf_decal/delivery, -/obj/structure/cable, /turf/open/floor/plasteel, /area/science/xenobiology) "bTe" = ( /obj/machinery/door/window/northleft{ dir = 4; - name = "Containment Pen"; + name = "Containment Pen 11"; req_access_txt = "55" }, -/obj/machinery/door/poddoor/preopen{ - id = "xenobio8"; - name = "containment blast door" - }, /obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio11"; + name = "Xenobio Pen 11 Blast Door" + }, /turf/open/floor/engine, /area/science/xenobiology) "bTg" = ( @@ -37342,36 +37358,6 @@ icon_state = "wood-broken5" }, /area/maintenance/port/aft) -"bTt" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden{ - dir = 4 - }, -/turf/open/floor/wood{ - icon_state = "wood-broken6" - }, -/area/maintenance/port/aft) -"bTu" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, -/turf/open/floor/wood, -/area/maintenance/port/aft) -"bTv" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden{ - dir = 4 - }, -/turf/open/floor/plating, -/area/maintenance/port/aft) -"bTw" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, -/obj/effect/mapping_helpers/airlock/abandoned, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ - dir = 4 - }, -/turf/open/floor/plating, -/area/maintenance/port/aft) "bTx" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 8 @@ -37379,13 +37365,6 @@ /obj/machinery/portable_atmospherics/canister/air, /turf/open/floor/plating, /area/maintenance/port/aft) -"bTy" = ( -/obj/effect/spawner/structure/window, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ - dir = 4 - }, -/turf/open/floor/plating, -/area/maintenance/port/aft) "bTz" = ( /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" @@ -37600,7 +37579,7 @@ pixel_x = -22 }, /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, @@ -37617,31 +37596,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/tcommsat/computer) -"bUd" = ( -/obj/structure/table/reinforced, -/obj/machinery/button/door{ - id = "xenobio3"; - name = "Containment Blast Doors"; - pixel_y = 4; - req_access_txt = "55" - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/turf/open/floor/plasteel, -/area/science/xenobiology) -"bUe" = ( -/obj/machinery/door/poddoor/preopen{ - id = "xenobio3"; - name = "containment blast door" - }, -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable, -/turf/open/floor/engine, -/area/science/xenobiology) "bUg" = ( /obj/structure/window/reinforced{ dir = 1 @@ -37656,23 +37610,24 @@ /turf/open/floor/plasteel, /area/science/xenobiology) "bUh" = ( +/obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio11"; + name = "Xenobio Pen 11 Blast Door" + }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/poddoor/preopen{ - id = "xenobio8"; - name = "containment blast door" - }, /obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable, -/turf/open/floor/engine, +/turf/open/floor/plating, /area/science/xenobiology) "bUi" = ( -/obj/structure/disposalpipe/trunk{ - dir = 8 +/obj/machinery/light{ + dir = 4 }, -/obj/structure/disposaloutlet{ - dir = 1 +/obj/machinery/camera/autoname{ + icon_state = "camera"; + dir = 8 }, /turf/open/floor/engine, /area/science/xenobiology) @@ -37709,6 +37664,10 @@ "bUq" = ( /obj/machinery/nanite_program_hub, /obj/effect/turf_decal/bot, +/obj/machinery/airalarm{ + dir = 1; + pixel_y = -22 + }, /turf/open/floor/plasteel/dark, /area/science/nanite) "bUr" = ( @@ -38004,18 +37963,23 @@ /turf/open/floor/plasteel, /area/hallway/primary/aft) "bVi" = ( -/obj/structure/sign/warning/electricshock, -/turf/closed/wall, -/area/science/xenobiology) -"bVj" = ( -/obj/machinery/light{ +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ dir = 8 }, -/turf/open/floor/plasteel/white, +/obj/structure/window/reinforced, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/structure/cable, +/turf/open/floor/plasteel, /area/science/xenobiology) "bVk" = ( +/obj/machinery/light{ + dir = 4 + }, /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /turf/open/floor/plasteel/white, @@ -38319,37 +38283,44 @@ /turf/open/floor/plating, /area/medical/virology) "bWl" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/poddoor/preopen{ - id = "xenobio2"; - name = "containment blast door" - }, -/obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio5"; + name = "Xenobio Pen 5 Blast Door" + }, +/obj/machinery/door/window/northleft{ + base_state = "right"; + dir = 8; + icon_state = "right"; + name = "Containment Pen 5"; + req_access_txt = "55" + }, /turf/open/floor/engine, /area/science/xenobiology) "bWm" = ( -/obj/structure/window/reinforced, -/obj/structure/table/reinforced, -/obj/machinery/button/door{ - id = "xenobio7"; - name = "Containment Blast Doors"; - pixel_y = 4; +/obj/machinery/door/window/northleft{ + base_state = "right"; + dir = 8; + icon_state = "right"; + name = "Containment Pen 10"; req_access_txt = "55" }, /obj/effect/turf_decal/stripes/line{ - dir = 10 + dir = 8 }, +/obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/science/xenobiology) "bWn" = ( -/obj/machinery/door/poddoor/preopen{ - id = "xenobio7"; - name = "containment blast door" +/obj/machinery/door/window/northleft{ + dir = 4; + name = "Containment Pen 10"; + req_access_txt = "55" + }, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio10"; + name = "Xenobio Pen 10 Blast Door" }, -/obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, /turf/open/floor/engine, /area/science/xenobiology) @@ -38383,6 +38354,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel, /area/tcommsat/computer) "bWv" = ( @@ -38670,32 +38642,26 @@ /turf/open/floor/engine, /area/science/xenobiology) "bXf" = ( -/obj/machinery/door/window/northleft{ - base_state = "right"; - dir = 8; - icon_state = "right"; - name = "Containment Pen"; - req_access_txt = "55" - }, -/obj/machinery/door/poddoor/preopen{ - id = "xenobio2"; - name = "containment blast door" - }, /obj/structure/cable, -/turf/open/floor/engine, +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio5"; + name = "Xenobio Pen 5 Blast Door" + }, +/turf/open/floor/plating, /area/science/xenobiology) "bXg" = ( -/obj/machinery/door/window/northleft{ - dir = 4; - name = "Containment Pen"; - req_access_txt = "55" - }, -/obj/machinery/door/poddoor/preopen{ - id = "xenobio7"; - name = "containment blast door" - }, /obj/structure/cable, -/turf/open/floor/engine, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio10"; + name = "Xenobio Pen 10 Blast Door" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/sign/warning/electricshock, +/turf/open/floor/plating, /area/science/xenobiology) "bXh" = ( /obj/structure/filingcabinet/chestdrawer, @@ -38862,6 +38828,7 @@ name = "Atmospherics"; req_access_txt = "24" }, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel, /area/engine/atmos) "bXO" = ( @@ -38989,33 +38956,14 @@ /obj/structure/closet/secure_closet/personal/patient, /turf/open/floor/plasteel/white, /area/medical/virology) -"bYf" = ( -/obj/structure/table/reinforced, -/obj/machinery/button/door{ - id = "xenobio2"; - name = "Containment Blast Doors"; - pixel_y = 4; - req_access_txt = "55" - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/turf/open/floor/plasteel, -/area/science/xenobiology) "bYh" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, +/obj/structure/cable, /obj/machinery/door/poddoor/preopen{ - id = "xenobio7"; - name = "containment blast door" + id = "xenobio9"; + name = "Xenobio Pen 9 Blast Door" }, /obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable, -/turf/open/floor/engine, +/turf/open/floor/plating, /area/science/xenobiology) "bYi" = ( /obj/machinery/door/poddoor/preopen{ @@ -39313,19 +39261,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/closed/wall/r_wall, /area/medical/virology) -"bZa" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = -12; - pixel_y = 2 - }, -/obj/machinery/camera{ - c_tag = "Xenobiology South"; - dir = 4; - network = list("ss13","rd") - }, -/turf/open/floor/plasteel/white, -/area/science/xenobiology) "bZb" = ( /obj/machinery/light{ dir = 4 @@ -39582,39 +39517,25 @@ /turf/open/floor/plating, /area/maintenance/aft) "bZV" = ( +/obj/structure/cable, +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio4"; + name = "Xenobio Pen 4 Blast Door" + }, +/turf/open/floor/plating, +/area/science/xenobiology) +"bZX" = ( +/obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio9"; + name = "Xenobio Pen 9 Blast Door" + }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/poddoor/preopen{ - id = "xenobio1"; - name = "containment blast door" - }, /obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable, -/turf/open/floor/engine, -/area/science/xenobiology) -"bZW" = ( -/obj/structure/window/reinforced, -/obj/structure/table/reinforced, -/obj/machinery/button/door{ - id = "xenobio6"; - name = "Containment Blast Doors"; - pixel_y = 4; - req_access_txt = "55" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/turf/open/floor/plasteel, -/area/science/xenobiology) -"bZX" = ( -/obj/machinery/door/poddoor/preopen{ - id = "xenobio6"; - name = "containment blast door" - }, -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable, -/turf/open/floor/engine, +/turf/open/floor/plating, /area/science/xenobiology) "bZZ" = ( /obj/effect/turf_decal/stripes/corner, @@ -39982,32 +39903,26 @@ /turf/open/floor/plating, /area/maintenance/aft) "caV" = ( -/obj/machinery/door/window/northleft{ - base_state = "right"; - dir = 8; - icon_state = "right"; - name = "Containment Pen"; - req_access_txt = "55" +/obj/structure/disposalpipe/segment{ + dir = 4 }, /obj/machinery/door/poddoor/preopen{ - id = "xenobio1"; - name = "containment blast door" + id = "xenobio3"; + name = "Xenobio Pen 3 Blast Door" }, +/obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, -/turf/open/floor/engine, +/obj/structure/sign/warning/electricshock, +/turf/open/floor/plating, /area/science/xenobiology) "caW" = ( -/obj/machinery/door/window/northleft{ - dir = 4; - name = "Containment Pen"; - req_access_txt = "55" - }, -/obj/machinery/door/poddoor/preopen{ - id = "xenobio6"; - name = "containment blast door" - }, /obj/structure/cable, -/turf/open/floor/engine, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio8"; + name = "Xenobio Pen 8 Blast Door" + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, /area/science/xenobiology) "caX" = ( /obj/machinery/sparker{ @@ -40318,40 +40233,42 @@ /turf/open/floor/plating, /area/maintenance/aft) "cbR" = ( -/obj/structure/table/reinforced, -/obj/machinery/button/door{ - id = "xenobio1"; - name = "Containment Blast Doors"; - pixel_y = 4; +/obj/machinery/door/window/northleft{ + dir = 4; + name = "Containment Pen 3"; req_access_txt = "55" }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/light, /obj/effect/turf_decal/stripes/line{ - dir = 5 + dir = 4 }, +/obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/science/xenobiology) "cbS" = ( -/obj/machinery/door/poddoor/preopen{ - id = "xenobio1"; - name = "containment blast door" +/obj/machinery/door/window/northleft{ + base_state = "right"; + dir = 8; + icon_state = "right"; + name = "Containment Pen 3"; + req_access_txt = "55" }, -/obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio3"; + name = "Xenobio Pen 3 Blast Door" + }, /turf/open/floor/engine, /area/science/xenobiology) "cbU" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/door/window/northleft{ + dir = 4; + name = "Containment Pen 8"; + req_access_txt = "55" }, /obj/machinery/door/poddoor/preopen{ - id = "xenobio6"; - name = "containment blast door" + id = "xenobio8"; + name = "Xenobio Pen 8 Blast Door" }, -/obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, /turf/open/floor/engine, /area/science/xenobiology) @@ -40625,8 +40542,12 @@ /turf/open/floor/plasteel/white, /area/science/xenobiology) "ccQ" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, +/obj/structure/sink{ + dir = 4; + pixel_x = -12; + pixel_y = 0 + }, +/turf/open/floor/plasteel/white, /area/science/xenobiology) "ccR" = ( /obj/item/paper_bin{ @@ -41129,16 +41050,11 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/sign/warning/biohazard, /turf/closed/wall/r_wall, -/area/medical/chemistry) -"ceI" = ( -/obj/structure/cable, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/space/basic, -/area/medical/chemistry) +/area/maintenance/starboard/aft) "ceJ" = ( /obj/structure/disposalpipe/segment, /turf/closed/wall/r_wall, -/area/medical/chemistry) +/area/maintenance/starboard/aft) "ceM" = ( /obj/machinery/meter, /obj/structure/disposalpipe/segment, @@ -41310,19 +41226,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/white, /area/medical/chemistry) -"cfr" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - external_pressure_bound = 140; - name = "killroom vent"; - pressure_checks = 0 - }, -/obj/machinery/camera{ - c_tag = "Xenobiology Kill Room"; - dir = 4; - network = list("ss13","rd") - }, -/turf/open/floor/circuit/telecomms, -/area/science/xenobiology) "cfu" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall/r_wall, @@ -41342,15 +41245,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating/airless, /area/maintenance/solars/port/aft) -"cfy" = ( -/obj/structure/rack, -/obj/item/clothing/shoes/winterboots, -/obj/item/clothing/suit/hooded/wintercoat, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/turf/open/floor/plasteel, -/area/science/xenobiology) "cfD" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/maintenance{ @@ -41530,9 +41424,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/chemistry) -"cgi" = ( -/turf/open/floor/circuit/telecomms, -/area/science/xenobiology) "cgj" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -41541,16 +41432,27 @@ /turf/closed/wall/r_wall, /area/maintenance/starboard/aft) "cgk" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/sign/warning/biohazard, -/turf/open/floor/plating, +/obj/machinery/disposal/bin, +/obj/structure/window/reinforced, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/turf/open/floor/plasteel, /area/science/xenobiology) "cgl" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{ - external_pressure_bound = 120; - name = "killroom vent" +/obj/machinery/door/poddoor/preopen{ + id = "xenobio2"; + name = "Xenobio Pen 2 Blast Door" }, -/turf/open/floor/circuit/telecomms, +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, /area/science/xenobiology) "cgm" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -41559,29 +41461,14 @@ /obj/structure/cable, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"cgn" = ( -/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/turf/open/floor/plasteel, -/area/science/xenobiology) "cgo" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/starboard/aft) "cgp" = ( -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 - }, -/obj/structure/cable, +/obj/structure/closet/wardrobe/mixed, /turf/open/floor/plating, /area/maintenance/starboard/aft) "cgr" = ( @@ -41886,13 +41773,6 @@ /obj/structure/cable, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) -"cho" = ( -/obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 5 - }, -/turf/open/floor/circuit/telecomms, -/area/science/xenobiology) "chp" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -41902,52 +41782,33 @@ }, /turf/closed/wall/r_wall, /area/maintenance/starboard/aft) -"chq" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 4 - }, -/turf/open/floor/circuit/telecomms, -/area/science/xenobiology) "chr" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/research{ - name = "Kill Chamber"; +/obj/machinery/door/window/northleft{ + dir = 4; + name = "Containment Pen 2"; req_access_txt = "55" }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/plating, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plasteel, /area/science/xenobiology) "chs" = ( -/obj/machinery/light, -/obj/machinery/atmospherics/pipe/manifold/general/visible, -/turf/open/floor/circuit/telecomms, -/area/science/xenobiology) -"cht" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel/white, -/area/science/xenobiology) -"chu" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/science/xenobiology) -"chv" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/disposalpipe/segment{ - dir = 5 +/obj/machinery/door/window/northleft{ + base_state = "right"; + dir = 8; + icon_state = "right"; + name = "Containment Pen 2"; + req_access_txt = "55" }, /obj/structure/cable, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) +/obj/machinery/door/poddoor/preopen{ + id = "xenobio2"; + name = "Xenobio Pen 2 Blast Door" + }, +/turf/open/floor/engine, +/area/science/xenobiology) "chw" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 10 @@ -42286,21 +42147,12 @@ }, /turf/open/floor/plasteel/white, /area/medical/chemistry) -"ciI" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) "ciJ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating{ icon_state = "platingdmg3" }, /area/maintenance/starboard/aft) -"ciK" = ( -/obj/structure/rack, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) "ciL" = ( /obj/effect/spawner/structure/window/reinforced/tinted, /turf/open/floor/plating, @@ -42565,23 +42417,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/chemistry) -"cjB" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 9 - }, -/obj/structure/table, -/obj/item/folder/white, -/obj/item/pen, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/turf/open/floor/plasteel, -/area/science/xenobiology) -"cjC" = ( -/obj/structure/grille, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) "cjD" = ( /turf/closed/wall/r_wall, /area/maintenance/solars/starboard/aft) @@ -42826,37 +42661,16 @@ /obj/structure/cable, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) -"ckl" = ( -/obj/machinery/vending/wardrobe/chem_wardrobe, -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/light{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/medical/chemistry) "ckm" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 8 }, /turf/open/floor/plasteel/white, /area/medical/chemistry) -"ckn" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating, -/area/science/xenobiology) "cko" = ( /obj/structure/disposalpipe/segment, /turf/closed/wall, /area/maintenance/starboard/aft) -"ckp" = ( -/obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance/two, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) "ckr" = ( /obj/structure/reagent_dispensers/fueltank, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -43156,12 +42970,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"cls" = ( -/obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance/three, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) "clt" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -43379,7 +43187,7 @@ }, /area/maintenance/starboard/aft) "cmr" = ( -/obj/structure/closet/toolcloset, +/obj/structure/rack, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 5 }, @@ -43683,11 +43491,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"cnJ" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/spawner/lootdrop/maintenance, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) "cnX" = ( /obj/structure/extinguisher_cabinet{ pixel_x = -5; @@ -44620,20 +44423,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall/r_wall, /area/engine/engineering) -"csk" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating/airless, -/area/space/nearstation) "csl" = ( /obj/structure/transit_tube/curved{ dir = 4 }, /turf/open/space, /area/space/nearstation) -"csm" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plasteel/white, -/area/medical/chemistry) "csn" = ( /obj/structure/transit_tube/horizontal, /turf/open/space, @@ -46426,6 +46221,9 @@ name = "Escape Airlock"; safety_mode = 1 }, +/obj/machinery/navbeacon/wayfinding{ + location = "Escape" + }, /turf/open/floor/plating, /area/hallway/secondary/exit) "cyr" = ( @@ -46611,11 +46409,6 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/bar) -"czQ" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) "czR" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable, @@ -46630,15 +46423,9 @@ }, /area/maintenance/starboard/aft) "czU" = ( -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating/airless, +/area/space/nearstation) "czW" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 @@ -46666,24 +46453,8 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "czZ" = ( -/obj/structure/chair, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) -"cAa" = ( -/obj/structure/chair, -/obj/item/storage/fancy/cigarettes, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/starboard/aft) "cAb" = ( @@ -46787,9 +46558,8 @@ /turf/open/floor/engine, /area/engine/engineering) "cAu" = ( -/obj/machinery/power/emitter/anchored{ - dir = 4; - state = 2 +/obj/machinery/power/emitter/welded{ + dir = 4 }, /obj/structure/cable, /turf/open/floor/plating, @@ -47150,6 +46920,7 @@ }, /obj/structure/disposalpipe/segment, /obj/effect/landmark/event_spawn, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel, /area/janitor) "cBz" = ( @@ -47203,6 +46974,9 @@ /obj/structure/disposalpipe/segment, /obj/effect/landmark/event_spawn, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/general/visible{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/science/xenobiology) "cBH" = ( @@ -48394,9 +48168,8 @@ /turf/open/floor/plasteel/dark, /area/engine/engineering) "cHj" = ( -/obj/machinery/power/emitter/anchored{ - dir = 8; - state = 2 +/obj/machinery/power/emitter/welded{ + dir = 8 }, /obj/structure/cable, /turf/open/floor/plating, @@ -48677,9 +48450,6 @@ }, /turf/open/floor/plating, /area/hallway/secondary/entry) -"cMl" = ( -/turf/open/space, -/area/space/nearstation) "cMm" = ( /obj/effect/spawner/structure/window/plasma/reinforced, /turf/open/floor/plating, @@ -48861,6 +48631,18 @@ }, /turf/closed/wall, /area/maintenance/starboard/aft) +"cSb" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/delivery, +/obj/machinery/door/window/northleft{ + dir = 4; + name = "Containment Pen 5"; + req_access_txt = "55" + }, +/turf/open/floor/plasteel, +/area/science/xenobiology) "cSz" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -49170,39 +48952,60 @@ /obj/structure/cable, /turf/open/floor/plating, /area/science/xenobiology) -"cTY" = ( -/obj/structure/sign/poster/official/safety_internals{ - pixel_x = -32 - }, -/turf/open/floor/plasteel/white, -/area/science/xenobiology) -"cTZ" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/science/xenobiology) "cVb" = ( /turf/closed/wall, /area/hallway/secondary/service) "cVu" = ( +/obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 }, -/obj/structure/cable, /turf/open/floor/plating, /area/maintenance/starboard/aft) "cYY" = ( -/obj/effect/landmark/blobstart, -/obj/effect/landmark/xeno_spawn, -/turf/open/floor/engine, -/area/science/explab) +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/plasteel/white, +/area/science/genetics) "ddf" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plating, /area/maintenance/starboard) +"ddy" = ( +/obj/machinery/door/window/westleft{ + dir = 1; + name = "Monkey Pen"; + pixel_y = 2; + req_access_txt = "9" + }, +/mob/living/carbon/monkey, +/turf/open/floor/engine, +/area/science/genetics) +"ddD" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/table, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/structure/cable, +/obj/item/toy/plush/slimeplushie, +/turf/open/floor/plasteel, +/area/science/xenobiology) "dfx" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plating, @@ -49220,10 +49023,39 @@ /obj/machinery/chem_heater, /turf/open/floor/plasteel/white, /area/medical/chemistry) +"dni" = ( +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/cable, +/obj/structure/chair{ + dir = 1 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) +"dnY" = ( +/obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio10"; + name = "Xenobio Pen 10 Blast Door" + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/science/xenobiology) "dqu" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/closed/wall/r_wall, /area/maintenance/disposal/incinerator) +"dqL" = ( +/obj/machinery/atmospherics/pipe/simple/general/visible{ + dir = 9 + }, +/obj/structure/cable, +/turf/open/floor/plasteel/white, +/area/science/xenobiology) "dtc" = ( /obj/machinery/photocopier, /turf/open/floor/wood, @@ -49248,6 +49080,14 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"dxb" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "dyk" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 @@ -49277,6 +49117,13 @@ /obj/effect/turf_decal/tile/blue, /turf/open/floor/plasteel/white, /area/medical/medbay/central) +"dBM" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/processor/slime, +/turf/open/floor/plasteel/white, +/area/science/xenobiology) "dCG" = ( /obj/structure/sign/warning/vacuum/external{ pixel_x = -32 @@ -49352,6 +49199,20 @@ /obj/structure/table/reinforced, /turf/open/floor/plasteel/white, /area/science/mixing) +"dOm" = ( +/obj/machinery/door/window/northleft{ + base_state = "right"; + dir = 8; + icon_state = "right"; + name = "Containment Pen 6"; + req_access_txt = "55" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plasteel, +/area/science/xenobiology) "dPH" = ( /obj/machinery/light, /obj/structure/cable, @@ -49383,6 +49244,12 @@ }, /turf/open/floor/plasteel/white, /area/medical/chemistry) +"egr" = ( +/obj/machinery/atmospherics/pipe/simple/general/visible{ + dir = 6 + }, +/turf/open/floor/plasteel/white, +/area/science/xenobiology) "eja" = ( /obj/effect/turf_decal/bot, /obj/machinery/computer/nanite_chamber_control{ @@ -49419,6 +49286,15 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/plasteel, /area/vacant_room/commissary) +"eFD" = ( +/obj/structure/table/glass, +/obj/item/storage/box/disks{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/machinery/light, +/turf/open/floor/plasteel/dark, +/area/science/genetics) "eIE" = ( /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ @@ -49442,6 +49318,16 @@ /obj/structure/grille, /turf/open/space/basic, /area/space/nearstation) +"eSG" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/camera/autoname{ + icon_state = "camera"; + dir = 5 + }, +/turf/open/floor/engine, +/area/science/xenobiology) "eUr" = ( /obj/machinery/door/poddoor/preopen{ id = "testlab"; @@ -49469,6 +49355,24 @@ }, /turf/closed/wall/r_wall, /area/science/mixing/chamber) +"fep" = ( +/obj/structure/window/reinforced, +/turf/open/floor/engine, +/area/science/xenobiology) +"fif" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/cable, +/obj/structure/chair{ + dir = 1 + }, +/obj/item/storage/fancy/cigarettes, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "flc" = ( /obj/item/assembly/prox_sensor{ pixel_x = -4; @@ -49491,6 +49395,11 @@ }, /turf/open/floor/plasteel/white, /area/science/mixing) +"flN" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/portable_atmospherics/canister, +/turf/open/floor/plasteel, +/area/science/mixing) "fnC" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 @@ -49502,6 +49411,36 @@ /obj/structure/cable, /turf/open/floor/plasteel, /area/hallway/secondary/service) +"fpR" = ( +/obj/machinery/door/window/northleft{ + base_state = "right"; + dir = 8; + icon_state = "right"; + name = "Containment Pen 9"; + req_access_txt = "55" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plasteel, +/area/science/xenobiology) +"fqQ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/requests_console{ + department = "Genetics"; + name = "Genetics Requests Console"; + pixel_y = 30 + }, +/obj/effect/turf_decal/stripes/corner, +/turf/open/floor/plasteel/white, +/area/science/genetics) "fqV" = ( /obj/structure/rack, /obj/item/storage/box, @@ -49533,6 +49472,11 @@ }, /turf/open/floor/plasteel/white, /area/science/mixing) +"fxH" = ( +/obj/effect/spawner/structure/window, +/obj/machinery/pinpointer_dispenser, +/turf/open/floor/plating, +/area/hallway/secondary/entry) "fBs" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/table/wood, @@ -49552,6 +49496,10 @@ /obj/structure/table, /turf/open/floor/plasteel, /area/hydroponics) +"fGg" = ( +/obj/effect/landmark/start/paramedic, +/turf/open/floor/plasteel/white, +/area/medical/sleeper) "fGF" = ( /obj/machinery/portable_atmospherics/scrubber, /obj/effect/turf_decal/bot, @@ -49560,6 +49508,20 @@ }, /turf/open/floor/plasteel, /area/science/mixing) +"fJT" = ( +/obj/machinery/door/window/northleft{ + base_state = "right"; + dir = 8; + icon_state = "right"; + name = "Containment Pen 7"; + req_access_txt = "55" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plasteel, +/area/science/xenobiology) "fPm" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -49569,6 +49531,12 @@ }, /turf/open/floor/plasteel/white, /area/medical/chemistry) +"fUn" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "fXM" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 8 @@ -49591,6 +49559,18 @@ /obj/item/stack/sheet/glass/fifty, /turf/open/floor/plating, /area/maintenance/department/medical/morgue) +"gdq" = ( +/obj/machinery/button/door{ + id = "xenobio2"; + layer = 3.3; + name = "Xenobio Pen 2 Blast Doors"; + pixel_y = 4; + req_access_txt = "55" + }, +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/science/xenobiology) "gjb" = ( /obj/machinery/vending/cigarette, /obj/effect/turf_decal/tile/red, @@ -49653,6 +49633,18 @@ }, /turf/closed/wall, /area/maintenance/starboard) +"gCA" = ( +/obj/machinery/button/door{ + id = "xenobio8"; + layer = 3.3; + name = "Xenobio Pen 8 Blast Doors"; + pixel_y = 4; + req_access_txt = "55" + }, +/obj/structure/cable, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/science/xenobiology) "gES" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -49666,12 +49658,35 @@ }, /turf/open/floor/plasteel, /area/vacant_room/commissary) +"gGJ" = ( +/obj/machinery/camera/autoname{ + icon_state = "camera"; + dir = 5 + }, +/turf/open/floor/engine, +/area/science/xenobiology) "gHj" = ( -/obj/structure/closet/radiation, -/turf/open/floor/plasteel/white/corner{ +/obj/effect/turf_decal/tile/purple{ dir = 1 }, -/area/science/explab) +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/science/genetics) +"gHL" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "gLd" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -49729,7 +49744,6 @@ /area/space/nearstation) "gZG" = ( /obj/structure/closet/crate/freezer/surplus_limbs, -/obj/item/reagent_containers/glass/beaker/instabitaluri, /turf/open/floor/plasteel/white/side{ dir = 8 }, @@ -49768,6 +49782,12 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/fore) +"hnW" = ( +/obj/effect/spawner/structure/window/reinforced{ + pixel_w = 1 + }, +/turf/closed/wall, +/area/maintenance/starboard/aft) "hox" = ( /obj/machinery/door/firedoor/heavy, /turf/open/floor/plasteel/white/side{ @@ -49780,6 +49800,20 @@ }, /turf/open/floor/plasteel/white, /area/medical/chemistry) +"hAo" = ( +/obj/machinery/door/window/northleft{ + base_state = "right"; + dir = 8; + icon_state = "right"; + name = "Containment Pen 8"; + req_access_txt = "55" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plasteel, +/area/science/xenobiology) "hAK" = ( /obj/structure/table, /obj/item/storage/box/disks_nanite, @@ -49789,6 +49823,12 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"hDb" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/engine, +/area/science/xenobiology) "hFg" = ( /obj/machinery/door/airlock/external{ name = "Port Docking Bay 1"; @@ -49797,6 +49837,30 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/plating, /area/hallway/secondary/entry) +"hGP" = ( +/obj/machinery/button/door{ + id = "xenobio3"; + layer = 3.3; + name = "Xenobio Pen 3 Blast Doors"; + pixel_y = 4; + req_access_txt = "55" + }, +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/science/xenobiology) +"hHq" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/research/glass{ + name = "Kill Chamber"; + normalspeed = 0; + req_access_txt = "55" + }, +/obj/machinery/atmospherics/pipe/simple/general/visible{ + dir = 4 + }, +/turf/open/floor/plasteel/freezer, +/area/science/xenobiology) "hJq" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/door/airlock/medical/glass{ @@ -49804,7 +49868,7 @@ req_access_txt = "5; 33" }, /turf/open/floor/plating, -/area/medical/chemistry) +/area/maintenance/starboard/aft) "hQK" = ( /obj/machinery/light/small{ dir = 8 @@ -49843,14 +49907,9 @@ /turf/open/floor/plasteel, /area/science/nanite) "ifv" = ( -/obj/structure/table, -/obj/item/clipboard, -/obj/item/book/manual/wiki/experimentor, -/obj/item/relic, -/turf/open/floor/plasteel/white/corner{ - dir = 4 - }, -/area/science/explab) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel/white, +/area/science/genetics) "igT" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -49858,11 +49917,34 @@ }, /turf/open/floor/plasteel/white, /area/medical/chemistry) +"iiu" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/computer/camera_advanced/xenobio{ + icon_state = "computer"; + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/science/xenobiology) "ijc" = ( /obj/structure/table, /obj/item/stack/sheet/metal/fifty, /turf/open/floor/plasteel/dark, /area/engine/engineering) +"ink" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple, +/turf/open/floor/plasteel/white, +/area/science/genetics) "ipA" = ( /turf/open/floor/plating, /area/maintenance/department/medical/morgue) @@ -49923,12 +50005,35 @@ /obj/structure/reagent_dispensers/cooking_oil, /turf/open/floor/plasteel/showroomfloor, /area/crew_quarters/kitchen) +"iOI" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/rack, +/obj/item/wirecutters, +/obj/item/screwdriver, +/obj/item/storage/box/lights/tubes, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/plasteel, +/area/science/xenobiology) "iQF" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable, /turf/open/floor/plasteel, /area/engine/engineering) +"iSv" = ( +/obj/machinery/door/window/northleft{ + dir = 4; + name = "Containment Pen 4"; + req_access_txt = "55" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plasteel, +/area/science/xenobiology) "iTt" = ( /obj/item/radio/intercom{ desc = "Talk through this. It looks like it has been modified to not broadcast."; @@ -49953,6 +50058,11 @@ /obj/structure/cable, /turf/open/floor/plasteel, /area/hallway/secondary/service) +"jdH" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/maintenance/four, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "jiK" = ( /obj/structure/closet/toolcloset, /obj/effect/turf_decal/tile/yellow, @@ -49974,6 +50084,19 @@ }, /turf/closed/wall/r_wall, /area/security/courtroom) +"jly" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/machinery/door/airlock/external{ + name = "Port Docking Bay 1"; + safety_mode = 1 + }, +/obj/machinery/navbeacon/wayfinding{ + location = "Arrival Shuttle" + }, +/turf/open/floor/plating, +/area/hallway/secondary/entry) "jox" = ( /obj/machinery/chem_dispenser, /obj/machinery/camera{ @@ -50011,23 +50134,43 @@ /obj/structure/cable, /turf/open/floor/plating, /area/maintenance/fore) +"jsw" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "jsP" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 4 }, /turf/open/floor/plasteel/white, /area/medical/chemistry) +"jtt" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/medical/chemistry) "jxy" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple, +/obj/structure/sink{ + dir = 4; + pixel_x = -12; + pixel_y = 2 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, /turf/open/floor/plasteel/white, -/area/science/explab) +/area/science/genetics) "jyF" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/white, -/area/science/explab) +/obj/machinery/dna_scannernew, +/turf/open/floor/plasteel/dark, +/area/science/genetics) "jAD" = ( /obj/structure/grille, /turf/open/floor/plating/airless, @@ -50090,6 +50233,20 @@ /obj/item/stack/cable_coil, /turf/open/floor/plasteel/dark, /area/engine/engineering) +"jQV" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/engine, +/area/science/xenobiology) +"jUW" = ( +/obj/machinery/camera/autoname{ + dir = 4; + icon_state = "camera" + }, +/obj/structure/cable, +/turf/open/floor/plasteel/white, +/area/science/xenobiology) "jVc" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -50137,6 +50294,10 @@ }, /turf/open/floor/plasteel/white, /area/medical/chemistry) +"keQ" = ( +/obj/effect/decal/cleanable/dirt, +/turf/closed/wall, +/area/maintenance/starboard/aft) "keW" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/sorting/mail{ @@ -50198,6 +50359,12 @@ "kul" = ( /turf/closed/wall, /area/engine/engine_smes) +"kvJ" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "kwA" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 8 @@ -50225,13 +50392,12 @@ /turf/open/floor/plasteel/white, /area/science/mixing) "kxC" = ( -/obj/machinery/computer/rdconsole/experiment{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 }, -/turf/open/floor/plasteel/white/corner{ - dir = 1 - }, -/area/science/explab) +/turf/open/floor/plasteel/white, +/area/science/genetics) "kxP" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 @@ -50271,18 +50437,38 @@ /turf/open/floor/plasteel/white, /area/medical/pharmacy) "kGS" = ( -/obj/machinery/door/poddoor/preopen{ - id = "telelab"; - name = "test chamber blast door" +/obj/structure/table/glass, +/obj/item/storage/pill_bottle/mannitol, +/obj/item/storage/pill_bottle/mutadone, +/obj/item/radio/headset/headset_sci{ + pixel_x = -3 }, -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/firedoor/heavy, -/turf/open/floor/engine, -/area/science/explab) +/obj/item/folder/white, +/turf/open/floor/plasteel/dark, +/area/science/genetics) "kKK" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/closed/wall, /area/security/detectives_office) +"kKM" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/machinery/light, +/obj/machinery/camera/autoname{ + icon_state = "camera"; + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/plasteel, +/area/science/xenobiology) "kLd" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ @@ -50290,6 +50476,10 @@ }, /turf/open/floor/plasteel/dark, /area/hallway/primary/central) +"kLj" = ( +/obj/machinery/atmospherics/pipe/simple/general/visible, +/turf/open/floor/engine, +/area/science/xenobiology) "kLM" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 8 @@ -50367,6 +50557,13 @@ }, /turf/open/floor/plasteel, /area/vacant_room/commissary) +"kXf" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/mob/living/carbon/monkey, +/turf/open/floor/engine, +/area/science/genetics) "kXt" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 1 @@ -50376,6 +50573,18 @@ dir = 8 }, /area/science/research) +"kZR" = ( +/obj/structure/closet/toolcloset, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) +"lar" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/cable, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "lcg" = ( /obj/machinery/light{ dir = 4 @@ -50392,6 +50601,9 @@ }, /turf/open/floor/plasteel/white, /area/medical/pharmacy) +"ljx" = ( +/turf/closed/wall/r_wall, +/area/medical/medbay/zone2) "lqJ" = ( /obj/structure/table/wood, /obj/item/flashlight/lantern, @@ -50468,6 +50680,12 @@ /obj/machinery/meter, /turf/open/floor/plasteel, /area/science/mixing) +"lFP" = ( +/obj/machinery/computer/scan_consolenew{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/science/genetics) "lHR" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -50502,6 +50720,25 @@ }, /turf/open/floor/plasteel/white, /area/science/mixing) +"lOR" = ( +/obj/machinery/door/window/northleft{ + base_state = "right"; + dir = 8; + icon_state = "right"; + name = "Containment Pen 1"; + req_access_txt = "55" + }, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio1"; + name = "Xenobio Pen 1 Blast Door" + }, +/obj/structure/cable, +/turf/open/floor/engine, +/area/science/xenobiology) +"lOY" = ( +/obj/structure/lattice/catwalk, +/turf/closed/wall/r_wall, +/area/maintenance/disposal/incinerator) "lQm" = ( /obj/machinery/camera{ c_tag = "Nanite Lab"; @@ -50526,6 +50763,13 @@ }, /turf/open/floor/plasteel, /area/science/misc_lab) +"lSv" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "lST" = ( /obj/structure/table, /obj/machinery/recharger, @@ -50536,6 +50780,27 @@ }, /turf/open/floor/plasteel, /area/science/misc_lab) +"lVv" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio4"; + name = "Xenobio Pen 4 Blast Door" + }, +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/science/xenobiology) +"lVC" = ( +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/structure/disposaloutlet{ + dir = 4 + }, +/turf/open/floor/engine, +/area/science/xenobiology) "lWA" = ( /obj/machinery/door/airlock/external{ name = "External Access"; @@ -50610,17 +50875,16 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/machinery/camera{ c_tag = "Experimentor Lab"; network = list("ss13","rd") }, -/obj/structure/closet/l3closet/scientist, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 + }, /turf/open/floor/plasteel/white, -/area/science/explab) +/area/science/genetics) "mMA" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -50632,6 +50896,27 @@ }, /turf/open/floor/plasteel/white, /area/science/mixing) +"mPl" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/table/glass, +/obj/item/storage/box/monkeycubes{ + pixel_x = 2; + pixel_y = -2 + }, +/obj/machinery/button/door{ + name = "Containment Blast Doors"; + pixel_x = 1; + pixel_y = -26; + req_access_txt = "55"; + id = "xenobiomain" + }, +/turf/open/floor/plasteel, +/area/science/xenobiology) "mSf" = ( /obj/structure/chair/office{ dir = 1 @@ -50651,9 +50936,11 @@ }, /turf/open/floor/plasteel/white, /area/medical/chemistry) -"nbv" = ( -/turf/closed/wall, -/area/science/explab) +"mYY" = ( +/obj/structure/bed, +/obj/item/bedsheet/medical, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "ndR" = ( /obj/structure/cable, /obj/machinery/photocopier, @@ -50670,6 +50957,23 @@ /obj/structure/girder, /turf/open/floor/plasteel/dark, /area/engine/engineering) +"npF" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple, +/obj/structure/chair/office/light{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/landmark/start/geneticist, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/science/genetics) "nro" = ( /obj/effect/turf_decal/loading_area{ dir = 4 @@ -50710,6 +51014,10 @@ /obj/structure/cable, /turf/open/floor/plating, /area/construction) +"nxx" = ( +/obj/structure/sign/warning/biohazard, +/turf/closed/wall/r_wall, +/area/science/xenobiology) "nzh" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/dark, @@ -50730,6 +51038,15 @@ }, /turf/open/floor/plasteel, /area/vacant_room/commissary) +"nCW" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Hydroponics"; + req_access_txt = "35" + }, +/obj/machinery/navbeacon/wayfinding, +/turf/open/floor/plasteel, +/area/hydroponics) "nEk" = ( /obj/machinery/chem_master, /turf/open/floor/plasteel/white, @@ -50771,6 +51088,16 @@ /obj/structure/cable, /turf/open/floor/carpet, /area/crew_quarters/heads/hos) +"nPP" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + id = "xenobiomain"; + name = "containment blast door" + }, +/turf/open/floor/plating, +/area/science/xenobiology) "nQI" = ( /obj/machinery/light_switch{ pixel_x = -23 @@ -50834,9 +51161,19 @@ /turf/closed/wall, /area/vacant_room/commissary) "nXP" = ( -/obj/effect/landmark/event_spawn, -/turf/open/floor/engine, -/area/science/explab) +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple, +/obj/structure/chair/office/light{ + dir = 4 + }, +/obj/effect/landmark/start/geneticist, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/science/genetics) "nXT" = ( /obj/effect/turf_decal/tile/brown{ dir = 1 @@ -50853,13 +51190,19 @@ /obj/structure/cable, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"nZl" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/cable, -/turf/open/floor/plating{ - icon_state = "platingdmg3" +"nYU" = ( +/obj/machinery/door/window/northleft{ + dir = 4; + name = "Containment Pen 9"; + req_access_txt = "55" }, -/area/maintenance/starboard/aft) +/obj/machinery/door/poddoor/preopen{ + id = "xenobio9"; + name = "Xenobio Pen 9 Blast Door" + }, +/obj/structure/cable, +/turf/open/floor/engine, +/area/science/xenobiology) "ofT" = ( /obj/machinery/computer/bounty, /turf/open/floor/plasteel, @@ -50876,18 +51219,14 @@ /turf/open/floor/plasteel, /area/science/misc_lab) "orP" = ( -/obj/machinery/button/door{ - id = "telelab"; - name = "Test Chamber Blast Doors"; - pixel_x = 25; - req_access_txt = "47" +/obj/machinery/computer/scan_consolenew{ + dir = 8 }, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 1 +/obj/machinery/light{ + dir = 4 }, -/turf/open/floor/plasteel/white, -/area/science/explab) +/turf/open/floor/plasteel/dark, +/area/science/genetics) "orS" = ( /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel/dark, @@ -50947,6 +51286,13 @@ /obj/machinery/light, /turf/open/floor/plating, /area/engine/engineering) +"oHH" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/science/xenobiology) "oHU" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 10 @@ -50971,6 +51317,25 @@ }, /turf/open/floor/plasteel, /area/science/mixing) +"oUU" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/plasteel/white, +/area/science/xenobiology) +"oVV" = ( +/obj/machinery/button/door{ + id = "xenobio10"; + layer = 3.3; + name = "Xenobio Pen 10 Blast Doors"; + pixel_y = 4; + req_access_txt = "55" + }, +/obj/structure/cable, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/science/xenobiology) "oXE" = ( /obj/machinery/door/airlock/maintenance{ id_tag = "commissarydoor"; @@ -51002,6 +51367,18 @@ }, /turf/open/space/basic, /area/space) +"oYY" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/cable, +/obj/structure/bed, +/obj/item/bedsheet/medical, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "oZc" = ( /obj/machinery/camera{ c_tag = "Chapel South"; @@ -51009,6 +51386,19 @@ }, /turf/open/floor/plasteel/white, /area/medical/chemistry) +"oZn" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) +"pdB" = ( +/obj/effect/turf_decal/tile/blue, +/obj/structure/table, +/obj/machinery/light, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "pfj" = ( /obj/machinery/power/apc{ areastring = "/area/storage/tools"; @@ -51035,6 +51425,18 @@ }, /turf/open/floor/plasteel, /area/storage/tools) +"pfy" = ( +/obj/machinery/button/door{ + id = "xenobio6"; + layer = 3.3; + name = "Xenobio Pen 6 Blast Doors"; + pixel_y = 4; + req_access_txt = "55" + }, +/obj/structure/cable, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/science/xenobiology) "pgP" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -51072,6 +51474,29 @@ dir = 1 }, /area/engine/break_room) +"pmx" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio1"; + name = "Xenobio Pen 1 Blast Door" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sign/warning/electricshock, +/turf/open/floor/plating, +/area/science/xenobiology) +"pnj" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/chair/stool, +/turf/open/floor/plasteel/white, +/area/science/xenobiology) "poM" = ( /obj/machinery/holopad, /obj/effect/turf_decal/bot, @@ -51085,6 +51510,27 @@ /obj/item/toner, /turf/open/floor/plasteel, /area/quartermaster/office) +"pqR" = ( +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/structure/disposaloutlet{ + dir = 8 + }, +/turf/open/floor/engine, +/area/science/xenobiology) +"prl" = ( +/obj/machinery/door/window/northleft{ + dir = 4; + name = "Containment Pen 1"; + req_access_txt = "55" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plasteel, +/area/science/xenobiology) "prC" = ( /obj/item/radio/intercom{ pixel_x = -29 @@ -51103,8 +51549,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/white, -/area/science/explab) +/area/science/genetics) "ptw" = ( /obj/structure/chair/stool, /turf/open/floor/plasteel/white, @@ -51114,6 +51561,15 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/grimy, /area/security/detectives_office) +"pvI" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{ + name = "killroom vent"; + icon_state = "vent_map_siphon_on-2"; + dir = 1; + external_pressure_bound = 120 + }, +/turf/open/floor/plasteel/freezer, +/area/science/xenobiology) "pwd" = ( /obj/machinery/light/small{ dir = 8 @@ -51127,6 +51583,13 @@ }, /turf/open/floor/plasteel/white, /area/medical/chemistry) +"pxV" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 10 + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "pzA" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -51162,6 +51625,23 @@ }, /turf/open/floor/plasteel/white, /area/medical/pharmacy) +"pBV" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/machinery/portable_atmospherics/scrubber, +/turf/open/floor/plasteel, +/area/science/mixing) +"pCj" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio6"; + name = "Xenobio Pen 6 Blast Door" + }, +/turf/open/floor/plating, +/area/science/xenobiology) "pDu" = ( /obj/machinery/computer/nanite_cloud_controller, /obj/effect/turf_decal/bot, @@ -51211,6 +51691,13 @@ "pKm" = ( /obj/structure/table, /obj/item/nanite_remote, +/obj/machinery/requests_console{ + department = "Science"; + departmentType = 2; + name = "Science Requests Console"; + pixel_x = 30; + receive_ore_updates = 1 + }, /turf/open/floor/plasteel/dark, /area/science/nanite) "pLn" = ( @@ -51252,8 +51739,34 @@ dir = 4 }, /obj/structure/cable, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, /turf/open/floor/plasteel/white, -/area/science/explab) +/area/science/genetics) +"pPs" = ( +/obj/structure/cable, +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio3"; + name = "Xenobio Pen 3 Blast Door" + }, +/turf/open/floor/plating, +/area/science/xenobiology) +"pSN" = ( +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel/white, +/area/science/genetics) "pUr" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /turf/open/floor/wood, @@ -51300,6 +51813,10 @@ dir = 10 }, /area/science/research) +"qbW" = ( +/obj/machinery/rnd/bepis, +/turf/open/floor/engine, +/area/science/misc_lab) "qcV" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 @@ -51335,15 +51852,30 @@ }, /turf/open/floor/plasteel, /area/science/nanite) +"qrH" = ( +/obj/machinery/door/window/westleft{ + base_state = "right"; + dir = 1; + icon_state = "right"; + name = "Monkey Pen"; + pixel_y = 2; + req_access_txt = "9" + }, +/turf/open/floor/engine, +/area/science/genetics) "qrU" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ dir = 1 }, -/turf/open/floor/plasteel/white/corner{ +/turf/open/floor/plasteel/dark, +/area/science/genetics) +"qsH" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/area/science/explab) +/turf/closed/wall/r_wall, +/area/medical/medbay/zone2) "quT" = ( /obj/structure/lattice, /obj/structure/grille/broken, @@ -51353,6 +51885,15 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plasteel/dark, /area/hallway/primary/central) +"qyX" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + id = "xenobiomain"; + name = "containment blast door" + }, +/turf/open/floor/plating, +/area/science/xenobiology) "qBr" = ( /obj/item/stack/ducts/fifty, /obj/item/stack/ducts/fifty, @@ -51387,13 +51928,8 @@ /turf/open/floor/plasteel, /area/science/mixing) "qQH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, +/obj/effect/spawner/lootdrop/minor/bowler_or_that, +/obj/structure/rack, /turf/open/floor/plating, /area/maintenance/starboard/aft) "qRW" = ( @@ -51435,6 +51971,18 @@ /obj/item/reagent_containers/food/drinks/beer, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"rox" = ( +/obj/structure/window/reinforced{ + dir = 1; + pixel_y = 2 + }, +/turf/open/floor/engine, +/area/science/xenobiology) +"ryM" = ( +/obj/structure/rack, +/obj/effect/spawner/lootdrop/maintenance/three, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "rAt" = ( /obj/effect/turf_decal/tile/red{ dir = 4 @@ -51445,6 +51993,14 @@ }, /turf/open/floor/plasteel, /area/security/brig) +"rAv" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel/white, +/area/science/genetics) "rFI" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/white, @@ -51544,10 +52100,6 @@ "sjr" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/loading_area, -/obj/machinery/airalarm{ - dir = 8; - pixel_x = 24 - }, /turf/open/floor/plasteel/dark, /area/science/nanite) "sjK" = ( @@ -51635,6 +52187,19 @@ /obj/structure/lattice, /turf/open/space, /area/space) +"sAk" = ( +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 1; + pixel_y = 2 + }, +/obj/structure/disposaloutlet{ + dir = 8 + }, +/turf/open/floor/engine, +/area/science/xenobiology) "sHk" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 @@ -51649,6 +52214,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plating, /area/hallway/secondary/entry) "sLv" = ( @@ -51685,6 +52251,18 @@ }, /turf/open/floor/engine, /area/science/misc_lab) +"sUw" = ( +/obj/machinery/button/door{ + id = "xenobio4"; + layer = 3.3; + name = "Xenobio Pen 4 Blast Doors"; + pixel_y = 4; + req_access_txt = "55" + }, +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/science/xenobiology) "sXy" = ( /obj/machinery/door/airlock/external{ name = "Security External Airlock"; @@ -51695,6 +52273,18 @@ }, /turf/open/floor/plating, /area/security/main) +"sZy" = ( +/obj/machinery/button/door{ + id = "xenobio9"; + layer = 3.3; + name = "Xenobio Pen 9 Blast Doors"; + pixel_y = 4; + req_access_txt = "55" + }, +/obj/structure/cable, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/science/xenobiology) "tal" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall, @@ -51702,6 +52292,12 @@ "tav" = ( /turf/closed/wall, /area/vacant_room/commissary) +"taM" = ( +/obj/structure/table/glass, +/obj/item/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, +/turf/open/floor/plasteel/dark, +/area/science/genetics) "tbd" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -51726,28 +52322,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/machinery/airalarm{ - pixel_y = 23 - }, -/obj/structure/table, -/obj/item/storage/toolbox/mechanical{ - pixel_x = 2; - pixel_y = 3 - }, /obj/structure/cable, +/obj/machinery/dna_scannernew, /turf/open/floor/plasteel/white, -/area/science/explab) -"tfg" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/cable, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) +/area/science/genetics) "tgl" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -51763,6 +52341,10 @@ /obj/item/wrench, /turf/open/floor/plating, /area/maintenance/port/aft) +"tiO" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/medical/medbay/zone2) "tjy" = ( /obj/machinery/holopad, /obj/structure/disposalpipe/segment{ @@ -51770,6 +52352,10 @@ }, /turf/open/floor/plasteel/white, /area/science/mixing) +"tkC" = ( +/obj/structure/grille, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "tqd" = ( /obj/machinery/light/small{ dir = 1 @@ -51829,11 +52415,20 @@ }, /turf/open/floor/plasteel, /area/security/courtroom) +"trt" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible, +/turf/open/floor/engine, +/area/science/xenobiology) "tsw" = ( /obj/structure/table, /obj/item/storage/toolbox/emergency, /turf/open/floor/plasteel, /area/hallway/primary/port) +"tsM" = ( +/obj/effect/turf_decal/tile/blue, +/obj/item/twohanded/required/kirbyplants/random, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "tti" = ( /obj/structure/chair/stool{ pixel_y = 8 @@ -51853,6 +52448,21 @@ /obj/structure/cable, /turf/open/floor/plasteel, /area/security/brig) +"twh" = ( +/obj/machinery/atmospherics/pipe/simple/general/visible{ + dir = 5 + }, +/turf/open/floor/plasteel/white, +/area/science/xenobiology) +"tCh" = ( +/obj/structure/cable, +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio2"; + name = "Xenobio Pen 2 Blast Door" + }, +/turf/open/floor/plating, +/area/science/xenobiology) "tDw" = ( /obj/machinery/light_switch{ pixel_y = 28 @@ -51879,16 +52489,42 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) +"tJc" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4; + external_pressure_bound = 140; + name = "killroom vent"; + pressure_checks = 0 + }, +/obj/machinery/light, +/turf/open/floor/plasteel/freezer, +/area/science/xenobiology) "tKG" = ( /obj/machinery/light/small{ dir = 4 }, /turf/open/floor/engine, /area/science/misc_lab) +"tLf" = ( +/obj/effect/spawner/lootdrop/two_percent_xeno_egg_spawner, +/turf/open/floor/engine, +/area/science/xenobiology) "tMl" = ( /obj/effect/turf_decal/loading_area, /turf/open/floor/plasteel/showroomfloor, /area/crew_quarters/kitchen) +"tPW" = ( +/obj/machinery/door/poddoor/preopen{ + id = "xenobio7"; + name = "Xenobio Pen 7 Blast Door" + }, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/engine, +/area/science/xenobiology) "tQk" = ( /obj/machinery/camera{ c_tag = "Auxiliary Tool Storage" @@ -51946,6 +52582,15 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/locker) +"ueE" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/general/visible{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/science/xenobiology) "uhH" = ( /obj/item/wrench, /obj/item/weldingtool, @@ -51956,6 +52601,18 @@ /obj/structure/rack, /turf/open/floor/plasteel/dark, /area/engine/engineering) +"ujh" = ( +/obj/machinery/button/door{ + id = "xenobio1"; + layer = 3.3; + name = "Xenobio Pen 1 Blast Doors"; + pixel_y = 4; + req_access_txt = "55" + }, +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/science/xenobiology) "ulo" = ( /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/general/visible{ @@ -51977,6 +52634,12 @@ }, /turf/open/floor/plasteel, /area/science/mixing) +"usX" = ( +/obj/machinery/atmospherics/pipe/simple/general/visible{ + dir = 9 + }, +/turf/open/floor/plasteel/freezer, +/area/science/xenobiology) "uvi" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -51984,12 +52647,30 @@ }, /turf/open/floor/plasteel, /area/science/misc_lab) +"uyS" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio1"; + name = "Xenobio Pen 1 Blast Door" + }, +/turf/open/floor/plating, +/area/science/xenobiology) "uzl" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 }, /turf/open/floor/plasteel, /area/science/nanite) +"uzt" = ( +/obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio7"; + name = "Xenobio Pen 7 Blast Door" + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/science/xenobiology) "uCq" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -52001,10 +52682,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plasteel/dark, /area/science/nanite) -"uDP" = ( -/obj/machinery/light, -/turf/open/floor/plasteel/white, -/area/medical/chemistry) "uES" = ( /obj/machinery/door/firedoor/heavy, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ @@ -52012,6 +52689,10 @@ }, /turf/open/floor/plasteel/white, /area/science/mixing) +"uGz" = ( +/obj/machinery/vending/wardrobe/chem_wardrobe, +/turf/open/floor/plasteel/white, +/area/medical/chemistry) "uHA" = ( /obj/machinery/firealarm{ pixel_y = 24 @@ -52022,12 +52703,12 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 1 - }, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/plasteel/white, -/area/science/explab) +/area/science/genetics) "uIv" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -52071,13 +52752,15 @@ /turf/open/floor/plasteel, /area/vacant_room/commissary) "uTM" = ( -/obj/machinery/clonepod, -/obj/structure/window/reinforced{ - dir = 4; - layer = 2.9 +/obj/effect/turf_decal/tile/blue{ + dir = 1 }, -/turf/open/floor/plasteel/dark, -/area/medical/genetics) +/obj/effect/turf_decal/tile/blue, +/obj/structure/chair{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "uUy" = ( /turf/open/floor/plasteel, /area/science/mixing) @@ -52110,6 +52793,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel, /area/ai_monitored/storage/eva) "vdl" = ( @@ -52124,6 +52808,30 @@ dir = 8 }, /area/science/research) +"vdT" = ( +/obj/machinery/door/window/northleft{ + dir = 4; + name = "Containment Pen 7"; + req_access_txt = "55" + }, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio7"; + name = "Xenobio Pen 7 Blast Door" + }, +/obj/structure/cable, +/turf/open/floor/engine, +/area/science/xenobiology) +"vgp" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/start/prisoner, +/turf/open/floor/plasteel, +/area/security/prison) +"vhn" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "vjm" = ( /obj/structure/sign/warning/biohazard, /turf/closed/wall/r_wall, @@ -52226,15 +52934,16 @@ dir = 4 }, /obj/machinery/door/airlock/research{ - name = "Experimentation Lab"; - req_access_txt = "47" + name = "Genetics Lab"; + req_access_txt = "9" }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/structure/cable, +/obj/machinery/door/firedoor/heavy, /turf/open/floor/plasteel/white, -/area/science/explab) +/area/science/genetics) "vHp" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/tile/red, @@ -52264,6 +52973,22 @@ }, /turf/open/floor/grass, /area/hydroponics/garden) +"vPt" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/open/floor/plasteel/white, +/area/science/genetics) "vPE" = ( /obj/item/assembly/signaler{ pixel_y = 8 @@ -52365,6 +53090,11 @@ /obj/structure/cable, /turf/open/floor/plasteel, /area/hallway/secondary/service) +"wtc" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/structure/cable, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "wBd" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 @@ -52405,13 +53135,26 @@ }, /turf/closed/wall/r_wall, /area/maintenance/disposal/incinerator) +"wIs" = ( +/obj/effect/turf_decal/tile/blue, +/obj/machinery/camera{ + c_tag = "Ward Starboard"; + dir = 8; + network = list("ss13","medbay") + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "wJU" = ( /obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel/white, -/area/science/explab) +/area/science/genetics) "wLh" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -52428,9 +53171,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"wRd" = ( -/turf/open/space/basic, -/area/space/nearstation) "wUs" = ( /obj/structure/closet/secure_closet/detective, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ @@ -52456,6 +53196,19 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/exit) +"wYm" = ( +/obj/machinery/door/poddoor/preopen{ + id = "xenobio8"; + name = "Xenobio Pen 8 Blast Door" + }, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/sign/warning/electricshock, +/turf/open/floor/plating, +/area/science/xenobiology) "wZy" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -52470,24 +53223,46 @@ /obj/structure/closet/emcloset, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"xeP" = ( -/obj/structure/chair/office/light, -/obj/effect/landmark/start/scientist, -/turf/open/floor/plasteel/white, -/area/science/explab) -"xfD" = ( -/obj/machinery/power/apc{ - areastring = "/area/science/explab"; - dir = 4; - name = "Experimentation Lab APC"; - pixel_x = 24 +"xbN" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 1 +/obj/machinery/door/poddoor/preopen{ + id = "xenobio6"; + name = "Xenobio Pen 6 Blast Door" }, /obj/structure/cable, +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/sign/warning/electricshock, +/turf/open/floor/plating, +/area/science/xenobiology) +"xeP" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, /turf/open/floor/plasteel/white, -/area/science/explab) +/area/science/genetics) +"xfD" = ( +/obj/machinery/power/apc{ + areastring = "/area/science/genetics"; + dir = 4; + name = "Genetics Lab APC"; + pixel_x = 24 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/closet/emcloset, +/turf/open/floor/plasteel/dark, +/area/science/genetics) "xfL" = ( /obj/structure/table/glass, /obj/item/reagent_containers/dropper, @@ -52522,6 +53297,19 @@ /obj/structure/cable, /turf/open/floor/plating, /area/hallway/secondary/service) +"xkP" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/science/genetics) "xmh" = ( /obj/structure/extinguisher_cabinet{ pixel_x = -27 @@ -52550,6 +53338,20 @@ "xwN" = ( /turf/open/floor/plating, /area/engine/engine_smes) +"xzi" = ( +/obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio6"; + name = "Xenobio Pen 6 Blast Door" + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/science/xenobiology) +"xzI" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "xzN" = ( /obj/machinery/door/airlock/external{ name = "Common Mining Shuttle Bay" @@ -52566,13 +53368,6 @@ /turf/closed/wall/r_wall, /area/maintenance/disposal/incinerator) "xEM" = ( -/obj/machinery/requests_console{ - department = "Science"; - departmentType = 2; - name = "Science Requests Console"; - pixel_x = 30; - receive_ore_updates = 1 - }, /obj/structure/table, /obj/item/nanite_scanner, /turf/open/floor/plasteel/dark, @@ -52600,13 +53395,19 @@ /turf/open/floor/plasteel, /area/security/prison) "xXe" = ( -/obj/machinery/door/poddoor/preopen{ - id = "telelab"; - name = "test chamber blast door" +/obj/structure/closet/radiation, +/turf/open/floor/plasteel/dark, +/area/science/genetics) +"xYx" = ( +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/structure/window/reinforced, +/obj/structure/disposaloutlet{ + dir = 4 }, -/obj/machinery/door/firedoor/heavy, /turf/open/floor/engine, -/area/science/explab) +/area/science/xenobiology) "xYA" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -52624,10 +53425,43 @@ }, /turf/open/floor/plasteel, /area/security/courtroom) +"xZg" = ( +/obj/machinery/door/window/northleft{ + base_state = "right"; + dir = 8; + icon_state = "right"; + name = "Containment Pen 4"; + req_access_txt = "55" + }, +/obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio4"; + name = "Xenobio Pen 4 Blast Door" + }, +/turf/open/floor/engine, +/area/science/xenobiology) "yay" = ( /obj/machinery/computer/med_data, /turf/open/floor/plasteel/grimy, /area/security/detectives_office) +"yck" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio5"; + name = "Xenobio Pen 5 Blast Door" + }, +/obj/structure/sign/warning/electricshock, +/turf/open/floor/plating, +/area/science/xenobiology) +"ydc" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "ydA" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -52671,6 +53505,25 @@ }, /turf/open/floor/plasteel/dark, /area/science/nanite) +"yjr" = ( +/obj/machinery/atmospherics/pipe/simple/general/visible{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/science/xenobiology) +"ylC" = ( +/obj/machinery/door/window/northleft{ + dir = 4; + name = "Containment Pen 6"; + req_access_txt = "55" + }, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio6"; + name = "Xenobio Pen 6 Blast Door" + }, +/obj/structure/cable, +/turf/open/floor/engine, +/area/science/xenobiology) (1,1,1) = {" aaa @@ -64097,7 +64950,7 @@ aaa aaa azy auP -cIh +jly ayl aRY awW @@ -65639,7 +66492,7 @@ aKj aLw aLw aLw -aLw +fxH aQI aNh czK @@ -70525,7 +71378,7 @@ aOp aPA aQR aQN -aTA +aTz aUq aWq aXs @@ -71594,7 +72447,7 @@ bCq bCq bLv bCq -aoV +bCq cbj aoV aag @@ -71847,10 +72700,10 @@ aaa aaa aaa bCq -bJP +akY bCq bSn -bCq +amO bCq cbj bLv @@ -72106,8 +72959,8 @@ aaa bCq bPS aad -bPS amu +amP bCq cbk bLv @@ -72361,10 +73214,10 @@ aaa aaa aaa bLv -bPR +akZ bRc bSo -bTs +amR bCq bVy bLv @@ -72617,11 +73470,11 @@ aaa aaa aaa aaa -bCq +bLv bPS bRf bSo -bTu +amS bCq bVB bHE @@ -72878,7 +73731,7 @@ bLv bPT bRe bSo -bTt +ani bCq bVA bWw @@ -73131,11 +73984,11 @@ aaa aaa aaa aaa -bCq -bPV -bCq -bCq -bTw +bLv +bPS +alv +bSo +bPS bCq bVD bWy @@ -73389,10 +74242,10 @@ bGi aoV aoV bCq -bPU -bHE -bSp -bTv +ala +alK +bPS +anq bCq bVC bWx @@ -73646,10 +74499,10 @@ bGi aoV aoV bCq -bPW -bCq -bCq -bTy +alg +alN +amB +anr bCq bVF bWA @@ -73903,10 +74756,10 @@ bGi aoV aoV bCq -bHE -bHE -bSq -bTx +bTs +bPS +amI +anB bCq bVE bWz @@ -74160,9 +75013,9 @@ bxy aaf aaf bCq -bPY +als cOw -bCq +amJ bCq bCq bCq @@ -74417,9 +75270,9 @@ bxy aaH aaH bCq -bPX -bRg +bHE bRg +bTx bCq bHE bVG @@ -75446,7 +76299,7 @@ aaH aaH bCq bHE -bRh +alT bLu bCq bHE @@ -77675,7 +78528,7 @@ aat aat aat ace -aat +vgp aat adH aei @@ -89828,7 +90681,7 @@ bAs bvj bCL bxO -bDR +fGg bDR bIk bJC @@ -91618,10 +92471,10 @@ bfL boo bqQ bhg -bua +tiO bvn -bwL -bxX +fUn +fUn uTM bua bBJ @@ -91650,7 +92503,7 @@ bKH bzs bzs bzs -bzs +cNW cmd cmd cmd @@ -91664,9 +92517,9 @@ cmd cmd cmd cmd -aag -aag -aag +cmd +cmd +lOY aaa aaa aaf @@ -91876,8 +92729,8 @@ bom bIq bri bsu -bsL -bsL +fUn +brc bvo bzl bua @@ -91907,24 +92760,24 @@ bKL keW cbM cdJ -hTU +mtK cfm cgc qBr ciF cjw -ckl +uGz clk xfL vQQ jox nEk djq +bip +bip +bip hTU -aaf -aaf -aaa -aaa +aoV aaa aaa aaa @@ -92132,10 +92985,10 @@ bmY boq boq brj -bpE -btk +tiO +bvn bum -bvp +vhn bzn bua bBL @@ -92164,7 +93017,7 @@ caO sjK ccI cdL -ceI +akV cfo bip lrg @@ -92174,13 +93027,13 @@ iMP bjL bjL bjL +bjL +bjL +bjL +bjL cmi bip -bip hTU -wRd -aaa -aaa aaa aaa aaa @@ -92386,13 +93239,13 @@ biB biB bkU bmX -bpE -bpE -bpE -bpE -bti +tiO +tiO +tiO +tiO +fUn bul -bvp +vhn bzm bua bBK @@ -92423,6 +93276,8 @@ bJs cdK ceH cfn +cfn +cfn cgd bjL bjL @@ -92430,14 +93285,12 @@ bjL bjL bjL bjL +bjL +bjL cmi xYA bip -uDP vjm -wRd -aaa -aaa aaa aaa aaa @@ -92642,16 +93495,16 @@ bhm bkb bhm bla -bmZ +qsH bpH -bra -bsK -bpE -bpE +fUn +fUn +brc +brc buq -bvt +vhn bye -bon +ljx bBN bEi bEi @@ -92680,21 +93533,21 @@ ccK ccM ceJ kdR +bjL +bjL cgf bjL bjL bjL bjL bjL +bjL +bjL cmi xYA xYA bip -bip -csm -wRd -aaa -aaa +jtt aaa aaa aaa @@ -92889,7 +93742,7 @@ aVI aVI aYO aRJ -bbB +nCW aYV aYV aYV @@ -92899,16 +93752,16 @@ bfL bfL bfL blg -bmZ +qsH bpG bqZ brk bsv -bsv +xzI bun bvr bzo -bon +ljx aFa bCY bEh @@ -92937,22 +93790,22 @@ ccJ bLS hJq cfp +cfp +cfp cge cfp cfp cfp +cfp +cfp ckm cln cmh cnd cnE bip -bip -csm -cMl -aaa -aaa -aaa +jtt +aoV aaa aaa aaa @@ -93156,16 +94009,16 @@ biD bkd bfS cTO -bmZ +qsH bpJ brc -bsL -bug +brc +brc btl but bvw -bzq -bon +pdB +ljx bBP bCZ bEk @@ -93194,21 +94047,21 @@ ccL ccM ceJ xUg +bjL +bjL cgf bjL bjL bjL +bjL +bjL igT cAe cmj cne xYA bip -bip -csm -wRd -aaa -aaa +jtt aaa aaa aaa @@ -93413,16 +94266,16 @@ biC bkc bfS blo -bmZ -bpI -brb -bsL -buf +qsH +bpH +brc +brc +brc +brc +gHL +vhn bvs -bur -bvp -bzp -bon +ljx bBO bCY bEj @@ -93451,8 +94304,12 @@ bJs bFr ceJ bjL +bjL +bjL cgf bjL +bjL +bjL bmT bjL bjL @@ -93461,11 +94318,7 @@ lwc fPm lwc bip -bip -csm -wRd -aaa -aaa +jtt aaa aaa aaa @@ -93670,16 +94523,16 @@ biE bkf bfS cTO -bmZ +qsH bpL -bre -bsN -bre -bvv -bur -bvp -bzr -bon +mYY +brc +mYY +brc +oYY +vhn +brb +ljx bBQ bDa bEl @@ -93706,10 +94559,14 @@ caS caO ccN bHd -hTU +mtK +bip +bip bip rZB rFI +rFI +rFI jsP oBu cfn @@ -93718,11 +94575,7 @@ cgd cng bip bip -bip -csm -wRd -aaa -aaa +jtt aaa aaa aaa @@ -93927,16 +94780,16 @@ bfS bfS bfS cTO -bmZ +qsH bpK brd -bpK -bpK bvu +wIs +tsM bux bvy -bon -bon +ljx +ljx bBN bBN bBN @@ -93963,10 +94816,14 @@ bJs bFr ccM cdN -hTU +mtK +bip +bip bip mSR haX +bip +bip ciH xYA hpH @@ -93975,11 +94832,7 @@ mSR cnf bip bip -bip -csm -wRd -aaa -aaa +jtt aaa aaa aaa @@ -94184,15 +95037,15 @@ kQk ipA gbT cTO -bmZ -bon -bon -bon -bon -bon +qsH +ljx +ljx +ljx +ljx +ljx buG bvA -bon +ljx bAw bzg bLS @@ -94222,21 +95075,21 @@ cNY cNY rGg rGg +rGg +rGg cgj rGg rGg +rGg +rGg chp -mtK +hTU clp mSR cnf bip bip -bip -csm -wRd -aaa -aaa +jtt aaa aaa aaa @@ -94479,21 +95332,21 @@ ccO nXU nXU nXU +nXU +nXU cnH nXU +kvJ +kvJ jCq czY -mtK +hTU bip mSR lZN bip bip -bip -csm -wRd -aaa -aaa +jtt aaa aaa aaa @@ -94736,21 +95589,21 @@ bDb bDb bDb bDb +bDb +bDb +bDb +bDb cNW cNW ccq czY -mtK +hTU bip mSR cnf bip bip -bip -csm -wRd -aaa -aaa +jtt aaa aaa aaa @@ -94969,45 +95822,45 @@ byf bDb bEm bEm -bEm +tLf bDb bJH bKW bMg bIh -bOx +iiu bPx -bJN -bRT -bEm -bEm -bJN -bRT -bEm -bEm -bJN -bRT -bEm -bEm bDb -cfr -cho +bRT +tJc bDb +bEm +hDb +bEm +rox +bEm +bEm +rox +eSG +bEm +rox +bEm +bEm +rox +hDb +gGJ +uyS aaa -cNW +cOT ccq czY -cOT +jtt bip mSR cnf bip bip -bip -csm -wRd -aaa -aaa +jtt aaa aaa aaa @@ -95234,37 +96087,37 @@ bMi bIh bIP bPA -bJN +bDb bRU +usX +bDb bEm -bEm -bJN -bRU bXe bEm -bJN -bRU +rox +bXe +bEm +rox bEm bEm -bDb -cgi -chq -ccQ +rox +bEm +bEm +rox +bEm +bEm +uyS aaa cOT ccq czY -cOT +jtt bip mSR efK bip bip -bip -csm -wRd -aaa -aaa +jtt aaa aaa aaa @@ -95489,39 +96342,39 @@ bJJ bKX bMh bIh -bOx +dBM bPz -bJN +bDb bRU +pvI +bDb +pqR bEm bEm -bJN -bRU +sAk bEm bEm -bJN -bRU +sAk +bEm +bEm +sAk +bEm +bEm +sAk bEm cBz -bDb -cgi -chq -ccQ +uyS aaa cOT ccq czY -cOT +jtt bip mSR bip bip bip -bip -csm -wRd -aaa -aaa +jtt aaa aaa aaa @@ -95740,45 +96593,45 @@ bBV bDb bEn bEm -bEm -bEm +trt +kLj bJL bLa -bMi +twh bIh bPy -bPA -bJN -bRW +mPl +bDb +bRU bTb -bUe -bJN +bDb +yck bWl bXf -bWl -bJN +lVv +xZg bZV caV cbS -bDb +pPs cgl chs +tCh +pmx +lOR +uyS bDb aaa cNW ccq czY -mtK +hTU wBC mSR bip bip bip -bip -csm -wRd -aaa -aaa +jtt aaa aaa aaa @@ -96001,41 +96854,41 @@ bEm bIy bJK bKZ -bMi +yjr bIu bIO bPB -bLe -bRV +nxx +hHq bTa -bUd -bVi -bRV -bTa -bYf -bVi -bRV -bTa -cbR bDb +bVi +cSb +aGC +bRV +iSv +sUw +bRV +cbR +hGP cgk chr -bDb +gdq +cgk +prl +ujh +bIx aaa cNW cBN czY -mtK +hTU bip mSR bip bip bip -bip -csm -wRd -aaa -aaa +jtt aaa aaa aaa @@ -96258,41 +97111,41 @@ bEm bIx bJJ bLc -bMi +yjr bIh bOx bPD bQM -bMi +ueE +oUU +jUW bMk bMi -bVj bMi -bMk bMi -bZa bMi -bMk bMi -cTY -cTZ -chu +bMi +bMi +bMi +bMi +bMi ccQ -aaf -cOT -ccq -cAa +bMi +bMi +ddD +qyX +gXs cOT +fif +czY +jtt bip pxd bip bip bip -bip -csm -wRd -aaa -aaa +jtt aaa aaa aaa @@ -96515,41 +97368,41 @@ bEm bDb cTX bLb -bMk +oHH bIh bIQ bPC bQL cBG bTc -bTc -bTc -bTc -bTc -bTc -bTc -bTc -bTc ccP ccP ccP -cht -ckn -csk -czQ +ccP +ccP +ccP +ccP +ccP +ccP +ccP +ccP +ccP +ccP +ccP +ccP +iOI +nPP czU czZ -cOT +dni +czY +jtt bip bip bip bip bip -bip -csm -wRd -aaa -aaa +jtt aaa aaa aaa @@ -96775,38 +97628,38 @@ bJN bMm bNp bOx -bMi +egr bQN +dqL bMi -bMk bMi bVk bMi -bMk +bMi +bZb +bMi +bMi +bZb +bMi +bMi +bZb +bMi bMi bZb bMi bMk -bMi -cfy -cgn -cjB -ccQ -aaf +qyX +gXs cOT cgm czY -cOT +jtt bip bip bip bip bip -bip -csm -wRd -aaa -aaa +jtt aaa aaa aaa @@ -97037,33 +97890,33 @@ bLe bRY bTd bUg -bVi +oVV bWm -bTd bUg -bVi -bZW -bTd +sZy +fpR bUg -bDb -bDb -bDb +gCA +hAo +bUg +bSO +fJT +bUg +pfy +dOm +kKM bDb aaa cNW cgm czY -mtK +hTU bip bip bip bip bip -bip -csm -wRd -aaa -aaa +jtt aaa aaa aaa @@ -97287,37 +98140,41 @@ bIB bIB bJN bMo -bNp +pnj bOx bPH bJN bSa bTe bUh -bJN +dnY bWn bXg bYh -bJN +nYU bZX caW cbU -bDb -aaf -aaf -aaa +wYm +uzt +vdT +tPW +xzi +ylC +xbN +bIx aaa cNW cgm czY -mtK -bip +hTU bip bip bip iKL bip -hTU +mtK +cNW cNW cOT cOT @@ -97385,10 +98242,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa "} (175,1,1) = {" aaa @@ -97545,37 +98398,41 @@ bIA bJN bMn bNp -bOz +bOx bPG bJN bEm bEm -bRU -bJN +xYx bEm bEm -bRU -bJN +xYx bEm bEm -bRU -bDb -aaf -aaa -aaa +xYx +bEm +bEm +xYx +bEm +bEm +xYx +bEm +bEm +lVC +pCj aaa cOT cgm czY -cOT +jtt bip bip bip bip bip -bip -hTU -cNW +mtK +jdH +keQ cOe cqu aag @@ -97642,10 +98499,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa "} (176,1,1) = {" aaa @@ -97807,31 +98660,35 @@ bPJ bJN bEm bEm -bRU -bJN +fep bEm bXe -bRU -bJN +fep bEm bEm -bRU -bDb -aaf -aaa -aaa +fep +bEm +bEm +fep +bEm +bEm +fep +bEm +bEm +bEm +pCj aaa cOT cgm czY -cOT +jtt bip bip bip bip bip mtK -mtK +cNW cNW cqu cOT @@ -97899,10 +98756,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa "} (177,1,1) = {" aaa @@ -98060,32 +98913,36 @@ bJN bMp bNp bOx -bPI +bPJ bJN bEm +aYb +fep +bEm +jQV +fep +bEm +bEm +fep bEm bUi -bJN +fep bEm bEm -bUi -bJN +fep bEm -bEm -bUi -bDb -aaf -aaf -aaa +jQV +aYb +pCj aaa cOT cgm czY -cOT +jtt bip bip oZc -hpH +bip bip mtK cwy @@ -98156,10 +99013,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa "} (178,1,1) = {" aaa @@ -98331,9 +99184,13 @@ bDb bDb bDb bDb -cNW -cNW -cNW +bDb +bDb +bDb +bDb +bDb +bDb +bDb cNW cNW czX @@ -98413,10 +99270,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa "} (179,1,1) = {" aaa @@ -98591,6 +99444,10 @@ xaZ cOe cOe cOe +cOe +cOe +cOe +cOe czG czR czW @@ -98598,8 +99455,8 @@ cAb cko clq cmq -ciI -cnJ +jsw +jsw cri cTI cmn @@ -98670,10 +99527,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa "} (180,1,1) = {" aaa @@ -98847,8 +99700,12 @@ wQy nXU nXU ceM -cNZ +kvJ cgo +dxb +ydc +ydc +wtc czS cOb cAd @@ -98862,11 +99719,7 @@ cNW cNW cNW cNW -cNW -aaa -aaa -aaa -aaa +hnW aaa aaa aaa @@ -99105,7 +99958,11 @@ cNY cNY nWA cNY -tfg +cNY +oZn +cNY +cNY +lar hBY cNW cNW @@ -99184,10 +100041,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa "} (182,1,1) = {" aaa @@ -99363,12 +100216,16 @@ cOe cPA cNW qQH +cvO +cOe +cNW +cgm chw -ciK -cjC -ckp -cls cmr +tkC +bNB +ryM +kZR cNW cOe cmo @@ -99384,10 +100241,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa aae aaa aaa @@ -99620,12 +100473,16 @@ hYR ceO cNW cgp -chv -nZl -czR -czR +cvO +cOe +cNW +pxV cVu -cdr +lSv +cOe +cOe +cOe +cOe cNW cOe cou @@ -99698,10 +100555,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa "} (184,1,1) = {" aaa @@ -99884,6 +100737,10 @@ cNW clt cdr cNW +cNW +cNW +cNW +cNW cOe bMB cOT @@ -99955,10 +100812,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa "} (185,1,1) = {" aaa @@ -100142,6 +100995,10 @@ cgr cms cNW cOe +cOe +cOe +cOe +cOe bNA cNW aaf @@ -100212,10 +101069,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa "} (186,1,1) = {" aaa @@ -100401,10 +101254,10 @@ cOe cOe cNW cNW -aaa -aaa -aaa -aaa +cNW +cNW +cNW +cNW aaa aaa aaa @@ -101124,16 +101977,16 @@ bgc bgc bgc rKc -bqe +bon vGb brr -nbv -bqe -bqe -bqe -bqe -bqe -bqe +bpE +bpE +bpE +bpE +bpE +bon +bon byt bvK bvK @@ -101381,16 +102234,16 @@ biY bmd eRu bnr -bqe +bon pOJ jxy buu qrU kGS bzO -bzO -bzO -bqe +taM +bon +flN rYJ rYJ bFW @@ -101638,16 +102491,16 @@ bhG blO bmc bnq -bqe +bon uHA bru -bvO gHj -kGS -bzO -bzO -bzO -bqe +gHj +gHj +xeP +bAR +bon +pBV fGF bEA bEA @@ -101895,16 +102748,16 @@ bky bqh bme bnx -bqe +bon mJM psy -bvO -nbv -bqe -bzO -bAR -bzO -bqe +bsH +bsL +bsL +rAv +eFD +bon +bEC uUy bED bFX @@ -102152,16 +103005,16 @@ bky btp ddf boF -bqe +bon brz -psy -bvO +brv +kxC ifv -kGS -bzO +ifv +xkP cYY bCl -bqe +bon bEC bEC bEC @@ -102181,7 +103034,7 @@ bGz bQZ oHU bZc -bTl +qbW kLM bTl bTl @@ -102409,16 +103262,16 @@ bky blP bns boF -bqe +bon tcY -psy -xeP -kxC -kGS -bzO -bzO -bzO -bqe +bvp +bsL +bsL +bsL +ink +pSN +ddy +bon btp bEF bky @@ -102666,16 +103519,16 @@ bky blR bns boF -bqe -brv +bon +fqQ wJU -bvO -nbv bqe nXP -bzO -bzO bqe +npF +vPt +qrH +bon btp bEE bFY @@ -102923,16 +103776,16 @@ bky cyC bns boF -bqe -brv +bon +bur xfD jyF orP xXe -bzO -bzO -bzO -bqe +lFP +jyF +kXf +bon cMB vqI bhG @@ -103180,16 +104033,16 @@ aaf aaa bns boF -bqe +bon bry -bsH -bqe -bqe -bqe -bqe -bqe -bqe -bqe +bmZ +bon +bon +bon +bon +bon +bon +bon ddf bEG bEs diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 0308f06286e..f1a358db777 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -59,6 +59,48 @@ /obj/item/clothing/head/chefhat, /turf/open/floor/plasteel, /area/crew_quarters/kitchen) +"aai" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/iannewyear, +/turf/open/floor/plasteel/grimy, +/area/crew_quarters/heads/hop) +"aaj" = ( +/obj/machinery/shower{ + dir = 4 + }, +/obj/item/soap/nanotrasen, +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/security/prison/toilet) +"aak" = ( +/obj/structure/toilet{ + dir = 4 + }, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 5 + }, +/turf/open/floor/plating{ + icon_state = "platingdmg3" + }, +/area/security/prison/toilet) +"aal" = ( +/obj/machinery/door/airlock{ + name = "Bathroom" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/sign/poster/official/cleanliness{ + pixel_y = 32 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/security/prison/toilet) "aao" = ( /obj/structure/lattice/catwalk, /obj/structure/cable, @@ -537,9 +579,6 @@ dir = 9 }, /obj/structure/cable, -/obj/machinery/power/terminal{ - dir = 4 - }, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "acu" = ( @@ -565,6 +604,9 @@ dir = 1 }, /obj/structure/cable, +/obj/machinery/power/terminal{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "acF" = ( @@ -6376,9 +6418,8 @@ /turf/open/space, /area/solar/port/fore) "ark" = ( -/obj/machinery/power/emitter/anchored{ - dir = 1; - state = 2 +/obj/machinery/power/emitter/welded{ + dir = 1 }, /obj/structure/cable, /turf/open/floor/circuit/green, @@ -6444,9 +6485,8 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 10 }, -/obj/machinery/power/emitter/anchored{ - dir = 1; - state = 2 +/obj/machinery/power/emitter/welded{ + dir = 1 }, /obj/structure/cable, /turf/open/floor/circuit/green, @@ -9242,7 +9282,7 @@ pixel_x = -26 }, /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12 }, /obj/effect/turf_decal/bot, @@ -10478,7 +10518,7 @@ /area/maintenance/port/fore) "aza" = ( /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12 }, /obj/item/reagent_containers/glass/bucket, @@ -11034,6 +11074,7 @@ dir = 1 }, /obj/structure/cable, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel, /area/janitor) "aAj" = ( @@ -12693,7 +12734,7 @@ /area/space/nearstation) "aDx" = ( /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, @@ -12713,7 +12754,7 @@ /area/hydroponics/garden/abandoned) "aDA" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/structure/sign/departments/botany{ @@ -17000,6 +17041,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel/dark, /area/crew_quarters/bar) "aLK" = ( @@ -17201,15 +17243,6 @@ }, /turf/open/floor/plating, /area/quartermaster/storage) -"aMc" = ( -/obj/machinery/shower{ - dir = 4 - }, -/obj/item/soap/nanotrasen, -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel, -/area/security/prison) "aMd" = ( /obj/structure/table, /obj/item/storage/crayons, @@ -17886,34 +17919,6 @@ }, /turf/open/floor/plasteel, /area/quartermaster/storage) -"aNx" = ( -/obj/structure/toilet{ - dir = 4 - }, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 - }, -/turf/open/floor/plating{ - icon_state = "platingdmg3" - }, -/area/security/prison) -"aNy" = ( -/obj/machinery/door/airlock{ - name = "Bathroom" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/structure/sign/poster/official/cleanliness{ - pixel_y = 32 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel, -/area/security/prison) "aNz" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -22161,6 +22166,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/effect/landmark/start/prisoner, /turf/open/floor/plasteel, /area/security/prison) "aUx" = ( @@ -22205,6 +22211,7 @@ dir = 8 }, /obj/structure/cable, +/obj/effect/landmark/start/prisoner, /turf/open/floor/plasteel, /area/security/prison) "aUA" = ( @@ -22233,6 +22240,7 @@ /area/security/prison) "aUB" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/landmark/start/prisoner, /turf/open/floor/plating{ icon_state = "panelscorched" }, @@ -26877,6 +26885,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel, /area/quartermaster/office) "bcr" = ( @@ -30811,7 +30820,7 @@ /area/maintenance/port/fore) "bjp" = ( /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12 }, /obj/machinery/airalarm{ @@ -30908,6 +30917,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel, /area/hydroponics) "bjx" = ( @@ -30959,6 +30969,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel, /area/crew_quarters/kitchen) "bjB" = ( @@ -37619,7 +37630,7 @@ /area/storage/tech) "bvz" = ( /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12 }, /obj/effect/turf_decal/bot, @@ -37657,7 +37668,7 @@ /area/hydroponics) "bvD" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/machinery/requests_console{ @@ -38114,6 +38125,7 @@ }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/structure/cable, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel, /area/engine/atmos) "bwB" = ( @@ -39150,6 +39162,7 @@ dir = 8 }, /obj/structure/cable, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel/dark, /area/security/nuke_storage) "byw" = ( @@ -45592,6 +45605,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel, /area/storage/primary) "bIF" = ( @@ -46695,9 +46709,9 @@ /area/storage/primary) "bKt" = ( /obj/structure/table/reinforced, -/obj/item/clothing/gloves/color/yellow, /obj/item/storage/box/lights/mixed, /obj/effect/turf_decal/bot, +/obj/item/clothing/gloves/color/fyellow, /turf/open/floor/plasteel, /area/storage/primary) "bKu" = ( @@ -50201,8 +50215,6 @@ /obj/structure/table/reinforced, /obj/item/assembly/timer, /obj/item/assembly/timer, -/obj/item/multitool, -/obj/item/multitool, /obj/machinery/light, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -50854,6 +50866,7 @@ /obj/machinery/power/terminal{ dir = 8 }, +/obj/structure/cable, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat_interior) "bRC" = ( @@ -51257,6 +51270,7 @@ dir = 1 }, /obj/structure/cable, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel, /area/storage/tech) "bSt" = ( @@ -51528,6 +51542,7 @@ name = "Auxiliary Tool Storage"; req_access_txt = "12" }, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel, /area/storage/tools) "bSV" = ( @@ -51558,6 +51573,7 @@ dir = 4 }, /obj/structure/cable, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel, /area/security/detectives_office) "bSY" = ( @@ -54568,6 +54584,7 @@ dir = 4 }, /obj/structure/cable, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel, /area/security/brig) "bXC" = ( @@ -55713,7 +55730,7 @@ /area/crew_quarters/heads/captain/private) "bZp" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -56412,6 +56429,7 @@ dir = 1 }, /obj/structure/cable, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel, /area/engine/engineering) "cay" = ( @@ -63550,10 +63568,6 @@ /obj/structure/bookcase/random/reference, /turf/open/floor/wood, /area/library) -"cnP" = ( -/obj/structure/bookcase/manuals/medical, -/turf/open/floor/wood, -/area/library) "cnQ" = ( /obj/structure/bookcase/manuals/engineering, /turf/open/floor/wood, @@ -64963,6 +64977,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/wood, /area/crew_quarters/heads/hop) "cqY" = ( @@ -67222,6 +67237,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel/dark, /area/library) "cvn" = ( @@ -67245,6 +67261,7 @@ dir = 1 }, /obj/structure/cable, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel, /area/ai_monitored/storage/eva) "cvq" = ( @@ -67544,6 +67561,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel, /area/crew_quarters/locker) "cvR" = ( @@ -70061,11 +70079,6 @@ /area/crew_quarters/locker) "cAq" = ( /obj/structure/table, -/obj/item/storage/toolbox/mechanical{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/toolbox/emergency, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -70509,15 +70522,6 @@ /turf/closed/wall/r_wall, /area/ai_monitored/storage/eva) "cBj" = ( -/obj/structure/closet/crate/rcd{ - pixel_y = 4 - }, -/obj/machinery/door/window/northleft{ - dir = 4; - name = "RCD Storage"; - pixel_x = 1; - req_access_txt = "19" - }, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ dir = 1; @@ -70533,6 +70537,21 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/item/grenade/chem_grenade/smart_metal_foam{ + pixel_x = -4; + pixel_y = 6 + }, +/obj/item/grenade/chem_grenade/smart_metal_foam{ + pixel_x = 4; + pixel_y = 2 + }, +/obj/item/grenade/chem_grenade/smart_metal_foam{ + pixel_x = 8 + }, +/obj/item/grenade/chem_grenade/smart_metal_foam{ + pixel_y = 4 + }, +/obj/structure/table/reinforced, /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/eva) "cBk" = ( @@ -72775,7 +72794,7 @@ pixel_x = -26 }, /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ @@ -73558,7 +73577,7 @@ pixel_x = -26 }, /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -74284,7 +74303,7 @@ "cId" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock{ - name = "Lockerroom" + name = "Locker Room" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/stripes/line, @@ -74297,7 +74316,7 @@ "cIe" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock{ - name = "Lockerroom" + name = "Locker Room" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, @@ -74783,6 +74802,7 @@ dir = 4 }, /obj/structure/cable, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel, /area/crew_quarters/dorms) "cJj" = ( @@ -74803,17 +74823,6 @@ /obj/structure/cable, /turf/open/floor/plasteel, /area/crew_quarters/dorms) -"cJl" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/structure/cable, -/turf/open/floor/plasteel, -/area/crew_quarters/dorms) "cJm" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -80006,6 +80015,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel, /area/medical/medbay/central) "cSK" = ( @@ -81379,7 +81389,7 @@ pixel_x = 26 }, /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/effect/decal/cleanable/dirt, @@ -82258,6 +82268,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/effect/landmark/start/paramedic, /turf/open/floor/plasteel/white, /area/medical/storage) "cWx" = ( @@ -83775,6 +83786,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel, /area/science/research) "cZk" = ( @@ -84680,7 +84692,7 @@ /area/science/research) "daN" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -85010,7 +85022,7 @@ pixel_x = 26 }, /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/effect/turf_decal/tile/blue{ @@ -86495,7 +86507,7 @@ /area/science/research) "deb" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ @@ -89220,7 +89232,7 @@ /area/maintenance/starboard/aft) "diR" = ( /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12 }, /obj/effect/decal/cleanable/dirt, @@ -89498,88 +89510,82 @@ /area/maintenance/department/science) "djA" = ( /turf/closed/wall/r_wall, -/area/science/explab) +/area/science/genetics) "djB" = ( -/obj/item/storage/toolbox/mechanical, -/obj/item/flashlight, -/obj/effect/turf_decal/bot, /obj/structure/sign/poster/official/science{ pixel_x = -32 }, -/obj/structure/rack, -/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/science/explab) -"djC" = ( -/obj/machinery/camera{ - c_tag = "Science - Experimentation Lab"; - name = "science camera"; - network = list("ss13","rd") - }, -/obj/effect/turf_decal/bot, /obj/machinery/airalarm{ pixel_y = 23 }, -/obj/structure/closet/radiation, -/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{ +/obj/structure/window/reinforced{ dir = 8 }, -/turf/open/floor/plasteel/dark, -/area/science/explab) -"djD" = ( -/obj/machinery/light{ +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ dir = 1 }, +/obj/effect/turf_decal/stripes/end{ + dir = 8 + }, +/mob/living/carbon/monkey, +/turf/open/floor/plasteel/dark, +/area/science/genetics) +"djC" = ( +/obj/machinery/camera{ + CanAtmosPass = "science camera"; + c_tag = "Genetics Lab North"; + name = "science camera"; + network = list("ss13","rd") + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/door/window/westleft{ + dir = 2; + name = "'Monkey Pen"; + req_access_txt = "9" + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/mob/living/carbon/monkey, +/turf/open/floor/plasteel/dark, +/area/science/genetics) +"djD" = ( /obj/structure/sign/warning/nosmoking{ pixel_y = 32 }, -/obj/effect/turf_decal/bot, -/obj/structure/closet/bombcloset/white, -/obj/effect/turf_decal/tile/neutral{ +/obj/structure/window/reinforced{ dir = 1 }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 +/obj/machinery/door/window/westright{ + dir = 2; + name = "Monkey Pen"; + req_access_txt = "9" }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, +/mob/living/carbon/monkey, /turf/open/floor/plasteel/dark, -/area/science/explab) +/area/science/genetics) "djE" = ( -/obj/item/crowbar, -/obj/item/wrench, -/obj/item/clothing/mask/gas, -/obj/structure/rack, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 +/obj/structure/window/reinforced{ + dir = 1 }, +/obj/effect/turf_decal/stripes/end{ + dir = 4 + }, +/mob/living/carbon/monkey, /turf/open/floor/plasteel/dark, -/area/science/explab) +/area/science/genetics) "djF" = ( /turf/closed/wall/r_wall, /area/science/nanite) @@ -90514,60 +90520,42 @@ /turf/open/floor/plasteel/white, /area/maintenance/department/science) "dlo" = ( -/obj/machinery/newscaster{ - pixel_x = -32 - }, -/obj/structure/table/reinforced, -/obj/effect/turf_decal/bot, -/obj/item/clothing/gloves/color/latex, -/obj/item/clothing/glasses/science, -/obj/item/clothing/glasses/science, /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 }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/landmark/start/geneticist, /turf/open/floor/plasteel/dark, -/area/science/explab) +/area/science/genetics) "dlp" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, /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/science/explab) +/area/science/genetics) "dlr" = ( -/obj/structure/table/reinforced, -/obj/item/taperecorder, -/obj/item/folder/white, -/obj/effect/turf_decal/bot, -/obj/item/stack/sheet/mineral/plasma{ - amount = 5 - }, -/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 +/obj/machinery/light{ + dir = 4 }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk, /turf/open/floor/plasteel/dark, -/area/science/explab) +/area/science/genetics) "dlt" = ( /obj/effect/turf_decal/bot, /obj/machinery/power/apc/auto_name/west, @@ -90752,9 +90740,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/aft) -"dlT" = ( -/turf/closed/wall, -/area/maintenance/department/medical) "dlU" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance_hatch{ @@ -90767,18 +90752,18 @@ dir = 1 }, /turf/open/floor/plasteel, -/area/maintenance/department/medical/central) +/area/medical/chemistry) "dlV" = ( /turf/closed/wall, -/area/medical/genetics/cloning) +/area/medical/medbay/zone2) "dlW" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/medical/genetics/cloning) +/area/medical/medbay/zone2) "dlX" = ( /obj/structure/sign/departments/medbay/alt, /turf/closed/wall, -/area/medical/genetics/cloning) +/area/medical/medbay/zone2) "dlY" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, @@ -90945,62 +90930,26 @@ /turf/open/floor/plasteel, /area/maintenance/department/science) "dmB" = ( -/obj/machinery/light_switch{ - pixel_x = -26 +/obj/effect/turf_decal/tile/neutral{ + dir = 8 }, -/obj/structure/table/reinforced, -/obj/effect/turf_decal/bot, -/obj/item/stack/medical/gauze, -/obj/item/stack/medical/suture, -/obj/item/stack/medical/mesh, /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 - }, -/obj/machinery/light{ - dir = 8 - }, /turf/open/floor/plasteel/dark, -/area/science/explab) +/area/science/genetics) "dmC" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/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/science/explab) -"dmE" = ( -/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/atmospherics/components/unary/vent_pump/on, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 24 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, +/turf/open/floor/plasteel/dark, +/area/science/genetics) +"dmE" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/dark, -/area/science/explab) +/area/science/genetics) "dmF" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -91263,62 +91212,52 @@ }, /area/maintenance/department/medical/central) "dnl" = ( -/obj/machinery/clonepod, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/status_display/evac{ - pixel_x = -32 - }, -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/tile/blue{ dir = 8 }, -/turf/open/floor/plasteel/dark, -/area/medical/genetics/cloning) +/obj/structure/closet/wardrobe/mixed, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "dnm" = ( -/obj/machinery/computer/cloning, /obj/machinery/light{ dir = 1 }, /obj/structure/sign/warning/nosmoking{ pixel_y = 32 }, -/obj/effect/turf_decal/tile/purple{ +/obj/effect/turf_decal/tile/blue{ dir = 1 }, +/obj/structure/closet/wardrobe/mixed, /turf/open/floor/plasteel/white, -/area/medical/genetics/cloning) +/area/medical/medbay/zone2) "dnn" = ( -/obj/machinery/dna_scannernew, /obj/machinery/airalarm{ pixel_y = 22 }, /obj/effect/turf_decal/tile/blue{ dir = 1 }, +/obj/structure/closet/wardrobe/mixed, /turf/open/floor/plasteel/white, -/area/medical/genetics/cloning) +/area/medical/medbay/zone2) "dno" = ( /obj/item/twohanded/required/kirbyplants/random, -/obj/effect/turf_decal/tile/purple{ +/obj/effect/turf_decal/tile/blue{ dir = 1 }, /turf/open/floor/plasteel/white, -/area/medical/genetics/cloning) +/area/medical/medbay/zone2) "dnp" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/effect/turf_decal/tile/blue{ - dir = 4 + dir = 1 }, /turf/open/floor/plasteel/white, -/area/medical/genetics/cloning) +/area/medical/medbay/zone2) "dnq" = ( /obj/structure/table/glass, /obj/item/storage/box/bodybags{ @@ -91327,27 +91266,25 @@ }, /obj/item/storage/box/bodybags, /obj/item/pen, -/obj/effect/turf_decal/tile/purple{ - dir = 4 +/obj/effect/turf_decal/tile/blue{ + dir = 1 }, /turf/open/floor/plasteel/white, -/area/medical/genetics/cloning) +/area/medical/medbay/zone2) "dnr" = ( /obj/structure/table/glass, /obj/machinery/power/apc/highcap/five_k{ - areastring = "/area/medical/genetics/cloning"; dir = 1; - name = "Cloning Lab APC"; + name = "Ward APC"; pixel_y = 23 }, /obj/item/folder/white, -/obj/item/book/manual/wiki/medical_cloning, /obj/effect/turf_decal/tile/blue{ dir = 4 }, /obj/structure/cable, /turf/open/floor/plasteel/white, -/area/medical/genetics/cloning) +/area/medical/medbay/zone2) "dns" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/tile/blue{ @@ -91830,10 +91767,6 @@ /turf/open/floor/plasteel/white, /area/maintenance/department/science) "dos" = ( -/obj/machinery/door/airlock/research{ - name = "Experimentation Lab"; - req_access_txt = "47" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -91851,6 +91784,10 @@ dir = 4 }, /obj/structure/cable, +/obj/machinery/door/airlock/research{ + name = "Genetics Lab"; + req_access_txt = "47, 9" + }, /turf/open/floor/plasteel, /area/maintenance/department/science) "dot" = ( @@ -91863,76 +91800,44 @@ /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 }, /obj/structure/cable, /turf/open/floor/plasteel/dark, -/area/science/explab) +/area/science/genetics) "dou" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/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 - }, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/open/floor/plasteel/dark, -/area/science/explab) +/area/science/genetics) "dov" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/structure/chair/office/light, -/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 - }, -/obj/structure/cable, /turf/open/floor/plasteel/dark, -/area/science/explab) +/area/science/genetics) "dow" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, -/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{ +/obj/structure/cable, +/obj/structure/disposalpipe/junction{ dir = 8 }, -/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/plasteel/dark, -/area/science/explab) +/area/science/genetics) "dox" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -91941,8 +91846,8 @@ dir = 4 }, /obj/machinery/door/airlock/research{ - name = "Experimentation Lab"; - req_access_txt = "47" + name = "Genetics Lab"; + req_access_txt = "47, 9" }, /obj/machinery/door/firedoor, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -92362,32 +92267,14 @@ /turf/open/floor/plasteel, /area/maintenance/department/medical/central) "dpm" = ( -/obj/machinery/door/window/eastleft, -/obj/structure/mirror{ - pixel_x = -28 - }, -/obj/machinery/shower{ - dir = 4; - name = "emergency shower" - }, -/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{ +/obj/effect/turf_decal/tile/blue{ dir = 8 }, -/turf/open/floor/plasteel/dark, -/area/medical/genetics/cloning) -"dpn" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, /turf/open/floor/plasteel/white, -/area/medical/genetics/cloning) +/area/medical/medbay/zone2) +"dpn" = ( +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "dpo" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -92399,8 +92286,8 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/turf/open/floor/plasteel, -/area/medical/genetics/cloning) +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "dpp" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 8 @@ -92415,8 +92302,8 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/turf/open/floor/plasteel, -/area/medical/genetics/cloning) +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "dpq" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -92431,28 +92318,24 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/turf/open/floor/plasteel, -/area/medical/genetics/cloning) +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "dpr" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/effect/turf_decal/tile/purple{ +/obj/structure/cable, +/obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/structure/cable, /turf/open/floor/plasteel/white, -/area/medical/genetics/cloning) +/area/medical/medbay/zone2) "dps" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical/glass{ - id_tag = "cloningfoyer"; - name = "Cloning Lab"; + name = "Ward"; req_access_txt = "5" }, -/obj/effect/mapping_helpers/airlock/unres{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -92464,7 +92347,7 @@ }, /obj/structure/cable, /turf/open/floor/plasteel, -/area/medical/genetics/cloning) +/area/medical/medbay/zone2) "dpt" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -92855,107 +92738,49 @@ dir = 4 }, /turf/closed/wall/r_wall, -/area/science/explab) +/area/science/genetics) "dqj" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/structure/table/reinforced, -/obj/item/book/manual/wiki/experimentor, -/obj/item/healthanalyzer, -/obj/machinery/light_switch{ - pixel_x = -26 - }, /obj/machinery/power/apc/auto_name/west, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/stripes/line{ - dir = 9 +/obj/effect/turf_decal/tile/neutral{ + dir = 8 }, /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 - }, /obj/structure/cable, -/obj/item/relic, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, /turf/open/floor/plasteel/dark, -/area/science/explab) +/area/science/genetics) "dqk" = ( -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, -/obj/effect/turf_decal/stripes/line{ +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 1 }, -/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/science/explab) +/area/science/genetics) "dql" = ( -/obj/machinery/light, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/effect/turf_decal/bot, -/obj/machinery/computer/rdconsole/experiment{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/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/science/explab) +/area/science/genetics) "dqm" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/structure/table/reinforced, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/item/paper_bin, -/obj/item/pen, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/machinery/button/door{ - id = "experimentor"; - name = "Experimentor Door Control"; - pixel_x = 24; - req_access_txt = "47" - }, -/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 +/obj/structure/table/glass, +/obj/machinery/computer/med_data/laptop{ + dir = 8; + pixel_y = 1 }, +/obj/item/toy/figure/geneticist, /turf/open/floor/plasteel/dark, -/area/science/explab) +/area/science/genetics) "dqn" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -93286,6 +93111,9 @@ /area/hallway/primary/aft) "dqU" = ( /obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small{ + dir = 8 + }, /turf/open/floor/plating{ icon_state = "panelscorched" }, @@ -93338,31 +93166,22 @@ }, /area/maintenance/department/medical/central) "dqZ" = ( -/obj/machinery/door/window/eastright, /obj/machinery/status_display/ai{ pixel_x = -32 }, -/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 - }, /obj/machinery/light/small{ dir = 8 }, -/turf/open/floor/plasteel/dark, -/area/medical/genetics/cloning) -"dra" = ( -/obj/effect/turf_decal/tile/purple{ +/obj/effect/turf_decal/tile/blue{ dir = 8 }, /turf/open/floor/plasteel/white, -/area/medical/genetics/cloning) +/area/medical/medbay/zone2) +"dra" = ( +/obj/structure/bed, +/obj/item/bedsheet/medical, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "drb" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 @@ -93377,8 +93196,8 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/turf/open/floor/plasteel, -/area/medical/genetics/cloning) +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "drc" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -93393,8 +93212,10 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/turf/open/floor/plasteel, -/area/medical/genetics/cloning) +/obj/structure/bed, +/obj/item/bedsheet/medical, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "drd" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -93410,12 +93231,9 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/turf/open/floor/plasteel, -/area/medical/genetics/cloning) +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "dre" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 1 - }, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -93426,25 +93244,24 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/turf/open/floor/plasteel, -/area/medical/genetics/cloning) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/bed, +/obj/item/bedsheet/medical, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "drf" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, /turf/open/floor/plasteel/white, -/area/medical/genetics/cloning) +/area/medical/medbay/zone2) "drg" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/medical/glass{ - id_tag = "cloningfoyer"; - name = "Cloning Lab"; - req_access_txt = "5" - }, -/obj/effect/mapping_helpers/airlock/unres{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -93454,8 +93271,12 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/machinery/door/airlock/medical/glass{ + name = "Ward"; + req_access_txt = "5" + }, /turf/open/floor/plasteel, -/area/medical/genetics/cloning) +/area/medical/medbay/zone2) "drh" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 @@ -93670,42 +93491,32 @@ /turf/open/floor/plasteel/white, /area/maintenance/department/science) "drI" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/preopen{ - id = "experimentor"; - name = "Test Chamber Blast door" +/obj/effect/turf_decal/tile/neutral{ + dir = 8 }, -/turf/open/floor/engine, -/area/science/explab) +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/item/twohanded/required/kirbyplants/random, +/turf/open/floor/plasteel/dark, +/area/science/genetics) "drJ" = ( -/obj/machinery/door/firedoor/heavy, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/door/poddoor/preopen{ - id = "experimentor"; - name = "Test Chamber Blast door" +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/effect/turf_decal/delivery, -/turf/open/floor/engine, -/area/science/explab) +/turf/open/floor/plasteel/dark, +/area/science/genetics) "drK" = ( -/obj/structure/sign/warning/securearea, -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/preopen{ - id = "experimentor"; - name = "Test Chamber Blast door" - }, -/turf/open/floor/engine, -/area/science/explab) +/turf/open/floor/plasteel/dark, +/area/science/genetics) "drL" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/preopen{ - id = "experimentor"; - name = "Test Chamber Blast door" +/obj/effect/turf_decal/tile/neutral{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/engine, -/area/science/explab) +/obj/effect/turf_decal/tile/neutral, +/obj/item/twohanded/required/kirbyplants/random, +/turf/open/floor/plasteel/dark, +/area/science/genetics) "drM" = ( /obj/structure/table/reinforced, /obj/item/storage/box/disks_nanite{ @@ -94011,97 +93822,57 @@ /area/maintenance/department/medical/central) "dsp" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, +/turf/open/floor/plasteel, /area/maintenance/department/medical/central) "dsq" = ( -/obj/structure/cable, /turf/open/floor/plating, /area/maintenance/department/medical/central) "dsr" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/tile/blue, -/obj/structure/cable, /turf/open/floor/plasteel, /area/maintenance/department/medical/central) "dss" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/blue, -/obj/machinery/power/apc/auto_name/south, -/obj/structure/cable, +/obj/structure/girder, /turf/open/floor/plasteel, /area/maintenance/department/medical/central) "dst" = ( -/obj/structure/window/reinforced{ - dir = 4 +/obj/machinery/camera{ + c_tag = "Medbay - Ward"; + dir = 4; + name = "medbay camera"; + network = list("ss13","medbay") }, -/obj/item/radio/intercom{ - pixel_x = -26 - }, -/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/medical/genetics/cloning) -"dsu" = ( -/obj/structure/closet/secure_closet/personal/patient, /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/structure/closet/wardrobe/pjs, /turf/open/floor/plasteel/white, -/area/medical/genetics/cloning) -"dsv" = ( -/obj/structure/closet/crate/freezer/surplus_limbs, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/medical/genetics/cloning) +/area/medical/medbay/zone2) "dsw" = ( /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/white, -/area/medical/genetics/cloning) +/area/medical/medbay/zone2) "dsx" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel/white, -/area/medical/genetics/cloning) -"dsy" = ( -/obj/item/twohanded/required/kirbyplants/random, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/plasteel/white, -/area/medical/genetics/cloning) +/area/medical/medbay/zone2) "dsz" = ( -/obj/structure/filingcabinet/chestdrawer, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 7; - pixel_y = -26 +/obj/machinery/light{ + dir = 4 }, -/obj/machinery/light, -/obj/machinery/light_switch{ - pixel_x = 7; - pixel_y = -38 +/obj/effect/turf_decal/tile/blue{ + dir = 4 }, -/obj/machinery/camera{ - c_tag = "Medbay - Cloning Lab"; - dir = 1; - name = "medbay camera"; - network = list("ss13","medbay") - }, -/obj/effect/turf_decal/tile/purple, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/white, -/area/medical/genetics/cloning) +/area/medical/medbay/zone2) "dsA" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/tile/purple{ @@ -94393,24 +94164,15 @@ /turf/closed/wall, /area/maintenance/department/science) "dte" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/open/floor/engine, -/area/science/explab) -"dtf" = ( -/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 }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/dna_scannernew, /turf/open/floor/plasteel/dark, -/area/science/explab) +/area/science/genetics) "dtg" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -94587,50 +94349,20 @@ /turf/open/floor/plasteel, /area/hallway/primary/aft) "dtA" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Genetics Desk Maintenance"; - req_access_txt = "9" - }, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, /obj/structure/cable, -/turf/open/floor/plasteel, +/obj/effect/decal/cleanable/dirt, +/obj/structure/girder, +/turf/open/floor/plating, /area/maintenance/department/medical/central) "dtB" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/closed/wall, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, /area/maintenance/department/medical/central) "dtC" = ( /turf/closed/wall/r_wall, -/area/medical/genetics) -"dtD" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable, -/turf/open/floor/plating, -/area/medical/genetics) -"dtE" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/research{ - name = "Genetics Lab"; - req_access_txt = "9" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/cable, -/turf/open/floor/plasteel, -/area/medical/genetics) -"dtF" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/cable, -/turf/open/floor/plating, -/area/medical/genetics) +/area/medical/medbay/zone2) "dtG" = ( /obj/machinery/power/apc{ areastring = "/area/medical/medbay/central"; @@ -95015,17 +94747,40 @@ /turf/open/floor/plasteel, /area/maintenance/port) "duw" = ( -/turf/open/floor/engine, -/area/science/explab) +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/computer/scan_consolenew{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/plasteel/dark, +/area/science/genetics) "dux" = ( -/obj/effect/turf_decal/bot_white, -/obj/machinery/rnd/experimentor, -/turf/open/floor/engine, -/area/science/explab) +/obj/structure/chair/office/light{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/landmark/start/geneticist, +/turf/open/floor/plasteel/dark, +/area/science/genetics) "duy" = ( -/obj/effect/turf_decal/bot_white, -/turf/open/floor/engine, -/area/science/explab) +/obj/structure/chair/office/light{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/landmark/start/geneticist, +/turf/open/floor/plasteel/dark, +/area/science/genetics) "duz" = ( /obj/effect/turf_decal/bot, /obj/machinery/airalarm/directional/west, @@ -95271,166 +95026,57 @@ "dvb" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel, /area/hallway/primary/aft) "dvc" = ( -/turf/closed/wall, -/area/medical/genetics) +/obj/effect/decal/cleanable/dirt, +/obj/structure/rack, +/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/lootdrop/donkpockets, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/maintenance/department/medical/central) "dvd" = ( -/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/firealarm{ dir = 4; pixel_x = -24 }, -/obj/effect/turf_decal/bot, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, -/area/medical/genetics) -"dve" = ( -/obj/structure/extinguisher_cabinet{ - pixel_y = 32 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/maintenance/department/medical/central) "dvf" = ( -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, /obj/structure/cable, -/turf/open/floor/plasteel/white, -/area/medical/genetics) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating{ + icon_state = "platingdmg3" + }, +/area/maintenance/department/medical/central) "dvg" = ( -/obj/machinery/newscaster{ - pixel_y = 32 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/obj/machinery/light{ - dir = 1 - }, -/turf/open/floor/plasteel/white, -/area/medical/genetics) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/maintenance/department/medical/central) "dvh" = ( -/obj/structure/table/glass, -/obj/item/storage/box/beakers{ - pixel_x = 3; - pixel_y = 3 +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/crate, +/obj/effect/spawner/lootdrop/maintenance/two, +/turf/open/floor/plating{ + icon_state = "platingdmg3" }, -/obj/item/storage/box/masks, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/maintenance/department/medical/central) "dvi" = ( /obj/machinery/status_display/evac, /turf/closed/wall/r_wall, -/area/medical/genetics) -"dvj" = ( -/obj/structure/table/reinforced, -/obj/item/radio/intercom{ - pixel_y = 26 - }, -/obj/item/clothing/gloves/color/latex, -/obj/item/storage/box/disks, -/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/medical/genetics) -"dvk" = ( -/obj/machinery/computer/scan_consolenew, -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/noticeboard{ - pixel_y = 32 - }, -/obj/effect/turf_decal/stripes/end{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/medical/genetics) -"dvl" = ( -/obj/machinery/dna_scannernew, -/obj/effect/turf_decal/stripes/end{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/medical/genetics) -"dvm" = ( -/obj/item/twohanded/required/kirbyplants/random, -/obj/machinery/firealarm{ - pixel_x = -26; - pixel_y = 26 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"dvn" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/cable, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"dvo" = ( -/obj/machinery/button/door{ - id = "geneticslab"; - name = "Genetics Lab Shutters"; - pixel_x = 26; - pixel_y = 26; - req_access_txt = "9" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "dvp" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 - }, -/obj/structure/window/reinforced{ +/obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/end{ - dir = 1 - }, -/mob/living/carbon/monkey, -/turf/open/floor/plasteel, -/area/medical/genetics) -"dvq" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "geneticslab"; - name = "Genetics Lab Shutters" - }, -/obj/structure/cable, -/turf/open/floor/plating, -/area/medical/genetics) +/obj/structure/closet/secure_closet/personal/patient, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "dvr" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -95876,19 +95522,51 @@ /turf/open/floor/plasteel, /area/maintenance/port) "dwd" = ( +/obj/structure/table/reinforced, +/obj/machinery/requests_console{ + department = "Medbay Storage"; + name = "Genetics Lab RC"; + pixel_y = -32 + }, +/obj/item/storage/box/gloves{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/box/bodybags, +/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 + }, /obj/machinery/camera{ - c_tag = "Science - Experimentor"; - dir = 1; + c_tag = "Research Division - Genetics Lab"; + dir = 4; name = "science camera"; network = list("ss13","rd") }, -/turf/open/floor/engine, -/area/science/explab) +/turf/open/floor/plasteel/dark, +/area/science/genetics) "dwe" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/light, -/turf/open/floor/engine, -/area/science/explab) +/obj/structure/table/reinforced, +/obj/item/storage/pill_bottle/mannitol, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/plasteel/dark, +/area/science/genetics) "dwg" = ( /obj/machinery/camera{ c_tag = "Science - Toxins Mixing Lab Fore"; @@ -96061,34 +95739,20 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/structure/disposalpipe/sorting/mail{ - dir = 1; - name = "Genetics Junction"; - sortType = 23 +/obj/structure/disposalpipe/junction{ + dir = 1 }, -/obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel, /area/hallway/primary/aft) "dwG" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/research{ - name = "Genetics Desk"; - req_access_txt = "9" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/medical/genetics) +/turf/closed/wall, +/area/maintenance/department/medical/central) "dwH" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -96096,9 +95760,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, -/area/medical/genetics) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating{ + icon_state = "platingdmg3" + }, +/area/maintenance/department/medical/central) "dwI" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -96106,11 +95772,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/tile/purple{ - dir = 1 +/obj/effect/decal/cleanable/dirt, +/obj/structure/girder, +/turf/open/floor/plating{ + icon_state = "platingdmg3" }, -/turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/maintenance/department/medical/central) "dwJ" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 1 @@ -96129,8 +95796,9 @@ dir = 8 }, /obj/structure/cable, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, -/area/medical/genetics) +/area/maintenance/department/medical/central) "dwK" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -96146,145 +95814,48 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, -/area/medical/genetics) +/area/maintenance/department/medical/central) "dwL" = ( -/obj/structure/table/glass, -/obj/item/clipboard, -/obj/item/toy/figure/geneticist, -/obj/machinery/power/apc{ - areastring = "/area/medical/genetics"; - dir = 4; - name = "Genetics Lab APC"; - pixel_x = 24 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/plasteel/white, -/area/medical/genetics) +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/crate, +/obj/effect/spawner/lootdrop/maintenance/two, +/turf/open/floor/plasteel, +/area/maintenance/department/medical/central) "dwM" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/closed/wall/r_wall, -/area/medical/genetics) +/area/medical/medbay/zone2) "dwN" = ( -/obj/structure/table/reinforced, -/obj/item/folder/white, -/obj/item/storage/pill_bottle/mutadone, -/obj/item/storage/pill_bottle/mannitol, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/machinery/camera{ - c_tag = "Medbay - Genetics Lab"; - dir = 4; - name = "medbay camera"; - network = list("ss13","medbay") - }, -/obj/machinery/light_switch{ - pixel_x = -26 - }, -/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/medical/genetics) -"dwO" = ( -/obj/structure/chair/office/light{ - dir = 8 - }, -/obj/effect/landmark/start/geneticist, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple{ +/obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) +"dwO" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/bed, +/obj/item/bedsheet/medical, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "dwP" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 4 + dir = 10 }, /turf/open/floor/plasteel/white, -/area/medical/genetics) -"dwQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"dwR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/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 - }, -/obj/structure/cable, -/turf/open/floor/plasteel, -/area/medical/genetics) -"dwS" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"dwT" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/door/window/westright{ - name = "'Monkey Pen"; - req_access_txt = "9" - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/mob/living/carbon/monkey, -/turf/open/floor/plasteel, -/area/medical/genetics) +/area/medical/medbay/zone2) "dwV" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 8 @@ -96458,9 +96029,6 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/central) "dxi" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 1 - }, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -96485,6 +96053,9 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, /turf/open/floor/plasteel, /area/medical/surgery) "dxk" = ( @@ -96508,7 +96079,7 @@ pixel_x = -26 }, /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12 }, /obj/effect/turf_decal/tile/blue{ @@ -96853,31 +96424,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/aft) -"dyi" = ( -/obj/structure/table/glass, -/obj/machinery/airalarm{ - dir = 4; - pixel_x = -23 - }, -/obj/machinery/light{ - dir = 8 - }, -/obj/item/folder/white, -/obj/item/storage/box/disks, -/obj/machinery/camera{ - c_tag = "Medbay - Genetics Desk"; - dir = 4; - name = "medbay camera"; - network = list("ss13","medbay") - }, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/medical/genetics) "dyj" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/disposalpipe/segment{ @@ -96894,8 +96440,11 @@ dir = 8 }, /obj/structure/cable, -/turf/open/floor/plasteel, -/area/medical/genetics) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating{ + icon_state = "platingdmg3" + }, +/area/maintenance/department/medical/central) "dyk" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 8 @@ -96913,9 +96462,9 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, -/area/medical/genetics) +/area/maintenance/department/medical/central) "dyl" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -96923,19 +96472,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/plasteel/white, -/area/medical/genetics) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/maintenance/department/medical/central) "dym" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/research{ - name = "Genetics Lab"; - req_access_txt = "9" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -96948,143 +96488,60 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/structure/cable, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Ward Maintenance"; + req_access_txt = "5" + }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, -/area/medical/genetics) +/area/medical/medbay/zone2) "dyn" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/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{ +/obj/effect/turf_decal/tile/blue{ dir = 8 }, -/obj/structure/cable, -/turf/open/floor/plasteel/dark, -/area/medical/genetics) -"dyo" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/obj/structure/cable, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) +"dyo" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "dyp" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/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 - }, -/obj/structure/cable, -/turf/open/floor/plasteel, -/area/medical/genetics) -"dyq" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/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 - }, -/obj/structure/cable, -/turf/open/floor/plasteel, -/area/medical/genetics) +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "dyr" = ( -/obj/machinery/holopad, -/obj/effect/landmark/start/geneticist, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/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 - }, -/obj/structure/cable, -/turf/open/floor/plasteel, -/area/medical/genetics) +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "dys" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 }, /turf/open/floor/plasteel/white, -/area/medical/genetics) -"dyt" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/door/window/westleft{ - name = "'Monkey Pen"; - req_access_txt = "9" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/medical/genetics) -"dyv" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 8 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/obj/structure/cable, -/turf/open/floor/plasteel/white, -/area/medical/medbay/central) +/area/medical/medbay/zone2) "dyw" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 8 @@ -97227,7 +96684,7 @@ pixel_y = -23 }, /obj/machinery/camera{ - c_tag = "Medbay - Surgery"; + c_tag = "Medbay - Surgery A"; dir = 1; name = "medbay camera"; network = list("ss13","medbay") @@ -97731,48 +97188,21 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/aft) -"dzM" = ( -/obj/structure/sign/departments/science{ - pixel_x = 32; - pixel_y = 32 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/purple, -/turf/open/floor/plasteel, -/area/hallway/primary/aft) "dzN" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "geneticsdesk"; - name = "Genetics Desk Shutters" - }, -/obj/machinery/door/window/westright{ - dir = 4; - name = "Genetics Desk"; - req_access_txt = "9" - }, -/obj/machinery/door/window/westright{ - name = "Genetics Desk" - }, -/obj/item/folder/white, -/obj/item/pen, -/obj/effect/turf_decal/delivery, +/obj/effect/decal/cleanable/dirt, +/obj/structure/rack, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plasteel, -/area/medical/genetics) +/area/maintenance/department/medical/central) "dzO" = ( -/obj/structure/chair/office/light{ - dir = 8 - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 }, -/obj/effect/turf_decal/tile/purple{ - dir = 8 +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating{ + icon_state = "platingdmg3" }, -/turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/maintenance/department/medical/central) "dzP" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 @@ -97788,8 +97218,9 @@ dir = 8 }, /obj/structure/cable, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, -/area/medical/genetics) +/area/maintenance/department/medical/central) "dzQ" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 @@ -97804,101 +97235,30 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/turf/open/floor/plasteel, -/area/medical/genetics) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating{ + icon_state = "platingdmg3" + }, +/area/maintenance/department/medical/central) "dzR" = ( -/obj/item/twohanded/required/kirbyplants/random, -/obj/effect/turf_decal/tile/purple, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"dzS" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "geneticslab"; - name = "Genetics Lab Shutters" +/obj/effect/decal/cleanable/dirt, +/obj/structure/girder, +/turf/open/floor/plating{ + icon_state = "platingdmg3" }, -/turf/open/floor/plating, -/area/medical/genetics) -"dzT" = ( -/obj/structure/table/reinforced, -/obj/item/storage/box/monkeycubes, -/obj/item/storage/box/monkeycubes, -/obj/item/radio/headset/headset_medsci, -/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/medical/genetics) -"dzU" = ( -/obj/structure/chair/office/light, -/obj/effect/landmark/start/geneticist, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/maintenance/department/medical/central) "dzV" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 1 }, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, /turf/open/floor/plasteel/white, -/area/medical/genetics) -"dzW" = ( -/obj/effect/landmark/event_spawn, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"dzX" = ( -/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, -/area/medical/genetics) +/area/medical/medbay/zone2) "dzY" = ( /obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, +/obj/structure/bed, +/obj/item/bedsheet/medical, /turf/open/floor/plasteel/white, -/area/medical/genetics) -"dzZ" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/end, -/mob/living/carbon/monkey, -/turf/open/floor/plasteel, -/area/medical/genetics) +/area/medical/medbay/zone2) "dAa" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/camera{ @@ -98047,9 +97407,6 @@ dir = 9 }, /obj/structure/cable, -/obj/machinery/power/terminal{ - dir = 4 - }, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "dAm" = ( @@ -98072,6 +97429,9 @@ dir = 5 }, /obj/structure/cable, +/obj/machinery/power/terminal{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "dAo" = ( @@ -98312,130 +97672,73 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/science/robotics/lab) -"dAQ" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "geneticsdesk"; - name = "Genetics Desk Shutters" - }, -/obj/structure/cable, -/turf/open/floor/plating, -/area/medical/genetics) "dAR" = ( -/obj/structure/filingcabinet/chestdrawer, -/obj/machinery/button/door{ - id = "geneticsdesk"; - name = "Genetics Desk Shutters"; - pixel_x = -26; - pixel_y = -26; - req_access_txt = "9" +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating{ + icon_state = "platingdmg3" }, -/obj/structure/noticeboard{ - dir = 1; - pixel_y = -32 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/obj/structure/cable, -/turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/maintenance/department/medical/central) "dAS" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, /obj/structure/cable, -/turf/open/floor/plasteel/white, -/area/medical/genetics) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/maintenance/department/medical/central) "dAT" = ( /obj/item/radio/intercom{ pixel_y = -26 }, -/obj/effect/turf_decal/tile/purple, -/turf/open/floor/plasteel/white, -/area/medical/genetics) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating{ + icon_state = "platingdmg3" + }, +/area/maintenance/department/medical/central) "dAU" = ( -/obj/machinery/vending/wardrobe/gene_wardrobe, -/obj/effect/turf_decal/tile/purple, -/turf/open/floor/plasteel/white, -/area/medical/genetics) +/obj/effect/decal/cleanable/dirt, +/obj/structure/rack, +/obj/effect/spawner/lootdrop/maintenance, +/turf/open/floor/plating{ + icon_state = "platingdmg3" + }, +/area/maintenance/department/medical/central) "dAV" = ( /obj/machinery/status_display/ai, /turf/closed/wall/r_wall, -/area/medical/genetics) -"dAW" = ( -/obj/structure/table/reinforced, -/obj/machinery/requests_console{ - department = "Medbay Storage"; - name = "Genetics Lab RC"; - pixel_y = -32 - }, -/obj/item/storage/box/gloves{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/box/bodybags, -/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/medical/genetics) +/area/medical/medbay/zone2) "dAX" = ( -/obj/machinery/computer/scan_consolenew{ - dir = 1 - }, -/obj/machinery/light, /obj/structure/sign/warning/nosmoking{ pixel_y = -32 }, -/obj/effect/turf_decal/stripes/end{ +/obj/effect/turf_decal/tile/blue{ dir = 8 }, -/turf/open/floor/plasteel, -/area/medical/genetics) +/obj/structure/closet/secure_closet/personal/patient{ + anchored = 1 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "dAY" = ( -/obj/machinery/dna_scannernew, /obj/structure/extinguisher_cabinet{ pixel_y = -32 }, -/obj/effect/turf_decal/stripes/end{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/medical/genetics) -"dAZ" = ( -/obj/item/twohanded/required/kirbyplants/random, -/obj/machinery/airalarm{ - dir = 1; - pixel_y = -22 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple{ +/obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/structure/closet/secure_closet/personal/patient{ + anchored = 1 + }, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "dBa" = ( -/obj/machinery/computer/med_data/laptop{ - dir = 1; - pixel_y = 4 - }, -/obj/structure/table/glass, /obj/structure/mirror{ - pixel_y = -28 + pixel_y = -33 }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/light, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "dBb" = ( /obj/machinery/newscaster{ pixel_y = -32 @@ -98443,32 +97746,27 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 4 +/obj/effect/turf_decal/tile/blue{ + dir = 8 }, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "dBc" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ dir = 8 }, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, -/area/medical/genetics) +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "dBd" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "geneticslab"; - name = "Genetics Lab Shutters" - }, /obj/structure/sign/warning/electricshock{ pixel_y = -32 }, -/obj/structure/cable, /turf/open/floor/plating, -/area/medical/genetics) +/area/medical/medbay/zone2) "dBe" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/sign/poster/official/do_not_question{ @@ -98606,7 +97904,7 @@ pixel_y = 32 }, /turf/open/floor/plasteel/white, -/area/medical/medbay/central) +/area/medical/surgery/room_b) "dBp" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -98622,7 +97920,7 @@ dir = 4 }, /turf/open/floor/plasteel, -/area/medical/medbay/central) +/area/medical/surgery/room_b) "dBq" = ( /obj/item/retractor, /obj/item/hemostat, @@ -98638,7 +97936,7 @@ dir = 1 }, /turf/open/floor/plasteel/white, -/area/medical/medbay/central) +/area/medical/surgery/room_b) "dBr" = ( /obj/structure/table/glass, /obj/effect/turf_decal/tile/blue{ @@ -98649,8 +97947,15 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/machinery/power/apc{ + areastring = "/area/medical/surgery/room_b"; + dir = 1; + name = "Surgery B APC"; + pixel_y = 23 + }, +/obj/structure/cable, /turf/open/floor/plasteel/white, -/area/medical/medbay/central) +/area/medical/surgery/room_b) "dBs" = ( /obj/item/circular_saw, /obj/item/scalpel{ @@ -98665,7 +97970,7 @@ }, /obj/effect/turf_decal/tile/blue, /turf/open/floor/plasteel/white, -/area/medical/medbay/central) +/area/medical/surgery/room_b) "dBt" = ( /obj/effect/decal/cleanable/cobweb, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -99247,7 +98552,7 @@ }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/medical/medbay/central) +/area/medical/surgery/room_b) "dCN" = ( /obj/structure/window/reinforced{ dir = 8 @@ -99256,13 +98561,14 @@ dir = 4 }, /turf/open/floor/plasteel/white, -/area/medical/medbay/central) +/area/medical/surgery/room_b) "dCO" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 }, +/obj/structure/cable, /turf/open/floor/plasteel/white, -/area/medical/medbay/central) +/area/medical/surgery/room_b) "dCP" = ( /obj/structure/table/optable, /obj/effect/turf_decal/tile/blue{ @@ -99276,7 +98582,7 @@ pixel_y = 4 }, /turf/open/floor/plasteel/white, -/area/medical/medbay/central) +/area/medical/surgery/room_b) "dCQ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 @@ -99920,10 +99226,10 @@ }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/medical/medbay/central) +/area/medical/surgery/room_b) "dEc" = ( /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, @@ -99934,7 +99240,7 @@ dir = 8 }, /turf/open/floor/plasteel/white, -/area/medical/medbay/central) +/area/medical/surgery/room_b) "dEd" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -99947,10 +99253,10 @@ }, /obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/white, -/area/medical/medbay/central) +/area/medical/surgery/room_b) "dEe" = ( /turf/open/floor/plasteel/white, -/area/medical/medbay/central) +/area/medical/surgery/room_b) "dEg" = ( /obj/machinery/computer/operating{ dir = 1 @@ -99960,7 +99266,7 @@ }, /obj/effect/turf_decal/tile/blue, /turf/open/floor/plasteel/white, -/area/medical/medbay/central) +/area/medical/surgery/room_b) "dEh" = ( /obj/effect/landmark/blobstart, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -100480,7 +99786,7 @@ dir = 4 }, /turf/open/floor/plasteel, -/area/medical/medbay/central) +/area/medical/surgery/room_b) "dFk" = ( /obj/structure/table/wood, /obj/item/clothing/under/costume/maid, @@ -100935,6 +100241,7 @@ dir = 4 }, /obj/effect/turf_decal/tile/purple, +/obj/machinery/rnd/bepis, /turf/open/floor/plasteel/white, /area/science/research) "dFY" = ( @@ -101013,6 +100320,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel, /area/medical/morgue) "dGh" = ( @@ -103331,7 +102639,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/structure/cable, /turf/open/floor/plasteel, -/area/maintenance/department/medical) +/area/medical/medbay/central) "dKp" = ( /obj/effect/landmark/xeno_spawn, /obj/machinery/atmospherics/components/unary/vent_pump/on{ @@ -103867,7 +103175,7 @@ dir = 1 }, /turf/open/floor/plasteel/white, -/area/maintenance/department/medical) +/area/medical/medbay/central) "dLk" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 1 @@ -103880,7 +103188,7 @@ }, /obj/structure/cable, /turf/open/floor/plasteel/white, -/area/maintenance/department/medical) +/area/medical/medbay/central) "dLl" = ( /obj/item/twohanded/required/kirbyplants/random, /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, @@ -103888,7 +103196,7 @@ dir = 4 }, /turf/open/floor/plasteel/white, -/area/maintenance/department/medical) +/area/medical/medbay/central) "dLm" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -104673,7 +103981,7 @@ }, /obj/structure/cable, /turf/open/floor/plasteel, -/area/maintenance/department/medical) +/area/maintenance/aft) "dMP" = ( /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, /obj/structure/disposalpipe/segment{ @@ -104687,7 +103995,7 @@ }, /obj/structure/cable, /turf/open/floor/plasteel/white, -/area/maintenance/department/medical) +/area/medical/medbay/central) "dMQ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -104701,7 +104009,7 @@ }, /obj/structure/cable, /turf/open/floor/plasteel, -/area/maintenance/department/medical) +/area/medical/medbay/central) "dMR" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -104713,7 +104021,7 @@ }, /obj/structure/cable, /turf/open/floor/plasteel/white, -/area/maintenance/department/medical) +/area/medical/medbay/central) "dMS" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/maintenance_hatch{ @@ -104734,7 +104042,7 @@ }, /obj/structure/cable, /turf/open/floor/plasteel, -/area/maintenance/department/medical) +/area/maintenance/aft) "dMT" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -105222,10 +104530,8 @@ /obj/effect/turf_decal/tile/green{ dir = 8 }, -/obj/machinery/power/apc/auto_name/west, -/obj/structure/cable, /turf/open/floor/plasteel/white, -/area/maintenance/department/medical) +/area/medical/medbay/central) "dNV" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 @@ -105234,7 +104540,7 @@ /obj/structure/disposalpipe/segment, /obj/structure/cable, /turf/open/floor/plasteel, -/area/maintenance/department/medical) +/area/medical/medbay/central) "dNW" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/tile/green, @@ -105242,7 +104548,7 @@ dir = 4 }, /turf/open/floor/plasteel/white, -/area/maintenance/department/medical) +/area/medical/medbay/central) "dNX" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -105422,7 +104728,7 @@ /area/science/storage) "dOq" = ( /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12 }, /obj/structure/mirror{ @@ -105694,14 +105000,14 @@ dir = 8 }, /turf/open/floor/plasteel/white, -/area/maintenance/department/medical) +/area/medical/medbay/central) "dOJ" = ( /obj/machinery/light/small, /obj/machinery/iv_drip, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/tile/green, /turf/open/floor/plasteel/white, -/area/maintenance/department/medical) +/area/medical/medbay/central) "dOK" = ( /obj/item/stack/cable_coil, /obj/structure/lattice/catwalk, @@ -105990,11 +105296,11 @@ /area/hallway/primary/aft) "dPm" = ( /turf/closed/wall/r_wall, -/area/maintenance/department/medical) +/area/medical/medbay/central) "dPn" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/closed/wall/r_wall, -/area/maintenance/department/medical) +/area/medical/medbay/central) "dPo" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/line, @@ -106029,7 +105335,7 @@ /obj/structure/sign/warning/biohazard, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall/r_wall, -/area/maintenance/department/medical) +/area/medical/medbay/central) "dPq" = ( /turf/closed/wall/r_wall, /area/medical/virology) @@ -106394,7 +105700,7 @@ /area/hallway/primary/aft) "dQe" = ( /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12 }, /obj/machinery/shower{ @@ -106778,7 +106084,7 @@ /area/hallway/primary/aft) "dQU" = ( /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12 }, /obj/structure/mirror{ @@ -110049,7 +109355,7 @@ /area/medical/virology) "dYe" = ( /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12 }, /obj/structure/extinguisher_cabinet{ @@ -110636,7 +109942,7 @@ /area/medical/virology) "dZC" = ( /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ @@ -112182,6 +111488,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel/dark, /area/chapel/main) "ecV" = ( @@ -114106,6 +113413,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/machinery/navbeacon/wayfinding{ + location = "Escape" + }, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) "eMD" = ( @@ -114139,7 +113449,7 @@ dir = 8 }, /turf/open/floor/plasteel/white, -/area/medical/medbay/central) +/area/medical/surgery/room_b) "eOB" = ( /obj/machinery/atmospherics/pipe/simple/general/hidden{ dir = 4 @@ -114171,7 +113481,7 @@ dir = 4 }, /turf/open/floor/plasteel/white, -/area/medical/medbay/central) +/area/medical/surgery/room_b) "faI" = ( /obj/item/twohanded/required/kirbyplants/random, /obj/machinery/camera{ @@ -114331,6 +113641,23 @@ }, /turf/open/floor/plasteel/dark, /area/science/nanite) +"gJw" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/door/airlock/external{ + name = "External Docking Port"; + safety_mode = 1 + }, +/obj/machinery/navbeacon/wayfinding, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "gKr" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 1 @@ -114505,11 +113832,22 @@ /turf/open/floor/plating, /area/maintenance/port) "hFX" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ +/obj/structure/table/reinforced, +/obj/item/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, +/obj/item/radio/headset/headset_medsci, +/obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/turf/open/floor/engine, -/area/science/explab) +/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/science/genetics) "hGT" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ @@ -114585,7 +113923,7 @@ /obj/effect/turf_decal/tile/blue, /obj/machinery/light, /turf/open/floor/plasteel/white, -/area/medical/medbay/central) +/area/medical/surgery/room_b) "igE" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/airalarm{ @@ -114624,6 +113962,13 @@ "inw" = ( /turf/closed/wall, /area/maintenance/department/medical/central) +"iqc" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/structure/closet/wardrobe/pjs, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "itc" = ( /obj/structure/lattice/catwalk, /obj/structure/disposalpipe/segment{ @@ -114667,7 +114012,7 @@ dir = 8 }, /turf/open/floor/plasteel/white, -/area/medical/medbay/central) +/area/medical/surgery/room_b) "iDp" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -114735,7 +114080,15 @@ req_access_txt = "45" }, /turf/open/floor/plasteel, -/area/medical/medbay/central) +/area/medical/surgery/room_b) +"jac" = ( +/obj/machinery/power/apc/auto_name/east, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/crate, +/obj/effect/spawner/lootdrop/maintenance/two, +/turf/open/floor/plating, +/area/maintenance/department/medical/central) "jdO" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -114748,12 +114101,6 @@ }, /turf/open/floor/plasteel/white, /area/science/research) -"jdT" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/closed/wall, -/area/maintenance/department/medical) "jeu" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -114836,12 +114183,6 @@ /obj/structure/cable, /turf/open/floor/plasteel/dark, /area/science/mixing) -"jAD" = ( -/mob/living/simple_animal/pet/dog/pug{ - name = "Swanson" - }, -/turf/open/floor/engine, -/area/science/explab) "jDu" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/stripes/line{ @@ -114852,7 +114193,7 @@ /area/engine/engineering) "jEz" = ( /obj/machinery/camera{ - c_tag = "Science - Lab Access"; + c_tag = "Science - Firing Range"; name = "science camera"; network = list("ss13","rd") }, @@ -115122,7 +114463,7 @@ /area/engine/engineering) "loc" = ( /turf/open/floor/plasteel, -/area/medical/medbay/central) +/area/medical/surgery/room_b) "loI" = ( /obj/machinery/door/poddoor/shutters/preopen{ id = "rndlab1"; @@ -115145,6 +114486,32 @@ }, /turf/open/floor/plasteel/dark, /area/science/mixing) +"luq" = ( +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/machinery/door/airlock/command/glass{ + name = "Bridge Access"; + req_access_txt = "19" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/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 + }, +/obj/structure/cable, +/obj/machinery/navbeacon/wayfinding, +/turf/open/floor/plasteel/dark, +/area/bridge) "lwE" = ( /obj/structure/disposalpipe/sorting/mail{ dir = 8; @@ -115296,6 +114663,20 @@ }, /turf/open/floor/plasteel, /area/science/misc_lab/range) +"mbO" = ( +/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 + }, +/obj/effect/landmark/start/paramedic, +/turf/open/floor/plasteel, +/area/medical/medbay/central) "mkm" = ( /obj/machinery/atmospherics/components/binary/valve, /obj/machinery/embedded_controller/radio/airlock_controller/incinerator_toxmix{ @@ -115378,7 +114759,7 @@ pixel_y = -24 }, /turf/open/floor/plasteel/white, -/area/medical/medbay/central) +/area/medical/surgery/room_b) "mMY" = ( /obj/effect/turf_decal/bot, /obj/machinery/vending/snack/random, @@ -115421,6 +114802,10 @@ /obj/structure/cable, /turf/open/floor/plasteel, /area/vacant_room/commissary) +"mSk" = ( +/obj/structure/cable, +/turf/open/floor/plasteel, +/area/medical/surgery/room_b) "mUY" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/stripes/line{ @@ -115448,11 +114833,31 @@ }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/medical/medbay/central) +/area/medical/surgery/room_b) "ncP" = ( -/obj/effect/landmark/xeno_spawn, -/turf/open/floor/engine, -/area/science/explab) +/obj/structure/table/reinforced, +/obj/item/clothing/gloves/color/latex, +/obj/item/storage/box/disks, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/item/radio/intercom{ + pixel_y = -32 + }, +/obj/machinery/camera{ + c_tag = "Genetics Lab"; + dir = 1; + name = "genetics lab camera" + }, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/plasteel/dark, +/area/science/genetics) "npR" = ( /obj/structure/table, /obj/item/storage/secure/safe{ @@ -115613,9 +115018,13 @@ /turf/open/floor/plating, /area/maintenance/port) "oyx" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/engine, -/area/science/explab) +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/machinery/dna_scannernew, +/turf/open/floor/plasteel/dark, +/area/science/genetics) "oHC" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -115773,6 +115182,12 @@ }, /turf/open/floor/plasteel, /area/maintenance/port) +"pif" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/effect/turf_decal/tile/blue, +/obj/structure/cable, +/turf/open/floor/plasteel/white, +/area/medical/medbay/central) "pmQ" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, @@ -115886,6 +115301,19 @@ /obj/structure/cable, /turf/open/floor/plasteel, /area/science/research/abandoned) +"pXY" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/machinery/computer/scan_consolenew{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/science/genetics) "qcx" = ( /obj/machinery/firealarm{ dir = 4; @@ -116039,12 +115467,6 @@ }, /turf/open/floor/plasteel/dark, /area/science/nanite) -"qVd" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 9 - }, -/turf/open/floor/engine, -/area/science/explab) "qWg" = ( /obj/structure/table/reinforced, /obj/machinery/light/small{ @@ -116118,7 +115540,7 @@ dir = 1 }, /turf/open/floor/plasteel/white, -/area/medical/medbay/central) +/area/medical/surgery/room_b) "ruy" = ( /obj/machinery/power/smes, /obj/machinery/light/small{ @@ -116180,7 +115602,7 @@ /area/hallway/secondary/exit/departure_lounge) "rLD" = ( /obj/machinery/camera{ - c_tag = "Medbay - Recovery Room"; + c_tag = "Medbay - Surgery B"; dir = 8; name = "medbay camera"; network = list("ss13","medbay") @@ -116190,16 +115612,13 @@ pixel_x = 26 }, /turf/open/floor/plasteel/white, -/area/medical/medbay/central) +/area/medical/surgery/room_b) "rMT" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical{ name = "Auxilliary Surgical Theatres"; req_access_txt = "45" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -116207,8 +115626,9 @@ dir = 4 }, /obj/structure/cable, +/obj/structure/cable, /turf/open/floor/plasteel, -/area/medical/medbay/central) +/area/medical/surgery/room_b) "rOf" = ( /obj/item/twohanded/required/kirbyplants/random, /obj/effect/turf_decal/delivery, @@ -116539,6 +115959,15 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/maintenance/port/fore) +"uxC" = ( +/obj/structure/cable, +/turf/open/floor/plasteel/white, +/area/medical/surgery/room_b) +"uqb" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/girder, +/turf/open/floor/plasteel, +/area/maintenance/department/medical/central) "uCc" = ( /obj/structure/disposalpipe/sorting/mail/flip{ dir = 4; @@ -116613,6 +116042,19 @@ }, /turf/open/floor/engine, /area/engine/supermatter) +"vko" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/medical/surgery/room_b) "vmK" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/corner{ @@ -116695,6 +116137,13 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/engine/storage_shared) +"vEx" = ( +/obj/machinery/firealarm, +/turf/closed/wall, +/area/medical/medbay/zone2) +"vFc" = ( +/turf/closed/wall, +/area/medical/surgery/room_b) "vGz" = ( /obj/machinery/power/apc/highcap/five_k{ areastring = "/area/engine/gravity_generator"; @@ -116719,7 +116168,7 @@ }, /obj/structure/cable, /turf/open/floor/plasteel/white, -/area/maintenance/department/medical) +/area/medical/medbay/central) "vJu" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Nanite Lab Maintenance"; @@ -116737,6 +116186,11 @@ }, /turf/open/space/basic, /area/space/nearstation) +"vVy" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/pinpointer_dispenser, +/turf/open/floor/plating, +/area/hallway/secondary/entry) "wav" = ( /obj/machinery/door/airlock/external{ name = "External Docking Port" @@ -116748,6 +116202,7 @@ dir = 1 }, /obj/effect/turf_decal/stripes/line, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "waK" = ( @@ -116843,7 +116298,7 @@ }, /obj/effect/turf_decal/tile/blue, /turf/open/floor/plasteel/white, -/area/medical/medbay/central) +/area/medical/surgery/room_b) "wEB" = ( /obj/structure/table/reinforced, /obj/item/storage/toolbox/electrical, @@ -116864,7 +116319,7 @@ dir = 4 }, /turf/open/floor/plasteel/white, -/area/medical/medbay/central) +/area/medical/surgery/room_b) "wNc" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -116912,8 +116367,10 @@ /area/science/nanite) "wZq" = ( /obj/effect/landmark/start/medical_doctor, +/obj/structure/cable, +/obj/structure/cable, /turf/open/floor/plasteel/white, -/area/medical/medbay/central) +/area/medical/surgery/room_b) "xaf" = ( /obj/machinery/door/airlock/public/glass{ name = "Holodeck Access" @@ -116951,8 +116408,9 @@ /area/medical/medbay/central) "xxD" = ( /obj/machinery/smartfridge/organ, +/obj/structure/cable, /turf/open/floor/plasteel/white, -/area/medical/medbay/central) +/area/medical/surgery/room_b) "xze" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ @@ -116972,7 +116430,7 @@ /obj/item/surgical_drapes, /obj/effect/turf_decal/tile/blue, /turf/open/floor/plasteel/white, -/area/medical/medbay/central) +/area/medical/surgery/room_b) "xAW" = ( /obj/effect/turf_decal/delivery, /obj/machinery/computer/shuttle/mining/common, @@ -116996,6 +116454,12 @@ }, /turf/open/floor/plasteel/dark, /area/science/mixing) +"xFp" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "xHZ" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -117036,7 +116500,7 @@ dir = 4 }, /turf/open/floor/plasteel/white, -/area/medical/medbay/central) +/area/medical/surgery/room_b) "xOo" = ( /obj/machinery/light/small, /obj/structure/closet/firecloset, @@ -146048,7 +145512,7 @@ dmC dou dqk drJ -qVd +drK dux dwe djA @@ -146300,12 +145764,12 @@ cNd cNd cMY djD -dtf -dtf +dlp +drK dov dql drK -jAD +drK duy ncP djA @@ -146563,7 +146027,7 @@ dow dqm drL oyx -oyx +pXY hFX djA dzq @@ -149095,7 +148559,7 @@ chS cjt ckR cms -cnP +cqN cpu cqP cmt @@ -153206,7 +152670,7 @@ cge ehb cjB ckX -bZb +aai coa cpE caM @@ -155960,7 +155424,7 @@ aaa aaa aaa aaa -aaO +vVy ajw akg akL @@ -156332,7 +155796,7 @@ dtz dvb dwF dyh -dzM +dvb dvb dCx dDH @@ -156586,11 +156050,11 @@ dpg inw inw inw -dvc +inw dwG -dvc -din -dgR +inw +inw +inw dCy dCy dCy @@ -156837,17 +156301,17 @@ dcM dgU dip dba -inw +dcM dng dph dqU dso -inw +uqb dvd dwH dvc dzN -dAQ +dzR dCy dDI dER @@ -157094,15 +156558,15 @@ dfw dgV diq dkg -inw +dcM dnh dpi dqV dsp -inw -dve +dsp +dsp dwI -dyi +uqb dzO dAR dCy @@ -157351,7 +156815,7 @@ den dgW dir dkh -inw +dcM dni dpj dqW @@ -157752,7 +157216,7 @@ afz afV agk aaO -qkG +gJw aaO adq abf @@ -157865,12 +157329,12 @@ dfy dgY den dkj -inw +dcM dnk dpl dqY dss -inw +jac dvh dwL dyl @@ -158122,16 +157586,16 @@ dcS dgZ dcS dkk +dcM dlV dlV dlV -dlV -dlV +vEx dtC dvi dwM dym -dzS +dtC dAV dCB tGU @@ -158379,17 +157843,17 @@ dfz dha dit dkl -dlV +dcM dnl dpm dqZ dst -dtC -dvj +iqc +dpm dwN dyn -dzT -dAW +dsw +dpm dCB dDN dEW @@ -158636,16 +158100,16 @@ dcM dhb diu dkm -dlV +dcM dnm dpn dra -dsu -dtC -dvk +dpn +dra +dpn dwO dyo -dzU +dra dAX dCB tGU @@ -158897,9 +158361,9 @@ dlV dnn dpo drb -dsv -dtC -dvl +dpn +dpn +dpn dwP dyp dzV @@ -159154,13 +158618,13 @@ dlW dno dpo drc -dsw -dtD -dvm -dwQ -dyq -dzW -dAZ +dpn +dra +dpn +dra +dyo +dra +dpm dCB dDP dEX @@ -159412,11 +158876,11 @@ dnp dpp drd dsx -dtE -dvn -dwR +dsx +dsx +dsx dyr -dzX +dpn dBa dCB dDQ @@ -159668,10 +159132,10 @@ dlW dnq dpq dre -dsy -dtF -dvo -dwS +dpn +dra +dpn +dra dys dzY dBb @@ -159926,11 +159390,11 @@ dnr dpr drf dsz -dtC +xFp +dvp +dvp +dvp dvp -dwT -dyt -dzZ dBc dCC dDR @@ -160126,7 +159590,7 @@ bvK bvI bwU bBw -bDA +luq bFC bBw bIV @@ -160184,10 +159648,10 @@ dps drg dlW dtC -dvq -dvq -dvq -dvq +dlW +dlW +dlW +dlW dBd dCC dDS @@ -160443,7 +159907,7 @@ dsA dtG dsA dwV -dyv +dwV dsA dBe dCD @@ -162741,7 +162205,7 @@ cQU cQT cSE cZG -cQU +mbO cQT cQU cNA @@ -162766,10 +162230,10 @@ dtK dtK dtK dtK -jdT +dhs dMO -dlT -dlT +cPy +cPy dPm dPq dPq @@ -163532,7 +162996,7 @@ dAg dnB dkC xsF -dnB +pif iko dnB dJo @@ -163793,11 +163257,11 @@ rMT mYs dEb dEb -cPy -jdT +vFc +dhs dMS -dlT -dlT +cPy +cPy dPm dPq dQX @@ -164046,11 +163510,11 @@ dma dBo dEd dEc -dEe +uxC wLR rmX mIX -cPy +vFc dLm dMT cHU @@ -164300,13 +163764,13 @@ dvB dxj dtR dyE -cQT +vko dFj -cQT -loc +vko +mSk dBp loc -cQT +vko iZy dLn dMU @@ -164564,7 +164028,7 @@ xxD eWa iDa icz -cPy +vFc cMg dMV cHU @@ -164816,12 +164280,12 @@ dma dma dBr dCO -dEe +uxC wZq eNA dEe xzY -cPy +vFc dLo dMW cHU @@ -165078,7 +164542,7 @@ rLD xNr dCP wEq -cPy +vFc dLp dMV cHU @@ -165328,14 +164792,14 @@ dvF dxm dyH dma -cPy -cPy -cPy -cPy -cPy -cPy -cPy -cPy +vFc +vFc +vFc +vFc +vFc +vFc +vFc +vFc cMg dMX dfX @@ -167870,7 +167334,7 @@ cDD cFx cGU cAw -cJl +cJk cLa cMx cIi @@ -168580,8 +168044,8 @@ ajr aaa aad aFm -aMc -aNx +aaj +aak aFm aQY aSE @@ -168838,7 +168302,7 @@ aaa aad aFm aKV -aNy +aal aFm aFm aFm diff --git a/_maps/map_files/Donutstation/Donutstation.dmm b/_maps/map_files/Donutstation/Donutstation.dmm index 19902c17fae..6510f4ace14 100644 --- a/_maps/map_files/Donutstation/Donutstation.dmm +++ b/_maps/map_files/Donutstation/Donutstation.dmm @@ -805,6 +805,10 @@ /area/quartermaster/miningdock) "abV" = ( /obj/structure/closet/wardrobe/miner, +/obj/machinery/camera{ + c_tag = "Cargo - Mining Bay"; + dir = 1 + }, /turf/open/floor/plasteel, /area/quartermaster/miningdock) "abW" = ( @@ -966,9 +970,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nitrous_output{ dir = 8 }, -/turf/open/floor/engine/n2o{ - initial_gas_mix = "n2o=1000;TEMP=293.15" - }, +/turf/open/floor/engine/n2o, /area/engine/atmos) "acw" = ( /turf/open/floor/engine, @@ -1012,9 +1014,6 @@ /area/maintenance/port) "acC" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/obj/machinery/sparker/toxmix{ - pixel_y = -20 - }, /turf/open/floor/engine/vacuum, /area/science/mixing) "acD" = ( @@ -1032,13 +1031,11 @@ /area/bridge) "acE" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxins_mixing_input, -/obj/machinery/sparker/toxmix{ - pixel_y = -20 - }, /turf/open/floor/engine/vacuum, /area/science/mixing) "acF" = ( -/turf/open/floor/engine/airless, +/obj/machinery/portable_atmospherics/canister/air, +/turf/open/floor/engine/air, /area/engine/atmos) "acG" = ( /obj/structure/disposalpipe/segment{ @@ -1059,11 +1056,13 @@ "acI" = ( /obj/machinery/computer/nanite_cloud_controller, /obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/dark, /area/science/lab) "acJ" = ( /obj/machinery/nanite_programmer, /obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/dark, /area/science/lab) "acK" = ( @@ -1168,17 +1167,15 @@ /area/bridge) "acS" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ dir = 8 }, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/science/storage) "acT" = ( -/turf/open/floor/engine/n2o{ - initial_gas_mix = "n2o=1000;TEMP=293.15" - }, +/turf/open/floor/engine/n2o, /area/engine/atmos) "acU" = ( /obj/structure/bookcase, @@ -1225,9 +1222,9 @@ /area/science/lab) "add" = ( /obj/machinery/computer/nanite_cloud_controller, -/obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/dark, /area/science/lab) "ade" = ( @@ -1306,13 +1303,16 @@ /turf/open/floor/plasteel/dark, /area/science/lab) "adn" = ( -/obj/structure/chair/stool, +/obj/structure/chair/pew/right{ + dir = 4 + }, /turf/open/floor/carpet, /area/chapel/main) "ado" = ( /obj/machinery/airalarm{ pixel_y = 24 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/plasteel/dark, /area/science/lab) "adp" = ( @@ -1794,7 +1794,7 @@ /area/gateway) "aev" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 + dir = 9 }, /turf/closed/wall/r_wall, /area/science/mixing) @@ -1824,7 +1824,7 @@ pixel_y = 25 }, /obj/structure/disposalpipe/segment{ - dir = 9 + dir = 4 }, /turf/open/floor/plasteel/chapel{ dir = 1 @@ -1889,7 +1889,9 @@ /area/ai_monitored/turret_protected/aisat/service) "aeK" = ( /obj/effect/landmark/event_spawn, -/obj/structure/chair/stool, +/obj/structure/chair/pew/right{ + dir = 4 + }, /turf/open/floor/carpet, /area/chapel/main) "aeL" = ( @@ -1968,9 +1970,7 @@ /area/medical/virology) "aeV" = ( /obj/machinery/air_sensor/atmos/nitrous_tank, -/turf/open/floor/engine/n2o{ - initial_gas_mix = "n2o=1000;TEMP=293.15" - }, +/turf/open/floor/engine/n2o, /area/engine/atmos) "aeW" = ( /obj/effect/decal/cleanable/dirt, @@ -2677,12 +2677,6 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plasteel, /area/quartermaster/storage) -"agw" = ( -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "agx" = ( /obj/machinery/mass_driver{ dir = 1; @@ -3266,16 +3260,6 @@ "ahM" = ( /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/heads/hor) -"ahN" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable, -/obj/structure/cable, -/obj/machinery/door/poddoor/preopen{ - id = "rdprivacy"; - name = "privacy shutters" - }, -/turf/open/floor/plating, -/area/crew_quarters/heads/hor) "ahO" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -3353,6 +3337,17 @@ dir = 5 }, /area/crew_quarters/kitchen) +"ahZ" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 5 + }, +/obj/structure/cable, +/obj/effect/mapping_helpers/iannewyear, +/turf/open/floor/carpet, +/area/crew_quarters/heads/hop) "aib" = ( /obj/structure/plasticflaps, /obj/machinery/conveyor{ @@ -3566,6 +3561,10 @@ "aiM" = ( /obj/machinery/light/small, /obj/effect/turf_decal/tile/brown, +/obj/machinery/camera{ + c_tag = "Cargo - Mining Dock"; + dir = 1 + }, /turf/open/floor/plasteel, /area/quartermaster/miningdock) "aiN" = ( @@ -3987,10 +3986,6 @@ /obj/item/clothing/suit/straight_jacket, /turf/open/floor/plasteel, /area/security/prison) -"akd" = ( -/obj/machinery/vending/boozeomat/all_access, -/turf/open/floor/wood, -/area/maintenance/starboard) "ake" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ dir = 1 @@ -4595,9 +4590,13 @@ /obj/machinery/light{ dir = 1 }, +/obj/machinery/camera{ + c_tag = "Cargo - Docking Bay North" + }, /turf/open/floor/plasteel, /area/quartermaster/storage) "alP" = ( +/obj/effect/decal/cleanable/vomit/old, /turf/open/floor/wood, /area/maintenance/starboard) "alV" = ( @@ -4678,6 +4677,11 @@ /obj/effect/landmark/start/detective, /turf/open/floor/carpet, /area/security/detectives_office) +"amf" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/turf/open/floor/plasteel/white, +/area/medical/chemistry) "amg" = ( /obj/machinery/pdapainter, /turf/open/floor/wood, @@ -4939,7 +4943,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3, /turf/open/floor/plasteel/dark, -/area/ai_monitored/turret_protected/ai_upload) +/area/ai_monitored/turret_protected/ai_upload_foyer) "and" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, @@ -5119,12 +5123,8 @@ }, /area/crew_quarters/kitchen) "anM" = ( -/obj/machinery/atmospherics/miner/n2o{ - max_ext_kpa = 2500 - }, -/turf/open/floor/engine/n2o{ - initial_gas_mix = "n2o=1000;TEMP=293.15" - }, +/obj/machinery/portable_atmospherics/canister/nitrous_oxide, +/turf/open/floor/engine/n2o, /area/engine/atmos) "anQ" = ( /obj/structure/sign/warning/docking{ @@ -5135,10 +5135,6 @@ "anR" = ( /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai_upload) -"anS" = ( -/obj/machinery/computer/arcade/orion_trail, -/turf/open/floor/plating, -/area/maintenance/starboard) "anT" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/techstorage/medical, @@ -5153,7 +5149,8 @@ /area/storage/tech) "anU" = ( /obj/structure/chair/stool, -/turf/open/floor/wood, +/obj/effect/decal/cleanable/vomit/old, +/turf/open/floor/plating, /area/maintenance/starboard) "anV" = ( /obj/effect/decal/cleanable/dirt, @@ -5264,9 +5261,6 @@ /turf/open/floor/plasteel/white, /area/science/research) "aon" = ( -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 }, @@ -5275,6 +5269,9 @@ dir = 4; network = list("ss13","Medical") }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, /turf/open/floor/plasteel/white, /area/medical/genetics) "aoo" = ( @@ -5307,6 +5304,10 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/purple/hidden/layer1, /obj/structure/cable, +/obj/machinery/navbeacon/wayfinding{ + location = "Engineering"; + name = "navigation beacon (Engineering)" + }, /turf/open/floor/plasteel, /area/engine/engineering) "aor" = ( @@ -5430,10 +5431,10 @@ /turf/open/floor/plasteel/white, /area/science/research) "aoO" = ( -/obj/effect/turf_decal/tile/blue, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, -/obj/effect/turf_decal/tile/blue{ +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ dir = 8 }, /turf/open/floor/plasteel/white, @@ -5520,16 +5521,16 @@ /turf/open/floor/plasteel, /area/quartermaster/storage) "apd" = ( -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ dir = 1 }, -/obj/effect/turf_decal/tile/blue{ +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ dir = 8 }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/medical/genetics) "ape" = ( @@ -5802,6 +5803,10 @@ name = "Privacy Shutters Control"; pixel_y = 26 }, +/obj/machinery/light_switch{ + pixel_x = -8; + pixel_y = 27 + }, /turf/open/floor/wood, /area/crew_quarters/heads/hos) "apX" = ( @@ -6102,7 +6107,7 @@ /area/hallway/primary/central) "aqG" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /turf/open/floor/plasteel, @@ -6487,7 +6492,7 @@ dir = 8 }, /obj/machinery/camera/motion{ - c_tag = "AI Upload Access"; + c_tag = "Secure - AI Upload Access"; dir = 4; network = list("aiupload") }, @@ -6496,7 +6501,7 @@ }, /obj/structure/cable, /turf/open/floor/plasteel/dark, -/area/ai_monitored/turret_protected/ai_upload) +/area/ai_monitored/turret_protected/ai_upload_foyer) "arM" = ( /obj/machinery/door/airlock/highsecurity{ name = "AI Upload"; @@ -6529,6 +6534,9 @@ /obj/effect/turf_decal/tile/yellow{ dir = 1 }, +/obj/item/radio/intercom{ + pixel_y = 24 + }, /turf/open/floor/plasteel, /area/engine/atmos) "arT" = ( @@ -6648,10 +6656,6 @@ /obj/item/storage/fancy/donut_box, /turf/open/floor/plasteel, /area/crew_quarters/fitness/recreation) -"ash" = ( -/obj/effect/spawner/structure/window/reinforced/tinted, -/turf/open/floor/plating, -/area/maintenance/port) "asi" = ( /obj/structure/table/wood, /obj/item/paper_bin{ @@ -6849,9 +6853,9 @@ /area/crew_quarters/fitness/recreation) "asN" = ( /obj/machinery/power/apc{ - areastring = "/area/solar/starboard"; + areastring = "/area/maintenance/solars/starboard/fore"; dir = 8; - name = "Starboard Aux Solar APC"; + name = "Starboard Fore Solar APC"; pixel_x = -25; pixel_y = 3 }, @@ -8417,9 +8421,7 @@ /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nitrous_input{ dir = 8 }, -/turf/open/floor/engine/n2o{ - initial_gas_mix = "n2o=1000;TEMP=293.15" - }, +/turf/open/floor/engine/n2o, /area/engine/atmos) "axm" = ( /obj/effect/turf_decal/tile/neutral{ @@ -8430,7 +8432,7 @@ /area/hallway/primary/central) "axn" = ( /obj/effect/landmark/xeno_spawn, -/turf/open/floor/engine/airless, +/turf/open/floor/engine/air, /area/engine/atmos) "axo" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ @@ -8567,9 +8569,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/toxin_output{ dir = 8 }, -/turf/open/floor/engine/plasma{ - initial_gas_mix = "plasma=1000;TEMP=293.15" - }, +/turf/open/floor/engine/plasma, /area/engine/atmos) "axE" = ( /obj/effect/turf_decal/tile/purple{ @@ -8625,9 +8625,7 @@ }, /area/science/research) "axJ" = ( -/turf/open/floor/engine/plasma{ - initial_gas_mix = "plasma=1000;TEMP=293.15" - }, +/turf/open/floor/engine/plasma, /area/engine/atmos) "axK" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, @@ -8765,23 +8763,17 @@ /area/engine/atmos) "aya" = ( /obj/effect/landmark/xeno_spawn, -/turf/open/floor/engine/plasma{ - initial_gas_mix = "plasma=1000;TEMP=293.15" - }, +/turf/open/floor/engine/plasma, /area/engine/atmos) "ayb" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 - }, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/white, /area/science/mixing) "ayc" = ( /obj/machinery/air_sensor/atmos/toxin_tank, -/turf/open/floor/engine/plasma{ - initial_gas_mix = "plasma=1000;TEMP=293.15" - }, +/turf/open/floor/engine/plasma, /area/engine/atmos) "ayd" = ( /obj/machinery/suit_storage_unit/atmos, @@ -8813,12 +8805,8 @@ /turf/open/floor/plasteel/dark, /area/engine/atmos) "ayh" = ( -/obj/machinery/atmospherics/miner/toxins{ - max_ext_kpa = 2500 - }, -/turf/open/floor/engine/plasma{ - initial_gas_mix = "plasma=1000;TEMP=293.15" - }, +/obj/machinery/portable_atmospherics/canister/toxins, +/turf/open/floor/engine/plasma, /area/engine/atmos) "ayi" = ( /obj/machinery/light/small{ @@ -8829,17 +8817,13 @@ dir = 8; network = list("ss13","Atmospherics") }, -/turf/open/floor/engine/plasma{ - initial_gas_mix = "plasma=1000;TEMP=293.15" - }, +/turf/open/floor/engine/plasma, /area/engine/atmos) "ayj" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxin_input{ dir = 8 }, -/turf/open/floor/engine/plasma{ - initial_gas_mix = "plasma=1000;TEMP=293.15" - }, +/turf/open/floor/engine/plasma, /area/engine/atmos) "ayk" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ @@ -8871,9 +8855,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/carbon_output{ dir = 8 }, -/turf/open/floor/engine/co2{ - initial_gas_mix = "co2=1000;TEMP=293.15" - }, +/turf/open/floor/engine/co2, /area/engine/atmos) "ayo" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ @@ -9015,15 +8997,11 @@ /turf/open/floor/plasteel/dark, /area/engine/atmos) "ayD" = ( -/turf/open/floor/engine/co2{ - initial_gas_mix = "co2=1000;TEMP=293.15" - }, +/turf/open/floor/engine/co2, /area/engine/atmos) "ayF" = ( /obj/machinery/air_sensor/atmos/carbon_tank, -/turf/open/floor/engine/co2{ - initial_gas_mix = "co2=1000;TEMP=293.15" - }, +/turf/open/floor/engine/co2, /area/engine/atmos) "ayG" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ @@ -9095,6 +9073,7 @@ /obj/machinery/atmospherics/pipe/simple/dark/hidden/layer1{ dir = 4 }, +/obj/effect/landmark/start/prisoner, /turf/open/floor/plasteel, /area/security/prison) "ayQ" = ( @@ -9116,12 +9095,8 @@ /turf/open/floor/plasteel/dark, /area/engine/atmos) "ayS" = ( -/obj/machinery/atmospherics/miner/carbon_dioxide{ - max_ext_kpa = 2500 - }, -/turf/open/floor/engine/co2{ - initial_gas_mix = "co2=1000;TEMP=293.15" - }, +/obj/machinery/portable_atmospherics/canister/carbon_dioxide, +/turf/open/floor/engine/co2, /area/engine/atmos) "ayT" = ( /obj/machinery/light/small{ @@ -9132,9 +9107,7 @@ dir = 8; network = list("ss13","Atmospherics") }, -/turf/open/floor/engine/co2{ - initial_gas_mix = "co2=1000;TEMP=293.15" - }, +/turf/open/floor/engine/co2, /area/engine/atmos) "ayU" = ( /obj/structure/closet/l3closet/scientist, @@ -9282,17 +9255,13 @@ /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/carbon_input{ dir = 8 }, -/turf/open/floor/engine/co2{ - initial_gas_mix = "co2=1000;TEMP=293.15" - }, +/turf/open/floor/engine/co2, /area/engine/atmos) "azj" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nitrogen_input{ dir = 1 }, -/turf/open/floor/engine/n2{ - initial_gas_mix = "n2=1000;TEMP=293.15" - }, +/turf/open/floor/engine/n2, /area/engine/atmos) "azk" = ( /obj/machinery/atmospherics/components/binary/pump{ @@ -9899,6 +9868,10 @@ /obj/structure/bed, /obj/effect/landmark/start/captain, /obj/item/bedsheet/captain, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = -24 + }, /turf/open/floor/holofloor/wood, /area/crew_quarters/heads/captain/private) "aAP" = ( @@ -10005,7 +9978,8 @@ "aBf" = ( /obj/machinery/door/airlock/research{ name = "Genetics Research Access"; - req_access_txt = "9" + req_access_txt = null; + req_one_access_txt = "9; 30" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -10168,6 +10142,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 }, +/obj/machinery/navbeacon/wayfinding{ + location = "Gateway"; + name = "navigation beacon (Gateway)" + }, /turf/open/floor/plasteel, /area/gateway) "aBC" = ( @@ -10191,23 +10169,8 @@ /turf/open/floor/plasteel/white, /area/science/xenobiology) "aBM" = ( -/obj/structure/table/wood/poker, -/obj/item/reagent_containers/food/drinks/bottle/rum, -/obj/item/reagent_containers/food/drinks/drinkingglass, -/obj/item/reagent_containers/food/drinks/drinkingglass{ - pixel_x = 4; - pixel_y = 2 - }, -/obj/item/reagent_containers/food/drinks/drinkingglass{ - pixel_y = 6 - }, -/obj/item/reagent_containers/food/drinks/drinkingglass{ - pixel_x = -4; - pixel_y = 2 - }, -/turf/open/floor/wood{ - icon_state = "wood-broken" - }, +/obj/structure/table_frame/wood, +/turf/open/floor/plating, /area/maintenance/starboard) "aBN" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ @@ -10482,6 +10445,10 @@ pixel_y = 32 }, /obj/structure/cable, +/obj/machinery/navbeacon/wayfinding{ + location = "Telecomms Minisat Access"; + name = "navigation beacon (Telecomms Minisat Access)" + }, /turf/open/floor/plating, /area/maintenance/port) "aCL" = ( @@ -10510,8 +10477,21 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/eva) "aCN" = ( -/obj/structure/closet/crate/rcd, -/obj/effect/turf_decal/bot, +/obj/item/grenade/chem_grenade/smart_metal_foam{ + pixel_x = -4; + pixel_y = 6 + }, +/obj/item/grenade/chem_grenade/smart_metal_foam{ + pixel_x = 4; + pixel_y = 2 + }, +/obj/item/grenade/chem_grenade/smart_metal_foam{ + pixel_x = 8 + }, +/obj/item/grenade/chem_grenade/smart_metal_foam{ + pixel_y = 4 + }, +/obj/structure/rack, /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/eva) "aCO" = ( @@ -10585,12 +10565,13 @@ /turf/open/floor/plasteel/white, /area/science/explab) "aCY" = ( -/obj/machinery/door/airlock/research{ - name = "Genetics Research Access"; - req_access_txt = "47" - }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/research{ + name = "Genetics Research Access"; + req_access_txt = null; + req_one_access_txt = "9;30;47" + }, /turf/open/floor/plasteel/white, /area/science/research) "aCZ" = ( @@ -10815,55 +10796,45 @@ /area/engine/atmos) "aDD" = ( /obj/machinery/air_sensor/atmos/nitrogen_tank, -/turf/open/floor/engine/n2{ - initial_gas_mix = "n2=1000;TEMP=293.15" - }, +/turf/open/floor/engine/n2, /area/engine/atmos) "aDE" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/air_input{ dir = 1 }, -/turf/open/floor/engine/airless, +/turf/open/floor/engine/air, /area/engine/atmos) "aDF" = ( /obj/machinery/air_sensor/atmos/air_tank, -/turf/open/floor/engine/airless, +/turf/open/floor/engine/air, /area/engine/atmos) "aDG" = ( /obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/atmos/air_output{ dir = 1 }, -/turf/open/floor/engine/airless, +/turf/open/floor/engine/air, /area/engine/atmos) "aDH" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nitrogen_output{ dir = 1 }, -/turf/open/floor/engine/n2{ - initial_gas_mix = "n2=1000;TEMP=293.15" - }, +/turf/open/floor/engine/n2, /area/engine/atmos) "aDI" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/oxygen_input{ dir = 1 }, -/turf/open/floor/engine/o2{ - initial_gas_mix = "o2=1000;TEMP=293.15" - }, +/turf/open/floor/engine/o2, /area/engine/atmos) "aDJ" = ( /obj/machinery/air_sensor/atmos/oxygen_tank, -/turf/open/floor/engine/o2{ - initial_gas_mix = "o2=1000;TEMP=293.15" - }, +/turf/open/floor/engine/o2, /area/engine/atmos) "aDK" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/oxygen_output{ dir = 1 }, -/turf/open/floor/engine/o2{ - initial_gas_mix = "o2=1000;TEMP=293.15" - }, +/turf/open/floor/engine/o2, /area/engine/atmos) "aDL" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, @@ -10881,7 +10852,7 @@ dir = 1; network = list("ss13","Atmospherics") }, -/turf/open/floor/engine/airless, +/turf/open/floor/engine/air, /area/engine/atmos) "aDO" = ( /obj/machinery/door/airlock/research{ @@ -10914,14 +10885,14 @@ name = "Unisex Restroom" }, /turf/open/floor/plasteel/freezer, -/area/security/prison) +/area/security/prison/toilet) "aDS" = ( /obj/structure/toilet, /turf/open/floor/plasteel/freezer, -/area/security/prison) +/area/security/prison/toilet) "aDT" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/structure/cable, @@ -11007,11 +10978,11 @@ /area/security/prison) "aEe" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /turf/open/floor/plasteel/freezer, -/area/security/prison) +/area/security/prison/toilet) "aEf" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -11396,12 +11367,6 @@ /area/library/lounge) "aEU" = ( /obj/machinery/dna_scannernew, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, /obj/machinery/firealarm{ pixel_y = 24 }, @@ -11409,6 +11374,12 @@ c_tag = "Medical - Genetics"; network = list("ss13","Medical") }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/medical/genetics) "aEV" = ( @@ -11775,6 +11746,10 @@ /area/science/research) "aFK" = ( /obj/machinery/vending/wardrobe/gene_wardrobe, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, /turf/open/floor/plasteel/white, /area/medical/genetics) "aFL" = ( @@ -11812,14 +11787,14 @@ /area/medical/storage) "aFN" = ( /turf/closed/wall, -/area/medical/genetics/cloning) +/area/medical/medbay/zone2) "aFO" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/medical/genetics/cloning) +/area/medical/medbay/zone2) "aFR" = ( /turf/open/floor/plasteel/white, -/area/medical/genetics/cloning) +/area/medical/medbay/zone2) "aFT" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -11913,21 +11888,25 @@ /turf/open/floor/plasteel/white, /area/medical/storage) "aGf" = ( -/obj/machinery/dna_scannernew, /obj/machinery/airalarm{ dir = 4; pixel_x = -23 }, +/obj/structure/bodycontainer/morgue{ + dir = 2 + }, /turf/open/floor/plasteel/white, -/area/medical/genetics/cloning) +/area/medical/medbay/zone2) "aGg" = ( -/obj/machinery/computer/cloning, +/obj/structure/bodycontainer/morgue{ + dir = 2 + }, /turf/open/floor/plasteel/white, -/area/medical/genetics/cloning) +/area/medical/medbay/zone2) "aGh" = ( -/obj/machinery/clonepod, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/white, -/area/medical/genetics/cloning) +/area/medical/medbay/zone2) "aGk" = ( /obj/structure/bed/roller, /obj/effect/turf_decal/bot, @@ -11992,16 +11971,13 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/lobby) "aGw" = ( -/obj/machinery/door/airlock/research/glass{ - name = "Genetics Research"; - req_access_txt = "5; 9; 68" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/structure/disposalpipe/segment, /obj/structure/cable, -/turf/open/floor/plasteel/white, -/area/medical/genetics/cloning) +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/medical/medbay/zone2) "aGx" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -12019,7 +11995,7 @@ /obj/structure/disposalpipe/segment, /obj/structure/cable, /turf/open/floor/plasteel/white, -/area/medical/genetics/cloning) +/area/medical/medbay/zone2) "aGB" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -12041,7 +12017,7 @@ /obj/structure/disposalpipe/segment, /obj/structure/cable, /turf/open/floor/plasteel/white, -/area/medical/genetics/cloning) +/area/medical/medbay/zone2) "aGE" = ( /turf/closed/wall/r_wall, /area/medical/virology) @@ -12074,14 +12050,14 @@ dir = 4 }, /turf/open/floor/plasteel/white, -/area/medical/genetics/cloning) +/area/medical/medbay/zone2) "aGK" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/medical/genetics/cloning) +/area/medical/medbay/zone2) "aGL" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -12093,26 +12069,18 @@ /area/medical/medbay/central) "aGM" = ( /obj/structure/table, -/obj/item/book/manual/wiki/medical_cloning{ - pixel_y = 6 - }, /obj/machinery/firealarm{ dir = 4; pixel_x = -24 }, -/obj/machinery/requests_console{ - department = "Genetics"; - name = "Genetics Requests Console"; - pixel_y = -30 - }, /obj/machinery/camera{ - c_tag = "Medical - Cloning Bay"; + c_tag = "Medical - Corpse Disposal"; dir = 1; network = list("ss13","Medical") }, -/obj/item/toy/figure/geneticist, +/obj/item/storage/box/bodybags, /turf/open/floor/plasteel/white, -/area/medical/genetics/cloning) +/area/medical/medbay/zone2) "aGN" = ( /obj/structure/table, /obj/item/storage/box/donkpockets{ @@ -12137,11 +12105,11 @@ "aGS" = ( /obj/machinery/door/poddoor/shutters/preopen{ id = "chemistryshutter"; - name = "Chemistry Privacy Shutters" + name = "Pharmacy Privacy Shutters" }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/medical/chemistry) +/area/medical/pharmacy) "aGT" = ( /turf/closed/wall, /area/security/checkpoint/medical) @@ -12458,17 +12426,22 @@ "aHY" = ( /obj/machinery/smartfridge/chemistry/preloaded, /turf/closed/wall, -/area/medical/chemistry) +/area/medical/pharmacy) "aHZ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ dir = 8 }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, /turf/open/floor/plasteel/white, /area/medical/genetics) "aIa" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/white, -/area/medical/genetics/cloning) +/area/medical/medbay/zone2) "aIc" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -12539,6 +12512,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 4 }, +/obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel/white, /area/medical/genetics) "aIp" = ( @@ -12569,7 +12543,7 @@ pixel_y = 28 }, /turf/open/floor/plasteel/white, -/area/medical/chemistry) +/area/medical/pharmacy) "aIu" = ( /turf/closed/wall/r_wall, /area/medical/sleeper) @@ -12608,13 +12582,13 @@ pixel_y = 28 }, /turf/open/floor/plasteel/white, -/area/medical/chemistry) +/area/medical/pharmacy) "aIB" = ( /obj/structure/chair{ dir = 8 }, /turf/open/floor/plasteel/white, -/area/medical/chemistry) +/area/medical/pharmacy) "aIC" = ( /obj/machinery/chem_dispenser, /obj/effect/turf_decal/tile/yellow{ @@ -12624,7 +12598,7 @@ dir = 1 }, /turf/open/floor/plasteel/white, -/area/medical/chemistry) +/area/medical/pharmacy) "aID" = ( /obj/machinery/chem_dispenser, /obj/effect/turf_decal/tile/yellow{ @@ -12632,7 +12606,7 @@ }, /obj/effect/turf_decal/tile/yellow, /turf/open/floor/plasteel/white, -/area/medical/chemistry) +/area/medical/pharmacy) "aIE" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -12663,7 +12637,7 @@ "aII" = ( /obj/machinery/smartfridge/chemistry, /turf/closed/wall, -/area/medical/chemistry) +/area/medical/pharmacy) "aIJ" = ( /obj/machinery/chem_heater, /obj/effect/turf_decal/tile/yellow{ @@ -12673,7 +12647,7 @@ dir = 1 }, /turf/open/floor/plasteel/white, -/area/medical/chemistry) +/area/medical/pharmacy) "aIK" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/structure/disposalpipe/segment, @@ -12712,7 +12686,7 @@ "aIR" = ( /obj/machinery/vending/wardrobe/chem_wardrobe, /turf/open/floor/plasteel/white, -/area/medical/chemistry) +/area/medical/pharmacy) "aIS" = ( /obj/effect/turf_decal/delivery, /obj/machinery/door/poddoor{ @@ -12803,7 +12777,7 @@ "aJf" = ( /obj/structure/closet/secure_closet/chemical, /turf/open/floor/plasteel/white, -/area/medical/chemistry) +/area/medical/pharmacy) "aJg" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -12812,6 +12786,10 @@ dir = 4 }, /obj/structure/cable, +/obj/machinery/navbeacon/wayfinding{ + location = "Research"; + name = "navigation beacon (Research)" + }, /turf/open/floor/plasteel/white, /area/science/research) "aJh" = ( @@ -13055,11 +13033,11 @@ /obj/structure/table/reinforced, /obj/machinery/door/firedoor, /obj/machinery/door/window/eastleft{ - name = "Chemistry Desk"; - req_access_txt = "69" + name = "Pharmacy Desk"; + req_access_txt = "5; 69" }, /turf/open/floor/plasteel/white, -/area/medical/chemistry) +/area/medical/pharmacy) "aJI" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -13138,7 +13116,7 @@ /turf/open/floor/plasteel/white, /area/medical/surgery/room_b) "aJV" = ( -/obj/structure/closet/l3closet, +/obj/structure/closet/l3closet/virology, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -13256,7 +13234,6 @@ /area/medical/surgery) "aKl" = ( /obj/structure/closet/crate/freezer/surplus_limbs, -/obj/item/reagent_containers/glass/beaker/instabitaluri, /turf/open/floor/plasteel/white/side{ dir = 8 }, @@ -13419,6 +13396,10 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 4 }, +/obj/machinery/light_switch{ + pixel_x = 8; + pixel_y = -27 + }, /turf/open/floor/carpet, /area/crew_quarters/heads/hop) "aKE" = ( @@ -14043,27 +14024,21 @@ /obj/structure/cable, /turf/open/floor/grass, /area/hydroponics/garden) -"aMz" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable, -/obj/structure/cable, -/turf/open/floor/plating, -/area/hydroponics/garden) "aMD" = ( /obj/machinery/biogenerator, /turf/open/floor/grass, /area/hydroponics/garden) "aMF" = ( /obj/machinery/computer/scan_consolenew, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, /obj/structure/extinguisher_cabinet{ pixel_y = 28 }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/medical/genetics) "aMG" = ( @@ -15054,6 +15029,7 @@ /turf/open/floor/plasteel, /area/quartermaster/miningdock) "aPJ" = ( +/obj/effect/decal/cleanable/vomit/old, /turf/open/floor/wood{ icon_state = "wood-broken5" }, @@ -15118,18 +15094,6 @@ }, /turf/open/floor/plasteel, /area/quartermaster/miningdock) -"aPQ" = ( -/obj/structure/light_construct/small{ - dir = 8 - }, -/obj/machinery/vending/autodrobe/all_access, -/obj/structure/sign/poster/contraband/random{ - pixel_x = -32 - }, -/turf/open/floor/wood{ - icon_state = "wood-broken5" - }, -/area/maintenance/starboard) "aPR" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/crate/freezer, @@ -15387,13 +15351,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/maintenance/starboard) -"aQD" = ( -/obj/structure/chair{ - dir = 1 - }, -/obj/effect/landmark/start/geneticist, -/turf/open/floor/plasteel/white, -/area/medical/genetics/cloning) "aQE" = ( /obj/structure/closet/crate, /obj/effect/spawner/lootdrop/maintenance, @@ -15624,16 +15581,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/hallway/primary/central) -"aRr" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "5;12" - }, -/obj/effect/mapping_helpers/airlock_note_placer{ - name = "extra material"; - note_info = "Chief said to leave the surplus materials here for the construction shuttle to pick up. Don't forget about it or else the QM will have our asses for wasted material!" - }, -/turf/open/floor/plating, -/area/maintenance/port/aft) "aRs" = ( /obj/effect/landmark/start/station_engineer, /obj/structure/disposalpipe/segment{ @@ -16000,6 +15947,9 @@ "aSC" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/machinery/atmospherics/pipe/simple/general/visible{ + dir = 4 + }, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "aSE" = ( @@ -16054,6 +16004,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/light, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "aSK" = ( @@ -16062,6 +16013,9 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/general/visible{ + dir = 4 + }, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "aSL" = ( @@ -16137,10 +16091,12 @@ /area/maintenance/disposal/incinerator) "aSU" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/general/visible, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold{ + dir = 4 + }, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "aSV" = ( @@ -16463,7 +16419,7 @@ volume = 101 }, /turf/open/floor/plasteel/white, -/area/medical/chemistry) +/area/medical/pharmacy) "aTY" = ( /obj/machinery/light{ dir = 1 @@ -16508,7 +16464,7 @@ }, /obj/machinery/light, /turf/open/floor/plasteel/white, -/area/medical/chemistry) +/area/medical/pharmacy) "aUb" = ( /obj/structure/table/glass, /obj/effect/turf_decal/tile/yellow, @@ -16524,20 +16480,11 @@ }, /obj/item/clothing/glasses/science, /turf/open/floor/plasteel/white, -/area/medical/chemistry) +/area/medical/pharmacy) "aUc" = ( -/obj/structure/table/wood/poker, -/obj/item/reagent_containers/food/drinks/shaker, -/obj/item/reagent_containers/dropper, -/obj/item/reagent_containers/syringe, -/obj/item/reagent_containers/glass/beaker/cryoxadone, -/obj/item/reagent_containers/glass/beaker{ - pixel_x = 6; - pixel_y = 2 - }, -/turf/open/floor/wood{ - icon_state = "wood-broken3" - }, +/obj/structure/table_frame/wood, +/obj/effect/decal/cleanable/vomit/old, +/turf/open/floor/plating, /area/maintenance/starboard) "aUd" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ @@ -16583,7 +16530,7 @@ "aUl" = ( /obj/structure/sign/departments/medbay/alt, /turf/closed/wall, -/area/medical/chemistry) +/area/medical/pharmacy) "aUm" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -16649,7 +16596,7 @@ "aUt" = ( /obj/structure/table, /obj/item/storage/firstaid/regular, -/obj/structure/sign/departments/chemistry{ +/obj/structure/sign/departments/chemistry/pharmacy{ pixel_y = -32 }, /turf/open/floor/plasteel/white, @@ -16683,7 +16630,7 @@ /obj/item/folder/white, /obj/item/pen, /turf/open/floor/plasteel/white, -/area/medical/chemistry) +/area/medical/pharmacy) "aUy" = ( /obj/machinery/door/airlock/medical{ name = "Medbay Reception"; @@ -16743,7 +16690,7 @@ pixel_y = -32 }, /turf/open/floor/plasteel/white, -/area/medical/chemistry) +/area/medical/pharmacy) "aUB" = ( /obj/structure/table/glass, /obj/effect/turf_decal/tile/yellow, @@ -16759,7 +16706,7 @@ pixel_y = -28 }, /turf/open/floor/plasteel/white, -/area/medical/chemistry) +/area/medical/pharmacy) "aUC" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -16773,7 +16720,7 @@ pixel_y = -28 }, /turf/open/floor/plasteel/white, -/area/medical/chemistry) +/area/medical/pharmacy) "aUF" = ( /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/yellow{ @@ -16783,7 +16730,7 @@ pixel_y = -28 }, /turf/open/floor/plasteel/white, -/area/medical/chemistry) +/area/medical/pharmacy) "aUG" = ( /obj/machinery/door/airlock/engineering/glass{ name = "Gravity Generator"; @@ -17424,7 +17371,6 @@ }, /obj/structure/cable, /obj/effect/spawner/structure/window/reinforced, -/obj/effect/spawner/structure/window/reinforced, /obj/structure/disposalpipe/segment{ dir = 9 }, @@ -17862,7 +17808,7 @@ "aXy" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/white, -/area/medical/genetics/cloning) +/area/medical/medbay/zone2) "aXz" = ( /obj/structure/disposalpipe/trunk{ dir = 4 @@ -17997,27 +17943,14 @@ /obj/machinery/door/firedoor, /obj/machinery/door/poddoor/shutters/preopen{ id = "chemistryshutter"; - name = "Chemistry Privacy Shutters" - }, -/obj/machinery/door/window/southleft{ - name = "Chemistry Desk"; - req_access_txt = "69" - }, -/turf/open/floor/plating, -/area/medical/chemistry) -"aXV" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "chemistryshutter"; - name = "Chemistry Privacy Shutters" + name = "Pharmacy Privacy Shutters" }, /obj/machinery/door/window/southright{ - name = "Chemistry Desk"; - req_access_txt = "69" + name = "Pharmacy Desk"; + req_access_txt = "5; 69" }, /turf/open/floor/plating, -/area/medical/chemistry) +/area/medical/pharmacy) "aXW" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 @@ -18110,6 +18043,7 @@ /area/medical/genetics) "aYg" = ( /mob/living/carbon/monkey, +/obj/effect/landmark/start/geneticist, /turf/open/floor/plasteel, /area/medical/genetics) "aYh" = ( @@ -18619,6 +18553,7 @@ dir = 9 }, /obj/structure/cable, +/obj/effect/landmark/start/prisoner, /turf/open/floor/plasteel, /area/security/prison) "aZz" = ( @@ -18654,6 +18589,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 9 }, +/obj/effect/landmark/start/prisoner, /turf/open/floor/plasteel, /area/security/prison) "aZD" = ( @@ -19159,6 +19095,7 @@ /area/security/processing) "baC" = ( /obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/plasteel/dark, /area/security/brig) "baD" = ( @@ -19958,6 +19895,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ dir = 8 }, +/obj/structure/cable, /turf/open/floor/plasteel/cafeteria{ dir = 5 }, @@ -19982,15 +19920,14 @@ /turf/open/floor/plating, /area/maintenance/department/security) "bcQ" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Medical Maintenance Access"; - req_access_txt = "5" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/airlock/medical/glass{ + name = "Chemfactory Access Airlock"; + req_access_txt = "5" + }, /turf/open/floor/plasteel/white, -/area/maintenance/port) +/area/medical/medbay/central) "bcS" = ( /obj/machinery/door/airlock/maintenance{ name = "Disposal Access"; @@ -20109,20 +20046,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3, /turf/open/floor/plasteel/white, /area/medical/surgery) -"bdj" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, -/obj/structure/closet/secure_closet/medical2, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/medical/surgery/room_b) "bdl" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ dir = 8 @@ -20192,18 +20115,11 @@ /turf/open/floor/plasteel/white, /area/medical/surgery) "bdt" = ( -/obj/effect/decal/cleanable/cobweb, -/obj/structure/closet/crate{ - icon_state = "crateopen" +/obj/machinery/light{ + dir = 1 }, -/obj/item/stack/sheet/metal/ten, -/obj/item/stack/tile/plasteel{ - amount = 25 - }, -/obj/item/stack/rods/twentyfive, -/obj/item/storage/toolbox/mechanical, -/turf/open/floor/plating, -/area/maintenance/port/aft) +/turf/open/floor/plasteel/white, +/area/medical/chemistry) "bdu" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 @@ -20226,11 +20142,15 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "bdx" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/structure/cable, -/turf/open/floor/plating, -/area/maintenance/port) +/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer3, +/obj/machinery/navbeacon/wayfinding{ + location = "Chemfactory"; + name = "navigation beacon (Chemfactory)" + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/central) "bdy" = ( /obj/structure/cable, /obj/structure/grille/broken, @@ -20241,7 +20161,7 @@ dir = 6 }, /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, @@ -20249,23 +20169,8 @@ dir = 5 }, /area/crew_quarters/kitchen) -"bdC" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 4 - }, -/obj/structure/closet/secure_closet/medical1, -/obj/structure/cable, -/turf/open/floor/plating, -/area/maintenance/port) "bdD" = ( /obj/structure/table, -/obj/item/multitool{ - pixel_x = 6 - }, -/obj/item/multitool, /obj/item/assembly/signaler, /obj/item/assembly/signaler, /obj/effect/turf_decal/tile/brown{ @@ -20466,7 +20371,6 @@ /turf/open/floor/plasteel/white, /area/medical/virology) "bef" = ( -/obj/machinery/rnd/experimentor, /obj/effect/landmark/blobstart, /turf/open/floor/engine, /area/science/explab) @@ -20583,7 +20487,7 @@ dir = 9 }, /turf/open/floor/plasteel/white, -/area/medical/chemistry) +/area/medical/pharmacy) "beu" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/tile/blue{ @@ -20618,7 +20522,7 @@ }, /obj/structure/cable, /turf/open/floor/plasteel/white, -/area/medical/genetics/cloning) +/area/medical/medbay/zone2) "bey" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -20631,12 +20535,8 @@ /area/medical/virology) "beA" = ( /obj/machinery/door/airlock/medical/glass{ - id_tag = "GeneticsDoor"; - name = "Genetics"; - req_access_txt = "5; 68" - }, -/obj/effect/mapping_helpers/airlock/unres{ - dir = 8 + name = "Corpse Disposal"; + req_access_txt = "5" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -20646,7 +20546,7 @@ }, /obj/structure/cable, /turf/open/floor/plasteel/white, -/area/medical/genetics/cloning) +/area/medical/medbay/zone2) "beB" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -20688,14 +20588,15 @@ dir = 4 }, /turf/open/floor/plasteel/white, -/area/medical/chemistry) +/area/medical/pharmacy) "beG" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/landmark/start/chemist, /turf/open/floor/plasteel/white, -/area/medical/chemistry) +/area/medical/pharmacy) "beH" = ( /obj/effect/turf_decal/tile/red{ dir = 4 @@ -20814,10 +20715,6 @@ /turf/open/floor/plasteel/white, /area/medical/virology) "beT" = ( -/obj/machinery/door/airlock/medical/glass{ - name = "Chemistry Lab"; - req_access_txt = "5; 69" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -20825,8 +20722,12 @@ dir = 4 }, /obj/structure/cable, +/obj/machinery/door/airlock/medical/glass{ + name = "Pharmacy"; + req_access_txt = "5; 69" + }, /turf/open/floor/plasteel/white, -/area/medical/chemistry) +/area/medical/pharmacy) "beU" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -20836,7 +20737,7 @@ }, /obj/structure/cable, /turf/open/floor/plasteel/white, -/area/medical/chemistry) +/area/medical/pharmacy) "beV" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -20845,7 +20746,7 @@ dir = 4 }, /turf/open/floor/plasteel/white, -/area/medical/chemistry) +/area/medical/pharmacy) "beW" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -20865,7 +20766,7 @@ dir = 4 }, /turf/open/floor/plasteel/white, -/area/medical/chemistry) +/area/medical/pharmacy) "beY" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ @@ -20978,14 +20879,14 @@ "bfn" = ( /obj/machinery/door/poddoor/shutters/preopen{ id = "chemistryshutter"; - name = "Chemistry Privacy Shutters" + name = "Pharmacy Privacy Shutters" }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/medical/chemistry) +/area/medical/pharmacy) "bfo" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -21233,16 +21134,13 @@ /turf/open/floor/plasteel/white, /area/hallway/secondary/exit/departure_lounge) "bfQ" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 10 }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel/white, /area/medical/genetics) "bfR" = ( @@ -21321,7 +21219,7 @@ /area/crew_quarters/bar) "bgc" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 12 }, /obj/structure/mirror{ @@ -21426,6 +21324,9 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/structure/sign/departments/chemistry{ + pixel_y = -32 + }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "bgt" = ( @@ -21433,12 +21334,14 @@ name = "Kitchen Cold Room"; req_access_txt = "28" }, +/obj/structure/cable, /turf/open/floor/plasteel/showroomfloor, /area/crew_quarters/kitchen/coldroom) "bgu" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 6 }, +/obj/structure/cable, /turf/open/floor/plasteel/kitchen_coldroom/freezerfloor, /area/crew_quarters/kitchen/coldroom) "bgv" = ( @@ -21577,6 +21480,7 @@ /obj/machinery/airalarm/kitchen_cold_room{ pixel_y = 24 }, +/obj/structure/cable, /turf/open/floor/plasteel/kitchen_coldroom/freezerfloor, /area/crew_quarters/kitchen/coldroom) "bgK" = ( @@ -21761,7 +21665,7 @@ "bhp" = ( /obj/machinery/light/small, /turf/open/floor/plasteel/freezer, -/area/security/prison) +/area/security/prison/toilet) "bhq" = ( /obj/structure/table, /obj/machinery/recharger, @@ -22057,11 +21961,22 @@ /obj/structure/table/glass, /obj/item/paper_bin, /obj/item/pen, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel/white, /area/medical/genetics) "bhU" = ( /obj/structure/table/glass, /obj/item/storage/pill_bottle/mutadone, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/item/toy/figure/geneticist{ + pixel_x = -6; + pixel_y = 3 + }, /turf/open/floor/plasteel/white, /area/medical/genetics) "bhV" = ( @@ -22146,6 +22061,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 1 }, +/obj/structure/cable, /turf/open/floor/plasteel/kitchen_coldroom/freezerfloor, /area/crew_quarters/kitchen/coldroom) "bik" = ( @@ -23211,8 +23127,9 @@ /area/science/robotics/lab) "bkF" = ( /obj/machinery/door/airlock/maintenance{ - name = "Medical/Science Maintenance Access"; - req_one_access_txt = "5;47" + delayed_close_requested = null; + name = "Science Maintenance Access"; + req_one_access_txt = "9;30;47;12" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -23695,6 +23612,11 @@ req_access_txt = "1" }, /obj/structure/cable, +/obj/machinery/camera{ + c_tag = "Medical - Security Checkpoint"; + dir = 8; + network = list("ss13","Medical") + }, /turf/open/floor/plasteel, /area/security/checkpoint/medical) "blG" = ( @@ -24244,14 +24166,14 @@ /turf/open/floor/plasteel/white, /area/medical/genetics) "bnn" = ( -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, /obj/machinery/light/small, -/obj/effect/turf_decal/tile/blue{ +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ dir = 8 }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, /turf/open/floor/plasteel/white, /area/medical/genetics) "bno" = ( @@ -24479,6 +24401,11 @@ network = list("Research"); pixel_x = 32 }, +/obj/machinery/camera{ + c_tag = "Research - Security Checkpoint"; + dir = 8; + network = list("ss13","Research") + }, /turf/open/floor/plasteel, /area/security/checkpoint/science) "bnM" = ( @@ -25002,7 +24929,7 @@ dir = 4 }, /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, @@ -25018,9 +24945,8 @@ /obj/effect/turf_decal/tile/yellow{ dir = 1 }, -/obj/effect/landmark/start/chemist, /turf/open/floor/plasteel/white, -/area/medical/chemistry) +/area/medical/pharmacy) "bpl" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -25114,7 +25040,7 @@ }, /obj/item/toy/figure/chemist, /turf/open/floor/plasteel/white, -/area/medical/chemistry) +/area/medical/pharmacy) "bpw" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -25232,6 +25158,10 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable, +/obj/machinery/navbeacon/wayfinding{ + location = "Turbine Incinerator"; + name = "navigation beacon (Turbine Incinerator)" + }, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "bpP" = ( @@ -25298,7 +25228,7 @@ /area/engine/atmos) "bqa" = ( /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, @@ -25885,6 +25815,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/purple/hidden/layer1, +/obj/machinery/navbeacon/wayfinding{ + location = "Atmospherics"; + name = "navigation beacon (Atmospherics)" + }, /turf/open/floor/plasteel, /area/engine/atmos) "bry" = ( @@ -25895,6 +25829,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable, /turf/open/floor/plasteel/showroomfloor, /area/maintenance/port/aft) "brz" = ( @@ -26224,7 +26159,7 @@ dir = 4 }, /obj/machinery/camera{ - c_tag = "Cargo - Docking Bay"; + c_tag = "Cargo - Docking Bay South"; dir = 1 }, /obj/structure/cable, @@ -26673,17 +26608,6 @@ }, /turf/open/floor/plasteel, /area/gateway) -"btm" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "btn" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/circuit, @@ -26750,7 +26674,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable, -/obj/structure/cable, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -26826,7 +26749,6 @@ dir = 1 }, /obj/structure/cable, -/obj/structure/cable, /turf/open/floor/grass, /area/hydroponics/garden) "btG" = ( @@ -28191,6 +28113,7 @@ "bwy" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/structure/cable, /turf/open/floor/plating, /area/maintenance/port/aft) "bwz" = ( @@ -28805,8 +28728,9 @@ /turf/open/floor/plasteel, /area/hallway/secondary/entry) "bys" = ( +/obj/effect/decal/cleanable/vomit/old, /mob/living/simple_animal/hostile/retaliate/goose/vomit, -/turf/open/floor/wood, +/turf/open/floor/plating, /area/maintenance/starboard) "byt" = ( /obj/effect/decal/cleanable/dirt, @@ -29299,8 +29223,9 @@ /area/quartermaster/qm) "bzB" = ( /obj/machinery/vending/wardrobe/chap_wardrobe, -/obj/structure/disposalpipe/segment, -/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, /turf/open/floor/plasteel/dark, /area/chapel/office) "bzC" = ( @@ -29438,19 +29363,13 @@ dir = 4 }, /area/chapel/main) -"bzP" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/closed/wall, -/area/chapel/office) "bzQ" = ( /obj/structure/chair/stool, /obj/effect/landmark/start/virologist, /turf/open/floor/plasteel/white, /area/medical/virology) "bzR" = ( -/obj/structure/closet/l3closet, +/obj/structure/closet/l3closet/virology, /obj/effect/turf_decal/stripes/line{ dir = 9 }, @@ -29555,17 +29474,12 @@ /obj/structure/chair/stool, /turf/open/floor/plasteel, /area/engine/atmos) -"bAc" = ( -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/turf/closed/wall, -/area/chapel/office) "bAd" = ( /obj/machinery/door/airlock/public/glass{ name = "Chapel Office"; req_access_txt = "22" }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/dark, /area/chapel/office) "bAe" = ( @@ -29679,11 +29593,6 @@ "bAy" = ( /turf/open/floor/plasteel/chapel, /area/chapel/main) -"bAz" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/chair/stool, -/turf/open/floor/carpet, -/area/chapel/main) "bAA" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -30701,7 +30610,7 @@ /area/hydroponics/garden) "bCS" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 12 }, /obj/item/radio/intercom{ @@ -31082,6 +30991,10 @@ /obj/machinery/light/small{ dir = 1 }, +/obj/machinery/navbeacon/wayfinding{ + location = "Escape Pod 4"; + name = "navigation beacon (Escape Pod 4)" + }, /turf/open/floor/plating, /area/security/processing) "bDJ" = ( @@ -31875,9 +31788,7 @@ c_tag = "Atmospherics - Nitrous Oxide Tank"; network = list("ss13","Atmospherics") }, -/turf/open/floor/engine/n2o{ - initial_gas_mix = "n2o=1000;TEMP=293.15" - }, +/turf/open/floor/engine/n2o, /area/engine/atmos) "bFr" = ( /obj/structure/disposalpipe/segment{ @@ -32183,8 +32094,10 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ dir = 4 }, -/obj/structure/disposalpipe/segment, /obj/structure/cable, +/obj/structure/disposalpipe/junction/flip{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/port/aft) "bGi" = ( @@ -32220,7 +32133,7 @@ /area/security/courtroom) "bGp" = ( /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12 }, /turf/open/floor/plating, @@ -32342,12 +32255,12 @@ dir = 8 }, /obj/machinery/camera{ - c_tag = "Medical - Chemistry"; + c_tag = "Medical - Pharmacy"; dir = 1; network = list("ss13","Medical") }, /turf/open/floor/plasteel/white, -/area/medical/chemistry) +/area/medical/pharmacy) "bGH" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -33001,9 +32914,9 @@ /turf/open/floor/plasteel, /area/science/research) "bHU" = ( -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 +/obj/machinery/light_switch{ + pixel_x = 8; + pixel_y = -27 }, /turf/open/floor/holofloor/wood, /area/crew_quarters/heads/captain/private) @@ -33494,7 +33407,7 @@ /obj/machinery/ai_slipper, /obj/structure/cable, /turf/open/floor/plasteel/dark, -/area/ai_monitored/turret_protected/ai_upload) +/area/ai_monitored/turret_protected/ai_upload_foyer) "bJw" = ( /obj/machinery/door/poddoor/preopen{ id = "AI_Emergency_Lockdown_Left"; @@ -34039,9 +33952,6 @@ /area/hallway/primary/central) "bLe" = ( /obj/effect/landmark/start/cyborg, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/structure/cable, /obj/machinery/holopad/secure, /turf/open/floor/plasteel/grimy, @@ -34360,14 +34270,6 @@ /obj/effect/decal/cleanable/cobweb, /turf/open/floor/plating, /area/maintenance/port/aft) -"bLQ" = ( -/obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 2; - name = "2maintenance loot spawner" - }, -/turf/open/floor/plating, -/area/maintenance/port) "bLR" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/landmark/event_spawn, @@ -34517,11 +34419,6 @@ }, /turf/open/floor/plasteel, /area/quartermaster/office) -"bMn" = ( -/obj/structure/table/glass, -/obj/item/hatchet, -/turf/open/floor/plating, -/area/maintenance/port) "bMo" = ( /obj/structure/rack, /obj/item/clothing/mask/gas, @@ -35383,7 +35280,7 @@ /area/gateway) "bOM" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 12 }, /obj/structure/mirror{ @@ -35456,6 +35353,9 @@ dir = 4 }, /obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/port/aft) "bPe" = ( @@ -35467,6 +35367,9 @@ }, /obj/effect/turf_decal/stripes/line, /obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/port/aft) "bPf" = ( @@ -35488,6 +35391,9 @@ }, /obj/machinery/light/small, /obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/port/aft) "bPh" = ( @@ -36039,14 +35945,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard) -"bQQ" = ( -/obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 4; - name = "4maintenance loot spawner" - }, -/turf/open/floor/plating, -/area/maintenance/port) "bQR" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -36186,13 +36084,11 @@ /turf/open/floor/plating, /area/maintenance/port) "bRk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 +/obj/structure/closet/crate, +/obj/effect/spawner/lootdrop/maintenance{ + lootcount = 3; + name = "3maintenance loot spawner" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 4 - }, -/obj/structure/grille, /turf/open/floor/plating, /area/maintenance/port) "bRl" = ( @@ -36303,6 +36199,13 @@ network = list("ss13","Bar Area") }, /obj/item/toy/figure/chef, +/obj/machinery/power/apc{ + areastring = "/area/crew_quarters/kitchen"; + dir = 4; + name = "Kitchen APC"; + pixel_x = 24 + }, +/obj/structure/cable, /turf/open/floor/plasteel/cafeteria{ dir = 5 }, @@ -36594,9 +36497,7 @@ /area/maintenance/fore) "bSf" = ( /obj/machinery/light/small, -/turf/open/floor/engine/n2o{ - initial_gas_mix = "n2o=1000;TEMP=293.15" - }, +/turf/open/floor/engine/n2o, /area/engine/atmos) "bSh" = ( /obj/machinery/atmospherics/components/binary/pump, @@ -36978,7 +36879,7 @@ pixel_y = 25 }, /turf/open/floor/plasteel/white, -/area/medical/chemistry) +/area/medical/pharmacy) "bTf" = ( /obj/machinery/door/airlock/external{ name = "Labor Camp Shuttle Airlock"; @@ -37078,7 +36979,7 @@ /area/science/lab) "bTq" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/structure/mirror{ @@ -37195,12 +37096,6 @@ /obj/structure/closet/crate{ name = "Surplus Genetics Supplies" }, -/obj/item/book/manual/wiki/medical_cloning{ - pixel_y = 6 - }, -/obj/item/book/manual/wiki/medical_cloning{ - pixel_y = 6 - }, /obj/item/storage/box/rxglasses, /obj/item/storage/box/rxglasses, /turf/open/floor/plating, @@ -37303,14 +37198,6 @@ dir = 5 }, /area/science/research) -"bTS" = ( -/obj/structure/table/glass, -/obj/item/wirecutters, -/obj/item/flashlight/lamp{ - on = 0 - }, -/turf/open/floor/plating, -/area/maintenance/port) "bTT" = ( /obj/structure/closet/crate, /obj/effect/spawner/lootdrop/maintenance, @@ -37408,9 +37295,6 @@ /obj/structure/sign/warning/nosmoking{ pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/structure/cable, /turf/open/floor/plasteel/white, /area/science/mixing) @@ -37418,9 +37302,6 @@ /obj/machinery/airalarm/all_access{ pixel_y = 26 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /turf/open/floor/plasteel/white, /area/science/mixing) "bUg" = ( @@ -37438,18 +37319,12 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /turf/open/floor/plasteel/white, /area/science/mixing) "bUh" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /turf/open/floor/plasteel/white, /area/science/mixing) "bUi" = ( @@ -37463,9 +37338,6 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /turf/open/floor/plasteel/white, /area/science/mixing) "bUk" = ( @@ -37482,13 +37354,6 @@ /obj/machinery/atmospherics/pipe/simple/general/visible, /turf/open/floor/plasteel/white, /area/science/mixing) -"bUn" = ( -/obj/machinery/door/firedoor/heavy, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/science/mixing) "bUo" = ( /obj/effect/turf_decal/tile/green{ dir = 4 @@ -37534,7 +37399,6 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "bUu" = ( @@ -38027,10 +37891,16 @@ /turf/open/floor/plasteel/dark, /area/science/lab) "bVQ" = ( -/obj/structure/grille/broken, +/obj/machinery/power/apc{ + areastring = "/area/medical/chemistry"; + dir = 1; + name = "Chemistry APC"; + pixel_y = 23 + }, +/obj/structure/window/reinforced/spawner/east, /obj/structure/cable, -/turf/open/floor/plating, -/area/maintenance/port) +/turf/open/floor/plasteel/white, +/area/medical/chemistry) "bVR" = ( /obj/machinery/nanite_chamber, /turf/open/floor/plasteel/dark, @@ -38055,27 +37925,6 @@ /obj/effect/landmark/start/scientist, /turf/open/floor/plasteel/dark, /area/science/lab) -"bVX" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "5;12" - }, -/obj/effect/mapping_helpers/airlock/abandoned, -/obj/structure/cable, -/turf/open/floor/plating, -/area/maintenance/port) -"bWe" = ( -/obj/structure/closet/crate, -/obj/item/paicard, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 3; - name = "3maintenance loot spawner" - }, -/turf/open/floor/plating, -/area/maintenance/port/aft) -"bWl" = ( -/obj/item/clothing/head/cone, -/turf/open/floor/plating, -/area/maintenance/port/aft) "bWp" = ( /obj/effect/turf_decal/tile/bar{ dir = 1 @@ -38113,6 +37962,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 5 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/chapel/office) "bWu" = ( @@ -38124,22 +37976,29 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/chapel/office) "bWx" = ( -/obj/structure/extinguisher_cabinet{ - pixel_y = 28 - }, -/turf/open/floor/plating, -/area/maintenance/port/aft) +/obj/structure/disposalpipe/segment, +/turf/open/floor/plasteel/white, +/area/medical/chemistry) "bWy" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/maintenance/port/aft) +/obj/machinery/chem_master, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/medical/chemistry) "bWz" = ( -/obj/effect/decal/cleanable/dirt, -/turf/closed/wall, -/area/maintenance/port/aft) +/obj/machinery/chem_heater, +/turf/open/floor/plasteel/white, +/area/medical/chemistry) "bWA" = ( /obj/machinery/door/airlock/engineering{ name = "Gravity Generator"; @@ -38152,10 +38011,6 @@ /obj/structure/cable, /turf/open/floor/plasteel, /area/engine/gravity_generator) -"bWF" = ( -/obj/structure/reagent_dispensers/foamtank, -/turf/open/floor/plating, -/area/maintenance/port/aft) "bWK" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -38203,12 +38058,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel/dark, /area/chapel/office) -"bWR" = ( -/obj/structure/chair/stool, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, -/turf/open/floor/carpet, -/area/chapel/main) "bWS" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, @@ -38379,10 +38228,6 @@ /obj/effect/spawner/lootdrop/crate_spawner, /turf/open/floor/plating, /area/maintenance/port) -"bXA" = ( -/obj/effect/spawner/lootdrop/crate_spawner, -/turf/open/floor/plating, -/area/maintenance/port) "bXC" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -38428,12 +38273,6 @@ }, /turf/open/floor/plating, /area/maintenance/port) -"bXP" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/directional{ - dir = 8 - }, -/turf/open/floor/plating, -/area/maintenance/port) "bXQ" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance{ @@ -38443,21 +38282,6 @@ /obj/effect/spawner/lootdrop/minor/twentyfive_percent_cyborg_mask, /turf/open/floor/plating, /area/maintenance/port) -"bXR" = ( -/obj/structure/closet/cardboard, -/turf/open/floor/plating, -/area/maintenance/port/aft) -"bXS" = ( -/obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/structure/closet/crate{ - icon_state = "crateopen" - }, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 2; - name = "2maintenance loot spawner" - }, -/turf/open/floor/plating, -/area/maintenance/port/aft) "bXT" = ( /obj/effect/spawner/structure/window/hollow/reinforced/directional{ dir = 8 @@ -38490,6 +38314,9 @@ /obj/effect/turf_decal/stripes/white/corner{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, /turf/open/floor/plating, /area/maintenance/port/aft) "bXY" = ( @@ -38630,11 +38457,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/maintenance/port) -"bZk" = ( -/obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, -/turf/open/floor/plating, -/area/maintenance/port) "bZl" = ( /obj/structure/closet/crate, /obj/effect/spawner/lootdrop/maintenance{ @@ -38671,33 +38493,7 @@ /turf/open/floor/plating, /area/maintenance/department/security) "bZp" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 4 - }, -/obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 3; - name = "3maintenance loot spawner" - }, -/obj/structure/cable, -/turf/open/floor/plating, -/area/maintenance/port) -"bZq" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 4 - }, -/obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 3; - name = "3maintenance loot spawner" - }, -/obj/structure/cable, +/obj/structure/closet/secure_closet/medical1, /turf/open/floor/plating, /area/maintenance/port) "bZr" = ( @@ -38749,15 +38545,6 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/aft) -"bZx" = ( -/obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 3; - name = "3maintenance loot spawner" - }, -/obj/effect/decal/cleanable/cobweb, -/turf/open/floor/plating, -/area/maintenance/port) "bZA" = ( /obj/structure/window/reinforced{ dir = 4 @@ -38931,17 +38718,6 @@ /obj/machinery/vending/coffee, /turf/open/floor/plasteel, /area/hallway/primary/central) -"bZP" = ( -/obj/structure/girder, -/obj/effect/spawner/structure/window/hollow/directional{ - dir = 1 - }, -/turf/open/floor/plating, -/area/maintenance/port) -"bZQ" = ( -/obj/effect/landmark/event_spawn, -/turf/open/floor/plating, -/area/maintenance/port/aft) "bZS" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 4 @@ -39270,14 +39046,14 @@ /area/crew_quarters/heads/chief) "caN" = ( /obj/structure/table, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 6 }, /obj/item/flashlight/lamp, /obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 5 + }, /turf/open/floor/plasteel/dark, /area/security/brig) "caO" = ( @@ -39346,10 +39122,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/wood, /area/crew_quarters/theatre) -"caV" = ( -/obj/structure/chair/stool, -/turf/open/floor/plating, -/area/maintenance/port/aft) "caX" = ( /obj/machinery/computer/telecomms/monitor{ dir = 8 @@ -39361,16 +39133,15 @@ /area/tcommsat/computer) "caY" = ( /obj/machinery/computer/scan_consolenew, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue, /obj/structure/sign/departments/science{ pixel_y = 32 }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/medical/genetics) "caZ" = ( @@ -39577,7 +39348,7 @@ dir = 4 }, /turf/closed/wall, -/area/medical/genetics/cloning) +/area/medical/medbay/zone2) "cbJ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ dir = 4 @@ -39586,7 +39357,7 @@ dir = 4 }, /turf/open/floor/plasteel/white, -/area/medical/genetics/cloning) +/area/medical/medbay/zone2) "cbK" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 4 @@ -39596,7 +39367,7 @@ }, /obj/structure/cable, /turf/open/floor/plasteel/white, -/area/medical/genetics/cloning) +/area/medical/medbay/zone2) "cbL" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 4 @@ -39606,7 +39377,7 @@ }, /obj/structure/cable, /turf/open/floor/plasteel/white, -/area/medical/genetics/cloning) +/area/medical/medbay/zone2) "cbM" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 4 @@ -39674,7 +39445,7 @@ pixel_y = -32 }, /turf/open/floor/plasteel/white, -/area/medical/genetics/cloning) +/area/medical/medbay/zone2) "cbS" = ( /obj/structure/closet/wardrobe/white, /obj/structure/disposalpipe/segment{ @@ -39684,7 +39455,7 @@ dir = 8 }, /turf/open/floor/plasteel/white, -/area/medical/genetics/cloning) +/area/medical/medbay/zone2) "cbT" = ( /obj/machinery/door/airlock/maintenance{ req_one_access_txt = "12;22;25;26;28;35;37;38;46" @@ -40336,22 +40107,14 @@ /turf/open/floor/plasteel/dark, /area/tcommsat/server) "cdL" = ( -/turf/open/floor/engine/n2{ - initial_gas_mix = "n2=1000;TEMP=293.15" - }, +/turf/open/floor/engine/n2, /area/engine/atmos) "cdM" = ( -/obj/machinery/atmospherics/miner/nitrogen{ - max_ext_kpa = 2500 - }, -/turf/open/floor/engine/n2{ - initial_gas_mix = "n2=1000;TEMP=293.15" - }, +/obj/machinery/portable_atmospherics/canister/nitrogen, +/turf/open/floor/engine/n2, /area/engine/atmos) "cdN" = ( -/turf/open/floor/engine/o2{ - initial_gas_mix = "o2=1000;TEMP=293.15" - }, +/turf/open/floor/engine/o2, /area/engine/atmos) "cdP" = ( /obj/effect/turf_decal/tile/yellow{ @@ -40468,7 +40231,7 @@ /area/maintenance/port/fore) "ceh" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 12 }, /turf/open/floor/plating, @@ -40505,11 +40268,20 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/nuke_storage) "cep" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "5;12" +/obj/effect/turf_decal/trimline/yellow/filled/corner{ + dir = 1 }, -/turf/open/floor/plating, -/area/maintenance/port) +/obj/effect/turf_decal/trimline/yellow/filled/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/medical/chemistry) "ceq" = ( /obj/machinery/door/airlock/maintenance{ req_one_access_txt = "12" @@ -40751,12 +40523,8 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "ceK" = ( -/obj/machinery/atmospherics/miner/oxygen{ - max_ext_kpa = 2500 - }, -/turf/open/floor/engine/o2{ - initial_gas_mix = "o2=1000;TEMP=293.15" - }, +/obj/machinery/portable_atmospherics/canister/oxygen, +/turf/open/floor/engine/o2, /area/engine/atmos) "ceL" = ( /obj/machinery/light/small, @@ -40765,9 +40533,7 @@ dir = 1; network = list("ss13","Atmospherics") }, -/turf/open/floor/engine/n2{ - initial_gas_mix = "n2=1000;TEMP=293.15" - }, +/turf/open/floor/engine/n2, /area/engine/atmos) "ceM" = ( /obj/machinery/light/small, @@ -40776,9 +40542,7 @@ dir = 1; network = list("ss13","Atmospherics") }, -/turf/open/floor/engine/o2{ - initial_gas_mix = "o2=1000;TEMP=293.15" - }, +/turf/open/floor/engine/o2, /area/engine/atmos) "ceS" = ( /obj/effect/turf_decal/stripes/line{ @@ -40825,6 +40589,16 @@ }, /turf/open/floor/plasteel, /area/engine/engineering) +"cgG" = ( +/obj/effect/landmark/start/chemist, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 5 + }, +/turf/open/floor/plasteel/white, +/area/medical/chemistry) "cgH" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 1; @@ -40848,6 +40622,9 @@ }, /obj/structure/table, /obj/item/storage/box/cups, +/obj/machinery/pinpointer_dispenser{ + pixel_y = 32 + }, /turf/open/floor/plasteel, /area/crew_quarters/fitness) "cla" = ( @@ -40870,6 +40647,10 @@ /obj/structure/table/wood, /turf/open/floor/plating, /area/library/abandoned) +"coN" = ( +/obj/machinery/rnd/experimentor, +/turf/open/floor/engine, +/area/science/explab) "cpK" = ( /obj/machinery/door/airlock/public/glass, /obj/effect/turf_decal/delivery, @@ -40940,6 +40721,14 @@ }, /turf/open/floor/plating, /area/security/prison) +"cxu" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plasteel/chapel{ + dir = 4 + }, +/area/chapel/office) "cxK" = ( /obj/machinery/atmospherics/pipe/simple/green/visible{ dir = 4 @@ -40949,6 +40738,16 @@ }, /turf/open/floor/plasteel, /area/engine/engine_room) +"czs" = ( +/obj/structure/window/reinforced/spawner/east, +/obj/effect/turf_decal/trimline/yellow/filled/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/medical/chemistry) "czB" = ( /obj/item/crowbar, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -40987,6 +40786,19 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/heads/chief) +"cCS" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/machinery/power/apc{ + areastring = "/area/medical/medbay/central"; + dir = 1; + name = "Medical Main APC"; + pixel_y = 23 + }, +/obj/structure/cable, +/turf/open/floor/plasteel/white, +/area/medical/medbay/central) "cDf" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -41001,6 +40813,9 @@ }, /turf/open/floor/plasteel, /area/engine/engineering) +"cFG" = ( +/turf/open/floor/engine/air, +/area/engine/atmos) "cGH" = ( /obj/structure/girder, /obj/structure/grille/broken, @@ -41018,6 +40833,9 @@ }, /obj/structure/cable, /obj/structure/grille/broken, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/port/aft) "cLX" = ( @@ -41246,12 +41064,6 @@ }, /turf/open/floor/plasteel/dark, /area/ai_monitored/nuke_storage) -"dhm" = ( -/obj/structure/table/glass, -/obj/item/screwdriver, -/obj/item/weldingtool/mini, -/turf/open/floor/plating, -/area/maintenance/port) "dhq" = ( /obj/machinery/portable_atmospherics/scrubber, /obj/effect/turf_decal/bot, @@ -41331,11 +41143,6 @@ /obj/structure/lattice, /turf/open/space/basic, /area/space/nearstation) -"dom" = ( -/obj/structure/table, -/obj/item/storage/toolbox/electrical, -/turf/open/floor/plating, -/area/maintenance/port/aft) "dpg" = ( /obj/machinery/suit_storage_unit/open, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ @@ -41347,19 +41154,17 @@ }, /turf/open/floor/plasteel/dark, /area/engine/engine_room/external) -"dpq" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/cable, -/obj/structure/cable, -/turf/open/floor/plating, -/area/maintenance/port) "dpT" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/junction{ dir = 4 }, /turf/closed/wall/r_wall, /area/engine/engine_room) +"drK" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3, +/obj/effect/landmark/start/chemist, +/turf/open/floor/plasteel/white, +/area/medical/pharmacy) "dtB" = ( /obj/item/trash/can, /turf/open/floor/plating, @@ -41667,11 +41472,6 @@ /obj/structure/cable, /turf/open/floor/plasteel, /area/security/main) -"eet" = ( -/obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/machinery/space_heater, -/turf/open/floor/plating, -/area/maintenance/port) "eeA" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small{ @@ -41728,6 +41528,19 @@ }, /turf/open/floor/plasteel/dark, /area/engine/engine_room/external) +"enT" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/navbeacon/wayfinding{ + location = "Dorms"; + name = "navigation beacon (Dorms)" + }, +/turf/open/floor/plasteel/cafeteria, +/area/crew_quarters/fitness/recreation) "eot" = ( /obj/machinery/atmospherics/components/unary/portables_connector{ dir = 4 @@ -41793,6 +41606,9 @@ /area/maintenance/aft) "eqR" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/plasteel/chapel{ dir = 4 }, @@ -41817,6 +41633,11 @@ "esU" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple, /obj/structure/closet/secure_closet/freezer/fridge, +/obj/machinery/camera{ + c_tag = "Service - Kitchen Coldroom"; + dir = 8; + network = list("ss13","Bar Area") + }, /turf/open/floor/plasteel/kitchen_coldroom/freezerfloor, /area/crew_quarters/kitchen/coldroom) "etL" = ( @@ -41998,14 +41819,17 @@ /turf/open/floor/wood, /area/crew_quarters/bar) "eMB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 5 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 }, /obj/structure/cable, -/obj/item/trash/sosjerky, +/obj/machinery/door/airlock/maintenance{ + name = "Chemistry Pipe Airlock"; + req_one_access_txt = "5;12" + }, /turf/open/floor/plating, /area/maintenance/port) "eNp" = ( @@ -42127,16 +41951,36 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) -"eWS" = ( -/obj/structure/rack, -/obj/item/clothing/suit/hazardvest, -/obj/item/clothing/suit/hazardvest, -/obj/item/storage/belt/utility, -/obj/item/storage/belt/utility, -/obj/item/airlock_painter, -/obj/item/airlock_painter, +"eXk" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/port/aft) +"eXs" = ( +/obj/machinery/disposal/bin, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/airalarm{ + dir = 4; + pixel_x = -23 + }, +/turf/open/floor/plasteel/white, +/area/medical/chemistry) "eXR" = ( /obj/structure/closet/secure_closet/hop, /obj/machinery/light/small{ @@ -42151,10 +41995,6 @@ }, /turf/open/floor/carpet, /area/crew_quarters/heads/hop) -"eZh" = ( -/obj/structure/closet, -/turf/open/floor/plating, -/area/maintenance/port) "eZi" = ( /obj/machinery/power/apc{ areastring = "/area/security/warden"; @@ -42335,6 +42175,10 @@ "fmV" = ( /turf/closed/wall, /area/ai_monitored/turret_protected/ai) +"foN" = ( +/obj/machinery/light, +/turf/open/floor/plasteel/white, +/area/medical/chemistry) "fpA" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 9 @@ -42365,16 +42209,24 @@ /turf/open/floor/wood, /area/library/abandoned) "fst" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/turf/open/floor/plating, -/area/maintenance/port/aft) +/obj/structure/chair/office/light{ + dir = 8 + }, +/obj/effect/landmark/start/chemist, +/turf/open/floor/plasteel/white, +/area/medical/chemistry) "ftT" = ( /obj/effect/turf_decal/tile/red{ dir = 1 }, /turf/open/floor/plasteel, /area/security/prison) +"fva" = ( +/obj/machinery/airalarm{ + pixel_y = 25 + }, +/turf/open/floor/plasteel/white, +/area/medical/chemistry) "fvY" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -42494,6 +42346,13 @@ /obj/effect/turf_decal/tile/blue, /turf/open/floor/plasteel/white, /area/medical/medbay/central) +"fCi" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/plasteel/kitchen_coldroom/freezerfloor, +/area/crew_quarters/kitchen/coldroom) "fED" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 4 @@ -42518,6 +42377,17 @@ }, /turf/open/floor/plating, /area/engine/engineering) +"fKy" = ( +/obj/structure/closet/secure_closet/medical2, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/medical/surgery/room_b) "fLg" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/bookcase/random/adult, @@ -42772,6 +42642,10 @@ name = "Genetics Requests Console"; pixel_x = -30 }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel/white, /area/medical/genetics) "grn" = ( @@ -42938,7 +42812,6 @@ dir = 4 }, /obj/structure/cable, -/obj/structure/cable, /turf/open/floor/plasteel, /area/quartermaster/office) "gNl" = ( @@ -42961,6 +42834,25 @@ /obj/structure/cable, /turf/open/floor/plasteel, /area/engine/engine_room) +"gRo" = ( +/obj/machinery/power/apc{ + areastring = "/area/maintenance/port"; + dir = 8; + name = "Port Maintenance APC"; + pixel_x = -24 + }, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/end{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 5 + }, +/turf/open/floor/plating, +/area/maintenance/port) "gSW" = ( /turf/open/floor/plasteel/white/side{ dir = 6 @@ -42969,21 +42861,15 @@ "gTd" = ( /obj/machinery/power/terminal, /obj/effect/decal/cleanable/dirt, +/obj/structure/cable, /turf/open/floor/plating, /area/construction) "gTn" = ( -/obj/effect/landmark/blobstart, -/turf/open/floor/plating, -/area/maintenance/port/aft) -"gVy" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/bottle/gin, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ - pixel_x = 6; - pixel_y = 6 +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 10 }, -/turf/open/floor/wood, -/area/maintenance/starboard) +/turf/open/floor/plasteel/white, +/area/medical/chemistry) "gVB" = ( /obj/machinery/computer/med_data, /obj/machinery/power/apc{ @@ -43161,6 +43047,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/maintenance/aft) +"hrr" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 4; + name = "Canister to Burn" + }, +/turf/open/floor/plasteel, +/area/maintenance/disposal/incinerator) "hrD" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 4 @@ -43175,6 +43069,14 @@ /obj/structure/cable, /turf/open/floor/plasteel, /area/engine/engineering) +"hrX" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/machinery/navbeacon/wayfinding{ + location = "Courtroom"; + name = "navigation beacon (Courtroom)" + }, +/turf/open/floor/plasteel/dark, +/area/security/courtroom) "hrY" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -43185,6 +43087,9 @@ /obj/effect/turf_decal/tile/blue, /turf/open/floor/plasteel/white, /area/medical/medbay/central) +"hsn" = ( +/turf/open/floor/plasteel/white, +/area/medical/pharmacy) "htF" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ @@ -43377,6 +43282,13 @@ /obj/structure/cable, /turf/open/floor/plasteel, /area/hallway/primary/central) +"hOE" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/gateway) "hOK" = ( /obj/structure/falsewall{ name = "suspicious wall" @@ -43497,7 +43409,7 @@ /obj/machinery/power/apc{ areastring = "/area/crew_quarters/kitchen/coldroom"; dir = 1; - name = "Kitchen APC"; + name = "Coldroom APC"; pixel_y = 24 }, /obj/structure/cable, @@ -43723,6 +43635,10 @@ /obj/structure/cable, /turf/open/floor/plating, /area/maintenance/department/security) +"isH" = ( +/obj/machinery/igniter/incinerator_toxmix, +/turf/open/floor/engine/vacuum, +/area/science/mixing) "itU" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ dir = 1 @@ -43775,6 +43691,14 @@ /obj/item/trash/raisins, /turf/open/floor/plating, /area/maintenance/port) +"iGu" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/navbeacon/wayfinding{ + location = "Head of Personnel's Office"; + name = "navigation beacon (Head of Personnel's Office)" + }, +/turf/open/floor/plasteel, +/area/crew_quarters/heads/hop) "iGD" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -43829,13 +43753,43 @@ /turf/open/floor/plasteel, /area/engine/engine_room) "iJO" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "5;12" +/obj/effect/turf_decal/tile/yellow{ + dir = 1 }, -/obj/effect/mapping_helpers/airlock/abandoned, -/obj/structure/barricade/wooden/crude, -/turf/open/floor/plating, -/area/maintenance/port) +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/structure/rack, +/obj/item/stack/ducts/fifty, +/obj/item/stack/ducts/fifty{ + pixel_x = 2; + pixel_y = 3 + }, +/obj/item/stack/ducts/fifty{ + pixel_x = -2; + pixel_y = -3 + }, +/obj/item/stack/ducts/fifty{ + pixel_x = 3; + pixel_y = 4 + }, +/obj/item/stack/ducts/fifty{ + pixel_x = 5; + pixel_y = 4 + }, +/obj/item/stack/ducts/fifty{ + pixel_x = 2; + pixel_y = 1 + }, +/obj/item/hand_labeler, +/turf/open/floor/plasteel/white, +/area/medical/chemistry) +"iLi" = ( +/obj/structure/chair/pew{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/chapel/main) "iLj" = ( /obj/structure/table, /obj/effect/turf_decal/tile/brown{ @@ -43940,6 +43894,12 @@ /obj/structure/cable, /turf/open/floor/plasteel, /area/engine/engine_room) +"iZQ" = ( +/obj/structure/window/reinforced/spawner/east, +/obj/effect/turf_decal/trimline/yellow/filled/corner, +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/turf/open/floor/plasteel/white, +/area/medical/chemistry) "jaf" = ( /obj/structure/table/wood, /obj/item/storage/photo_album/Captain, @@ -44038,6 +43998,10 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ dir = 8 }, +/obj/machinery/navbeacon/wayfinding{ + location = "Cargo"; + name = "navigation beacon (Cargo)" + }, /turf/open/floor/plasteel, /area/quartermaster/office) "joc" = ( @@ -44057,6 +44021,9 @@ /obj/effect/turf_decal/stripes/white/corner{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/port/aft) "jpL" = ( @@ -44227,6 +44194,19 @@ icon_state = "wood-broken7" }, /area/maintenance/starboard) +"jDi" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 5 + }, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/plating, +/area/maintenance/port/aft) "jGx" = ( /obj/structure/table, /obj/structure/window/reinforced{ @@ -44290,13 +44270,6 @@ }, /turf/open/floor/wood, /area/lawoffice) -"jJa" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/plating, -/area/maintenance/port) "jJz" = ( /obj/machinery/photocopier, /obj/item/radio/intercom{ @@ -44330,6 +44303,14 @@ /obj/structure/cable, /turf/open/floor/plasteel, /area/engine/engine_room) +"jMY" = ( +/obj/machinery/door/firedoor, +/obj/machinery/navbeacon/wayfinding{ + location = "Arrivals and Escape Bay"; + name = "navigation beacon (Arrivals and Escape Bay)" + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/exit/departure_lounge) "jNM" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -44379,6 +44360,16 @@ }, /turf/open/floor/plating, /area/maintenance/port/fore) +"jUj" = ( +/obj/machinery/door/airlock/medical/glass{ + name = "Chemfactory"; + req_access_txt = "5; 69" + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/turf/open/floor/plasteel/white, +/area/medical/chemistry) "jVA" = ( /obj/structure/closet/secure_closet/engineering_welding, /turf/open/floor/plasteel, @@ -44403,6 +44394,9 @@ /obj/effect/turf_decal/stripes/white/corner{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/port/aft) "jZv" = ( @@ -44438,14 +44432,14 @@ /area/engine/engine_room) "kcl" = ( /obj/machinery/power/apc{ - areastring = "/area/medical/chemistry"; + areastring = "/area/medical/pharmacy"; dir = 8; - name = "Chemistry APC"; + name = "Pharmacy APC"; pixel_x = -25 }, /obj/structure/cable, /turf/open/floor/plasteel/white, -/area/medical/chemistry) +/area/medical/pharmacy) "kdL" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -44465,6 +44459,14 @@ /obj/structure/cable, /turf/open/floor/plasteel, /area/hallway/primary/central) +"kdV" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plasteel/chapel{ + dir = 1 + }, +/area/chapel/office) "kfP" = ( /obj/effect/landmark/carpspawn, /obj/structure/lattice, @@ -44621,9 +44623,8 @@ /turf/open/floor/plating, /area/crew_quarters/heads/chief) "kAU" = ( -/obj/machinery/power/emitter/anchored{ - dir = 8; - state = 2 +/obj/machinery/power/emitter/welded{ + dir = 8 }, /obj/machinery/camera{ c_tag = "Engine -Emitters Right"; @@ -44719,6 +44720,13 @@ /obj/structure/cable, /turf/open/floor/plasteel/dark, /area/gateway) +"kPF" = ( +/obj/machinery/navbeacon/wayfinding{ + location = "Escape Pod 1"; + name = "navigation beacon (Escape Pod 1)" + }, +/turf/open/floor/plating, +/area/maintenance/port/fore) "kRo" = ( /obj/machinery/camera/motion{ c_tag = "Secure - AI Core North"; @@ -44767,6 +44775,15 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) +"lag" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/navbeacon/wayfinding{ + location = "Tool Storage"; + name = "navigation beacon (Tool Storage)" + }, +/turf/open/floor/plasteel, +/area/storage/tools) "lbq" = ( /obj/machinery/door/window/southright{ name = "AI Access"; @@ -44873,10 +44890,18 @@ /area/hallway/primary/central) "ltA" = ( /obj/structure/chair/stool, +/obj/effect/decal/cleanable/vomit/old, /turf/open/floor/wood{ icon_state = "wood-broken4" }, /area/maintenance/starboard) +"lwj" = ( +/obj/machinery/navbeacon/wayfinding{ + location = "Custodial Closet"; + name = "navigation beacon (Custodial Closet)" + }, +/turf/open/floor/plasteel, +/area/janitor) "lwp" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 10 @@ -44959,6 +44984,16 @@ /obj/item/storage/belt/utility, /turf/open/floor/plating, /area/maintenance/aft) +"lBB" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/medical/genetics) "lEt" = ( /obj/machinery/atmospherics/pipe/manifold/cyan/visible{ dir = 4 @@ -45047,6 +45082,15 @@ }, /turf/open/floor/plating, /area/maintenance/port/fore) +"lNn" = ( +/obj/effect/turf_decal/trimline/yellow/filled/corner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/yellow/filled/corner{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/medical/chemistry) "lNw" = ( /obj/machinery/airalarm{ dir = 4; @@ -45090,6 +45134,13 @@ /obj/structure/window/reinforced, /turf/open/space/basic, /area/space/nearstation) +"miq" = ( +/obj/machinery/navbeacon/wayfinding{ + location = "Security"; + name = "navigation beacon (Security)" + }, +/turf/open/floor/plasteel, +/area/security/brig) "miv" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, /obj/structure/cable, @@ -45244,10 +45295,20 @@ /obj/effect/turf_decal/stripes/end, /turf/open/floor/plating, /area/maintenance/starboard) -"mvm" = ( -/obj/machinery/holopad, -/turf/open/floor/carpet, -/area/chapel/main) +"mtz" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/camera{ + c_tag = "Medical - Surgery B"; + dir = 4; + network = list("ss13","Medical") + }, +/turf/open/floor/plasteel/white, +/area/medical/surgery/room_b) "mvv" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -45299,6 +45360,10 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) +"mAm" = ( +/obj/machinery/pinpointer_dispenser, +/turf/closed/wall, +/area/security/checkpoint) "mBI" = ( /obj/structure/window/reinforced{ dir = 8 @@ -45326,6 +45391,15 @@ /obj/structure/cable, /turf/open/floor/plating, /area/maintenance/port/fore) +"mEw" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/plasteel/dark, +/area/chapel/office) "mFt" = ( /obj/structure/cable, /obj/effect/decal/cleanable/dirt, @@ -45370,13 +45444,18 @@ /turf/open/floor/plasteel, /area/engine/engineering) "mHo" = ( -/obj/machinery/power/emitter/anchored{ - dir = 8; - state = 2 +/obj/machinery/power/emitter/welded{ + dir = 8 }, /obj/structure/cable, /turf/open/floor/plating, /area/engine/engine_room) +"mHy" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/turf/open/floor/plasteel/white, +/area/medical/chemistry) "mHS" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 4 @@ -45461,6 +45540,12 @@ }, /turf/open/floor/plasteel, /area/security/processing) +"mUi" = ( +/obj/structure/extinguisher_cabinet{ + pixel_y = -28 + }, +/turf/open/floor/plasteel/white, +/area/medical/chemistry) "mUn" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -45526,6 +45611,25 @@ }, /turf/open/floor/engine, /area/engine/supermatter) +"mYC" = ( +/obj/effect/turf_decal/trimline/yellow/filled/corner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/yellow/filled/corner, +/obj/machinery/door/window/eastright{ + name = "Chemfactory Floor Access"; + req_access_txt = "69" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/turf/open/floor/plasteel/white, +/area/medical/chemistry) +"mZj" = ( +/obj/effect/spawner/structure/window, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/hydroponics) "naE" = ( /obj/machinery/power/apc{ areastring = "/area/security/brig"; @@ -45680,13 +45784,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/maintenance/aft) -"nvs" = ( -/obj/structure/closet/crate, -/obj/item/stack/sheet/glass/fifty, -/obj/item/stack/sheet/metal/twenty, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/turf/open/floor/plating, -/area/maintenance/port/aft) "nwZ" = ( /obj/structure/table, /obj/machinery/cell_charger, @@ -45718,6 +45815,20 @@ }, /turf/open/floor/plasteel/dark, /area/engine/engine_room) +"nzB" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/navbeacon/wayfinding{ + location = "Vault"; + name = "navigation beacon (Vault)" + }, +/turf/open/floor/circuit, +/area/ai_monitored/nuke_storage) "nBy" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -45808,6 +45919,24 @@ /obj/structure/cable, /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/chief) +"nFy" = ( +/obj/structure/window/reinforced/spawner/east, +/obj/effect/turf_decal/trimline/yellow/filled/corner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/yellow/filled/corner, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/structure/table/glass, +/obj/machinery/reagentgrinder, +/obj/item/stack/sheet/mineral/plasma{ + pixel_y = 10 + }, +/obj/item/reagent_containers/glass/beaker/large, +/turf/open/floor/plasteel/white, +/area/medical/chemistry) "nHE" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -45833,10 +45962,27 @@ /obj/structure/cable, /turf/open/floor/plasteel, /area/engine/engine_room) +"nIH" = ( +/obj/machinery/vending/wardrobe/chem_wardrobe, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/machinery/camera{ + c_tag = "Medical - Chemfactory West"; + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/medical/chemistry) "nJq" = ( /obj/machinery/camera{ c_tag = "Civilian - Chapel Main 2" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel/chapel{ dir = 1 }, @@ -45917,6 +46063,13 @@ /obj/item/analyzer, /turf/open/floor/plasteel, /area/engine/engine_room) +"nQY" = ( +/obj/machinery/navbeacon/wayfinding{ + location = "Escape Pod 3"; + name = "navigation beacon (Escape Pod 3)" + }, +/turf/open/floor/plating, +/area/maintenance/starboard) "nRb" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/junction{ dir = 1 @@ -45924,6 +46077,7 @@ /obj/machinery/light/small{ dir = 8 }, +/obj/structure/cable, /turf/open/floor/plasteel/kitchen_coldroom/freezerfloor, /area/crew_quarters/kitchen/coldroom) "nSn" = ( @@ -46118,6 +46272,17 @@ /obj/structure/cable, /turf/open/floor/plating, /area/maintenance/department/engine) +"ops" = ( +/obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/obj/machinery/navbeacon/wayfinding{ + location = "Hydroponics"; + name = "navigation beacon (Hydroponics)" + }, +/turf/open/floor/plasteel, +/area/hydroponics) "oqk" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump/layer1{ @@ -46168,6 +46333,13 @@ /obj/item/clipboard, /turf/open/floor/plasteel, /area/crew_quarters/fitness) +"ovv" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/port/aft) "ovO" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -46296,12 +46468,12 @@ /turf/open/floor/engine, /area/engine/engine_room/external) "oCS" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/directional{ - dir = 1 +/obj/machinery/camera{ + c_tag = "Medical - Chemfactory East"; + dir = 8 }, -/obj/structure/girder, -/turf/open/floor/plating, -/area/maintenance/port/aft) +/turf/open/floor/plasteel/white, +/area/medical/chemistry) "oDl" = ( /obj/machinery/door/window/westright{ name = "Supermatter External Access"; @@ -46362,9 +46534,9 @@ /turf/open/floor/plating/airless, /area/maintenance/disposal/incinerator) "oIp" = ( -/obj/machinery/computer/arcade/battle, -/turf/open/floor/wood{ - icon_state = "wood-broken6" +/obj/structure/frame/machine, +/turf/open/floor/plating{ + icon_state = "panelscorched" }, /area/maintenance/starboard) "oIG" = ( @@ -46377,6 +46549,21 @@ /obj/item/grown/bananapeel, /turf/open/floor/wood, /area/maintenance/port/aft) +"oIO" = ( +/obj/effect/turf_decal/trimline/yellow/filled/corner, +/obj/effect/turf_decal/trimline/yellow/filled/corner{ + dir = 4 + }, +/obj/machinery/door/window/eastleft{ + name = "Chemfactory Floor Access"; + req_access_txt = "69" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/medical/chemistry) "oJi" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -46397,6 +46584,10 @@ /obj/structure/cable, /turf/open/floor/plasteel, /area/security/processing) +"oLR" = ( +/obj/effect/landmark/start/geneticist, +/turf/open/floor/plasteel/white, +/area/medical/genetics) "oMf" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/components/binary/pump{ @@ -46405,14 +46596,24 @@ }, /turf/open/floor/plasteel, /area/engine/engine_room) +"oMq" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/structure/cable, +/obj/item/radio/intercom{ + pixel_y = 24 + }, +/turf/open/floor/plasteel, +/area/engine/engineering) "oMw" = ( /obj/machinery/camera{ c_tag = "Research - Toxins Main 2"; network = list("ss13","Research") }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 - }, /obj/item/radio/intercom{ pixel_y = 29 }, @@ -46447,6 +46648,15 @@ dir = 6 }, /area/science/research) +"oSB" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/navbeacon/wayfinding{ + location = "AI Minisat Access"; + name = "navigation beacon (AI Minisat Access)" + }, +/turf/open/floor/plating, +/area/maintenance/aft) "oTR" = ( /obj/structure/sign/poster/official/state_laws{ pixel_y = -32 @@ -46514,18 +46724,14 @@ /obj/effect/turf_decal/stripes/end, /turf/open/floor/plating, /area/maintenance/port) -"peq" = ( -/obj/item/chair, -/obj/item/chair{ - pixel_x = 2; - pixel_y = 2 +"pdg" = ( +/obj/effect/turf_decal/tile/blue, +/obj/machinery/camera{ + c_tag = "Medical - Chemfactory Airlock"; + dir = 8 }, -/obj/item/chair{ - pixel_x = 4; - pixel_y = 4 - }, -/turf/open/floor/plating, -/area/maintenance/port/aft) +/turf/open/floor/plasteel/white, +/area/medical/medbay/central) "pfT" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -46773,6 +46979,12 @@ }, /turf/closed/wall/r_wall, /area/engine/supermatter) +"pyx" = ( +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/plasteel/white, +/area/medical/chemistry) "pyT" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -46785,6 +46997,22 @@ "pBI" = ( /turf/open/floor/plasteel/kitchen_coldroom/freezerfloor, /area/crew_quarters/kitchen/coldroom) +"pEE" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue, +/obj/effect/landmark/start/paramedic, +/turf/open/floor/plasteel/white, +/area/medical/medbay/central) +"pGv" = ( +/obj/structure/window/reinforced/spawner/east, +/obj/structure/closet/secure_closet/chemical, +/turf/open/floor/plasteel/white, +/area/medical/chemistry) "pGM" = ( /obj/structure/sign/poster/contraband/random{ pixel_x = 32 @@ -46815,10 +47043,19 @@ }, /turf/open/floor/plating, /area/maintenance/fore) +"pLH" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 5 + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/maintenance/port) "pLI" = ( -/obj/machinery/power/emitter/anchored{ - dir = 4; - state = 2 +/obj/machinery/power/emitter/welded{ + dir = 4 }, /obj/structure/cable, /turf/open/floor/plating, @@ -46874,6 +47111,18 @@ }, /turf/open/floor/plating, /area/maintenance/department/security) +"pOE" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/sign/departments/chemistry{ + pixel_y = -32 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/central) "pOU" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -46918,16 +47167,27 @@ /turf/open/floor/plasteel, /area/engine/engine_room) "pTq" = ( -/obj/machinery/power/apc{ - areastring = "/area/medical/medbay/central"; - dir = 1; - name = "Medical Main APC"; - pixel_y = 23 +/obj/effect/turf_decal/tile/blue{ + dir = 4 }, -/obj/structure/cable, -/obj/effect/turf_decal/stripes/end, -/turf/open/floor/plating, -/area/maintenance/port) +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/central) +"pVz" = ( +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/effect/turf_decal/tile/bar, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/structure/disposalpipe/segment, +/obj/machinery/navbeacon/wayfinding{ + location = "Bar & Kitchen"; + name = "navigation beacon (Bar & Kitchen)" + }, +/turf/open/floor/plasteel, +/area/crew_quarters/bar) "pWc" = ( /obj/machinery/camera/motion{ c_tag = "Secure - Captain's Office External"; @@ -46945,6 +47205,11 @@ /obj/item/paicard, /turf/open/floor/plating, /area/maintenance/aft) +"pXq" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/holopad, +/turf/open/floor/carpet, +/area/chapel/main) "pXP" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -46954,8 +47219,7 @@ "pYp" = ( /obj/structure/table, /obj/machinery/power/apc{ - areastring = "/area/medical/genetics/cloning"; - name = "Cloning Bay APC"; + name = "Corpse Disposal APC"; pixel_y = -23 }, /obj/structure/window/reinforced{ @@ -46967,7 +47231,7 @@ name = "Why can't I hold all these corpses? - Proper Corpse Disposal 101" }, /turf/open/floor/plasteel/white, -/area/medical/genetics/cloning) +/area/medical/medbay/zone2) "pZA" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 5 @@ -46986,10 +47250,33 @@ /obj/structure/cable, /turf/open/floor/circuit/green, /area/engine/supermatter) +"qfm" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/medical/chemistry) "qfz" = ( /obj/machinery/pipedispenser, /turf/open/floor/plating, /area/maintenance/aft) +"qfG" = ( +/obj/machinery/navbeacon/wayfinding{ + location = "Escape Pod 2"; + name = "navigation beacon (Escape Pod 2)" + }, +/turf/open/floor/plating, +/area/maintenance/aft) +"qgT" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/plasteel/white, +/area/medical/medbay/central) "qkE" = ( /obj/machinery/power/smes/engineering, /obj/machinery/light{ @@ -47005,10 +47292,6 @@ /obj/structure/rack, /obj/item/poster/random_contraband, /obj/item/poster/random_contraband, -/obj/item/poster/random_contraband, -/obj/item/poster/random_contraband, -/obj/item/poster/random_contraband, -/obj/item/poster/random_contraband, /obj/item/instrument/saxophone, /obj/structure/sign/poster/contraband/random{ pixel_y = 32 @@ -47033,11 +47316,6 @@ /obj/structure/cable, /turf/open/floor/plasteel, /area/hallway/primary/central) -"qmL" = ( -/obj/structure/table, -/obj/item/flashlight/lamp/green, -/turf/open/floor/plating, -/area/maintenance/port/aft) "qoF" = ( /obj/structure/closet/crate/bin, /obj/effect/turf_decal/stripes/line{ @@ -47133,6 +47411,14 @@ }, /turf/open/floor/plasteel, /area/storage/tools) +"qxm" = ( +/obj/item/reagent_containers/food/drinks/bottle/whiskey{ + desc = "A premium single-malt whiskey, gently matured inside the tunnels of a nuclear shelter. You like the feel of it in your hand."; + list_reagents = list(/datum/reagent/consumable/ethanol/whiskey = 31); + name = "Kepler's special reserve" + }, +/turf/open/space/basic, +/area/space) "qxz" = ( /obj/effect/turf_decal/stripes/line, /obj/item/twohanded/required/kirbyplants/random, @@ -47179,12 +47465,21 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 6 }, +/obj/structure/cable, /turf/open/floor/plasteel/kitchen_coldroom/freezerfloor, /area/crew_quarters/kitchen/coldroom) "qyK" = ( /obj/structure/cable, /turf/open/floor/plasteel, /area/crew_quarters/fitness/recreation) +"qzW" = ( +/obj/machinery/light, +/obj/effect/turf_decal/tile/yellow, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/medical/chemistry) "qBm" = ( /obj/structure/table, /obj/item/stack/cable_coil{ @@ -47268,6 +47563,9 @@ /obj/effect/turf_decal/stripes/white/line{ dir = 10 }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, /turf/open/floor/plating, /area/maintenance/port/aft) "qLw" = ( @@ -47416,14 +47714,7 @@ /turf/open/floor/plasteel, /area/storage/tools) "rck" = ( -/obj/machinery/power/apc{ - areastring = "/area/maintenance/port/aft"; - dir = 1; - name = "Port Aft Maintenance APC"; - pixel_y = 24 - }, -/obj/structure/cable, -/obj/effect/turf_decal/stripes/end, +/obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/port/aft) "rcn" = ( @@ -47435,6 +47726,17 @@ }, /turf/open/space/basic, /area/space/nearstation) +"rcP" = ( +/obj/machinery/chem_dispenser, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow, +/turf/open/floor/plasteel/white, +/area/medical/chemistry) "rdR" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, @@ -47452,6 +47754,12 @@ }, /turf/open/space/basic, /area/space/nearstation) +"rhN" = ( +/obj/structure/chair/pew/left{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/chapel/main) "rhZ" = ( /obj/structure/sign/plaques/golden/captain{ pixel_y = 32 @@ -47495,7 +47803,7 @@ /turf/open/floor/plating, /area/maintenance/aft) "rkx" = ( -/obj/effect/decal/cleanable/blood/old, +/obj/structure/closet/firecloset, /turf/open/floor/plating, /area/maintenance/port) "rmb" = ( @@ -47541,6 +47849,9 @@ }, /turf/open/space/basic, /area/space/nearstation) +"rrH" = ( +/turf/open/floor/plasteel/freezer, +/area/security/prison/toilet) "rrR" = ( /obj/structure/cable, /turf/open/floor/plasteel/dark, @@ -47551,6 +47862,14 @@ icon_state = "platingdmg3" }, /area/maintenance/starboard) +"rtu" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Chemfactory Maintenance Access"; + req_access_txt = "69" + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/medical/chemistry) "ruT" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -47589,6 +47908,14 @@ /obj/effect/spawner/structure/window/hollow/reinforced/directional, /turf/open/floor/plating, /area/maintenance/port/fore) +"rxD" = ( +/obj/structure/closet, +/obj/effect/spawner/lootdrop/maintenance{ + lootcount = 3; + name = "3maintenance loot spawner" + }, +/turf/open/floor/plating, +/area/maintenance/port) "ryQ" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/caution{ @@ -47597,11 +47924,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/maintenance/port/fore) -"rzr" = ( -/obj/structure/table, -/obj/machinery/cell_charger, -/turf/open/floor/plating, -/area/maintenance/port/aft) "rBq" = ( /obj/machinery/atmospherics/pipe/manifold/general/visible{ dir = 4 @@ -47690,6 +48012,21 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, /area/maintenance/port/fore) +"rIj" = ( +/obj/structure/table/glass, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/item/storage/toolbox/mechanical, +/obj/item/clothing/head/welding, +/turf/open/floor/plasteel/white, +/area/medical/chemistry) "rJs" = ( /obj/machinery/atmospherics/components/binary/pump/on{ dir = 4; @@ -47760,6 +48097,16 @@ /obj/machinery/portable_atmospherics/scrubber, /turf/open/floor/plating, /area/science/research) +"rUP" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 + }, +/turf/open/floor/plating, +/area/maintenance/port/fore) "rUR" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 4 @@ -47785,6 +48132,13 @@ }, /turf/open/floor/plating, /area/maintenance/aft) +"sbm" = ( +/obj/machinery/navbeacon/wayfinding{ + location = "Aux Docking Port"; + name = "navigation beacon (Aux Docking Port)" + }, +/turf/open/floor/plating, +/area/maintenance/port/aft) "seF" = ( /obj/structure/cable, /turf/open/floor/plasteel/dark, @@ -47968,6 +48322,12 @@ /obj/effect/turf_decal/stripes/end, /turf/open/floor/plating, /area/maintenance/fore) +"srb" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/medical/pharmacy) "srD" = ( /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 @@ -48063,12 +48423,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel/dark, /area/engine/engine_room) -"sAv" = ( -/obj/structure/bed, -/obj/item/bedsheet/random, -/obj/effect/decal/cleanable/blood/old, -/turf/open/floor/plating, -/area/maintenance/port) "sAZ" = ( /obj/structure/cable, /obj/effect/decal/cleanable/cobweb/cobweb2, @@ -48288,10 +48642,6 @@ }, /turf/open/floor/plating, /area/maintenance/port/aft) -"tdV" = ( -/obj/item/trash/chips, -/turf/open/floor/plating, -/area/maintenance/port/aft) "tfw" = ( /obj/effect/turf_decal/tile/brown, /obj/effect/turf_decal/tile/brown{ @@ -48337,18 +48687,21 @@ }, /turf/closed/wall/r_wall, /area/maintenance/disposal/incinerator) +"tiC" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/medical/chemistry) "tjy" = ( /obj/effect/turf_decal/tile/red{ dir = 4 }, /turf/open/floor/plasteel, /area/security/prison) -"tjL" = ( -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/turf/closed/wall, -/area/chapel/main) "tlY" = ( /obj/machinery/status_display/evac, /turf/closed/wall/r_wall, @@ -48382,6 +48735,13 @@ }, /turf/open/floor/plasteel, /area/janitor) +"tou" = ( +/obj/machinery/navbeacon/wayfinding{ + location = "Bridge"; + name = "navigation beacon (Bridge)" + }, +/turf/open/floor/carpet, +/area/bridge) "toT" = ( /obj/structure/girder, /obj/structure/grille, @@ -48403,6 +48763,12 @@ }, /turf/open/space/basic, /area/engine/engine_room) +"trn" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/medical/chemistry) "trK" = ( /obj/machinery/vending/cola, /turf/open/floor/plasteel, @@ -48479,6 +48845,9 @@ /obj/effect/turf_decal/stripes/white/line{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/port/aft) "tyI" = ( @@ -48531,6 +48900,19 @@ /obj/machinery/atmospherics/pipe/simple/green/visible, /turf/closed/wall/r_wall, /area/engine/supermatter) +"tCw" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/turf/open/floor/plasteel/grimy, +/area/ai_monitored/turret_protected/aisat/foyer) +"tCF" = ( +/obj/machinery/navbeacon/wayfinding{ + location = "Chapel"; + name = "navigation beacon (Chapel)" + }, +/turf/open/floor/plasteel/chapel, +/area/chapel/main) "tDO" = ( /obj/machinery/door/airlock/external{ name = "Port External Shuttle Dock" @@ -48650,6 +49032,10 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plating, /area/maintenance/port/fore) +"tWA" = ( +/obj/effect/decal/cleanable/vomit/old, +/turf/open/floor/plating, +/area/maintenance/starboard) "tXQ" = ( /obj/machinery/door/window/southleft{ name = "AI Access"; @@ -48742,6 +49128,9 @@ /obj/structure/cable, /turf/open/floor/plasteel/airless/solarpanel, /area/solar/starboard) +"ufr" = ( +/turf/closed/wall, +/area/medical/pharmacy) "ufN" = ( /obj/machinery/photocopier, /obj/machinery/airalarm{ @@ -48898,6 +49287,10 @@ /obj/machinery/air_sensor/atmos/toxins_mixing_tank, /turf/open/floor/engine/vacuum, /area/science/mixing) +"uuf" = ( +/obj/machinery/rnd/bepis, +/turf/open/floor/engine, +/area/science/explab) "uva" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light{ @@ -49047,16 +49440,6 @@ /obj/effect/turf_decal/tile/blue, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai_upload) -"uOW" = ( -/obj/structure/rack, -/obj/item/flashlight/flare, -/obj/item/flashlight/flare{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/flashlight, -/turf/open/floor/plating, -/area/maintenance/port) "uPH" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral{ @@ -49122,6 +49505,16 @@ /obj/effect/turf_decal/stripes/end, /turf/open/floor/plating, /area/maintenance/starboard) +"uSO" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/plating, +/area/maintenance/port/aft) +"uTl" = ( +/obj/effect/landmark/start/paramedic, +/turf/open/floor/plasteel/white, +/area/medical/medbay/central) "uTy" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 9 @@ -49156,6 +49549,13 @@ }, /turf/open/floor/plating, /area/maintenance/aft) +"uWc" = ( +/obj/machinery/navbeacon/wayfinding{ + location = "Medical"; + name = "navigation beacon (Medical)" + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/lobby) "uXm" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 4 @@ -49169,6 +49569,14 @@ }, /turf/open/floor/plasteel, /area/engine/engine_room) +"uXH" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/white, +/area/medical/surgery/room_b) "uXP" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -49202,9 +49610,8 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "vbr" = ( -/obj/machinery/power/emitter/anchored{ - dir = 4; - state = 2 +/obj/machinery/power/emitter/welded{ + dir = 4 }, /obj/machinery/camera{ c_tag = "Engine - Emitters Left"; @@ -49281,6 +49688,12 @@ /obj/item/pen, /turf/open/floor/plasteel, /area/security/prison) +"viC" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/port/aft) "viK" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ dir = 4 @@ -49497,14 +49910,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) -"vDr" = ( -/obj/structure/table, -/obj/item/storage/toolbox/mechanical, -/obj/machinery/light/small{ - dir = 8 - }, -/turf/open/floor/plating, -/area/maintenance/port/aft) "vFq" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -49533,18 +49938,19 @@ /turf/open/floor/plasteel, /area/security/brig) "vLi" = ( -/obj/machinery/power/apc{ - areastring = "/area/maintenance/port"; - dir = 8; - name = "Port Maintenance APC"; - pixel_x = -24 - }, +/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/metal/fifty, +/obj/item/hand_labeler, +/obj/structure/table/glass, /obj/structure/cable, -/obj/effect/turf_decal/stripes/end{ +/obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/open/floor/plating, -/area/maintenance/port) +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/medical/chemistry) "vLE" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/airalarm{ @@ -49666,19 +50072,18 @@ /area/engine/engine_room) "vXg" = ( /obj/machinery/dna_scannernew, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue, /obj/machinery/light{ dir = 4 }, /obj/item/radio/intercom{ pixel_y = 24 }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/medical/genetics) "vXI" = ( @@ -49803,16 +50208,6 @@ /obj/structure/cable, /turf/open/floor/plasteel, /area/engine/engineering) -"woM" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 5 - }, -/obj/structure/cable, -/turf/open/floor/carpet, -/area/crew_quarters/heads/hop) "woV" = ( /obj/machinery/light/small{ dir = 8 @@ -49825,14 +50220,8 @@ "wrD" = ( /obj/structure/table, /obj/item/aiModule/reset, -/obj/item/aiModule/supplied/freeform, /obj/machinery/light, /obj/effect/turf_decal/tile/blue, -/obj/machinery/camera/motion{ - c_tag = "AI Upload - Aft"; - dir = 1; - network = list("aiupload") - }, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload) "wrV" = ( @@ -49863,6 +50252,10 @@ }, /turf/open/floor/plasteel/dark, /area/crew_quarters/dorms) +"wvo" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/white, +/area/medical/chemistry) "wvW" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -49984,6 +50377,20 @@ }, /turf/open/floor/plasteel, /area/storage/tools) +"wEO" = ( +/obj/machinery/power/apc{ + areastring = "/area/maintenance/port/aft"; + dir = 1; + name = "Port Aft Maintenance APC"; + pixel_y = 24 + }, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/end, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/port/aft) "wFa" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -49992,6 +50399,10 @@ dir = 4 }, /obj/structure/cable, +/obj/machinery/navbeacon/wayfinding{ + location = "AI Upload"; + name = "navigation beacon (AI Upload)" + }, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload) "wFi" = ( @@ -50009,6 +50420,13 @@ }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) +"wHm" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/plating, +/area/maintenance/port/aft) "wIc" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, @@ -50185,6 +50603,7 @@ name = "Core Modules"; req_one_access_txt = "20" }, +/obj/item/aiModule/supplied/freeform, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload) "wTx" = ( @@ -50259,6 +50678,12 @@ /obj/structure/lattice/catwalk, /turf/open/space/basic, /area/space/nearstation) +"xcB" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/medical/pharmacy) "xdQ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 @@ -50312,7 +50737,7 @@ dir = 4 }, /obj/machinery/camera/motion{ - c_tag = "AI Upload - Fore"; + c_tag = "Secure - AI Upload"; network = list("aiupload") }, /turf/open/floor/plasteel/dark, @@ -50358,6 +50783,9 @@ /obj/item/radio/intercom{ pixel_y = 25 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel/chapel{ dir = 4 }, @@ -50372,6 +50800,13 @@ /obj/structure/cable, /turf/open/floor/plasteel/white, /area/science/mixing) +"xxe" = ( +/obj/machinery/navbeacon/wayfinding{ + location = "Disposals Recycling Center"; + name = "navigation beacon (Disposals Recycling Center)" + }, +/turf/open/floor/plating, +/area/maintenance/disposal) "xyd" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, @@ -50404,6 +50839,15 @@ /obj/structure/bookcase/random/fiction, /turf/open/floor/wood, /area/library/abandoned) +"xBC" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 9 + }, +/turf/open/floor/plasteel/white, +/area/medical/pharmacy) "xBI" = ( /obj/machinery/atmospherics/pipe/manifold/cyan/visible, /obj/effect/turf_decal/stripes/corner{ @@ -50411,6 +50855,28 @@ }, /turf/open/floor/plasteel, /area/engine/engine_room) +"xCz" = ( +/obj/machinery/requests_console{ + department = "Chemistry"; + departmentType = 2; + pixel_x = -30; + receive_ore_updates = 1 + }, +/obj/item/wrench, +/obj/item/wrench, +/obj/structure/rack, +/obj/item/construction/plumbing, +/obj/item/construction/plumbing, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/item/plunger, +/obj/item/plunger, +/turf/open/floor/plasteel/white, +/area/medical/chemistry) "xCE" = ( /obj/item/radio/intercom{ pixel_y = 24 @@ -50456,9 +50922,9 @@ /area/engine/engineering) "xHc" = ( /obj/machinery/power/apc{ - areastring = "/area/solar/aft"; + areastring = "/area/maintenance/solars/starboard/aft"; dir = 8; - name = "Aft Solar APC"; + name = "Starboard Aft Solar APC"; pixel_x = -25; pixel_y = 3 }, @@ -50566,7 +51032,9 @@ /area/medical/medbay/central) "xRL" = ( /obj/structure/chair/stool, -/turf/open/floor/plating, +/turf/open/floor/plating{ + icon_state = "panelscorched" + }, /area/maintenance/starboard) "xRV" = ( /obj/effect/turf_decal/tile/neutral{ @@ -50593,6 +51061,10 @@ /obj/structure/lattice, /turf/open/space/basic, /area/space/nearstation) +"yaP" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/closed/wall, +/area/maintenance/port/fore) "ybh" = ( /obj/structure/closet/radiation, /obj/effect/turf_decal/stripes/line{ @@ -50600,6 +51072,28 @@ }, /turf/open/floor/plasteel, /area/engine/engineering) +"ybi" = ( +/obj/structure/cable, +/turf/open/floor/plasteel/cafeteria{ + dir = 5 + }, +/area/crew_quarters/kitchen) +"ybr" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/navbeacon/wayfinding{ + location = "Library"; + name = "navigation beacon (Library)" + }, +/turf/open/floor/wood, +/area/library) "ydf" = ( /obj/effect/turf_decal/tile/green{ dir = 1 @@ -50623,6 +51117,12 @@ /obj/structure/lattice, /turf/open/space/basic, /area/space/nearstation) +"yfq" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/turf/open/floor/plasteel/white, +/area/medical/medbay/central) "ygs" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -71100,7 +71600,7 @@ acb acb adj aco -bUn +adQ adQ adQ aew @@ -71405,7 +71905,7 @@ bfm ovO aCd ovO -ilI +gRo acB acB acB @@ -71609,7 +72109,7 @@ gJq jtf aal acm -acr +isH uuc ada adU @@ -71663,9 +72163,9 @@ bMs bMs bMs bfq +bMs acB -bMn -dhm +bTK acB aal aal @@ -71918,10 +72418,10 @@ aJv aJv aJv aJv -bMs -bfq acB -sAv +bfq +bMs +bMs bMs acB acB @@ -72119,15 +72619,15 @@ aeS aeS aeS eIR -gJq -aeS -aeS -aco -aco -aco -aco -aev +rUP +yaP +yaP aiZ +aiZ +aiZ +aiZ +aev +aco oMw njx bUr @@ -72172,19 +72672,19 @@ aGE aJw aYl mkR +mtz aJU bMe -aJv -bMs -bfq acB -bTS +bfq +bMs +acB rkx car -bMs +rxD acB -azH -azH +aaa +aaa aaa kfP aal @@ -72429,24 +72929,24 @@ aGE aKw aKf onl +onl aXY aUs -aJv -bXP -bfq acB +bfm +pLH acB -bMs -acB -bMs -acB -bXR -azH -azH -azH -azH -azH -azH +aHW +aHW +aHW +aHW +aHW +aHW +aHW +aHW +aHW +aal +aaa aaa aaa aaa @@ -72686,24 +73186,22 @@ aGE bfs aXr xyk +uXH bfE -bdj -aJv -bZk -bfm +fKy +aJF +aJF eMB -acB -acB -acB +aJF +aHW +rIj iJO -acB -aBx -aBx +nIH +eXs +xCz bWy -bWy -aBx -tdV -azH +rcP +aHW aal aaa aaa @@ -72798,6 +73296,8 @@ aaa aaa aaa aaa +aaa +aaa "} (87,1,1) = {" aaa @@ -72902,7 +73402,7 @@ aaa aaa avq aLv -bTU +kPF hlS bTU hSh @@ -72945,23 +73445,23 @@ aXH aJv aXp aXp -aJv -acB -bMs -bfq -acB -bZx +aXp +aJF +cCS +qgT +pOE +aHW vLi -rEa -bVX -sjP -sjP +aIp +aIp +bfj +aIp fst -fst -sjP -sjP -azH -azH +qzW +aHW +aal +aaa +aaa aaa aaa aaa @@ -73184,7 +73684,7 @@ ovO ovO ovO ovO -dpq +ovO cbH bTE aGQ @@ -73204,22 +73704,22 @@ bbK bdl aKh bcQ -bdv +bbK bdx -acB -acB -rEa -bMs -acB -bXS -bWe +yfq +jUj +mHy +amf +cgG +bfj +aIp bWz -bWz -aBy -sjP -aBx -azH +mUi +aHW aal +aal +aaa +aaa aaa aaa aaa @@ -73462,19 +73962,19 @@ bdm bgs aJF pTq -bfm -ilI -acB +qgT +pdg +aHW bVQ -bRh -acB +iZQ +oIO +nFy +mYC +czs +pGv +aHW azH azH -bWz -bWz -bRd -sjP -aBx azH aal aaa @@ -73719,18 +74219,18 @@ bdn aIY aIY aIY -bMs -bfq -ash -rEa -bMs +eMB +aJF +aHW +qfm +qfm cep -bMs -bMs -bTK -bWz -bQe -sjP +tiC +lNn +qfm +qfm +aHW +aBx bRm azH aal @@ -73950,12 +74450,12 @@ aBe aJE bLU aKp -aBU +oLR aGn bhT aFO aGg -aQD +aFR cbK pYp aGR @@ -73976,18 +74476,18 @@ bdo aKj bNI aIY -bMs +bfq bZp -ash -rEa -bMs -acB -bMs -uOW -acB -bWz -azH -sjP +aHW +aIp +bdZ +beW +bfj +aIp +aIp +aIp +aHW +aBx bXT azH aal @@ -74233,18 +74733,18 @@ bdp bds biB aIY -rEa -bZq -ash -rEa -iDR -acB -eet -bXr -bZP -eZh -azH -sjP +bYJ +bRh +aHW +aIp +aIp +bes +bfj +aIp +aIp +aIp +aHW +aBx bXW azH aaa @@ -74490,18 +74990,18 @@ bMf aKk aKa aXZ -rEa +bYJ bRk -ash -rEa -bXA -acB -azH -azH -azH -azH -azH -sjP +aHW +aIp +aIp +bes +bfj +aIp +aIp +aIp +aHW +aBx bXU azH aaa @@ -74698,7 +75198,7 @@ gst cbi cIZ acp -acw +uuf acw adk adG @@ -74708,7 +75208,7 @@ qHu acp agJ agJ -ahN +agJ bBg agJ afJ @@ -74747,18 +75247,18 @@ bdr aKa aKn aIY -oWU -bdC -ash -rEa -bLQ -acB -dom -vDr -rzr -bRd -azH -sjP +bfm +pLH +aHW +aIp +aIp +bes +bfj +aIp +aIp +aIp +aHW +aBx hyH azH aaa @@ -74980,7 +75480,7 @@ bnn aBe caY aNQ -aIo +lBB aFO aFO aFO @@ -75006,16 +75506,16 @@ aKo aIY bMs bfq -acB -rEa -bQQ -acB -qmL -caV +aHW +aIp +aIp +bes +bfj +aIp +aIp +aIp +aHW aBx -aBx -azH -sjP hnA azH azH @@ -75237,7 +75737,7 @@ aoO aBf aBT bhW -aIo +lBB aFT aGk aGs @@ -75261,21 +75761,21 @@ aIY aIY aIY aIY -bMs +oWU bYJ -bVX -rEa -acB -acB -azH +aHW +aIp +aIp +bes +pyx bWx -bZQ -aBx -azH +bWx +bWx +rtu rck -sjP +uSO kDS -aBx +sbm tDO fjh aaa @@ -75469,7 +75969,7 @@ mjC tVl ljF acp -acw +coN acw adk adJ @@ -75497,7 +75997,7 @@ bKk aHZ aFT piu -aGt +uTl beC aHF xQy @@ -75519,18 +76019,18 @@ bTo wxB acB bMs -jJa -acB -acB -acB -aBx -fOo -bWl -aBx -aBx -aRr +bYJ +aHW +fva +aIp +bes +aIp +aIp +aIp +aIp +aHW pwZ -sjP +viC azH azH azH @@ -75777,17 +76277,17 @@ ifi bRO bMs bfq -acB +aHW bdt -aBx +aIp gTn -azH -azH -azH -azH -azH +wvo +wvo +trn +foN +aHW bZt -sjP +viC bTs azH aaa @@ -76034,17 +76534,17 @@ bTq acB bTK bfq -acB -nvs -peq -eWS +aHW +aIp +aIp +aIp oCS -aBx -bTt -bWF -azH +aIp +aIp +aIp +aHW bZu -sjP +viC aBx azH aaa @@ -76291,17 +76791,17 @@ azH azH azH bfZ +aHW +aHW +aHW +aHW +aHW +aHW +aHW +aHW +aHW azH -azH -azH -azH -azH -azH -azH -azH -azH -azH -sjP +viC aBx azH aal @@ -76558,7 +77058,7 @@ bPk bPq bRP azH -sjP +viC bXV bWK aal @@ -76815,7 +77315,7 @@ bPl vyS myk azH -sjP +wEO aBx bWK aal @@ -77072,7 +77572,7 @@ azH azH azH azH -sjP +ovv aBx bWK aal @@ -77329,7 +77829,7 @@ aBx lGY bOV azH -sjP +ovv aBx bWK aaa @@ -77586,7 +78086,7 @@ dQq aBx bOW azH -sjP +ovv aBx bWK aaa @@ -77812,17 +78312,17 @@ aEw aEw rvt hrY -hrY +pEE dMi aJy eBV aHV -aHW +ufr aJH aII beT -aHW -aHW +ufr +ufr azH bCg bba @@ -77843,7 +78343,7 @@ azH bPf azH azH -sjP +ovv aBx azH aal @@ -78073,13 +78573,13 @@ aXn aVV aJz aGo -aHW -aHW +ufr +ufr aIB -aIp +hsn beU kcl -aHW +ufr aSs bGC llI @@ -78100,7 +78600,7 @@ sMe sMe bOY azH -sjP +ovv aBx azH aal @@ -78330,13 +78830,13 @@ aXs aep aex afc -aHW +ufr bTc -aIp -aIp +hsn +hsn beV aUF -aHW +ufr aSt sjP bba @@ -78356,8 +78856,8 @@ aBy aBx aBx bpV -bOY -sjP +jDi +wHm ozB azH aal @@ -78587,13 +79087,13 @@ aXt aHa aJY bya -aHW +ufr aIt aIC aIJ beV aUa -aHW +ufr aUm sjP bbb @@ -78613,7 +79113,7 @@ aoh aoh aBx aBx -aUi +eXk vbf bZm azH @@ -78846,11 +79346,11 @@ aJY aGu aXU bpk -aIp -bdZ -beW +hsn +drK +xBC aUA -aHW +ufr bCg sjP sjP @@ -79103,11 +79603,11 @@ aXx bZI aHY aTX -aIp +hsn beF -bes +srb bGG -aHW +ufr bCg aBx ahT @@ -79355,16 +79855,16 @@ aGo aVX aUQ aUQ -aGu +uWc aUQ aGu -aXV +aXU bpk -aIp +hsn beG bet aUB -aHW +ufr bCg bSU ahT @@ -79615,13 +80115,13 @@ aUQ aGu aUQ aTV -aHW +ufr aIA aID beX -aIp +hsn aUb -aHW +ufr bCg bTb ahT @@ -79872,13 +80372,13 @@ aXC aGz aXM aUt -aHW -aIp -aIp -bfj -aIp +ufr +hsn +hsn +xcB +hsn aUE -aHW +ufr bCg bKa ahT @@ -79899,7 +80399,7 @@ aoh aoh aoh iVH -aUi +eXk azH aal aaa @@ -80133,9 +80633,9 @@ aUl aGS aUx bpv -aIp -aIp -aHW +hsn +hsn +ufr bCg ahT ahT @@ -80365,7 +80865,7 @@ aHw aDL hvP bBJ -agw +qYP qYP qYP qYP @@ -80392,7 +80892,7 @@ aGS bfn aIR aJf -aHW +ufr bCg ahT bRt @@ -80413,7 +80913,7 @@ beZ aKr aoh aBx -aUi +eXk azH aal aal @@ -80649,7 +81149,7 @@ ahb bfn aGS aGS -aHW +ufr bCg ahT akT @@ -80670,7 +81170,7 @@ bfa aKs aoh aBx -aUi +eXk aUk aUk aUk @@ -81142,7 +81642,7 @@ amq aLs aLs aLs -bvu +ybr aLs aLs aLs @@ -81698,7 +82198,7 @@ aql boa ahT vcT -aUi +eXk aUk aUk aUk @@ -81884,7 +82384,7 @@ cRz bgA acf aap -aas +enT aBp asb acf @@ -81943,7 +82443,7 @@ bGU bGU bGU aXf -caQ +pVz bZT baK caQ @@ -82644,7 +83144,7 @@ awe bvQ awe bvK -bvQ +jMY awe awe awe @@ -82961,7 +83461,7 @@ ale aot bur aox -aox +ops aox aoJ aQA @@ -83221,7 +83721,7 @@ buv buv buv buz -aoA +mZj bHr bHs bHw @@ -83237,7 +83737,7 @@ bcz bce xhI xhI -bgx +fCi nuq xyz bim @@ -83504,7 +84004,7 @@ bCg aSh bxh bbi -aSw +hrr aSw nJs aSI @@ -83749,9 +84249,9 @@ ahY apt aqb bcL -amU +ybi bgt -bgx +fCi lEx bgx bir @@ -84005,7 +84505,7 @@ amU bbd amU amU -amU +ybi bOA xhI bhe @@ -85731,7 +86231,7 @@ acc acc acc acc -acc +mAm aty bwq aMl @@ -85834,7 +86334,7 @@ axK uUM aYN aIz -aYN +oSB aYN aIz htF @@ -85852,7 +86352,7 @@ aaa aal afA afR -kxE +tCw bLH bNp aNw @@ -87073,7 +87573,7 @@ aad aad aad aad -wok +oMq aor aAm wMf @@ -87804,7 +88304,7 @@ aBX dvc wKG jtN -hPo +hOE kOR kOR asy @@ -88654,7 +89154,7 @@ aDw avb aDF acF -acF +cFG bPb pjJ bPb @@ -88910,15 +89410,15 @@ azD aDx aDC aDG -acF -acF +cFG +cFG acj aal bPb bpL bXv cbt -bXv +qfG cbu bDd aaa @@ -89141,7 +89641,7 @@ bpe aMQ bGw aMU -aMU +lwj bpl bAa aYK @@ -90104,7 +90604,7 @@ bAs bAl bAy bBx -bAy +tCF kCr goV bUZ @@ -90214,7 +90714,7 @@ aaa aaa aaa abE -aaa +qxm aaa aaa aaa @@ -90376,7 +90876,7 @@ hxO bsp aMq aal -aMz +aMt aMt aMt aMt @@ -90894,7 +91394,7 @@ aMu btw aMu bCK -aMz +aMt aMt aal aal @@ -91227,7 +91727,7 @@ ccJ boc wMX bCT -ccJ +xxe bDg bDz bDz @@ -91383,7 +91883,7 @@ aTk bXp aCU aPL -tjL +bzq aey bAT bAT @@ -91640,8 +92140,8 @@ agh agh agh agh -bzP -gVN +agh +cxu bAT bAT bAT @@ -91897,8 +92397,8 @@ byW bzd bzd bzB -bAc -ijk +agh +kdV bAT bAT bAT @@ -91969,7 +92469,7 @@ aOt aPd aPe aPe -aPe +hrX aZe aZk aZk @@ -92156,9 +92656,9 @@ bVD bWt agh xtV -adn bAT -adn +bAT +bAT bBz bzq bUP @@ -92202,7 +92702,7 @@ anX bcj bcl bct -bcn +nzB bct bcl bOe @@ -92414,8 +92914,8 @@ bWu agh nJq aeK -bAT -adn +iLi +rhN bBA bzq bUQ @@ -92667,12 +93167,12 @@ agh akY agZ bzn -bWM +mEw bAd eqR -bAz bAX -bAz +pXq +bAX bSO bEC bUR @@ -92928,8 +93428,8 @@ bWM vLU ijk adn -mvm -adn +iLi +rhN bBH bzq bUS @@ -93184,9 +93684,9 @@ bWs bWN bWP mDe -bWR mDE -bWR +mDE +mDE bWS bED bUR @@ -93209,7 +93709,7 @@ arA atb aMq arh -aiV +ahv anc bJu arL @@ -93218,7 +93718,7 @@ bdD wUL bBo aSg -cad +lag cad mUu fZi @@ -93442,8 +93942,8 @@ bWO agh ijk adn -bAT -adn +iLi +rhN bBA bzq bUT @@ -93747,7 +94247,7 @@ acP buG arA arA -buG +arA arA arA buH @@ -94004,7 +94504,7 @@ awO uKZ ark btG -btm +qYP qYP qYP bua @@ -95015,7 +95515,7 @@ aKB aiO buR ajx -ajx +iGu ajx aFF aiO @@ -95285,7 +95785,7 @@ bKX adY aED akr -akt +miq aqB aBz aqA @@ -96029,9 +96529,9 @@ asj bta aup asj -akd +asj aUc -aPQ +bAp arO fQk jpL @@ -96044,7 +96544,7 @@ aiO oBZ buN xyd -woM +ahZ bCs aiO buh @@ -96287,9 +96787,9 @@ bta aup asj vHF -alP -alP -alP +aup +aup +aup fQk agY arm @@ -96545,7 +97045,7 @@ aup asj aBM jCK -alP +bAp hYL fQk arf @@ -96801,9 +97301,9 @@ bta aRW asj asj -gVy +aBM aPY -alP +bAp fQk aea aea @@ -97060,7 +97560,7 @@ bKW boQ anU ltA -alP +tWA fQk fQL wFi @@ -97072,7 +97572,7 @@ ahz aiW aiW ahx -aiW +tou aiW aiW bKo @@ -97317,7 +97817,7 @@ bKW bAv aPJ bys -alP +aup fQk icf vqS @@ -97573,8 +98073,8 @@ aRW asj asj alP -alP -aup +bAp +bAp fQk rhZ ang @@ -98342,7 +98842,7 @@ aup bQZ bQH asj -anS +oIp byL bAu pGM @@ -98850,7 +99350,7 @@ aaa aaa asj aRQ -aup +nQY hGR asj aaa @@ -102233,7 +102733,7 @@ aZE arp arq aDR -arq +rrH aDQ aDQ baB @@ -102490,8 +102990,8 @@ aeQ afq aiN aiN -arq -arq +rrH +rrH aij bDI aNZ @@ -102747,7 +103247,7 @@ aeZ afx aiN aDS -arq +rrH bhp aij aEb @@ -103004,7 +103504,7 @@ aeZ afy aiN aDS -arq +rrH aEe aij aaa diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index bc8d3409c30..c3b5dea38f4 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -81,7 +81,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /obj/machinery/computer/security/telescreen/entertainment{ @@ -259,7 +258,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -280,7 +278,6 @@ /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/blood/gibs/limb, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -367,12 +364,10 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /turf/open/floor/plasteel/dark/corner, @@ -385,7 +380,6 @@ /obj/effect/turf_decal/tile/neutral, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -418,7 +412,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/effect/decal/cleanable/blood/old, @@ -435,7 +428,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/engine, @@ -466,7 +458,6 @@ dir = 8 }, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 1 }, /obj/effect/decal/cleanable/dirt, @@ -486,12 +477,10 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /turf/open/floor/plasteel, @@ -505,7 +494,6 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 4 }, /obj/machinery/light/small{ @@ -523,7 +511,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -561,12 +548,10 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /turf/open/floor/plasteel/dark/corner, @@ -579,7 +564,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/effect/turf_decal/stripes/corner{ @@ -613,7 +597,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/airalarm{ @@ -725,7 +708,6 @@ icon_state = "plant-16" }, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 1 }, /obj/machinery/light{ @@ -762,7 +744,6 @@ /area/crew_quarters/heads/cmo) "abn" = ( /obj/structure/chair/pew{ - icon_state = "pewmiddle"; dir = 8 }, /obj/machinery/light{ @@ -975,7 +956,6 @@ /area/ai_monitored/turret_protected/ai) "abG" = ( /obj/structure/chair/pew/left{ - icon_state = "pewend_left"; dir = 4 }, /obj/machinery/newscaster{ @@ -1077,7 +1057,6 @@ /obj/machinery/flasher{ id = "AI"; name = "Meatbag Pacifier"; - pixel_x = 0; pixel_y = 24 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1, @@ -1085,9 +1064,9 @@ /area/ai_monitored/turret_protected/ai) "abS" = ( /obj/machinery/power/apc{ + areastring = "/area/ai_monitored/turret_protected/ai"; dir = 1; name = "AI Chamber APC"; - areastring = "/area/ai_monitored/turret_protected/ai"; pixel_y = 23 }, /obj/structure/cable, @@ -1114,7 +1093,6 @@ /obj/machinery/flasher{ id = "AI"; name = "Meatbag Pacifier"; - pixel_x = 0; pixel_y = 24 }, /turf/open/floor/circuit/green{ @@ -1123,7 +1101,6 @@ /area/ai_monitored/turret_protected/ai) "abW" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /turf/open/floor/circuit/green{ @@ -1135,7 +1112,6 @@ dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /obj/machinery/newscaster/security_unit{ @@ -1183,7 +1159,6 @@ "acc" = ( /obj/machinery/door/airlock/maintenance{ name = "security maintenance"; - req_access_txt = "0"; req_one_access_txt = "4;63" }, /turf/open/floor/plasteel/dark, @@ -1234,7 +1209,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /turf/open/floor/plasteel, @@ -1247,7 +1221,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/cable, @@ -1266,8 +1239,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/firealarm{ dir = 8; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /turf/open/floor/plasteel/dark, /area/security/detectives_office) @@ -1296,7 +1268,6 @@ }, /obj/effect/turf_decal/stripes/corner, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -1304,7 +1275,6 @@ /area/ai_monitored/turret_protected/ai) "ack" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/wood, @@ -1314,7 +1284,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/wood, @@ -1345,7 +1314,6 @@ pixel_y = -32 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/structure/cable, @@ -1361,7 +1329,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /turf/open/floor/plasteel, @@ -1371,7 +1338,6 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /obj/structure/noticeboard{ @@ -1381,8 +1347,7 @@ /obj/machinery/camera{ c_tag = "Detective's Office"; dir = 8; - name = "detective camera"; - network = list("ss13") + name = "detective camera" }, /turf/open/floor/wood, /area/security/detectives_office) @@ -1478,7 +1443,6 @@ /area/ai_monitored/turret_protected/aisat_interior) "acy" = ( /obj/docking_port/stationary/random{ - dir = 1; id = "pod_lavaland3"; name = "lavaland" }, @@ -1534,8 +1498,7 @@ /obj/machinery/vending/cola/random, /obj/machinery/firealarm{ dir = 4; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /turf/open/floor/plasteel/dark, /area/hallway/primary/port) @@ -1550,7 +1513,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/structure/cable, +/obj/structure/cable/layer3, /turf/open/floor/plating{ icon_state = "panelscorched" }, @@ -1567,9 +1530,7 @@ /turf/open/floor/plasteel/dark, /area/chapel/office) "acF" = ( -/obj/machinery/porta_turret/ai{ - dir = 2 - }, +/obj/machinery/porta_turret/ai, /obj/machinery/light/small{ dir = 1 }, @@ -1710,7 +1671,6 @@ /area/maintenance/port/fore) "acR" = ( /obj/machinery/computer/monitor{ - icon_state = "computer"; dir = 8 }, /obj/effect/turf_decal/bot, @@ -1732,14 +1692,13 @@ /area/ai_monitored/storage/satellite) "acS" = ( /obj/machinery/computer/atmos_alert{ - icon_state = "computer"; dir = 4 }, /obj/effect/turf_decal/bot, /obj/machinery/power/apc{ + areastring = "/area/ai_monitored/turret_protected/aisat/atmos"; dir = 8; name = "MiniSat Atmospherics APC"; - areastring = "/area/ai_monitored/turret_protected/aisat/atmos"; pixel_x = -27 }, /obj/effect/turf_decal/tile/neutral, @@ -1786,10 +1745,8 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 4 }, -/obj/structure/cable, /turf/open/floor/engine, /area/ai_monitored/turret_protected/aisat_interior) "acW" = ( @@ -1888,7 +1845,6 @@ id = "lawyer_shutters"; name = "Law Office Shutters Toggle"; pixel_x = 24; - pixel_y = 0; req_access_txt = "38" }, /turf/open/floor/plasteel/dark, @@ -1990,7 +1946,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, -/obj/structure/cable, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) "adn" = ( @@ -2008,7 +1963,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/machinery/holopad, @@ -2032,7 +1986,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/tile/red, @@ -2066,7 +2019,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, @@ -2091,7 +2043,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -2140,7 +2091,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -2175,7 +2125,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/effect/turf_decal/stripes/line, @@ -2211,7 +2160,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/light, @@ -2229,7 +2177,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/power/apc/highcap/five_k{ @@ -2244,10 +2191,7 @@ "adE" = ( /obj/machinery/turretid{ control_area = "/area/ai_monitored/turret_protected/aisat_interior"; - enabled = 1; - icon_state = "control_standby"; name = "Antechamber Turret Control"; - pixel_x = 0; pixel_y = 28; req_access_txt = "65" }, @@ -2261,10 +2205,8 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, -/obj/structure/cable, /turf/open/floor/engine, /area/ai_monitored/turret_protected/aisat/foyer) "adF" = ( @@ -2275,7 +2217,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -2291,7 +2232,6 @@ pixel_x = 24 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/machinery/camera/motion{ @@ -2323,9 +2263,7 @@ dir = 8 }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - pixel_x = 0; - pixel_y = 0 + icon_state = "plant-21" }, /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -2358,7 +2296,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -2373,7 +2310,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -2389,7 +2325,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -2412,7 +2347,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/structure/cable, @@ -2433,7 +2367,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/cable, /turf/open/floor/engine, /area/ai_monitored/turret_protected/aisat/atmos) "adS" = ( @@ -2580,7 +2513,6 @@ pixel_x = -22 }, /obj/effect/decal/cleanable/dirt, -/obj/structure/cable, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/atmos) "aed" = ( @@ -2599,7 +2531,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, -/obj/structure/cable, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat/atmos) "aef" = ( @@ -2612,7 +2543,6 @@ /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /obj/structure/cable, @@ -2638,7 +2568,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /turf/open/floor/plasteel, @@ -2651,7 +2580,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/corner{ @@ -2689,11 +2617,6 @@ }, /turf/open/floor/plasteel, /area/bridge) -"aen" = ( -/obj/structure/lattice/catwalk, -/obj/structure/cable, -/turf/open/floor/plating/airless, -/area/space/nearstation) "aeo" = ( /obj/structure/lattice, /obj/structure/grille, @@ -2713,7 +2636,6 @@ /area/maintenance/starboard/fore) "aeq" = ( /obj/structure/transit_tube/station{ - icon_state = "closed_station0"; dir = 1 }, /obj/structure/window/reinforced, @@ -2787,7 +2709,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/research{ @@ -2878,7 +2799,6 @@ }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 4 }, /obj/machinery/light/small{ @@ -2982,7 +2902,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/structure/cable, /turf/open/floor/plating/airless, /area/space/nearstation) "aeT" = ( @@ -3058,7 +2977,6 @@ "afa" = ( /obj/machinery/atmospherics/pipe/simple/general/visible, /obj/machinery/door/window/southleft{ - dir = 2; name = "Maximum Security Test Chamber"; req_access_txt = "55" }, @@ -3109,7 +3027,6 @@ }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -3312,7 +3229,6 @@ /area/security/warden) "afu" = ( /obj/structure/transit_tube/station/reverse{ - icon_state = "closed_terminus0"; dir = 8 }, /obj/structure/window/reinforced{ @@ -3481,7 +3397,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/showroomfloor, @@ -3499,8 +3414,7 @@ /obj/item/wirecutters, /obj/machinery/firealarm{ dir = 8; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/machinery/light{ dir = 1 @@ -3542,13 +3456,11 @@ /obj/machinery/flasher{ id = "AI"; name = "Meatbag Pacifier"; - pixel_x = 0; pixel_y = 24 }, /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/machinery/camera{ c_tag = "AI Chamber SMES"; - dir = 2; name = "core camera"; network = list("aicore") }, @@ -3556,7 +3468,6 @@ /area/ai_monitored/turret_protected/ai) "afO" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/landmark/event_spawn, @@ -3582,7 +3493,6 @@ /obj/effect/turf_decal/tile/purple, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/effect/turf_decal/stripes/corner, @@ -3661,8 +3571,7 @@ areastring = "/area/science/xenobiology"; dir = 4; name = "Xenobiology APC"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -3675,8 +3584,7 @@ /area/science/xenobiology) "afX" = ( /obj/machinery/door/airlock/external{ - name = "Science Escape Pod"; - req_access_txt = "0" + name = "Science Escape Pod" }, /obj/structure/cable, /turf/open/floor/plasteel/dark, @@ -3710,7 +3618,6 @@ "agb" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/sign/warning/vacuum/external{ - pixel_x = 0; pixel_y = 32 }, /obj/effect/landmark/event_spawn, @@ -3871,7 +3778,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/structure/cable, @@ -4044,7 +3950,6 @@ /area/maintenance/fore) "agD" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "0"; req_one_access_txt = "12;47" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -4141,7 +4046,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/structure/sign/poster/contraband/random{ @@ -4181,14 +4085,13 @@ /area/science/xenobiology) "agN" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 5 }, /turf/closed/wall, -/area/engine/break_room) +/area/engine/atmos) "agO" = ( /obj/structure/sign/warning/electricshock, /turf/closed/wall/rust, @@ -4216,7 +4119,6 @@ /area/bridge) "agR" = ( /obj/machinery/computer/camera_advanced/xenobio{ - icon_state = "computer"; dir = 4 }, /obj/effect/turf_decal/bot, @@ -4340,7 +4242,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/poddoor/shutters/preopen{ @@ -4580,7 +4481,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/cable, @@ -4594,8 +4494,7 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/neutral, @@ -4635,7 +4534,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/structure/cable, @@ -4706,7 +4604,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -4844,9 +4741,9 @@ /area/maintenance/department/electrical) "ahQ" = ( /obj/machinery/power/apc{ + areastring = "/area/maintenance/department/electrical"; dir = 1; name = "Electrical Maintenance APC"; - areastring = "/area/maintenance/department/electrical"; pixel_y = 23 }, /obj/effect/turf_decal/delivery, @@ -4877,7 +4774,6 @@ /area/hallway/primary/central) "ahT" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -4932,7 +4828,6 @@ name = "Abandoned External Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/structure/cable, /turf/open/floor/plasteel/dark, /area/maintenance/fore) "ahZ" = ( @@ -4982,9 +4877,8 @@ dir = 1 }, /obj/machinery/power/apc{ - dir = 2; - name = "Auxillary Base Construction APC"; areastring = "/area/construction/mining/aux_base"; + name = "Auxillary Base Construction APC"; pixel_y = -23 }, /obj/structure/cable, @@ -5126,7 +5020,6 @@ }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plating{ @@ -5225,9 +5118,7 @@ /turf/open/floor/plasteel, /area/security/main) "aiz" = ( -/obj/machinery/computer/secure_data{ - dir = 2 - }, +/obj/machinery/computer/secure_data, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -5262,8 +5153,7 @@ /obj/structure/grille, /obj/structure/barricade/wooden, /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -5280,7 +5170,6 @@ }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump/on, -/obj/structure/cable, /turf/open/floor/plating{ icon_state = "platingdmg3" }, @@ -5496,7 +5385,6 @@ /area/security/brig) "aiU" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "0"; req_one_access_txt = "12;37;47" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -5643,7 +5531,6 @@ /area/maintenance/port/aft) "aje" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 4 }, /obj/structure/disposalpipe/segment, @@ -5723,7 +5610,6 @@ /obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/effect/turf_decal/stripes/line{ @@ -5793,7 +5679,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/engine, @@ -5857,7 +5742,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/corner{ @@ -5938,11 +5822,9 @@ /area/maintenance/department/electrical) "ajB" = ( /obj/machinery/atmospherics/pipe/simple/supply/visible{ - icon_state = "pipe11-2"; dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/tile/neutral{ @@ -6037,7 +5919,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/command{ @@ -6060,7 +5941,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/effect/decal/cleanable/dirt, @@ -6077,7 +5957,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -6186,7 +6065,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/light/small{ @@ -6203,7 +6081,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/delivery, @@ -6216,24 +6093,20 @@ /obj/structure/flora/junglebush, /obj/structure/flora/ausbushes/brflowers, /obj/structure/flora/ausbushes/sunnybush, -/obj/item/reagent_containers/food/snacks/grown/banana, /obj/machinery/light{ dir = 8 }, -/mob/living/carbon/monkey, /turf/open/floor/grass, -/area/medical/genetics) +/area/medical/storage) "ajZ" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 }, /obj/item/radio/intercom{ - pixel_x = -28; - pixel_y = 0 + pixel_x = -28 }, /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-02"; - pixel_x = 0; pixel_y = 3 }, /turf/open/floor/plasteel, @@ -6266,7 +6139,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -6300,7 +6172,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -6321,7 +6192,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -6350,7 +6220,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -6398,7 +6267,6 @@ }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -6429,7 +6297,7 @@ /obj/structure/flora/junglebush/b, /obj/structure/flora/ausbushes/ppflowers, /turf/open/floor/grass, -/area/medical/genetics) +/area/medical/storage) "akr" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -6438,7 +6306,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -6453,7 +6320,6 @@ /area/engine/atmos) "akt" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/tile/neutral{ @@ -6478,7 +6344,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -6508,7 +6373,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -6521,7 +6385,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -6537,7 +6400,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -6557,7 +6419,6 @@ location = "Robotics" }, /obj/machinery/door/window/eastleft{ - dir = 4; name = "Robotics Delivery Access"; req_access_txt = "29" }, @@ -6602,7 +6463,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -6640,7 +6500,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/structure/cable, @@ -6720,7 +6579,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, -/obj/structure/cable, /turf/open/floor/plasteel/dark, /area/maintenance/fore) "akP" = ( @@ -6755,8 +6613,7 @@ /area/security/brig) "akR" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/barricade/wooden/crude, @@ -6767,8 +6624,7 @@ /area/maintenance/fore) "akS" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/barricade/wooden/crude, @@ -6845,7 +6701,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /obj/structure/cable, @@ -6864,7 +6719,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /turf/open/floor/plasteel/showroomfloor, @@ -6886,7 +6740,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/effect/decal/cleanable/dirt, @@ -6897,7 +6750,6 @@ /area/maintenance/port/fore) "alc" = ( /obj/effect/spawner/structure/window/hollow/reinforced/directional{ - icon_state = "hrwindow_spawner_directional"; dir = 1 }, /obj/structure/cable, @@ -7015,8 +6867,7 @@ /area/space/nearstation) "aln" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/barricade/wooden/crude, @@ -7045,7 +6896,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/effect/decal/cleanable/dirt, @@ -7062,7 +6912,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -7089,7 +6938,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -7124,7 +6972,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -7145,7 +6992,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -7198,7 +7044,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -7279,7 +7124,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -7296,7 +7140,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/blood/old, @@ -7342,7 +7185,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/effect/turf_decal/stripes/line{ @@ -7367,11 +7209,9 @@ /area/maintenance/fore) "alH" = ( /obj/machinery/atmospherics/pipe/simple/supply/visible{ - icon_state = "pipe11-2"; dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/tile/neutral{ @@ -7415,8 +7255,7 @@ department = "Head of Security's Desk"; departmentType = 5; name = "Head of Security RC"; - pixel_x = -30; - pixel_y = 0 + pixel_x = -30 }, /turf/open/floor/wood, /area/crew_quarters/heads/hos) @@ -7443,7 +7282,7 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/research{ name = "Xenobiology Lab"; - req_access_txt = "47" + req_access_txt = "8" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/structure/disposalpipe/segment, @@ -7458,29 +7297,31 @@ /area/crew_quarters/heads/hos) "alO" = ( /obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/structure/table, -/obj/item/paper_bin{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/pen, -/obj/machinery/requests_console{ - department = "Science"; - departmentType = 2; - name = "Science RC"; - pixel_x = 0; - pixel_y = 30; - receive_ore_updates = 1 - }, /obj/machinery/light{ dir = 1 }, -/obj/item/relic, +/obj/structure/table, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/item/folder/white, +/obj/item/folder/white, +/obj/item/pen, +/obj/item/flashlight/pen, +/obj/item/reagent_containers/syringe, +/obj/machinery/requests_console{ + department = "Genetics"; + name = "Genetics Requests Console"; + pixel_y = 28 + }, +/obj/item/reagent_containers/dropper, +/obj/item/storage/box/rxglasses{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/box/bodybags, /turf/open/floor/plasteel/dark, -/area/science/explab) +/area/science/genetics) "alP" = ( /obj/machinery/flasher/portable, /obj/effect/turf_decal/tile/neutral{ @@ -7560,7 +7401,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/light_switch{ @@ -7575,7 +7415,6 @@ "alW" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /obj/structure/cable, @@ -7612,7 +7451,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -7646,8 +7484,7 @@ /obj/machinery/power/solar_control{ dir = 4; id = "aftport"; - name = "Port Quarter Solar Control"; - track = 0 + name = "Port Quarter Solar Control" }, /obj/effect/turf_decal/bot, /obj/structure/sign/warning/vacuum/external{ @@ -7681,15 +7518,13 @@ areastring = "/area/maintenance/solars/port/fore"; dir = 4; name = "Port Bow Solar APC"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/effect/turf_decal/stripes/line{ dir = 5 }, /obj/machinery/camera{ c_tag = "Port Bow Solar"; - dir = 2; name = "engineering camera"; network = list("ss13","engine") }, @@ -7710,8 +7545,7 @@ /area/maintenance/central) "amh" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/barricade/wooden/crude, @@ -7739,7 +7573,6 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /obj/effect/decal/cleanable/dirt, @@ -7846,7 +7679,6 @@ dir = 10 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /turf/open/floor/plasteel/showroomfloor, @@ -7866,7 +7698,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/effect/decal/cleanable/dirt, @@ -7884,7 +7715,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/effect/decal/cleanable/dirt, @@ -7898,7 +7728,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/effect/turf_decal/stripes/corner{ @@ -7914,7 +7743,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -7958,7 +7786,6 @@ "amD" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -7971,7 +7798,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -7985,7 +7811,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/structure/cable, @@ -8054,7 +7879,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/sign/poster/contraband/random{ @@ -8151,7 +7975,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /mob/living/simple_animal/butterfly, @@ -8195,8 +8018,7 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /turf/open/floor/plasteel/dark, /area/security/checkpoint/science/research) @@ -8227,7 +8049,7 @@ }, /obj/effect/turf_decal/bot, /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, @@ -8244,7 +8066,7 @@ /obj/effect/decal/cleanable/blood/gibs/limb, /obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/plasteel/showroomfloor, -/area/security/prison) +/area/security/prison/toilet) "anb" = ( /obj/effect/turf_decal/tile/purple{ dir = 4 @@ -8296,37 +8118,23 @@ /turf/open/floor/plasteel/dark, /area/maintenance/port) "and" = ( -/obj/structure/table, -/obj/item/clothing/gloves/color/latex, -/obj/item/clothing/gloves/color/latex, -/obj/item/storage/box/disks{ - pixel_y = 5 - }, -/obj/item/radio/headset/headset_medsci, -/obj/structure/noticeboard{ - pixel_y = 30 - }, -/obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, +/obj/effect/turf_decal/tile/neutral, +/obj/structure/closet/secure_closet/personal/patient, /turf/open/floor/plasteel/dark, -/area/medical/genetics) +/area/medical/storage) "ane" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/sign/directions/evac{ dir = 8; - icon_state = "direction_evac"; pixel_y = 24 }, /obj/structure/cable, @@ -8340,7 +8148,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/landmark/event_spawn, @@ -8383,7 +8190,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 4 }, /obj/structure/cable, @@ -8413,7 +8219,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/caution/stand_clear, @@ -8474,7 +8279,6 @@ "ans" = ( /obj/structure/lattice/catwalk, /obj/effect/landmark/xeno_spawn, -/obj/structure/cable, /turf/open/floor/plating/airless, /area/solar/port/fore) "ant" = ( @@ -8492,8 +8296,7 @@ /obj/machinery/flasher{ id = "PCell 1"; name = "Prisoner Pacifier"; - pixel_x = 24; - pixel_y = 0 + pixel_x = 24 }, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -8515,7 +8318,7 @@ dir = 1 }, /turf/open/floor/plasteel/showroomfloor, -/area/security/prison) +/area/security/prison/toilet) "anv" = ( /obj/machinery/computer/secure_data{ dir = 8 @@ -8600,8 +8403,7 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/machinery/light_switch{ pixel_x = 24; @@ -8679,14 +8481,21 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/turf/open/floor/plasteel/dark, -/area/science/explab) +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/turf/open/floor/plasteel/showroomfloor, +/area/science/genetics) "anJ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -8740,8 +8549,7 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/effect/turf_decal/tile/red, /turf/open/floor/plasteel/showroomfloor, @@ -8778,7 +8586,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/effect/turf_decal/stripes/corner{ @@ -8799,7 +8606,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -8816,7 +8622,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/corner{ @@ -8869,7 +8674,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -8889,7 +8693,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/corner{ @@ -8989,7 +8792,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -9006,7 +8808,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -9102,7 +8903,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/effect/decal/cleanable/dirt, @@ -9152,7 +8952,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/machinery/firealarm{ @@ -9213,7 +9012,7 @@ /area/lawoffice) "aoz" = ( /obj/effect/decal/cleanable/blood/old, -/turf/open/floor/plating/asteroid/airless, +/turf/open/floor/plating/asteroid/lowpressure, /area/space/nearstation) "aoA" = ( /obj/effect/spawner/structure/window/reinforced, @@ -9257,7 +9056,6 @@ }, /obj/machinery/camera{ c_tag = "Telecomms Server SMES"; - dir = 2; name = "telecomms camera"; network = list("ss13","tcomms") }, @@ -9355,7 +9153,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/effect/decal/cleanable/dirt, @@ -9386,7 +9183,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -9401,7 +9197,6 @@ icon_state = "plant-10" }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /obj/machinery/firealarm{ @@ -9420,7 +9215,6 @@ "aoT" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_pump/on, @@ -9463,7 +9257,6 @@ }, /obj/item/reagent_containers/food/drinks/beer{ desc = "A station exclusive. Consumption may result in seizures, blindness, drunkenness, or even death."; - icon_state = "beer"; list_reagents = list(/datum/reagent/consumable/ethanol/thirteenloko = 30); name = "Kilo-Kocktail"; pixel_x = 5; @@ -9476,7 +9269,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -9492,7 +9284,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -9516,21 +9307,18 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/dark, /area/security/courtroom) "apb" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "0"; req_one_access_txt = "12;47" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -9553,7 +9341,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /turf/open/floor/plasteel/dark, @@ -9574,7 +9361,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/sorting/mail/flip{ @@ -9587,7 +9373,6 @@ /area/science/xenobiology) "ape" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /turf/open/floor/wood, @@ -9604,7 +9389,6 @@ /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -9638,7 +9422,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/light/small, @@ -9653,7 +9436,6 @@ network = list("minisat") }, /obj/effect/turf_decal/stripes/line, -/obj/structure/cable, /turf/open/floor/engine, /area/ai_monitored/turret_protected/aisat_interior) "api" = ( @@ -9682,7 +9464,6 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /turf/open/floor/plasteel/dark, @@ -9697,7 +9478,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -9710,7 +9490,7 @@ /area/lawoffice) "apm" = ( /obj/effect/decal/cleanable/blood/gibs/old, -/turf/open/floor/plating/asteroid/airless, +/turf/open/floor/plating/asteroid/lowpressure, /area/space/nearstation) "apn" = ( /obj/machinery/porta_turret/ai{ @@ -9780,7 +9560,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/structure/cable, @@ -9869,7 +9648,6 @@ "apz" = ( /obj/effect/turf_decal/delivery, /obj/machinery/power/terminal{ - icon_state = "term"; dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -10066,7 +9844,6 @@ "apQ" = ( /obj/effect/turf_decal/bot, /obj/structure/tank_dispenser/oxygen{ - layer = 2.9; pixel_x = -1; pixel_y = 2 }, @@ -10088,7 +9865,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/effect/turf_decal/loading_area, @@ -10106,7 +9882,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/disposalpipe/segment{ @@ -10143,29 +9918,19 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/structure/chair/office/light{ - dir = 8 - }, /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/item/radio/intercom{ pixel_x = -28; pixel_y = 22 }, -/obj/effect/landmark/start/geneticist, -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/obj/effect/turf_decal/tile/blue{ + dir = 1 }, /turf/open/floor/plasteel/showroomfloor, -/area/medical/genetics) +/area/medical/storage) "apX" = ( /turf/closed/wall/rust, /area/maintenance/central) @@ -10176,7 +9941,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -10193,7 +9957,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/landmark/event_spawn, @@ -10212,7 +9975,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -10225,14 +9987,12 @@ /area/maintenance/port/fore) "aqb" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -10262,7 +10022,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/effect/turf_decal/stripes/line{ @@ -10319,7 +10078,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/effect/landmark/start/chaplain, @@ -10343,7 +10101,6 @@ dir = 1 }, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 8 }, /obj/item/storage/briefcase, @@ -10386,8 +10143,10 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, +/obj/structure/bed, +/obj/item/bedsheet/medical, /turf/open/floor/plasteel/showroomfloor, -/area/medical/genetics) +/area/medical/storage) "aqp" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, @@ -10395,15 +10154,12 @@ /turf/open/floor/grass, /area/chapel/main) "aqq" = ( -/obj/machinery/status_display/ai{ - pixel_x = -32 - }, -/obj/machinery/light{ +/obj/structure/window/reinforced{ dir = 8 }, -/obj/item/beacon, -/turf/open/floor/engine, -/area/science/explab) +/obj/structure/flora/ausbushes/leafybush, +/turf/open/floor/grass, +/area/science/genetics) "aqr" = ( /obj/structure/flora/grass/jungle, /obj/structure/flora/ausbushes/grassybush, @@ -10411,7 +10167,6 @@ /obj/structure/flora/ausbushes/fernybush, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /turf/open/floor/grass, @@ -10492,7 +10247,6 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/machinery/door/airlock/engineering{ @@ -10516,7 +10270,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, /obj/machinery/door/airlock/research{ name = "Xenobiology Lab"; - req_access_txt = "47" + req_access_txt = "8" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -10527,7 +10281,7 @@ }, /obj/structure/cable, /turf/open/floor/plasteel/dark, -/area/science/explab) +/area/science/genetics) "aqC" = ( /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/dirt, @@ -10574,7 +10328,6 @@ areastring = "/area/maintenance/solars/starboard/fore"; dir = 1; name = "Starboard Bow Solar APC"; - pixel_x = 0; pixel_y = 26 }, /obj/effect/turf_decal/stripes/line{ @@ -10594,8 +10347,7 @@ /obj/machinery/power/solar_control{ dir = 8; id = "forestarboard"; - name = "Starboard Bow Solar Control"; - track = 0 + name = "Starboard Bow Solar Control" }, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/stripes/line{ @@ -10689,7 +10441,6 @@ /area/bridge) "aqN" = ( /obj/machinery/computer/med_data{ - icon_state = "computer"; dir = 8 }, /obj/effect/turf_decal/tile/blue, @@ -10711,26 +10462,14 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "aqP" = ( -/obj/item/storage/box/rxglasses{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/box/bodybags, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/structure/table, -/obj/machinery/power/apc{ - dir = 1; - name = "Genetics Lab APC"; - areastring = "/area/medical/genetics"; - pixel_y = 24 - }, -/obj/effect/turf_decal/stripes/corner, /obj/structure/cable, +/obj/structure/closet/secure_closet/personal/patient, /turf/open/floor/plasteel/dark, -/area/medical/genetics) +/area/medical/storage) "aqQ" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -10792,7 +10531,6 @@ }, /obj/effect/turf_decal/tile/purple, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /obj/effect/landmark/start/roboticist, @@ -10810,7 +10548,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/structure/cable, @@ -10909,7 +10646,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -10936,8 +10672,7 @@ dir = 8 }, /obj/structure/window/reinforced{ - dir = 1; - pixel_y = 0 + dir = 1 }, /turf/open/floor/plasteel/dark, /area/science/lab) @@ -10963,14 +10698,12 @@ /area/bridge) "are" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -10990,7 +10723,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/effect/decal/cleanable/dirt, @@ -11116,7 +10848,6 @@ }, /obj/effect/turf_decal/tile/purple, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 4 }, /obj/machinery/airalarm{ @@ -11220,14 +10951,13 @@ "arz" = ( /obj/effect/decal/cleanable/blood/old, /obj/item/tank/internals/emergency_oxygen/empty, -/turf/open/floor/plating/asteroid/airless, +/turf/open/floor/plating/asteroid/lowpressure, /area/space/nearstation) "arA" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/effect/turf_decal/stripes/line{ @@ -11257,7 +10987,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/effect/turf_decal/stripes/corner{ @@ -11279,7 +11008,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/effect/decal/cleanable/dirt, @@ -11289,7 +11017,6 @@ /area/maintenance/starboard/fore) "arF" = ( /obj/machinery/computer/communications{ - icon_state = "computer"; dir = 1 }, /obj/effect/turf_decal/tile/neutral{ @@ -11305,43 +11032,46 @@ /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/captain) "arG" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible, -/obj/effect/turf_decal/delivery, /obj/machinery/power/apc{ - areastring = "/area/science/explab"; + areastring = "/area/science/genetics"; dir = 1; - name = "Experimentation Lab APC"; + name = "Genetics Lab APC"; pixel_y = 26 }, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, /obj/structure/cable, +/obj/effect/turf_decal/tile/neutral, +/obj/machinery/vending/wardrobe/gene_wardrobe, /turf/open/floor/plasteel/dark, -/area/science/explab) +/area/science/genetics) "arH" = ( -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/junction/flip, -/obj/effect/turf_decal/stripes/line{ +/obj/structure/cable, +/obj/effect/turf_decal/tile/purple{ dir = 1 }, -/obj/structure/cable, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, /turf/open/floor/plasteel/showroomfloor, -/area/science/explab) +/area/science/genetics) "arI" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -11351,7 +11081,6 @@ dir = 1 }, /obj/effect/turf_decal/stripes/white/line{ - icon_state = "warningline_white"; dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -11407,7 +11136,6 @@ }, /obj/effect/turf_decal/stripes/corner, /obj/effect/turf_decal/stripes/white/corner{ - icon_state = "warninglinecorner_white"; dir = 1 }, /obj/machinery/light_switch{ @@ -11453,9 +11181,7 @@ /area/bridge) "arQ" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - pixel_x = 0; - pixel_y = 0 + icon_state = "plant-21" }, /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -11475,7 +11201,6 @@ /area/chapel/main) "arR" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /turf/open/floor/wood, @@ -11538,8 +11263,7 @@ dir = 4 }, /obj/item/storage/secure/safe{ - pixel_x = 34; - pixel_y = 0 + pixel_x = 34 }, /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/captain) @@ -11589,8 +11313,7 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /turf/open/floor/plasteel/dark, /area/bridge) @@ -11636,7 +11359,6 @@ "ase" = ( /obj/structure/lattice/catwalk, /obj/effect/landmark/xeno_spawn, -/obj/structure/cable, /turf/open/floor/plating/airless, /area/solar/starboard/fore) "asf" = ( @@ -11679,7 +11401,6 @@ /area/security/courtroom) "asl" = ( /obj/structure/chair/pew/right{ - icon_state = "pewend_right"; dir = 4 }, /obj/effect/turf_decal/tile/blue{ @@ -11695,7 +11416,6 @@ /area/security/courtroom) "asm" = ( /obj/structure/chair/pew/right{ - icon_state = "pewend_right"; dir = 4 }, /obj/effect/turf_decal/tile/blue{ @@ -11712,7 +11432,6 @@ /area/security/courtroom) "asn" = ( /obj/structure/chair/pew/left{ - icon_state = "pewend_left"; dir = 8 }, /obj/effect/turf_decal/tile/blue{ @@ -11739,7 +11458,6 @@ areastring = "/area/maintenance/port/fore"; dir = 1; name = "Port Bow Maintenance APC"; - pixel_x = 0; pixel_y = 26 }, /obj/structure/cable, @@ -11764,8 +11482,7 @@ /obj/effect/turf_decal/stripes/corner, /obj/machinery/firealarm{ dir = 8; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -11799,34 +11516,24 @@ }, /area/maintenance/port/fore) "ass" = ( -/obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ dir = 4 }, /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue, -/obj/structure/chair/office/light{ - dir = 4 - }, /obj/machinery/newscaster{ pixel_x = 30; pixel_y = 32 }, -/obj/effect/landmark/start/geneticist, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, /obj/structure/cable, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, /turf/open/floor/plasteel/showroomfloor, -/area/medical/genetics) +/area/medical/storage) "ast" = ( /obj/structure/chair/pew/left{ - icon_state = "pewend_left"; dir = 8 }, /obj/effect/turf_decal/tile/blue{ @@ -11864,11 +11571,9 @@ dir = 8 }, /obj/effect/turf_decal/stripes/white/line{ - icon_state = "warningline_white"; dir = 8 }, /obj/effect/turf_decal/stripes/white/line{ - icon_state = "warningline_white"; dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -11878,7 +11583,6 @@ /area/medical/morgue) "asw" = ( /obj/structure/chair/pew{ - icon_state = "pewmiddle"; dir = 4 }, /obj/effect/turf_decal/tile/blue{ @@ -11908,17 +11612,15 @@ dir = 8 }, /obj/effect/turf_decal/stripes/white/line{ - icon_state = "warningline_white"; dir = 4 }, /obj/effect/turf_decal/stripes/white/line{ - icon_state = "warningline_white"; dir = 8 }, /obj/machinery/power/apc{ + areastring = "/area/medical/morgue"; dir = 1; name = "Morgue APC"; - areastring = "/area/medical/morgue"; pixel_y = 24 }, /obj/structure/cable, @@ -11930,7 +11632,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /obj/structure/disposalpipe/segment, @@ -11965,8 +11666,7 @@ /obj/machinery/camera{ c_tag = "Autopsy Room"; dir = 1; - name = "detective camera"; - network = list("ss13") + name = "detective camera" }, /obj/machinery/status_display/ai{ pixel_x = 32; @@ -12002,14 +11702,11 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/power/apc{ - dir = 2; - lighting = 3; - name = "Chapel Office APC"; areastring = "/area/chapel/office"; + name = "Chapel Office APC"; pixel_y = -25 }, /obj/structure/cable, @@ -12026,7 +11723,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/effect/decal/cleanable/dirt, @@ -12080,7 +11776,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -12094,7 +11789,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -12103,7 +11797,6 @@ /area/maintenance/fore) "asN" = ( /obj/structure/chair/pew{ - icon_state = "pewmiddle"; dir = 4 }, /obj/machinery/light{ @@ -12117,7 +11810,6 @@ /area/security/prison) "asP" = ( /obj/structure/chair/pew/left{ - icon_state = "pewend_left"; dir = 4 }, /obj/effect/turf_decal/tile/blue{ @@ -12131,7 +11823,6 @@ /area/security/courtroom) "asQ" = ( /obj/structure/chair/pew/right{ - icon_state = "pewend_right"; dir = 8 }, /obj/effect/turf_decal/tile/blue{ @@ -12156,16 +11847,15 @@ /area/maintenance/fore) "asS" = ( /obj/machinery/power/apc{ + areastring = "/area/maintenance/fore"; dir = 1; name = "Fore Maintenance APC"; - areastring = "/area/maintenance/fore"; pixel_y = 23 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -12186,9 +11876,7 @@ dir = 4 }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - pixel_x = 0; - pixel_y = 0 + icon_state = "plant-21" }, /turf/open/floor/plasteel/dark, /area/chapel/main) @@ -12198,7 +11886,6 @@ }, /obj/structure/filingcabinet/chestdrawer, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /obj/effect/turf_decal/tile/blue{ @@ -12254,7 +11941,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -12295,8 +11981,7 @@ /obj/machinery/flasher{ id = "hopflash"; name = "Crowd Pacifier"; - pixel_x = 24; - pixel_y = 0 + pixel_x = 24 }, /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/hop) @@ -12305,7 +11990,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/structure/grille/broken, @@ -12375,8 +12059,7 @@ /area/bridge) "atk" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /turf/open/floor/plasteel/dark, /area/maintenance/port/aft) @@ -12391,8 +12074,7 @@ /area/maintenance/starboard/fore) "atm" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/barricade/wooden/crude, @@ -12411,17 +12093,18 @@ /turf/open/floor/plasteel/dark, /area/crew_quarters/bar/atrium) "atp" = ( -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, /obj/structure/disposalpipe/segment, /obj/structure/cable, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, /turf/open/floor/plasteel/showroomfloor, -/area/science/explab) +/area/science/genetics) "atq" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -12473,15 +12156,13 @@ /turf/open/floor/plasteel, /area/quartermaster/office) "att" = ( -/obj/machinery/computer/rdservercontrol{ - dir = 2 - }, +/obj/machinery/computer/rdservercontrol, /obj/effect/turf_decal/bot, /obj/effect/decal/cleanable/dirt, /obj/machinery/power/apc{ + areastring = "/area/science/server"; dir = 1; name = "Research Division Server Room APC"; - areastring = "/area/science/server"; pixel_y = 25 }, /obj/effect/turf_decal/stripes/corner, @@ -12504,7 +12185,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/effect/decal/cleanable/cobweb, @@ -12515,7 +12195,6 @@ /area/maintenance/starboard) "atw" = ( /obj/structure/chair/pew/left{ - icon_state = "pewend_left"; dir = 1 }, /obj/structure/extinguisher_cabinet{ @@ -12536,12 +12215,10 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/power/apc{ areastring = "/area/maintenance/starboard"; - dir = 2; name = "Starboard Maintenance APC"; pixel_y = -23 }, @@ -12557,7 +12234,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/effect/turf_decal/stripes/corner{ @@ -12599,7 +12275,6 @@ "atD" = ( /obj/effect/turf_decal/delivery, /obj/machinery/power/terminal{ - icon_state = "term"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -12753,7 +12428,7 @@ }, /obj/structure/cable, /turf/open/floor/grass, -/area/medical/genetics) +/area/medical/storage) "atN" = ( /obj/structure/flora/tree/jungle/small, /obj/structure/disposalpipe/segment{ @@ -12761,7 +12436,7 @@ }, /obj/structure/cable, /turf/open/floor/grass, -/area/medical/genetics) +/area/medical/storage) "atO" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -12790,7 +12465,7 @@ }, /obj/structure/cable, /turf/open/floor/grass, -/area/medical/genetics) +/area/medical/storage) "atR" = ( /obj/structure/flora/grass/jungle, /obj/structure/flora/ausbushes/fernybush, @@ -12799,25 +12474,12 @@ dir = 10 }, /obj/structure/cable, -/mob/living/carbon/monkey, /turf/open/floor/grass, -/area/medical/genetics) +/area/medical/storage) "atS" = ( -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/loading_area{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/corner, /obj/structure/cable, /turf/open/floor/plasteel/showroomfloor, -/area/medical/genetics) +/area/medical/storage) "atT" = ( /turf/closed/wall/r_wall, /area/bridge) @@ -12833,11 +12495,9 @@ dir = 4 }, /obj/effect/turf_decal/stripes/white/line{ - icon_state = "warningline_white"; dir = 8 }, /obj/effect/turf_decal/stripes/white/line{ - icon_state = "warningline_white"; dir = 4 }, /obj/effect/landmark/blobstart, @@ -12846,21 +12506,27 @@ /turf/open/floor/plasteel/dark, /area/medical/morgue) "atV" = ( -/obj/machinery/atmospherics/components/binary/pump{ - desc = "A pump that moves gas by pressure. Shower not included."; - dir = 8; - name = "Gas to Chamber" +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 }, /obj/effect/turf_decal/tile/purple{ dir = 8 }, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, /turf/open/floor/plasteel/showroomfloor, -/area/science/explab) +/area/science/genetics) "atW" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -12873,11 +12539,9 @@ dir = 4 }, /obj/effect/turf_decal/stripes/white/line{ - icon_state = "warningline_white"; dir = 4 }, /obj/effect/turf_decal/stripes/white/line{ - icon_state = "warningline_white"; dir = 8 }, /obj/structure/cable, @@ -12894,9 +12558,9 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, +/obj/structure/cable, /turf/open/floor/engine, /area/ai_monitored/turret_protected/aisat/atmos) "atY" = ( @@ -12945,22 +12609,20 @@ }, /area/tcommsat/server) "aub" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 9 +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, /obj/effect/turf_decal/tile/purple{ - dir = 8 + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 }, /turf/open/floor/plasteel/showroomfloor, -/area/science/explab) -"auc" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/bridge) +/area/science/genetics) "aud" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/structure/sign/poster/contraband/random{ @@ -12980,7 +12642,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -12992,9 +12653,9 @@ }, /obj/effect/turf_decal/stripes/corner, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, +/obj/structure/cable, /turf/open/floor/engine, /area/ai_monitored/turret_protected/aisat/atmos) "aug" = ( @@ -13003,7 +12664,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -13023,9 +12683,7 @@ dir = 1 }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - pixel_x = 0; - pixel_y = 0 + icon_state = "plant-21" }, /obj/effect/turf_decal/stripes/corner, /turf/open/floor/plasteel, @@ -13039,7 +12697,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/corner{ @@ -13065,7 +12722,6 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -13082,7 +12738,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/effect/turf_decal/stripes/corner, @@ -13107,9 +12762,9 @@ "auo" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/power/apc{ + areastring = "/area/maintenance/central"; dir = 4; name = "Central Maintenance APC"; - areastring = "/area/maintenance/central"; pixel_x = 26 }, /obj/effect/decal/cleanable/dirt, @@ -13143,6 +12798,7 @@ name = "Head of Personnel's Office"; req_access_txt = "57" }, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel/dark, /area/security/courtroom) "aus" = ( @@ -13150,7 +12806,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/machinery/light/small{ @@ -13170,7 +12825,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/effect/decal/cleanable/dirt, @@ -13205,6 +12859,7 @@ dir = 4 }, /obj/effect/turf_decal/stripes/line, +/obj/structure/cable, /turf/open/floor/plasteel, /area/bridge) "auw" = ( @@ -13243,19 +12898,14 @@ /turf/closed/wall/rust, /area/maintenance/starboard) "auA" = ( -/obj/machinery/disposal/bin, -/obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ dir = 8 }, /obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/bot, /obj/effect/turf_decal/stripes/corner, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, +/obj/effect/turf_decal/tile/blue, /turf/open/floor/plasteel/showroomfloor, -/area/medical/genetics) +/area/medical/storage) "auB" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment{ @@ -13293,16 +12943,10 @@ /turf/closed/wall/rust, /area/crew_quarters/heads/cmo) "auG" = ( -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/structure/disposalpipe/sorting/mail/flip{ @@ -13311,8 +12955,10 @@ sortType = 13 }, /obj/structure/cable, +/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel/showroomfloor, -/area/science/explab) +/area/science/genetics) "auH" = ( /obj/effect/turf_decal/bot, /obj/effect/decal/cleanable/dirt, @@ -13335,12 +12981,19 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/stripes/line{ +/obj/structure/cable, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ dir = 4 }, -/obj/structure/cable, -/turf/open/floor/plasteel/dark, -/area/science/explab) +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/turf/open/floor/plasteel/showroomfloor, +/area/science/genetics) "auK" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -13351,7 +13004,6 @@ "auL" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 1 }, /obj/effect/turf_decal/tile/neutral, @@ -13373,7 +13025,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -13386,7 +13037,6 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /obj/machinery/light_switch{ @@ -13457,7 +13107,6 @@ dir = 1 }, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 4 }, /obj/item/twohanded/required/kirbyplants, @@ -13512,7 +13161,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/effect/decal/cleanable/dirt, @@ -13570,7 +13218,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/effect/decal/cleanable/dirt, @@ -13585,7 +13232,6 @@ /area/security/courtroom) "avd" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{ - icon_state = "pipe11-3"; dir = 6 }, /obj/effect/decal/cleanable/blood/old, @@ -13634,7 +13280,6 @@ /area/crew_quarters/heads/captain) "avh" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{ - icon_state = "pipe11-3"; dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -13646,7 +13291,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/disposalpipe/segment{ @@ -13659,7 +13303,6 @@ /area/maintenance/port/fore) "avj" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{ - icon_state = "pipe11-3"; dir = 4 }, /obj/item/tank/internals/oxygen/empty, @@ -13721,7 +13364,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/blood/old, @@ -13815,7 +13457,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/machinery/light/small{ @@ -13830,12 +13471,10 @@ }, /area/maintenance/port/fore) "avx" = ( -/obj/item/reagent_containers/food/snacks/grown/banana, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/structure/disposalpipe/segment{ @@ -13843,7 +13482,7 @@ }, /obj/structure/cable, /turf/open/floor/grass, -/area/medical/genetics) +/area/medical/storage) "avy" = ( /obj/structure/table/wood, /obj/item/clipboard, @@ -13865,13 +13504,10 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/window/westleft{ - dir = 8; name = "Monkey Pen"; - pixel_y = 0; req_access_txt = "9" }, /obj/structure/disposalpipe/segment{ @@ -13880,38 +13516,33 @@ /obj/effect/turf_decal/delivery, /obj/structure/cable, /turf/open/floor/plasteel/dark, -/area/medical/genetics) +/area/medical/storage) "avC" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, -/obj/effect/landmark/start/geneticist, /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, /turf/open/floor/plasteel/showroomfloor, -/area/medical/genetics) +/area/medical/storage) "avD" = ( /obj/effect/turf_decal/tile/red{ dir = 4 @@ -13964,18 +13595,8 @@ /turf/open/floor/plasteel/dark, /area/teleporter) "avG" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -13983,7 +13604,7 @@ }, /obj/structure/cable, /turf/open/floor/plasteel/showroomfloor, -/area/medical/genetics) +/area/medical/storage) "avH" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/delivery, @@ -14004,22 +13625,19 @@ /turf/open/floor/plating, /area/medical/medbay/central) "avI" = ( -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1, /obj/effect/landmark/event_spawn, -/obj/effect/landmark/start/geneticist, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, /obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/bed, +/obj/item/bedsheet/medical, /turf/open/floor/plasteel/showroomfloor, -/area/medical/genetics) +/area/medical/storage) "avJ" = ( /obj/machinery/door/firedoor, /obj/machinery/light/small{ @@ -14045,22 +13663,18 @@ /turf/open/floor/plasteel/dark, /area/medical/morgue) "avL" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel/showroomfloor, -/area/medical/genetics) +/area/medical/storage) "avM" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/neutral{ @@ -14068,7 +13682,6 @@ }, /obj/effect/turf_decal/tile/neutral, /obj/machinery/computer/secure_data{ - icon_state = "computer"; dir = 4 }, /obj/machinery/newscaster/security_unit{ @@ -14083,7 +13696,6 @@ "avN" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{ - icon_state = "pipe11-3"; dir = 4 }, /obj/structure/sign/warning/xeno_mining{ @@ -14158,7 +13770,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -14174,14 +13785,12 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /turf/open/floor/plasteel, /area/bridge) "avS" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer3{ - icon_state = "manifold-3"; dir = 1 }, /obj/effect/turf_decal/stripes/line{ @@ -14202,11 +13811,9 @@ dir = 4 }, /obj/effect/turf_decal/stripes/white/corner{ - icon_state = "warninglinecorner_white"; dir = 4 }, /obj/effect/turf_decal/stripes/white/corner{ - icon_state = "warninglinecorner_white"; dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -14243,7 +13850,6 @@ dir = 4 }, /obj/effect/turf_decal/stripes/white/line{ - icon_state = "warningline_white"; dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -14268,7 +13874,6 @@ dir = 4 }, /obj/effect/turf_decal/stripes/white/line{ - icon_state = "warningline_white"; dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -14291,7 +13896,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -14311,11 +13915,9 @@ dir = 4 }, /obj/effect/turf_decal/stripes/white/corner{ - icon_state = "warninglinecorner_white"; dir = 4 }, /obj/effect/turf_decal/stripes/white/corner{ - icon_state = "warninglinecorner_white"; dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -14345,7 +13947,6 @@ "awb" = ( /obj/structure/lattice/catwalk, /obj/structure/transit_tube/horizontal{ - icon_state = "straight"; dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -14359,7 +13960,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/effect/turf_decal/stripes/line{ @@ -14404,14 +14004,12 @@ /area/maintenance/starboard/fore) "awg" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "0"; req_one_access_txt = "12;37" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -14425,6 +14023,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 }, +/obj/structure/cable, /turf/open/floor/plasteel, /area/bridge) "awi" = ( @@ -14435,7 +14034,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -14465,7 +14063,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -14483,7 +14080,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -14515,7 +14111,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -14552,7 +14147,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/effect/decal/cleanable/dirt, @@ -14564,14 +14158,16 @@ /area/maintenance/starboard/fore) "aws" = ( /obj/effect/turf_decal/tile/purple, +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /obj/effect/turf_decal/tile/purple{ dir = 4 }, -/obj/effect/turf_decal/tile/purple, -/obj/structure/disposalpipe/segment, -/obj/structure/cable, /turf/open/floor/plasteel/showroomfloor, -/area/science/explab) +/area/science/genetics) "awt" = ( /obj/machinery/atmospherics/pipe/layer_manifold, /turf/closed/wall/r_wall, @@ -14633,7 +14229,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/sign/departments/security{ @@ -14664,8 +14259,7 @@ pixel_y = 6 }, /obj/item/cartridge/engineering{ - pixel_x = 8; - pixel_y = 0 + pixel_x = 8 }, /obj/item/cartridge/atmos{ pixel_x = -6; @@ -14705,7 +14299,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/structure/cable, @@ -14747,7 +14340,6 @@ /area/crew_quarters/fitness/recreation) "awE" = ( /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 8 }, /obj/effect/turf_decal/tile/neutral, @@ -14772,7 +14364,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/table, @@ -14796,7 +14387,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/structure/cable, @@ -14818,8 +14408,7 @@ id = "bankshutter"; name = "Bank Shutter Toggle"; pixel_x = 24; - pixel_y = -8; - req_access_txt = "0" + pixel_y = -8 }, /obj/item/paper_bin{ pixel_x = -4; @@ -14853,7 +14442,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -14913,7 +14501,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/structure/cable, @@ -14967,7 +14554,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, /obj/structure/cable, /turf/open/floor/plasteel/showroomfloor, -/area/medical/genetics) +/area/medical/storage) "awZ" = ( /turf/closed/wall/rust, /area/security/checkpoint/engineering) @@ -14997,10 +14584,8 @@ dir = 1 }, /obj/structure/disposalpipe/junction/yjunction{ - icon_state = "pipe-y"; dir = 4 }, -/obj/structure/cable, /turf/open/floor/plasteel/dark, /area/medical/morgue) "axe" = ( @@ -15081,7 +14666,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/machinery/holopad, @@ -15092,9 +14676,9 @@ "axj" = ( /obj/structure/table, /obj/machinery/power/apc{ + areastring = "/area/security/nuke_storage"; dir = 1; name = "Vault APC"; - areastring = "/area/security/nuke_storage"; pixel_y = 25 }, /obj/item/folder/blue{ @@ -15141,6 +14725,7 @@ name = "Teleporter Access"; req_one_access_txt = "17;19" }, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel/dark, /area/teleporter) "axn" = ( @@ -15205,7 +14790,6 @@ /area/maintenance/starboard/fore) "axs" = ( /obj/machinery/computer/rdconsole/production{ - icon_state = "computer"; dir = 8 }, /obj/effect/turf_decal/bot, @@ -15265,7 +14849,6 @@ dir = 1 }, /obj/machinery/computer/prisoner/management{ - icon_state = "computer"; dir = 4 }, /turf/open/floor/plasteel/dark, @@ -15317,9 +14900,9 @@ dir = 1 }, /obj/machinery/power/apc/highcap/five_k{ + areastring = "/area/tcommsat/server"; dir = 4; name = "Telecomms Server Room APC"; - areastring = "/area/tcommsat/server"; pixel_x = 25 }, /obj/structure/cable, @@ -15428,16 +15011,15 @@ dir = 8 }, /obj/machinery/power/apc{ + areastring = "/area/science/robotics/lab"; dir = 1; name = "Robotics Lab APC"; - areastring = "/area/science/robotics/lab"; pixel_y = 25 }, /obj/structure/cable, /turf/open/floor/plasteel/dark, /area/science/robotics/lab) "axL" = ( -/obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple{ dir = 4 }, @@ -15447,8 +15029,11 @@ }, /obj/structure/disposalpipe/segment, /obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel/showroomfloor, -/area/science/explab) +/area/science/genetics) "axM" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -15599,7 +15184,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/structure/cable, @@ -15613,7 +15197,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/sink/kitchen{ @@ -15752,7 +15335,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -15767,7 +15349,6 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -15806,7 +15387,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/structure/cable, @@ -15828,8 +15408,13 @@ pixel_x = 26 }, /obj/effect/turf_decal/stripes/corner, -/turf/open/floor/plasteel/dark, -/area/science/explab) +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/landmark/start/geneticist, +/turf/open/floor/plasteel/showroomfloor, +/area/science/genetics) "ayv" = ( /obj/effect/turf_decal/box, /turf/open/floor/engine, @@ -15839,7 +15424,7 @@ dir = 4 }, /turf/closed/wall/r_wall, -/area/science/explab) +/area/science/genetics) "ayx" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -15894,7 +15479,6 @@ id = "medbay_front_door"; name = "Medbay Doors Toggle"; normaldoorcontrol = 1; - pixel_x = 0; pixel_y = 24; req_access_txt = "5" }, @@ -16001,7 +15585,6 @@ /obj/machinery/button/door{ id = "engsm"; name = "Radiation Shutters Toggle"; - pixel_x = 0; pixel_y = -24; req_access_txt = "10" }, @@ -16035,7 +15618,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -16059,17 +15641,14 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/sign/directions/evac{ dir = 4; - icon_state = "direction_evac"; pixel_y = 24 }, /obj/structure/sign/directions/science{ dir = 1; - icon_state = "direction_sci"; pixel_y = 40 }, /obj/structure/sign/directions/supply{ @@ -16103,8 +15682,7 @@ /obj/effect/turf_decal/tile/neutral, /obj/machinery/firealarm{ dir = 4; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /turf/open/floor/plasteel/dark, /area/engine/engineering) @@ -16133,30 +15711,28 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat/foyer) "ayT" = ( -/obj/machinery/computer/rdconsole/experiment{ - icon_state = "computer"; +/obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ + dir = 8 + }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; - dir = 8 +/obj/effect/turf_decal/stripes/line{ + dir = 10 }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ dir = 1 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/science/explab) +/turf/open/floor/plasteel/showroomfloor, +/area/science/genetics) "ayU" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -16176,7 +15752,6 @@ }, /obj/machinery/camera{ c_tag = "Starboard Hallway Research Desk"; - dir = 2; name = "starboard camera" }, /turf/open/floor/plasteel/dark, @@ -16239,7 +15814,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -16266,7 +15840,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/sign/departments/evac{ @@ -16313,12 +15886,12 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, /obj/machinery/door/airlock/medical/glass{ - name = "Genetics"; - req_access_txt = "5; 9; 68" + name = "Ward"; + req_access_txt = "5" }, /obj/structure/cable, /turf/open/floor/plasteel/dark, -/area/medical/genetics) +/area/medical/storage) "azg" = ( /obj/structure/table, /obj/item/hand_labeler, @@ -16334,12 +15907,11 @@ dir = 4 }, /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, /obj/structure/disposalpipe/segment, -/obj/structure/cable, /turf/open/floor/plasteel/dark, /area/medical/morgue) "azi" = ( @@ -16365,9 +15937,9 @@ dir = 1 }, /obj/machinery/power/apc{ + areastring = "/area/chapel/main"; dir = 8; name = "Chapel APC"; - areastring = "/area/chapel/main"; pixel_x = -25 }, /obj/structure/cable, @@ -16461,7 +16033,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/effect/landmark/start/assistant, @@ -16471,25 +16042,18 @@ }, /area/chapel/main) "azt" = ( -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, -/obj/effect/landmark/start/scientist, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/effect/landmark/start/geneticist, /turf/open/floor/plasteel/showroomfloor, -/area/science/explab) +/area/science/genetics) "azu" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -16498,7 +16062,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -16596,7 +16159,6 @@ "azG" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -16667,20 +16229,20 @@ /turf/open/floor/plasteel/dark, /area/engine/engineering) "azL" = ( -/obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple{ dir = 4 }, /obj/effect/turf_decal/tile/purple, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/stripes/line, /obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, /turf/open/floor/plasteel/showroomfloor, -/area/science/explab) +/area/science/genetics) "azM" = ( /obj/effect/turf_decal/tile/red{ dir = 8 @@ -16694,12 +16256,10 @@ /obj/effect/turf_decal/tile/yellow, /obj/machinery/portable_atmospherics/scrubber, /obj/machinery/atmospherics/components/unary/portables_connector/visible/layer3{ - icon_state = "connector_map-3"; dir = 1 }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /obj/effect/turf_decal/box, @@ -16817,7 +16377,6 @@ areastring = "/area/crew_quarters/heads/cmo"; dir = 1; name = "CMO's Office APC"; - pixel_x = 0; pixel_y = 26 }, /obj/structure/cable, @@ -16897,11 +16456,9 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/grunge{ name = "Morgue"; - opacity = 1; req_access_txt = "5" }, /obj/structure/disposalpipe/segment, -/obj/structure/cable, /turf/open/floor/plasteel/dark, /area/medical/morgue) "aAa" = ( @@ -16915,8 +16472,7 @@ /obj/effect/turf_decal/bot, /obj/machinery/firealarm{ dir = 8; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /turf/open/floor/plasteel/dark, /area/engine/engineering) @@ -16967,7 +16523,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/engineering/glass{ @@ -17047,7 +16602,6 @@ areastring = "/area/science/robotics/mechbay"; dir = 1; name = "Mech Bay APC"; - pixel_x = 0; pixel_y = 26 }, /obj/structure/cable, @@ -17094,13 +16648,13 @@ "aAp" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/research{ - name = "Experimentation Lab"; - req_access_txt = "47" + name = "Genetics Lab"; + req_access_txt = "47, 9" }, /obj/structure/disposalpipe/segment, /obj/structure/cable, /turf/open/floor/plasteel/dark, -/area/science/explab) +/area/science/genetics) "aAq" = ( /obj/effect/turf_decal/tile/purple{ dir = 1 @@ -17182,7 +16736,6 @@ /area/engine/atmos) "aAu" = ( /obj/machinery/modular_computer/console/preset/engineering{ - icon_state = "console"; dir = 4 }, /obj/effect/turf_decal/tile/neutral, @@ -17370,7 +16923,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /turf/open/floor/plasteel/dark, @@ -17384,7 +16936,6 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /obj/effect/turf_decal/stripes/corner{ @@ -17416,9 +16967,8 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/structure/cable, /turf/open/floor/plasteel/showroomfloor, -/area/medical/genetics/cloning) +/area/medical/storage) "aAL" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -17458,21 +17008,14 @@ dir = 1 }, /obj/structure/closet/secure_closet/personal/patient, -/obj/machinery/power/apc/unlocked{ - dir = 4; - name = "Cloning Lab APC"; - areastring = "/area/medical/genetics/cloning"; - pixel_x = 24 - }, /obj/machinery/camera{ - c_tag = "Cloning Lab"; - dir = 2; + c_tag = "Medbay Aux Storage"; name = "medical camera"; network = list("ss13","medical") }, -/obj/structure/cable, +/obj/effect/turf_decal/bot, /turf/open/floor/plasteel/dark, -/area/medical/genetics/cloning) +/area/medical/storage) "aAP" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -17489,7 +17032,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /turf/closed/wall/r_wall, @@ -17500,25 +17042,21 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plating, /area/engine/engineering) "aAS" = ( -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, /obj/effect/turf_decal/tile/purple{ dir = 8 }, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, /turf/open/floor/plasteel/showroomfloor, -/area/science/explab) +/area/science/genetics) "aAT" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -17557,7 +17095,6 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ name = "Apiary"; - req_access_txt = "0"; req_one_access_txt = "22;35" }, /turf/open/floor/plasteel/dark, @@ -17627,19 +17164,15 @@ /area/science/robotics/lab) "aBf" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/reflector/box/anchored{ - icon_state = "reflector_map"; dir = 1 }, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 4 }, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 1 }, /turf/open/floor/plasteel/dark, @@ -17664,27 +17197,9 @@ /turf/open/floor/plasteel, /area/gateway) "aBi" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/effect/turf_decal/loading_area{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/showroomfloor, -/area/medical/genetics) +/area/medical/storage) "aBj" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -17702,7 +17217,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -17732,7 +17246,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/effect/landmark/start/station_engineer, @@ -17747,6 +17260,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/eva) "aBn" = ( @@ -17796,7 +17310,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -17806,7 +17319,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/effect/turf_decal/tile/red, @@ -17900,7 +17412,6 @@ /area/science/robotics/mechbay) "aBx" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/engine, @@ -17917,11 +17428,9 @@ dir = 4 }, /obj/structure/reflector/double/anchored{ - icon_state = "reflector_map"; dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/engine, @@ -17932,12 +17441,12 @@ dir = 8 }, /obj/effect/turf_decal/bot, -/obj/machinery/computer/cloning, /obj/item/radio/intercom{ pixel_y = 22 }, +/obj/structure/closet/wardrobe/pjs, /turf/open/floor/plasteel/dark, -/area/medical/genetics/cloning) +/area/medical/storage) "aBB" = ( /obj/structure/flora/grass/jungle, /obj/structure/beebox, @@ -17954,7 +17463,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/engine, @@ -17974,7 +17482,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/structure/disposalpipe/segment{ @@ -17996,7 +17503,6 @@ /obj/effect/turf_decal/stripes/line, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /obj/structure/extinguisher_cabinet{ @@ -18015,7 +17521,6 @@ "aBH" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -18037,7 +17542,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -18095,7 +17599,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/research/glass{ @@ -18121,7 +17624,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -18217,7 +17719,6 @@ /obj/effect/turf_decal/tile/purple, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -18259,7 +17760,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -18304,7 +17804,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -18354,7 +17853,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/structure/cable, @@ -18364,11 +17862,9 @@ /area/maintenance/starboard) "aCj" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - icon_state = "pipe11-3"; dir = 6 }, /turf/closed/wall/r_wall, @@ -18404,8 +17900,7 @@ /area/engine/engineering) "aCn" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/barricade/wooden/crude, @@ -18495,7 +17990,6 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/effect/landmark/event_spawn, @@ -18620,7 +18114,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /obj/structure/cable, @@ -18674,7 +18167,6 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /obj/effect/turf_decal/stripes/line{ @@ -18689,19 +18181,14 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/medical/glass{ - id_tag = "CloningDoor"; - name = "Cloning Lab"; - req_access_txt = "5;68" - }, -/obj/effect/mapping_helpers/airlock/unres{ - dir = 4 + name = "Storage"; + req_access_txt = "5" }, /turf/open/floor/plasteel/dark, -/area/medical/genetics/cloning) +/area/medical/storage) "aCJ" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/blood/old, @@ -18709,7 +18196,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/cable, @@ -18725,7 +18211,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -18787,7 +18272,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/cable, @@ -18824,7 +18308,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /obj/structure/cable, @@ -18832,8 +18315,7 @@ /area/gateway) "aCS" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/barricade/wooden/crude, @@ -18857,7 +18339,6 @@ /area/engine/atmos) "aCU" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1{ - icon_state = "pipe11-1"; dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ @@ -18865,7 +18346,7 @@ }, /obj/structure/sign/plaques/atmos, /turf/closed/wall/rust, -/area/engine/break_room) +/area/engine/atmos) "aCV" = ( /obj/structure/sign/warning/securearea, /turf/closed/wall/r_wall, @@ -18888,7 +18369,6 @@ }, /obj/machinery/camera{ c_tag = "Atmospherics Scrubbers"; - dir = 2; name = "atmospherics camera"; network = list("ss13","engine") }, @@ -19010,7 +18490,6 @@ /obj/effect/turf_decal/bot, /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/machinery/button/door{ - dir = 2; id = "justiceblast"; layer = 4; name = "Justice Vent Toggle"; @@ -19043,7 +18522,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/landmark/start/cook, @@ -19128,7 +18606,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plating, @@ -19165,7 +18642,7 @@ }, /obj/effect/decal/cleanable/food/flour, /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12 }, /obj/machinery/camera{ @@ -19175,8 +18652,7 @@ }, /obj/machinery/firealarm{ dir = 4; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -19247,7 +18723,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/purple/visible{ - icon_state = "pipe11-2"; dir = 10 }, /obj/effect/turf_decal/stripes/line{ @@ -19257,38 +18732,22 @@ /turf/open/floor/plasteel, /area/engine/atmos) "aDz" = ( -/turf/open/floor/engine/n2{ - initial_gas_mix = "n2=1000;TEMP=293.15" - }, +/turf/open/floor/engine/n2, /area/engine/atmos) "aDA" = ( -/obj/machinery/atmospherics/miner/nitrogen{ - max_ext_kpa = 2500 - }, -/turf/open/floor/engine/n2{ - initial_gas_mix = "n2=1000;TEMP=293.15" - }, +/obj/machinery/portable_atmospherics/canister/nitrogen, +/turf/open/floor/engine/n2, /area/engine/atmos) -"aDB" = ( -/turf/closed/wall/r_wall, -/area/medical/genetics) "aDC" = ( -/turf/open/floor/engine/o2{ - initial_gas_mix = "o2=1000;TEMP=293.15" - }, +/turf/open/floor/engine/o2, /area/engine/atmos) "aDD" = ( -/obj/machinery/atmospherics/miner/oxygen{ - max_ext_kpa = 2500 - }, -/turf/open/floor/engine/o2{ - initial_gas_mix = "o2=1000;TEMP=293.15" - }, +/obj/machinery/portable_atmospherics/canister/oxygen, +/turf/open/floor/engine/o2, /area/engine/atmos) "aDE" = ( /obj/machinery/camera{ c_tag = "Atmospherics Tank - Air"; - dir = 2; name = "atmospherics camera"; network = list("ss13","engine") }, @@ -19322,7 +18781,6 @@ }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/cable, @@ -19339,7 +18797,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/structure/disposalpipe/segment, @@ -19486,15 +18943,13 @@ /obj/item/clothing/neck/stethoscope, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /obj/machinery/power/apc{ areastring = "/area/medical/cryo"; dir = 4; name = "Cryogenics APC"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -19535,6 +18990,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, /obj/effect/mapping_helpers/airlock/locked, /obj/structure/cable, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel/dark, /area/security/nuke_storage) "aEc" = ( @@ -19726,8 +19182,7 @@ dir = 4 }, /obj/structure/reagent_dispensers/peppertank{ - pixel_x = -30; - pixel_y = 0 + pixel_x = -30 }, /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -19764,7 +19219,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -19835,9 +19289,9 @@ dir = 1 }, /obj/machinery/power/apc{ + areastring = "/area/science/mixing"; dir = 4; name = "Toxins Lab APC"; - areastring = "/area/science/mixing"; pixel_x = 26 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -19888,8 +19342,7 @@ /area/maintenance/starboard/aft) "aEL" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/dark, @@ -19941,8 +19394,7 @@ /area/science/robotics/lab) "aEQ" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -19995,7 +19447,6 @@ /area/maintenance/port/fore) "aEU" = ( /obj/machinery/atmospherics/components/trinary/filter{ - icon_state = "filter_off"; dir = 1 }, /obj/effect/turf_decal/bot, @@ -20110,21 +19561,15 @@ pixel_x = -23 }, /turf/open/floor/grass, -/area/medical/genetics) +/area/medical/storage) "aFc" = ( -/turf/open/floor/engine/co2{ - initial_gas_mix = "co2=1000;TEMP=293.15" - }, +/turf/open/floor/engine/co2, /area/engine/atmos) "aFd" = ( -/turf/open/floor/engine/plasma{ - initial_gas_mix = "plasma=1000;TEMP=293.15" - }, +/turf/open/floor/engine/plasma, /area/engine/atmos) "aFe" = ( -/turf/open/floor/engine/n2o{ - initial_gas_mix = "n2o=1000;TEMP=293.15" - }, +/turf/open/floor/engine/n2o, /area/engine/atmos) "aFf" = ( /turf/open/floor/engine/vacuum, @@ -20213,28 +19658,16 @@ /turf/open/floor/plasteel/dark, /area/medical/cryo) "aFm" = ( -/obj/machinery/atmospherics/miner/carbon_dioxide{ - max_ext_kpa = 2500 - }, -/turf/open/floor/engine/co2{ - initial_gas_mix = "co2=1000;TEMP=293.15" - }, +/obj/machinery/portable_atmospherics/canister/carbon_dioxide, +/turf/open/floor/engine/co2, /area/engine/atmos) "aFn" = ( -/obj/machinery/atmospherics/miner/toxins{ - max_ext_kpa = 2500 - }, -/turf/open/floor/engine/plasma{ - initial_gas_mix = "plasma=1000;TEMP=293.15" - }, +/obj/machinery/portable_atmospherics/canister/toxins, +/turf/open/floor/engine/plasma, /area/engine/atmos) "aFo" = ( -/obj/machinery/atmospherics/miner/n2o{ - max_ext_kpa = 2500 - }, -/turf/open/floor/engine/n2o{ - initial_gas_mix = "n2o=1000;TEMP=293.15" - }, +/obj/machinery/portable_atmospherics/canister/nitrous_oxide, +/turf/open/floor/engine/n2o, /area/engine/atmos) "aFp" = ( /obj/machinery/computer/med_data, @@ -20312,12 +19745,19 @@ /area/medical/cryo) "aFs" = ( /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 1 }, -/obj/effect/decal/cleanable/cobweb, -/turf/open/floor/engine, -/area/science/explab) +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/grass, +/area/science/genetics) "aFt" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -20332,7 +19772,7 @@ dir = 4 }, /turf/open/floor/plasteel/showroomfloor, -/area/medical/genetics/cloning) +/area/medical/storage) "aFu" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical/glass{ @@ -20370,7 +19810,7 @@ dir = 1 }, /turf/open/floor/plasteel/showroomfloor, -/area/medical/genetics/cloning) +/area/medical/storage) "aFy" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -20379,13 +19819,12 @@ dir = 8 }, /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/showroomfloor, @@ -20544,9 +19983,8 @@ /obj/machinery/recharge_station, /obj/effect/turf_decal/bot, /obj/machinery/power/apc{ - dir = 2; - name = "MiniSat Maint APC"; areastring = "/area/ai_monitored/storage/satellite"; + name = "MiniSat Maint APC"; pixel_y = -26 }, /obj/effect/turf_decal/tile/neutral{ @@ -20570,7 +20008,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/cable, @@ -20608,7 +20045,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/effect/turf_decal/stripes/corner, @@ -20630,7 +20066,6 @@ /obj/machinery/atmospherics/pipe/simple/general/visible, /obj/effect/decal/cleanable/dirt, /obj/machinery/computer/atmos_control/incinerator{ - icon_state = "computer"; dir = 1 }, /obj/effect/turf_decal/tile/neutral{ @@ -20645,7 +20080,6 @@ /area/maintenance/disposal/incinerator) "aFV" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "0"; req_one_access_txt = "12;37" }, /obj/structure/disposalpipe/segment, @@ -20675,7 +20109,6 @@ }, /obj/effect/turf_decal/tile/purple, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /obj/structure/disposalpipe/segment, @@ -20686,7 +20119,6 @@ /turf/open/floor/plasteel/showroomfloor, /area/science/research) "aFZ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 4 }, @@ -20715,7 +20147,6 @@ /obj/effect/turf_decal/tile/purple, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/structure/disposalpipe/segment, @@ -20743,8 +20174,7 @@ /area/maintenance/disposal/incinerator) "aGd" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/barricade/wooden/crude, @@ -20754,8 +20184,7 @@ /area/maintenance/port) "aGe" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, @@ -20772,7 +20201,6 @@ /obj/effect/turf_decal/delivery, /obj/machinery/camera{ c_tag = "Atmospherics Lockers"; - dir = 2; name = "atmospherics camera"; network = list("ss13","engine") }, @@ -20833,13 +20261,10 @@ "aGk" = ( /obj/machinery/camera{ c_tag = "Atmospherics Tank - N2"; - dir = 2; name = "atmospherics camera"; network = list("ss13","engine") }, -/turf/open/floor/engine/n2{ - initial_gas_mix = "n2=1000;TEMP=293.15" - }, +/turf/open/floor/engine/n2, /area/engine/atmos) "aGl" = ( /obj/structure/table, @@ -20871,7 +20296,6 @@ dir = 1 }, /turf/open/floor/plasteel/dark/corner{ - icon_state = "darkcorner"; dir = 4 }, /area/hallway/primary/fore) @@ -20978,7 +20402,6 @@ /obj/effect/turf_decal/tile/yellow, /obj/machinery/portable_atmospherics/pump, /obj/machinery/atmospherics/components/unary/portables_connector/visible/layer1{ - icon_state = "connector_map-1"; dir = 1 }, /obj/machinery/light, @@ -21026,8 +20449,6 @@ dir = 4 }, /obj/machinery/door/window/northleft{ - dir = 1; - icon_state = "left"; name = "Inner Pipe Access"; req_access_txt = "24" }, @@ -21107,7 +20528,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/trinary/filter/atmos{ - icon_state = "filter_on"; dir = 8 }, /turf/open/floor/plasteel, @@ -21145,7 +20565,6 @@ dir = 4 }, /turf/open/floor/plasteel/dark/corner{ - icon_state = "darkcorner"; dir = 4 }, /area/hallway/primary/fore) @@ -21155,7 +20574,6 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -21198,7 +20616,6 @@ }, /obj/effect/decal/cleanable/food/flour, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/landmark/start/cook, @@ -21213,7 +20630,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -21281,7 +20697,6 @@ dir = 1 }, /turf/open/floor/plasteel/dark/corner{ - icon_state = "darkcorner"; dir = 4 }, /area/hallway/primary/fore) @@ -21292,7 +20707,6 @@ }, /obj/effect/decal/cleanable/food/flour, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/effect/landmark/event_spawn, @@ -21320,7 +20734,6 @@ }, /obj/structure/window/reinforced, /obj/machinery/atmospherics/components/trinary/filter/atmos/co2{ - icon_state = "filter_on"; dir = 4 }, /turf/open/floor/plasteel/dark, @@ -21329,45 +20742,33 @@ /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nitrogen_input{ dir = 4 }, -/turf/open/floor/engine/n2{ - initial_gas_mix = "n2=1000;TEMP=293.15" - }, +/turf/open/floor/engine/n2, /area/engine/atmos) "aGV" = ( /obj/machinery/air_sensor/atmos/nitrogen_tank, -/turf/open/floor/engine/n2{ - initial_gas_mix = "n2=1000;TEMP=293.15" - }, +/turf/open/floor/engine/n2, /area/engine/atmos) "aGW" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nitrogen_output{ dir = 4 }, -/turf/open/floor/engine/n2{ - initial_gas_mix = "n2=1000;TEMP=293.15" - }, +/turf/open/floor/engine/n2, /area/engine/atmos) "aGX" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/oxygen_input{ dir = 4 }, -/turf/open/floor/engine/o2{ - initial_gas_mix = "o2=1000;TEMP=293.15" - }, +/turf/open/floor/engine/o2, /area/engine/atmos) "aGY" = ( /obj/machinery/air_sensor/atmos/oxygen_tank, -/turf/open/floor/engine/o2{ - initial_gas_mix = "o2=1000;TEMP=293.15" - }, +/turf/open/floor/engine/o2, /area/engine/atmos) "aGZ" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/oxygen_output{ dir = 4 }, -/turf/open/floor/engine/o2{ - initial_gas_mix = "o2=1000;TEMP=293.15" - }, +/turf/open/floor/engine/o2, /area/engine/atmos) "aHa" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/air_input{ @@ -21389,67 +20790,49 @@ /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/carbon_input{ dir = 1 }, -/turf/open/floor/engine/co2{ - initial_gas_mix = "co2=1000;TEMP=293.15" - }, +/turf/open/floor/engine/co2, /area/engine/atmos) "aHe" = ( /obj/machinery/air_sensor/atmos/carbon_tank, -/turf/open/floor/engine/co2{ - initial_gas_mix = "co2=1000;TEMP=293.15" - }, +/turf/open/floor/engine/co2, /area/engine/atmos) "aHf" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/carbon_output{ dir = 1 }, -/turf/open/floor/engine/co2{ - initial_gas_mix = "co2=1000;TEMP=293.15" - }, +/turf/open/floor/engine/co2, /area/engine/atmos) "aHg" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxin_input{ dir = 1 }, -/turf/open/floor/engine/plasma{ - initial_gas_mix = "plasma=1000;TEMP=293.15" - }, +/turf/open/floor/engine/plasma, /area/engine/atmos) "aHh" = ( /obj/machinery/air_sensor/atmos/toxin_tank, -/turf/open/floor/engine/plasma{ - initial_gas_mix = "plasma=1000;TEMP=293.15" - }, +/turf/open/floor/engine/plasma, /area/engine/atmos) "aHi" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/toxin_output{ dir = 1 }, -/turf/open/floor/engine/plasma{ - initial_gas_mix = "plasma=1000;TEMP=293.15" - }, +/turf/open/floor/engine/plasma, /area/engine/atmos) "aHj" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nitrous_input{ dir = 1 }, -/turf/open/floor/engine/n2o{ - initial_gas_mix = "n2o=1000;TEMP=293.15" - }, +/turf/open/floor/engine/n2o, /area/engine/atmos) "aHk" = ( /obj/machinery/air_sensor/atmos/nitrous_tank, -/turf/open/floor/engine/n2o{ - initial_gas_mix = "n2o=1000;TEMP=293.15" - }, +/turf/open/floor/engine/n2o, /area/engine/atmos) "aHl" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nitrous_output{ dir = 1 }, -/turf/open/floor/engine/n2o{ - initial_gas_mix = "n2o=1000;TEMP=293.15" - }, +/turf/open/floor/engine/n2o, /area/engine/atmos) "aHm" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/mix_input{ @@ -21490,7 +20873,6 @@ pixel_y = 22 }, /turf/open/floor/plasteel/dark/corner{ - icon_state = "darkcorner"; dir = 4 }, /area/hallway/primary/fore) @@ -21529,7 +20911,6 @@ dir = 4 }, /obj/machinery/computer/atmos_control/tank/carbon_tank{ - icon_state = "computer"; dir = 1 }, /turf/open/floor/plasteel/dark, @@ -21537,7 +20918,6 @@ "aHt" = ( /obj/machinery/door/airlock/atmos{ name = "Atmospherics Connector"; - req_access_txt = "0"; req_one_access_txt = "10;24;5" }, /obj/effect/turf_decal/delivery, @@ -21588,9 +20968,7 @@ /turf/open/floor/plasteel, /area/engine/atmos) "aHw" = ( -/obj/machinery/porta_turret/ai{ - dir = 2 - }, +/obj/machinery/porta_turret/ai, /obj/machinery/airalarm{ dir = 4; pixel_x = -22 @@ -21609,7 +20987,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/closed/wall, @@ -21681,7 +21058,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /turf/open/floor/plasteel, @@ -21792,7 +21168,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /turf/closed/wall/rust, @@ -21825,7 +21200,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/effect/turf_decal/stripes/line{ @@ -21869,7 +21243,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment, @@ -21880,7 +21253,6 @@ dir = 5 }, /obj/structure/transit_tube/station/reverse/flipped{ - icon_state = "closed_terminus1"; dir = 4 }, /obj/structure/window/reinforced{ @@ -21892,7 +21264,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/ai_monitored/turret_protected/ai_upload) "aHR" = ( /obj/effect/turf_decal/tile/yellow, @@ -21943,7 +21315,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/caution/stand_clear, @@ -22004,7 +21375,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/structure/cable, @@ -22048,14 +21418,12 @@ /area/hallway/primary/fore) "aId" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "0"; req_one_access_txt = "12;47" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -22063,7 +21431,6 @@ }, /obj/structure/sign/directions/evac{ dir = 4; - pixel_x = 0; pixel_y = -24 }, /obj/structure/cable, @@ -22099,7 +21466,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/disposalpipe/segment{ @@ -22109,14 +21475,13 @@ /area/medical/medbay/central) "aIg" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1{ - icon_state = "pipe11-1"; dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 4 }, /turf/closed/wall, -/area/engine/break_room) +/area/engine/atmos) "aIh" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -22128,7 +21493,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -22143,7 +21507,6 @@ /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/neutral, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/effect/turf_decal/stripes/corner, @@ -22151,11 +21514,9 @@ /area/engine/break_room) "aIj" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - icon_state = "pipe11-3"; dir = 9 }, /turf/closed/wall/r_wall, @@ -22251,7 +21612,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/effect/landmark/start/station_engineer, @@ -22267,7 +21627,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -22291,7 +21650,6 @@ dir = 1 }, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 4 }, /obj/item/beacon, @@ -22361,9 +21719,8 @@ pixel_x = -24 }, /obj/machinery/power/apc{ - dir = 2; - name = "Telecomms Monitoring APC"; areastring = "/area/tcommsat/computer"; + name = "Telecomms Monitoring APC"; pixel_y = -24 }, /obj/effect/turf_decal/tile/neutral, @@ -22395,14 +21752,12 @@ }, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/stripes/white/line{ - icon_state = "warningline_white"; dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /turf/open/floor/plasteel/dark, @@ -22516,7 +21871,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/closed/wall, @@ -22607,9 +21961,7 @@ dir = 1 }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - pixel_x = 0; - pixel_y = 0 + icon_state = "plant-21" }, /obj/machinery/light{ dir = 8 @@ -22685,7 +22037,6 @@ dir = 4 }, /obj/machinery/button/door{ - dir = 2; id = "Skynet_launch"; name = "Mech Bay Door Control"; pixel_x = 6; @@ -22771,7 +22122,6 @@ /obj/effect/turf_decal/delivery, /obj/machinery/space_heater, /obj/machinery/atmospherics/components/binary/pump/on{ - dir = 2; name = "External Waste Ports to Filter" }, /turf/open/floor/plasteel/dark, @@ -22791,7 +22141,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/dark/corner, @@ -22801,7 +22150,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /turf/closed/wall/r_wall, @@ -22854,7 +22202,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/closed/wall/rust, @@ -22920,7 +22267,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/binary/pump/on{ - dir = 2; name = "Unfiltered & Air to Mix" }, /turf/open/floor/plasteel, @@ -22975,7 +22321,6 @@ /area/engine/atmos) "aJz" = ( /obj/machinery/computer/atmos_control/tank/mix_tank{ - icon_state = "computer"; dir = 1 }, /obj/effect/turf_decal/bot, @@ -23019,7 +22364,6 @@ }, /obj/structure/sign/departments/science{ name = "ROBOTICS"; - pixel_x = 0; pixel_y = 32 }, /turf/open/floor/plasteel, @@ -23088,7 +22432,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /turf/closed/wall, @@ -23153,7 +22496,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/structure/disposalpipe/segment{ @@ -23280,7 +22622,7 @@ dir = 1 }, /turf/open/floor/plasteel/dark, -/area/medical/genetics/cloning) +/area/medical/storage) "aJV" = ( /obj/effect/turf_decal/tile/purple{ dir = 4 @@ -23415,7 +22757,6 @@ pixel_y = 4 }, /obj/item/storage/toolbox/electrical, -/obj/item/multitool, /obj/machinery/light{ dir = 8 }, @@ -23423,7 +22764,6 @@ dir = 4; pixel_x = -26 }, -/obj/item/multitool, /turf/open/floor/plasteel/dark, /area/storage/primary) "aKe" = ( @@ -23492,7 +22832,6 @@ /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/stripes/corner, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /obj/structure/cable, @@ -23526,8 +22865,7 @@ /area/engine/atmos) "aKn" = ( /obj/machinery/door/airlock/external{ - name = "Cargo Escape Pod"; - req_access_txt = "0" + name = "Cargo Escape Pod" }, /obj/structure/cable, /turf/open/floor/plasteel/dark, @@ -23591,7 +22929,6 @@ icon_state = "plant-03" }, /obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ @@ -23621,8 +22958,7 @@ /area/maintenance/starboard) "aKs" = ( /obj/machinery/computer/security/telescreen/turbine{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/structure/table, /obj/effect/turf_decal/tile/neutral{ @@ -23714,7 +23050,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -23735,7 +23070,6 @@ /area/quartermaster/office) "aKB" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /turf/closed/wall, @@ -23943,7 +23277,6 @@ /area/hallway/primary/fore) "aKS" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{ - icon_state = "pipe11-3"; dir = 10 }, /obj/effect/turf_decal/stripes/line{ @@ -23983,11 +23316,8 @@ /area/hallway/primary/fore) "aKV" = ( /obj/structure/flora/junglebush/c, -/mob/living/carbon/monkey{ - name = "curious george" - }, /turf/open/floor/grass, -/area/medical/genetics) +/area/medical/storage) "aKW" = ( /obj/effect/turf_decal/bot, /obj/machinery/holopad, @@ -24027,7 +23357,6 @@ "aKZ" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ - id_tag = null; name = "Brig"; req_access_txt = "63" }, @@ -24126,7 +23455,6 @@ broadcasting = 1; frequency = 1447; name = "Private AI Channel"; - pixel_x = 0; pixel_y = -28 }, /obj/machinery/light, @@ -24207,7 +23535,6 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /obj/machinery/button/door{ @@ -24427,9 +23754,7 @@ dir = 4 }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - pixel_x = 0; - pixel_y = 0 + icon_state = "plant-21" }, /obj/machinery/airalarm{ dir = 8; @@ -24495,17 +23820,22 @@ /turf/closed/wall/r_wall/rust, /area/engine/engineering) "aLO" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/end{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/tile/purple{ dir = 4 }, -/obj/machinery/door/firedoor/heavy, -/obj/machinery/door/poddoor/preopen{ - id = "telelab"; - name = "Test Chamber Blast Door" - }, -/obj/effect/turf_decal/caution/stand_clear, -/turf/open/floor/engine, -/area/science/explab) +/obj/effect/turf_decal/tile/purple, +/turf/open/floor/plasteel/showroomfloor, +/area/science/genetics) "aLP" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, @@ -24588,7 +23918,6 @@ dir = 6 }, /obj/structure/transit_tube/horizontal{ - icon_state = "straight"; dir = 1 }, /obj/structure/window/reinforced{ @@ -24597,7 +23926,7 @@ /obj/structure/window/reinforced, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/ai_monitored/turret_protected/ai_upload) "aLY" = ( /obj/effect/turf_decal/tile/red, @@ -24686,13 +24015,11 @@ /turf/open/floor/plasteel, /area/hallway/primary/fore) "aMd" = ( -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1, +/obj/structure/bed, +/obj/item/bedsheet/medical, /turf/open/floor/plasteel/showroomfloor, -/area/medical/genetics) +/area/medical/storage) "aMe" = ( /obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple{ @@ -24703,7 +24030,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/structure/disposalpipe/segment{ @@ -24815,11 +24141,9 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /turf/open/floor/plasteel/dark, @@ -24893,7 +24217,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 4 }, /turf/open/floor/plasteel, @@ -24914,7 +24237,6 @@ }, /obj/machinery/meter, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -24934,7 +24256,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /turf/open/floor/plasteel, @@ -24954,7 +24275,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /turf/open/floor/plasteel, @@ -25006,7 +24326,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/holopad, @@ -25072,17 +24391,13 @@ /area/engine/atmos) "aME" = ( /obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/unres{ - icon_state = "airlock_unres_helper"; - dir = 1 - }, /obj/machinery/door/airlock/medical{ - name = "Cloning Lab"; - req_access_txt = "5;68" + name = "Storage"; + req_access_txt = "5" }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/dark, -/area/medical/genetics/cloning) +/area/medical/storage) "aMF" = ( /obj/machinery/button/ignition{ id = "Incinerator"; @@ -25202,9 +24517,7 @@ /area/security/main) "aML" = ( /obj/machinery/light/floor, -/turf/open/floor/engine/n2{ - initial_gas_mix = "n2=1000;TEMP=293.15" - }, +/turf/open/floor/engine/n2, /area/engine/atmos) "aMM" = ( /obj/machinery/door/airlock/maintenance{ @@ -25248,9 +24561,7 @@ /area/science/mixing/chamber) "aMO" = ( /obj/machinery/light/floor, -/turf/open/floor/engine/o2{ - initial_gas_mix = "o2=1000;TEMP=293.15" - }, +/turf/open/floor/engine/o2, /area/engine/atmos) "aMP" = ( /obj/structure/chair{ @@ -25293,7 +24604,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/purple/visible{ - icon_state = "manifold-2"; dir = 8 }, /obj/effect/turf_decal/stripes/corner{ @@ -25353,7 +24663,6 @@ dir = 10 }, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 1 }, /turf/open/floor/plasteel/dark, @@ -25366,6 +24675,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, /obj/structure/disposalpipe/segment, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel/dark, /area/chapel/main) "aMY" = ( @@ -25378,9 +24688,7 @@ name = "atmospherics camera"; network = list("ss13","engine") }, -/turf/open/floor/engine/co2{ - initial_gas_mix = "co2=1000;TEMP=293.15" - }, +/turf/open/floor/engine/co2, /area/engine/atmos) "aNa" = ( /obj/machinery/camera{ @@ -25389,9 +24697,7 @@ name = "atmospherics camera"; network = list("ss13","engine") }, -/turf/open/floor/engine/plasma{ - initial_gas_mix = "plasma=1000;TEMP=293.15" - }, +/turf/open/floor/engine/plasma, /area/engine/atmos) "aNb" = ( /obj/machinery/camera{ @@ -25400,9 +24706,7 @@ name = "atmospherics camera"; network = list("ss13","engine") }, -/turf/open/floor/engine/n2o{ - initial_gas_mix = "n2o=1000;TEMP=293.15" - }, +/turf/open/floor/engine/n2o, /area/engine/atmos) "aNc" = ( /obj/machinery/camera{ @@ -25429,20 +24733,11 @@ }, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) -"aNe" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/closed/wall, -/area/maintenance/disposal/incinerator) "aNf" = ( /obj/structure/reflector/single/anchored{ - icon_state = "reflector_map"; dir = 5 }, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 4 }, /turf/open/floor/plasteel/dark, @@ -25452,7 +24747,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /turf/closed/wall/r_wall, @@ -25530,11 +24824,6 @@ }, /area/maintenance/port/fore) "aNl" = ( -/obj/structure/rack, -/obj/effect/turf_decal/bot, -/obj/item/stack/packageWrap, -/obj/item/stack/sheet/glass/fifty, -/obj/item/hand_labeler, /obj/item/radio/intercom{ pixel_x = 28 }, @@ -25544,11 +24833,10 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, +/obj/structure/chair/office/light, +/obj/effect/landmark/start/geneticist, /turf/open/floor/plasteel/dark, -/area/science/explab) +/area/science/genetics) "aNm" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -25618,7 +24906,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/machinery/navbeacon{ @@ -25644,7 +24931,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/structure/cable, @@ -25661,9 +24947,6 @@ /obj/structure/cable, /turf/open/floor/plasteel, /area/hallway/primary/fore) -"aNt" = ( -/turf/closed/wall/r_wall/rust, -/area/medical/genetics) "aNu" = ( /turf/closed/wall, /area/medical/morgue) @@ -25672,10 +24955,10 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/effect/turf_decal/delivery, -/obj/machinery/clonepod, +/obj/effect/turf_decal/bot, +/obj/structure/closet/wardrobe/pjs, /turf/open/floor/plasteel/dark, -/area/medical/genetics/cloning) +/area/medical/storage) "aNw" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -25693,10 +24976,6 @@ /obj/structure/cable, /turf/open/floor/plasteel, /area/hallway/primary/fore) -"aNx" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/medical/genetics) "aNy" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -25729,22 +25008,11 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/structure/rack, /obj/effect/turf_decal/bot, -/obj/item/taperecorder{ - pixel_x = -6; - pixel_y = 6 - }, -/obj/item/aicard, -/obj/item/paicard{ - pixel_x = 6 - }, -/obj/item/radio/intercom{ - pixel_y = 22 - }, /obj/effect/turf_decal/stripes/corner{ dir = 4 }, +/obj/machinery/rnd/bepis, /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/hor) "aNB" = ( @@ -25771,7 +25039,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/disposalpipe/sorting/mail{ @@ -25800,12 +25067,6 @@ /obj/structure/cable, /turf/open/floor/plasteel, /area/hallway/primary/fore) -"aNG" = ( -/turf/closed/wall, -/area/medical/genetics) -"aNH" = ( -/turf/closed/wall/r_wall, -/area/medical/genetics/cloning) "aNI" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -25818,39 +25079,12 @@ pixel_x = -4; pixel_y = 4 }, -/obj/item/book/manual/wiki/medical_cloning{ - pixel_x = 4; - pixel_y = 6 - }, /obj/item/crowbar, -/obj/item/paper/guides/jobs/medical/cloning, /obj/machinery/light{ dir = 4 }, /turf/open/floor/plasteel/dark, -/area/medical/genetics/cloning) -"aNJ" = ( -/obj/structure/table, -/obj/item/storage/box/monkeycubes{ - pixel_y = 3 - }, -/obj/item/reagent_containers/dropper{ - pixel_y = 5 - }, -/obj/item/reagent_containers/syringe, -/obj/item/flashlight/pen, -/obj/machinery/requests_console{ - department = "Genetics"; - departmentType = 0; - name = "Genetics Requests Console"; - pixel_y = 28 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/medical/genetics) +/area/medical/storage) "aNK" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -25866,44 +25100,31 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/structure/cable, /turf/open/floor/plasteel, /area/hallway/primary/fore) -"aNL" = ( -/turf/closed/wall, -/area/medical/genetics/cloning) "aNM" = ( -/obj/machinery/vending/wardrobe/gene_wardrobe, -/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, /obj/effect/turf_decal/tile/blue{ dir = 1 }, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, /turf/open/floor/plasteel/showroomfloor, -/area/medical/genetics) +/area/medical/storage) "aNN" = ( /turf/closed/wall/r_wall/rust, /area/medical/morgue) -"aNO" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/medical/genetics/cloning) -"aNP" = ( -/turf/closed/wall/rust, -/area/medical/genetics/cloning) "aNQ" = ( /turf/closed/wall, /area/medical/cryo) @@ -25914,22 +25135,13 @@ /turf/open/floor/plasteel/dark, /area/medical/cryo) "aNS" = ( -/obj/structure/table/glass, -/obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ dir = 8 }, /obj/effect/turf_decal/tile/blue, -/obj/item/clipboard, -/obj/item/folder/white, -/obj/item/storage/pill_bottle/mutadone{ - pixel_x = 4 - }, -/obj/item/storage/pill_bottle/mannitol{ - pixel_x = -3 - }, +/obj/effect/turf_decal/tile/blue, /turf/open/floor/plasteel/showroomfloor, -/area/medical/genetics) +/area/medical/storage) "aNT" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 9 @@ -25969,7 +25181,6 @@ /turf/open/floor/plasteel, /area/hallway/primary/fore) "aNV" = ( -/obj/structure/table/glass, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -25978,27 +25189,16 @@ dir = 8 }, /obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/obj/item/paper_bin{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/pen, -/obj/item/toy/figure/geneticist{ - pixel_x = 8; - pixel_y = 6 - }, /obj/machinery/firealarm{ dir = 8; pixel_x = 24 }, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, /turf/open/floor/plasteel/showroomfloor, -/area/medical/genetics) +/area/medical/storage) "aNW" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -26011,7 +25211,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/structure/disposalpipe/segment, @@ -26031,7 +25230,6 @@ icon_state = "plant-10" }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /obj/effect/turf_decal/stripes/corner, @@ -26042,7 +25240,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/firedoor/heavy, @@ -26059,11 +25256,11 @@ "aOa" = ( /obj/structure/flora/junglebush/b, /turf/open/floor/grass, -/area/medical/genetics) +/area/medical/storage) "aOb" = ( /obj/structure/flora/junglebush/large, /turf/open/floor/grass, -/area/medical/genetics) +/area/medical/storage) "aOc" = ( /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/grassybush, @@ -26072,7 +25269,7 @@ dir = 9 }, /turf/open/floor/grass, -/area/medical/genetics) +/area/medical/storage) "aOd" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -26111,7 +25308,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/dark/corner{ - icon_state = "darkcorner"; dir = 4 }, /area/hallway/primary/fore) @@ -26156,7 +25352,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -26186,21 +25381,22 @@ /turf/open/space/basic, /area/hallway/secondary/command) "aOl" = ( -/obj/machinery/computer/scan_consolenew{ +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/effect/turf_decal/bot, -/obj/machinery/camera{ - c_tag = "Genetics"; - name = "medical camera"; - network = list("ss13","medical") +/obj/effect/turf_decal/tile/blue{ + dir = 1 }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/medical/genetics) +/obj/structure/bed, +/obj/item/bedsheet/medical, +/turf/open/floor/plasteel/showroomfloor, +/area/medical/storage) "aOm" = ( /obj/item/toy/beach_ball{ pixel_y = 6 @@ -26209,7 +25405,7 @@ dir = 4 }, /turf/open/floor/grass, -/area/medical/genetics) +/area/medical/storage) "aOn" = ( /obj/effect/turf_decal/tile/purple{ dir = 8 @@ -26218,7 +25414,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/effect/landmark/event_spawn, @@ -26241,7 +25436,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -26268,9 +25462,8 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/mob/living/carbon/monkey, /turf/open/floor/grass, -/area/medical/genetics) +/area/medical/storage) "aOr" = ( /obj/effect/turf_decal/tile/purple{ dir = 4 @@ -26285,7 +25478,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/effect/turf_decal/stripes/line{ @@ -26305,7 +25497,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 4 }, /obj/effect/turf_decal/stripes/corner{ @@ -26344,7 +25535,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -26355,7 +25545,6 @@ "aOw" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 1 }, /obj/effect/turf_decal/tile/purple, @@ -26370,10 +25559,6 @@ /turf/open/floor/plasteel/showroomfloor, /area/science/mixing) "aOx" = ( -/obj/machinery/computer/scan_consolenew{ - dir = 8 - }, -/obj/effect/turf_decal/bot, /obj/machinery/light{ dir = 4 }, @@ -26384,14 +25569,21 @@ /obj/structure/mirror{ pixel_x = 26 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 +/obj/effect/turf_decal/tile/blue{ + dir = 4 }, -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ dir = 1 }, -/turf/open/floor/plasteel/dark, -/area/medical/genetics) +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue, +/obj/structure/bed, +/obj/item/bedsheet/medical, +/turf/open/floor/plasteel/showroomfloor, +/area/medical/storage) "aOy" = ( /obj/machinery/door/airlock/maintenance{ name = "bar maintenance"; @@ -26454,7 +25646,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/tile/blue, @@ -26469,17 +25660,15 @@ dir = 10 }, /turf/open/floor/plasteel/showroomfloor, -/area/medical/genetics/cloning) +/area/medical/storage) "aOC" = ( /obj/structure/flora/grass/jungle, /obj/structure/flora/ausbushes/lavendergrass, -/mob/living/carbon/monkey, /turf/open/floor/grass, -/area/medical/genetics) +/area/medical/storage) "aOD" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 4 }, /obj/effect/turf_decal/tile/purple, @@ -26497,7 +25686,7 @@ pixel_y = 5 }, /turf/open/floor/grass, -/area/medical/genetics) +/area/medical/storage) "aOF" = ( /obj/machinery/door/firedoor/heavy, /obj/effect/turf_decal/caution/stand_clear, @@ -26509,7 +25698,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/effect/turf_decal/tile/blue{ @@ -26524,7 +25712,7 @@ dir = 8 }, /turf/open/floor/plasteel/showroomfloor, -/area/medical/genetics/cloning) +/area/medical/storage) "aOH" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -26547,7 +25735,7 @@ dir = 8 }, /turf/open/floor/plasteel/showroomfloor, -/area/medical/genetics/cloning) +/area/medical/storage) "aOI" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -26560,7 +25748,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1, /turf/open/floor/plasteel/showroomfloor, -/area/medical/genetics/cloning) +/area/medical/storage) "aOJ" = ( /obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple{ @@ -26586,10 +25774,7 @@ dir = 1 }, /turf/open/floor/plasteel/showroomfloor, -/area/medical/genetics/cloning) -"aOL" = ( -/turf/closed/wall/rust, -/area/medical/genetics) +/area/medical/storage) "aOM" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -26740,7 +25925,6 @@ }, /obj/structure/sign/directions/evac{ dir = 4; - pixel_x = 0; pixel_y = 24 }, /obj/structure/cable, @@ -26752,7 +25936,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/effect/turf_decal/stripes/line{ @@ -26800,7 +25983,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /turf/open/floor/plasteel/showroomfloor, @@ -26811,7 +25993,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/effect/landmark/event_spawn, @@ -26876,19 +26057,24 @@ dir = 6 }, /turf/open/floor/plasteel/showroomfloor, -/area/medical/genetics/cloning) +/area/medical/storage) "aPe" = ( -/obj/machinery/dna_scannernew, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/turf/open/floor/plasteel/dark, -/area/medical/genetics) +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/structure/bed, +/obj/item/bedsheet/medical, +/turf/open/floor/plasteel/showroomfloor, +/area/medical/storage) "aPf" = ( /turf/closed/wall/rust, /area/medical/virology) @@ -26956,7 +26142,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/effect/landmark/event_spawn, @@ -26980,7 +26165,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -26989,7 +26173,6 @@ "aPm" = ( /obj/machinery/door/firedoor/heavy, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/effect/turf_decal/caution/stand_clear, @@ -27005,7 +26188,7 @@ dir = 8 }, /turf/open/floor/plasteel/showroomfloor, -/area/medical/genetics/cloning) +/area/medical/storage) "aPo" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -27051,12 +26234,12 @@ /obj/effect/turf_decal/stripes/corner, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/bot, /turf/open/floor/plasteel/dark, -/area/medical/genetics/cloning) +/area/medical/storage) "aPs" = ( /obj/structure/table, /obj/effect/turf_decal/tile/neutral, @@ -27090,21 +26273,19 @@ /turf/open/floor/plasteel/showroomfloor, /area/medical/cryo) "aPu" = ( -/obj/machinery/dna_scannernew, -/obj/effect/turf_decal/delivery, /obj/machinery/airalarm{ dir = 8; pixel_x = 24 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 +/obj/effect/turf_decal/tile/blue{ + dir = 4 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/plasteel/dark, -/area/medical/genetics) +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue, +/obj/structure/bed, +/obj/item/bedsheet/medical, +/turf/open/floor/plasteel/showroomfloor, +/area/medical/storage) "aPv" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -27136,7 +26317,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -27167,7 +26347,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -27211,7 +26390,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -27274,7 +26452,7 @@ /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel/showroomfloor, -/area/medical/genetics/cloning) +/area/medical/storage) "aPH" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -27293,7 +26471,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/effect/turf_decal/plaque{ @@ -27327,7 +26504,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/public/glass{ @@ -27399,7 +26575,7 @@ dir = 8 }, /turf/open/floor/plasteel/showroomfloor, -/area/medical/genetics/cloning) +/area/medical/storage) "aPP" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -27436,7 +26612,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -27488,7 +26663,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -27502,6 +26676,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel/dark, /area/crew_quarters/bar) "aPU" = ( @@ -27549,7 +26724,6 @@ /area/crew_quarters/heads/cmo) "aPW" = ( /obj/machinery/microwave{ - pixel_x = 0; pixel_y = 5 }, /obj/structure/table/glass, @@ -27568,12 +26742,11 @@ /obj/structure/plasticflaps/opaque, /obj/effect/turf_decal/delivery, /obj/machinery/door/window/northleft{ - dir = 1; - name = "Cloning Delivery Access"; + name = "Medbay Storage Access"; req_access_txt = "50" }, /turf/open/floor/plasteel/dark, -/area/medical/genetics/cloning) +/area/medical/storage) "aPY" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -27603,7 +26776,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -27626,9 +26798,7 @@ dir = 4 }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - pixel_x = 0; - pixel_y = 0 + icon_state = "plant-21" }, /turf/open/floor/plasteel/showroomfloor, /area/medical/medbay/central) @@ -27664,7 +26834,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/firealarm{ @@ -27691,7 +26860,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -27712,7 +26880,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/landmark/event_spawn, @@ -27739,7 +26906,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/effect/turf_decal/stripes/corner, @@ -27760,7 +26926,6 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 4 }, /turf/open/floor/plasteel/showroomfloor, @@ -27770,7 +26935,6 @@ /obj/effect/turf_decal/tile/blue, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 4 }, /turf/open/floor/plasteel/showroomfloor, @@ -27918,7 +27082,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/disposalpipe/segment{ @@ -28023,7 +27186,6 @@ /obj/effect/turf_decal/tile/blue, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /turf/open/floor/plasteel/showroomfloor, @@ -28107,7 +27269,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -28138,7 +27299,6 @@ }, /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ @@ -28162,7 +27322,6 @@ /area/security/checkpoint/medical) "aQR" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/effect/turf_decal/tile/blue{ @@ -28286,7 +27445,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/reagent_dispensers/peppertank{ @@ -28303,7 +27461,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment, @@ -28364,7 +27521,6 @@ /area/crew_quarters/bar/atrium) "aRi" = ( /obj/effect/spawner/structure/window/hollow/reinforced/directional{ - icon_state = "hrwindow_spawner_directional"; dir = 5 }, /obj/structure/cable, @@ -28415,7 +27571,6 @@ }, /obj/structure/sign/directions/security{ dir = 8; - icon_state = "direction_sec"; pixel_y = 32 }, /obj/structure/sign/directions/medical{ @@ -28485,7 +27640,6 @@ /obj/effect/turf_decal/tile/purple, /obj/machinery/power/apc{ areastring = "/area/science/research"; - dir = 2; name = "Research Division APC"; pixel_y = -26 }, @@ -28503,7 +27657,6 @@ /area/science/research) "aRq" = ( /obj/machinery/computer/med_data{ - icon_state = "computer"; dir = 4 }, /obj/effect/turf_decal/bot, @@ -28540,7 +27693,6 @@ }, /obj/machinery/camera{ c_tag = "Fore Hallway Centre"; - dir = 2; name = "fore camera" }, /obj/structure/disposalpipe/segment{ @@ -28618,7 +27770,6 @@ }, /obj/structure/sign/directions/evac{ dir = 4; - pixel_x = 0; pixel_y = 24 }, /obj/structure/disposalpipe/segment{ @@ -28638,12 +27789,10 @@ }, /obj/structure/sign/directions/science{ dir = 4; - pixel_x = 0; pixel_y = 40 }, /obj/structure/sign/directions/supply{ dir = 4; - icon_state = "direction_supply"; pixel_y = 32 }, /obj/structure/sign/directions/engineering{ @@ -28918,8 +28067,7 @@ }, /obj/machinery/firealarm{ dir = 4; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /obj/machinery/camera{ c_tag = "Medbay Lobby"; @@ -28989,7 +28137,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/caution/stand_clear, @@ -29034,7 +28181,6 @@ /area/hallway/primary/port) "aSc" = ( /obj/machinery/computer/crew{ - icon_state = "computer"; dir = 1 }, /obj/effect/turf_decal/bot, @@ -29051,7 +28197,6 @@ /area/medical/medbay/central) "aSd" = ( /obj/machinery/computer/med_data{ - icon_state = "computer"; dir = 1 }, /obj/effect/turf_decal/bot, @@ -29160,7 +28305,6 @@ }, /obj/machinery/atmospherics/pipe/simple/green/visible, /obj/machinery/computer/atmos_control/tank/nitrogen_tank{ - icon_state = "computer"; dir = 4 }, /turf/open/floor/plasteel/showroomfloor, @@ -29335,8 +28479,7 @@ /area/medical/medbay/central) "aSv" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, @@ -29388,6 +28531,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/landmark/start/paramedic, /turf/open/floor/plasteel, /area/medical/medbay/central) "aSA" = ( @@ -29427,9 +28571,9 @@ /obj/effect/turf_decal/bot, /obj/machinery/vending/autodrobe, /obj/machinery/power/apc{ + areastring = "/area/crew_quarters/theatre"; dir = 1; name = "Theatre APC"; - areastring = "/area/crew_quarters/theatre"; pixel_y = 25 }, /obj/effect/turf_decal/tile/neutral, @@ -29448,7 +28592,6 @@ }, /obj/effect/turf_decal/tile/neutral, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -29493,7 +28636,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -29512,7 +28654,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/landmark/start/security_officer, @@ -29654,8 +28795,7 @@ /area/medical/medbay/central) "aSS" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/barricade/wooden/crude, @@ -29686,7 +28826,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /obj/structure/cable, @@ -29700,7 +28839,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ @@ -29783,7 +28921,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -29792,12 +28929,6 @@ /obj/structure/cable, /turf/open/floor/plasteel/showroomfloor, /area/medical/storage) -"aTd" = ( -/obj/effect/decal/cleanable/blood/old, -/turf/open/floor/plating/asteroid/airless{ - initial_gas_mix = "o2=14;n2=23;TEMP=300" - }, -/area/space/nearstation) "aTe" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -29825,7 +28956,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -29856,9 +28986,8 @@ }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1, /obj/machinery/power/apc{ - dir = 2; - name = "Medbay Storage APC"; areastring = "/area/medical/storage"; + name = "Medbay Storage APC"; pixel_y = -24 }, /obj/machinery/light, @@ -29923,9 +29052,6 @@ /turf/open/floor/plasteel, /area/bridge) "aTn" = ( -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, /obj/effect/turf_decal/tile/purple{ dir = 8 }, @@ -29937,8 +29063,11 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, /turf/open/floor/plasteel/showroomfloor, -/area/science/explab) +/area/science/genetics) "aTo" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ @@ -29952,7 +29081,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -29972,7 +29100,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/medical/glass{ @@ -29983,20 +29110,13 @@ /turf/open/floor/plasteel/dark, /area/medical/storage) "aTr" = ( -/obj/structure/table, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/machinery/cell_charger, -/obj/item/stock_parts/cell/high{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/stock_parts/cell/high, -/obj/effect/turf_decal/stripes/corner, +/obj/machinery/dna_scannernew, /turf/open/floor/plasteel/dark, -/area/science/explab) +/area/science/genetics) "aTs" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ @@ -30007,7 +29127,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -30026,7 +29145,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/structure/cable, @@ -30040,6 +29158,7 @@ /obj/effect/turf_decal/tile/blue, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/stripes/line, +/obj/effect/landmark/start/paramedic, /turf/open/floor/plasteel/showroomfloor, /area/medical/medbay/central) "aTv" = ( @@ -30106,7 +29225,6 @@ /obj/effect/turf_decal/tile/blue, /obj/machinery/power/apc{ areastring = "/area/medical/medbay/central"; - dir = 2; name = "Medbay Central APC"; pixel_y = -24 }, @@ -30124,7 +29242,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /turf/open/floor/plasteel/showroomfloor, @@ -30166,7 +29283,6 @@ /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/emergency_oxygen, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /obj/effect/turf_decal/tile/neutral{ @@ -30180,21 +29296,16 @@ }, /obj/machinery/camera{ c_tag = "Virology Airlock"; - dir = 2; name = "medical camera"; network = list("ss13","medical") }, /obj/machinery/firealarm{ dir = 8; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /turf/open/floor/plasteel/dark, /area/medical/virology) "aTE" = ( -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, /obj/effect/turf_decal/tile/purple{ dir = 8 }, @@ -30203,12 +29314,13 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, /turf/open/floor/plasteel/showroomfloor, -/area/science/explab) +/area/science/genetics) "aTF" = ( /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/yellow{ @@ -30236,7 +29348,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -30294,9 +29405,7 @@ }, /obj/structure/plasticflaps/opaque, /obj/machinery/door/window/southleft{ - base_state = "left"; dir = 8; - icon_state = "left"; name = "Bar Delivery Access"; req_access_txt = "25" }, @@ -30471,7 +29580,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/firealarm{ @@ -30548,7 +29656,6 @@ }, /obj/effect/turf_decal/stripes/corner, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 4 }, /turf/open/floor/plasteel/dark, @@ -30596,7 +29703,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /turf/open/floor/plasteel/dark, @@ -30680,8 +29786,7 @@ pixel_x = 24 }, /obj/structure/window/reinforced{ - dir = 1; - pixel_y = 0 + dir = 1 }, /turf/open/floor/plasteel/dark, /area/science/lab) @@ -30717,7 +29822,6 @@ dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -30742,7 +29846,6 @@ pixel_y = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/landmark/start/mime, @@ -30755,9 +29858,7 @@ "aUq" = ( /obj/machinery/light/small, /obj/effect/turf_decal/sand/plating, -/turf/open/floor/plating/airless{ - initial_gas_mix = "o2=14;n2=23;TEMP=300" - }, +/turf/open/floor/plating/lowpressure, /area/maintenance/port) "aUr" = ( /obj/effect/turf_decal/tile/purple{ @@ -30771,7 +29872,6 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -30815,7 +29915,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/medical{ @@ -30899,13 +29998,6 @@ dir = 1 }, /obj/effect/turf_decal/tile/blue, -/obj/machinery/camera{ - c_tag = "Recovery Room"; - dir = 1; - name = "medical camera"; - network = list("ss13","medical"); - pixel_x = 32 - }, /turf/open/floor/plasteel/showroomfloor, /area/medical/surgery) "aUB" = ( @@ -30923,6 +30015,12 @@ dir = 1; pixel_y = -26 }, +/obj/machinery/camera{ + c_tag = "Recovery Room"; + dir = 1; + name = "medical camera"; + network = list("ss13","medical") + }, /turf/open/floor/plasteel/showroomfloor, /area/medical/surgery) "aUC" = ( @@ -30981,7 +30079,6 @@ }, /obj/effect/turf_decal/tile/yellow, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/structure/disposalpipe/segment{ @@ -31082,7 +30179,6 @@ /obj/machinery/gibber, /obj/machinery/camera{ c_tag = "Kitchen Cold Room"; - dir = 2; name = "diner camera" }, /obj/machinery/airalarm{ @@ -31112,7 +30208,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -31321,7 +30416,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/effect/decal/cleanable/blood/old, @@ -31341,7 +30435,6 @@ /obj/structure/bed, /obj/item/bedsheet/medical, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /obj/effect/turf_decal/tile/neutral{ @@ -31375,14 +30468,12 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/grunge{ name = "Morgue"; - opacity = 1; req_access_txt = "9" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -31415,7 +30506,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/effect/landmark/start/virologist, @@ -31440,8 +30530,6 @@ "aVn" = ( /obj/machinery/door/airlock/grunge{ name = "Morgue"; - opacity = 1; - req_access_txt = "0"; req_one_access_txt = "5;6;22" }, /obj/structure/disposalpipe/segment{ @@ -31450,6 +30538,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel/dark, /area/chapel/main) "aVo" = ( @@ -31512,8 +30601,7 @@ dir = 4 }, /obj/structure/window/reinforced{ - dir = 1; - pixel_y = 0 + dir = 1 }, /turf/open/floor/grass, /area/chapel/main) @@ -31526,8 +30614,7 @@ dir = 4 }, /obj/structure/extinguisher_cabinet{ - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /turf/open/floor/plasteel/dark, /area/medical/surgery) @@ -31536,7 +30623,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/corner{ @@ -31551,7 +30637,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/showroomfloor, @@ -31593,7 +30678,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /turf/open/floor/plasteel/showroomfloor, @@ -31674,10 +30758,8 @@ }, /obj/machinery/computer/security/telescreen{ desc = "Used for monitoring medbay to ensure patient safety."; - dir = 2; name = "Medbay Monitor"; - network = list("medical"); - pixel_y = 0 + network = list("medical") }, /turf/open/floor/plasteel/dark, /area/security/checkpoint/medical) @@ -31718,20 +30800,12 @@ /area/medical/virology) "aVF" = ( /obj/effect/landmark/xeno_spawn, -/turf/open/floor/engine/o2{ - initial_gas_mix = "o2=1000;TEMP=293.15" - }, +/turf/open/floor/engine/o2, /area/engine/atmos) "aVG" = ( /obj/effect/landmark/xeno_spawn, -/turf/open/floor/engine/n2o{ - initial_gas_mix = "n2o=1000;TEMP=293.15" - }, +/turf/open/floor/engine/n2o, /area/engine/atmos) -"aVH" = ( -/obj/machinery/status_display/evac, -/turf/closed/wall, -/area/medical/genetics/cloning) "aVI" = ( /obj/effect/turf_decal/delivery, /obj/machinery/suit_storage_unit/cmo, @@ -31758,12 +30832,12 @@ dir = 8 }, /obj/effect/turf_decal/bot, -/obj/machinery/dna_scannernew, /obj/machinery/airalarm{ pixel_y = 24 }, +/obj/structure/closet/secure_closet/personal/patient, /turf/open/floor/plasteel/dark, -/area/medical/genetics/cloning) +/area/medical/storage) "aVL" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -31841,7 +30915,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/window/eastleft{ @@ -31894,11 +30967,11 @@ dir = 8 }, /turf/open/floor/plasteel/dark, -/area/medical/genetics/cloning) +/area/medical/storage) "aVU" = ( /obj/structure/sign/departments/medbay/alt, /turf/closed/wall, -/area/medical/genetics/cloning) +/area/medical/storage) "aVV" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -31989,14 +31062,12 @@ /area/medical/morgue) "aWa" = ( /obj/structure/transit_tube/horizontal{ - icon_state = "straight"; dir = 1 }, /obj/structure/grille, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, @@ -32065,29 +31136,24 @@ /turf/open/floor/plasteel/dark, /area/medical/morgue) "aWf" = ( -/obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, /obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/effect/turf_decal/tile/blue, +/obj/structure/bed, +/obj/item/bedsheet/medical, /turf/open/floor/plasteel/showroomfloor, -/area/medical/genetics) +/area/medical/storage) "aWg" = ( /obj/structure/bodycontainer/morgue{ dir = 8 @@ -32179,7 +31245,7 @@ pixel_y = 32 }, /turf/open/floor/plating, -/area/medical/genetics) +/area/medical/storage) "aWn" = ( /obj/structure/chair/sofa/right{ color = "#c45c57"; @@ -32205,8 +31271,9 @@ dir = 1 }, /obj/machinery/vending/clothing, +/obj/effect/turf_decal/bot, /turf/open/floor/plasteel/dark, -/area/medical/genetics/cloning) +/area/medical/storage) "aWp" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical/glass{ @@ -32265,8 +31332,7 @@ dir = 8 }, /obj/structure/window/reinforced{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -32283,7 +31349,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -32306,7 +31371,6 @@ pixel_y = -27 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /obj/effect/decal/cleanable/dirt, @@ -32344,7 +31408,6 @@ "aWy" = ( /obj/structure/lattice/catwalk, /obj/structure/transit_tube/horizontal{ - icon_state = "straight"; dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -32377,7 +31440,6 @@ /obj/effect/turf_decal/tile/blue, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/structure/disposalpipe/segment{ @@ -32537,7 +31599,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 4 }, /obj/structure/cable, @@ -32601,34 +31662,26 @@ /turf/open/floor/plating, /area/science/server) "aWV" = ( -/obj/effect/decal/cleanable/blood/old, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1, -/turf/open/floor/engine, -/area/science/explab) +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/flora/ausbushes/fernybush, +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/turf/open/floor/grass, +/area/science/genetics) "aWW" = ( -/obj/structure/rack, -/obj/effect/turf_decal/bot, -/obj/effect/decal/cleanable/dirt, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/mineral/plasma, -/obj/item/grenade/chem_grenade, -/obj/item/grenade/chem_grenade, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/machinery/light, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, +/obj/machinery/dna_scannernew, /turf/open/floor/plasteel/dark, -/area/science/explab) +/area/science/genetics) "aWX" = ( /obj/machinery/computer/mecha{ - dir = 1; - icon_state = "computer" + dir = 1 }, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/neutral{ @@ -32642,7 +31695,7 @@ /area/crew_quarters/heads/hor) "aWY" = ( /turf/closed/wall/r_wall, -/area/science/explab) +/area/science/genetics) "aWZ" = ( /obj/structure/table, /obj/effect/turf_decal/tile/neutral{ @@ -32676,19 +31729,26 @@ /turf/open/floor/plasteel/dark, /area/science/xenobiology) "aXb" = ( -/obj/effect/landmark/blobstart, -/obj/effect/landmark/xeno_spawn, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, -/turf/open/floor/engine, -/area/science/explab) +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/mob/living/carbon/monkey, +/turf/open/floor/grass, +/area/science/genetics) "aXc" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/preopen{ - id = "telelab"; - name = "Test Chamber Blast Door" +/obj/structure/table, +/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/color/latex, +/obj/item/storage/box/disks{ + pixel_y = 5 }, -/turf/open/floor/plating, -/area/science/explab) +/obj/structure/noticeboard{ + pixel_y = 30 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/science/genetics) "aXd" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -32696,7 +31756,6 @@ }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -32722,7 +31781,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -32799,7 +31857,7 @@ /area/science/robotics/lab) "aXk" = ( /turf/closed/wall/r_wall/rust, -/area/science/explab) +/area/science/genetics) "aXl" = ( /turf/closed/wall/r_wall/rust, /area/science/mixing) @@ -32837,10 +31895,9 @@ /turf/open/floor/plasteel/dark, /area/science/lab) "aXo" = ( -/obj/machinery/rnd/experimentor, -/obj/effect/landmark/event_spawn, -/turf/open/floor/engine, -/area/science/explab) +/obj/structure/flora/tree/jungle/small, +/turf/open/floor/grass, +/area/science/genetics) "aXp" = ( /obj/structure/table/wood, /obj/effect/turf_decal/tile/neutral, @@ -32915,7 +31972,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/machinery/newscaster{ @@ -32934,7 +31990,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -32973,7 +32028,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line, @@ -33043,7 +32097,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -33064,7 +32117,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -33084,9 +32136,7 @@ /area/science/research) "aXF" = ( /obj/effect/turf_decal/bot, -/obj/machinery/computer/nanite_chamber_control{ - dir = 2 - }, +/obj/machinery/computer/nanite_chamber_control, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, @@ -33163,7 +32213,6 @@ }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -33174,7 +32223,6 @@ "aXK" = ( /obj/effect/decal/remains/human, /obj/machinery/sparker/toxmix{ - dir = 2; name = "chamber igniter"; pixel_x = -16 }, @@ -33216,18 +32264,18 @@ /turf/open/floor/engine/vacuum, /area/science/mixing/chamber) "aXO" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ +/obj/structure/window/reinforced, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ dir = 4 }, -/turf/open/floor/engine, -/area/science/explab) +/turf/open/floor/grass, +/area/science/genetics) "aXP" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/research/glass{ @@ -33268,15 +32316,16 @@ /turf/open/floor/plating, /area/science/server) "aXS" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, +/obj/structure/window/reinforced, +/obj/item/reagent_containers/food/snacks/grown/banana, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 }, -/turf/open/floor/engine, -/area/science/explab) +/turf/open/floor/grass, +/area/science/genetics) "aXT" = ( /obj/machinery/atmospherics/components/binary/valve, /obj/machinery/embedded_controller/radio/airlock_controller/incinerator_toxmix{ @@ -33300,17 +32349,18 @@ /turf/open/floor/plasteel/showroomfloor, /area/science/mixing/chamber) "aXU" = ( -/obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; +/obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/button/door{ - id = "telelab"; - name = "Test Chamber Toggle"; - pixel_y = 25 +/obj/structure/window/reinforced{ + dir = 1 }, -/turf/open/floor/engine, -/area/science/explab) +/obj/effect/turf_decal/box/corners{ + dir = 4 + }, +/mob/living/carbon/monkey, +/turf/open/floor/grass, +/area/science/genetics) "aXV" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -33412,9 +32462,9 @@ name = "scrubber ducky" }, /obj/machinery/power/apc/highcap/five_k{ + areastring = "/area/science/storage"; dir = 1; name = "Toxins Storage APC"; - areastring = "/area/science/storage"; pixel_y = 25 }, /obj/structure/cable, @@ -33468,20 +32518,32 @@ }, /area/maintenance/starboard) "aYj" = ( -/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ + dir = 8 + }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; - dir = 8 +/obj/structure/table, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 }, -/obj/machinery/door/poddoor/preopen{ - id = "telelab"; - name = "Test Chamber Blast Door" +/obj/effect/turf_decal/tile/neutral{ + dir = 4 }, -/turf/open/floor/plating, -/area/science/explab) +/obj/effect/turf_decal/tile/neutral, +/obj/item/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, +/obj/item/storage/pill_bottle/mutadone{ + pixel_x = 4 + }, +/obj/item/storage/pill_bottle/mannitol, +/obj/item/toy/figure/geneticist{ + pixel_x = 8; + pixel_y = 6 + }, +/turf/open/floor/plasteel/dark, +/area/science/genetics) "aYk" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/hatch{ @@ -33489,7 +32551,6 @@ req_one_access_txt = "32;19" }, /obj/effect/mapping_helpers/airlock/unres{ - icon_state = "airlock_unres_helper"; dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -33730,7 +32791,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -33929,7 +32989,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 4 }, /turf/open/floor/plasteel/showroomfloor, @@ -34167,6 +33226,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, /mob/living/simple_animal/bot/secbot/pingsky, +/obj/structure/cable, /turf/open/floor/engine, /area/ai_monitored/turret_protected/aisat_interior) "aZi" = ( @@ -34223,7 +33283,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -34239,9 +33298,9 @@ dir = 4 }, /obj/machinery/power/apc{ + areastring = "/area/security/checkpoint/medical"; dir = 8; name = "Medical Security Checkpoint APC"; - areastring = "/area/security/checkpoint/medical"; pixel_x = -24 }, /obj/structure/cable, @@ -34354,7 +33413,6 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 4 }, /obj/structure/cable, @@ -34362,7 +33420,7 @@ /area/security/checkpoint/medical) "aZv" = ( /turf/closed/wall, -/area/science/explab) +/area/science/genetics) "aZw" = ( /turf/closed/wall/r_wall/rust, /area/crew_quarters/heads/cmo) @@ -34384,7 +33442,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/landmark/start/depsec/medical, @@ -34432,7 +33489,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -34550,7 +33606,6 @@ dir = 5 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /obj/machinery/door/window/westleft{ @@ -34567,8 +33622,7 @@ /obj/structure/closet/crate/goldcrate, /obj/machinery/firealarm{ dir = 4; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /obj/item/crowbar/power, /obj/effect/turf_decal/tile/neutral, @@ -34587,7 +33641,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/security/glass{ @@ -34647,7 +33700,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/firedoor, @@ -34707,7 +33759,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/landmark/event_spawn, @@ -34730,7 +33781,7 @@ dir = 4 }, /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12 }, /obj/effect/landmark/start/roboticist, @@ -34776,7 +33827,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -34790,7 +33840,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment, @@ -34818,7 +33867,6 @@ dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 4 }, /turf/open/floor/plasteel/showroomfloor, @@ -34837,7 +33885,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/effect/turf_decal/stripes/line{ @@ -34950,7 +33997,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/structure/disposalpipe/segment{ @@ -34975,7 +34021,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -35048,7 +34093,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/landmark/start/chemist, @@ -35079,7 +34123,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/chair/wood{ @@ -35137,8 +34180,7 @@ /area/ai_monitored/turret_protected/ai_upload) "bat" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable, @@ -35169,7 +34211,6 @@ /area/tcommsat/computer) "baw" = ( /obj/structure/transit_tube/horizontal{ - icon_state = "straight"; dir = 1 }, /obj/structure/window/reinforced{ @@ -35195,7 +34236,6 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /turf/open/floor/plasteel/showroomfloor, @@ -35355,7 +34395,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/effect/landmark/start/shaft_miner, @@ -35385,7 +34424,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/public/glass{ @@ -35432,9 +34470,7 @@ "baQ" = ( /obj/effect/turf_decal/sand/plating, /obj/structure/cable, -/turf/open/floor/plating/airless{ - initial_gas_mix = "o2=14;n2=23;TEMP=300" - }, +/turf/open/floor/plating/lowpressure, /area/maintenance/port) "baR" = ( /obj/effect/turf_decal/tile/yellow{ @@ -35499,7 +34535,6 @@ "baX" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxins_mixing_input, /obj/machinery/sparker/toxmix{ - dir = 2; name = "chamber igniter"; pixel_x = -16 }, @@ -35531,8 +34566,7 @@ /obj/machinery/camera{ c_tag = "Engineering Security Post"; dir = 1; - name = "engineering camera"; - network = list("ss13") + name = "engineering camera" }, /turf/open/floor/plasteel/dark, /area/security/checkpoint/engineering) @@ -35630,7 +34664,6 @@ dir = 5 }, /obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{ - dir = 2; external_pressure_bound = 120; name = "server vent" }, @@ -35749,7 +34782,6 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /obj/machinery/light_switch{ @@ -35774,7 +34806,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/meter, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -35796,7 +34827,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/maintenance{ @@ -35815,7 +34845,6 @@ /area/science/mixing/chamber) "bbx" = ( /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 1 }, /turf/open/floor/engine, @@ -35840,7 +34869,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -35921,7 +34949,6 @@ /obj/effect/turf_decal/tile/purple, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /obj/structure/disposalpipe/segment{ @@ -35943,8 +34970,7 @@ dir = 4 }, /obj/item/radio/intercom{ - pixel_x = 28; - pixel_y = 0 + pixel_x = 28 }, /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/tile/neutral{ @@ -36048,7 +35074,6 @@ /obj/effect/turf_decal/tile/blue, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/effect/landmark/start/medical_doctor, @@ -36057,7 +35082,6 @@ /area/medical/storage) "bbS" = ( /obj/machinery/atmospherics/components/trinary/mixer/flipped{ - icon_state = "mixer_off_f"; dir = 1 }, /obj/effect/turf_decal/tile/neutral{ @@ -36226,7 +35250,6 @@ /area/science/mixing) "bce" = ( /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 8 }, /obj/effect/turf_decal/tile/neutral{ @@ -36254,7 +35277,7 @@ }, /obj/machinery/door/airlock/research/glass{ name = "Research Lab"; - req_one_access_txt = "7;29" + req_one_access_txt = "7;29;9" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -36282,7 +35305,6 @@ }, /obj/machinery/camera{ c_tag = "Toxins Launch Site"; - dir = 2; name = "science camera"; network = list("ss13","rd") }, @@ -36336,8 +35358,7 @@ }, /obj/machinery/firealarm{ dir = 4; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /obj/machinery/light{ dir = 8 @@ -36448,7 +35469,6 @@ }, /obj/structure/transit_tube/station/reverse, /obj/structure/transit_tube_pod{ - icon_state = "pod"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -36458,7 +35478,6 @@ /area/bridge) "bcw" = ( /obj/structure/transit_tube/horizontal{ - icon_state = "straight"; dir = 1 }, /obj/structure/lattice/catwalk, @@ -36528,8 +35547,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, /obj/machinery/firealarm{ dir = 4; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /obj/machinery/light{ dir = 8 @@ -36627,7 +35645,6 @@ /area/science/server) "bcI" = ( /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -36698,7 +35715,6 @@ /obj/effect/turf_decal/stripes/corner, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/effect/landmark/event_spawn, @@ -36728,7 +35744,6 @@ dir = 4 }, /obj/machinery/button/massdriver{ - dir = 2; id = "toxinsdriver"; pixel_x = 24; pixel_y = -24 @@ -36831,8 +35846,8 @@ }, /obj/effect/turf_decal/tile/neutral, /obj/effect/decal/cleanable/dirt, -/obj/machinery/newscaster{ - pixel_y = 30 +/obj/item/radio/intercom{ + pixel_y = 22 }, /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/hor) @@ -36844,7 +35859,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/effect/turf_decal/stripes/line{ @@ -36884,7 +35898,6 @@ }, /obj/machinery/camera{ c_tag = "Hydroponics"; - dir = 2; name = "hydroponics camera" }, /obj/machinery/light{ @@ -36897,7 +35910,6 @@ dir = 1 }, /obj/effect/spawner/structure/window/hollow/reinforced/middle{ - icon_state = "hrwindow_spawner_middle"; dir = 4 }, /obj/structure/cable, @@ -36942,28 +35954,28 @@ /turf/open/floor/plating/airless, /area/hallway/secondary/command) "bdb" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/on{ - dir = 4 +/obj/machinery/door/window/northleft{ + dir = 4; + name = "Monkey Pen"; + req_access_txt = "9, 7" }, -/turf/open/floor/engine, -/area/science/explab) +/turf/open/floor/grass, +/area/science/genetics) "bdc" = ( -/obj/structure/table, -/obj/item/storage/box/beakers{ - pixel_y = 5 - }, -/obj/machinery/button/door{ - id = "telelab"; - name = "Test Chamber Toggle"; - pixel_x = -24; - pixel_y = 0 - }, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, +/obj/structure/chair/office/light, +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/landmark/start/geneticist, /turf/open/floor/plasteel/dark, -/area/science/explab) +/area/science/genetics) "bdd" = ( /obj/effect/decal/cleanable/blood/old, /obj/structure/table/optable{ @@ -36981,8 +35993,11 @@ name = "science camera"; network = list("ss13","rd") }, -/turf/open/floor/engine, -/area/science/explab) +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/open/floor/grass, +/area/science/genetics) "bdf" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/caution/stand_clear, @@ -37073,6 +36088,14 @@ /obj/machinery/light{ dir = 8 }, +/obj/item/paicard{ + pixel_x = 6 + }, +/obj/item/aicard, +/obj/item/taperecorder{ + pixel_x = -6; + pixel_y = 6 + }, /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/hor) "bdn" = ( @@ -37098,7 +36121,6 @@ }, /obj/machinery/camera{ c_tag = "Backstage"; - dir = 2; name = "diner camera" }, /obj/effect/turf_decal/tile/neutral{ @@ -37190,7 +36212,6 @@ }, /obj/machinery/power/apc/highcap/five_k{ areastring = "/area/crew_quarters/bar"; - dir = 2; name = "Bar APC"; pixel_y = -26 }, @@ -37220,7 +36241,6 @@ }, /obj/machinery/atmospherics/pipe/simple/green/visible, /obj/machinery/computer/atmos_control/tank/oxygen_tank{ - icon_state = "computer"; dir = 4 }, /turf/open/floor/plasteel/showroomfloor, @@ -37261,14 +36281,12 @@ departmentType = 5; name = "Research Director RC"; pixel_x = 30; - pixel_y = 0; receive_ore_updates = 1 }, /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/hor) "bdx" = ( /obj/machinery/computer/robotics{ - icon_state = "computer"; dir = 4 }, /obj/effect/turf_decal/bot, @@ -37310,14 +36328,19 @@ /area/maintenance/starboard) "bdA" = ( /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 8 }, /obj/item/radio/intercom{ pixel_x = -28 }, -/turf/open/floor/engine, -/area/science/explab) +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/flora/ausbushes/grassybush, +/mob/living/carbon/monkey, +/turf/open/floor/grass, +/area/science/genetics) "bdB" = ( /obj/effect/turf_decal/tile/green{ dir = 1 @@ -37332,7 +36355,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/effect/turf_decal/stripes/line{ @@ -37366,7 +36388,6 @@ }, /obj/effect/turf_decal/tile/purple, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -37405,9 +36426,7 @@ desc = "Used for watching the RD's goons from the safety of his office."; dir = 1; name = "Research Monitor"; - network = list("rd"); - pixel_x = 0; - pixel_y = 0 + network = list("rd") }, /obj/machinery/newscaster/security_unit{ pixel_y = -30 @@ -37436,8 +36455,7 @@ req_access_txt = "55" }, /obj/structure/window/reinforced{ - dir = 1; - pixel_y = 0 + dir = 1 }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) @@ -37446,7 +36464,7 @@ /obj/machinery/door/airlock/research{ id_tag = "ResearchInt"; name = "Research Division"; - req_one_access_txt = "47" + req_one_access_txt = "47, 9" }, /obj/effect/mapping_helpers/airlock/unres{ dir = 4 @@ -37488,7 +36506,6 @@ /obj/machinery/light, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /turf/open/floor/plasteel/showroomfloor, @@ -37504,7 +36521,6 @@ departmentType = 2; name = "Science RC"; pixel_x = 30; - pixel_y = 0; receive_ore_updates = 1 }, /obj/structure/window/reinforced, @@ -37542,34 +36558,35 @@ /turf/open/floor/plating, /area/ai_monitored/turret_protected/ai_upload) "bdR" = ( -/obj/structure/table, -/obj/item/folder{ - pixel_x = -6 - }, -/obj/item/book/manual/wiki/experimentor, -/obj/item/pen, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, +/obj/machinery/computer/scan_consolenew{ + dir = 1 + }, /turf/open/floor/plasteel/dark, -/area/science/explab) +/area/science/genetics) "bdS" = ( +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -26 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced, /obj/effect/turf_decal/box/corners, +/obj/structure/sink/puddle, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ + dir = 8 + }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; - dir = 8 - }, -/obj/machinery/firealarm{ - dir = 1; - pixel_x = 0; - pixel_y = -26 - }, -/turf/open/floor/engine, -/area/science/explab) +/mob/living/carbon/monkey, +/turf/open/floor/grass, +/area/science/genetics) "bdT" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, @@ -37618,7 +36635,6 @@ /area/science/mixing) "bdW" = ( /obj/structure/transit_tube/horizontal{ - icon_state = "straight"; dir = 1 }, /obj/structure/lattice/catwalk, @@ -37632,7 +36648,6 @@ /obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/showroomfloor, @@ -37647,7 +36662,6 @@ dir = 6 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /turf/open/floor/plasteel/showroomfloor, @@ -37680,7 +36694,6 @@ }, /obj/effect/turf_decal/tile/red, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/effect/landmark/start/depsec/science, @@ -37699,7 +36712,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /turf/open/floor/plasteel/showroomfloor, @@ -37718,7 +36730,6 @@ department = "Science"; departmentType = 2; name = "Science RC"; - pixel_x = 0; pixel_y = -30; receive_ore_updates = 1 }, @@ -37765,7 +36776,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/effect/turf_decal/stripes/corner{ @@ -37787,7 +36797,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -37826,7 +36835,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -37842,7 +36850,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/showroomfloor, @@ -37860,7 +36867,6 @@ dir = 6 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /turf/open/floor/plasteel/showroomfloor, @@ -37894,7 +36900,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -37933,7 +36938,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/effect/turf_decal/stripes/line, @@ -37965,7 +36969,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/corner{ @@ -38000,7 +37003,6 @@ /obj/item/flashlight, /obj/effect/decal/cleanable/dirt, /obj/machinery/button/door{ - dir = 2; id = "Skynet_launch"; name = "Mech Bay Door Control"; pixel_x = 6; @@ -38023,7 +37025,6 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /turf/open/floor/plasteel/dark, @@ -38071,7 +37072,6 @@ }, /obj/structure/plasticflaps/opaque, /obj/machinery/door/window/eastright{ - dir = 4; name = "Hydroponics Delivery Access"; req_access_txt = "35" }, @@ -38084,7 +37084,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/research{ @@ -38108,7 +37107,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/effect/landmark/event_spawn, @@ -38143,7 +37141,6 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /obj/effect/landmark/start/chemist, @@ -38190,7 +37187,6 @@ dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 4 }, /obj/machinery/light{ @@ -38227,7 +37223,6 @@ /obj/effect/turf_decal/tile/purple, /obj/effect/decal/cleanable/blood/old, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /obj/effect/turf_decal/stripes/line{ @@ -38253,9 +37248,8 @@ }, /obj/effect/turf_decal/tile/purple, /obj/machinery/power/apc{ - dir = 2; - name = "Research Lab APC"; areastring = "/area/science/lab"; + name = "Research Lab APC"; pixel_y = -26 }, /obj/effect/turf_decal/stripes/line{ @@ -38315,10 +37309,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/mob/living/simple_animal/bot/cleanbot{ - name = "Scrubs, MD"; - on = 0 - }, +/mob/living/simple_animal/bot/cleanbot/medbay, /turf/open/floor/plasteel/dark, /area/medical/storage) "beR" = ( @@ -38332,9 +37323,9 @@ dir = 8 }, /obj/machinery/power/apc{ + areastring = "/area/medical/chemistry"; dir = 8; name = "Chemistry APC"; - areastring = "/area/medical/chemistry"; pixel_x = -24 }, /obj/effect/turf_decal/bot, @@ -38555,8 +37546,7 @@ req_access_txt = "55" }, /obj/structure/window/reinforced{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/machinery/processor/slime, /turf/open/floor/plasteel/dark, @@ -38662,7 +37652,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/light/small, @@ -38692,7 +37681,6 @@ /area/teleporter) "bfq" = ( /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 4 }, /turf/open/floor/engine, @@ -38703,7 +37691,6 @@ /area/science/mixing) "bfs" = ( /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 8 }, /turf/open/floor/engine, @@ -38718,7 +37705,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/structure/cable, @@ -38753,7 +37739,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/cable, @@ -38779,7 +37764,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/command{ @@ -38815,7 +37799,6 @@ /obj/machinery/light, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /turf/open/floor/plasteel/dark, @@ -38836,7 +37819,6 @@ }, /obj/effect/turf_decal/tile/blue, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /obj/structure/disposalpipe/segment, @@ -38928,7 +37910,6 @@ "bfK" = ( /obj/structure/table/reinforced, /obj/machinery/computer/security/telescreen{ - dir = 2; name = "Test Chamber Monitor"; network = list("xeno"); pixel_y = 2 @@ -38955,7 +37936,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/grille/broken, @@ -38972,7 +37952,6 @@ /obj/machinery/button/door{ id = "Xenolab"; name = "Containment Chamber Toggle"; - pixel_x = 0; pixel_y = 4; req_access_txt = "55" }, @@ -38988,7 +37967,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, /obj/machinery/door/airlock/research/glass{ name = "Research Lab"; - req_one_access_txt = "7;29" + req_one_access_txt = "7;29;9" }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/dark, @@ -39005,7 +37984,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/grille/broken, @@ -39030,8 +38008,7 @@ /obj/machinery/door/firedoor, /obj/machinery/firealarm{ dir = 4; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /obj/effect/turf_decal/caution/stand_clear, /turf/open/floor/plasteel/dark, @@ -39046,7 +38023,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -39086,7 +38062,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -39098,7 +38073,6 @@ }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, @@ -39110,7 +38084,6 @@ "bfY" = ( /obj/machinery/camera{ c_tag = "Xenobiology Test Chamber"; - dir = 2; name = "xenobiology camera"; network = list("ss13","rd","xeno") }, @@ -39126,7 +38099,6 @@ }, /obj/effect/turf_decal/tile/neutral, /obj/machinery/atmospherics/components/unary/thermomachine/freezer/on{ - dir = 2; name = "euthanization chamber freezer" }, /turf/open/floor/plasteel/dark, @@ -39145,8 +38117,7 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/machinery/camera{ c_tag = "Toxins Storage"; @@ -39183,7 +38154,6 @@ }, /obj/effect/turf_decal/bot, /obj/machinery/computer/prisoner/gulag_teleporter_computer{ - icon_state = "computer"; dir = 4 }, /turf/open/floor/plasteel/dark, @@ -39230,7 +38200,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -39272,13 +38241,10 @@ /turf/open/floor/plasteel/showroomfloor, /area/science/research) "bgk" = ( -/obj/effect/turf_decal/bot, /obj/machinery/firealarm{ dir = 8; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, -/obj/machinery/vending/wardrobe/science_wardrobe, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -39291,8 +38257,11 @@ name = "science camera"; network = list("ss13","rd") }, +/obj/machinery/computer/scan_consolenew{ + dir = 1 + }, /turf/open/floor/plasteel/dark, -/area/science/explab) +/area/science/genetics) "bgl" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -39302,7 +38271,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/structure/cable, @@ -39316,7 +38284,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -39330,7 +38297,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/structure/cable, @@ -39359,8 +38325,8 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4; external_pressure_bound = 140; - pressure_checks = 0; - name = "server vent" + name = "server vent"; + pressure_checks = 0 }, /turf/open/floor/circuit/telecomms, /area/science/xenobiology) @@ -39458,7 +38424,6 @@ dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 4 }, /obj/structure/cable, @@ -39499,7 +38464,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/tile/neutral{ @@ -39551,7 +38515,6 @@ }, /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -39593,7 +38556,6 @@ }, /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/landmark/event_spawn, @@ -39612,7 +38574,7 @@ dir = 1 }, /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12 }, /obj/effect/turf_decal/stripes/corner{ @@ -39642,7 +38604,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -39728,7 +38689,7 @@ /obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple, /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, @@ -39759,7 +38720,6 @@ /area/hallway/secondary/command) "bgR" = ( /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 1 }, /obj/structure/sign/warning/electricshock{ @@ -39848,7 +38808,6 @@ }, /obj/structure/window/reinforced, /obj/machinery/computer/camera_advanced/xenobio{ - icon_state = "computer"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -39886,7 +38845,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/structure/sign/poster/official/cleanliness{ @@ -39901,7 +38859,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/medical{ @@ -39924,7 +38881,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/power/apc{ @@ -39954,7 +38910,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/sorting/mail/flip{ @@ -39974,7 +38929,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -40015,7 +38969,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -40026,14 +38979,12 @@ /area/hallway/primary/starboard) "bhi" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -40061,7 +39012,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -40069,7 +39019,6 @@ }, /obj/structure/sign/directions/evac{ dir = 4; - pixel_x = 0; pixel_y = 24 }, /obj/structure/cable, @@ -40109,7 +39058,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -40130,7 +39078,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -40166,7 +39113,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/light/small{ @@ -40188,7 +39134,6 @@ }, /obj/machinery/camera{ c_tag = "Xenobiology Euthanization Chamber"; - dir = 2; name = "xenobiology camera"; network = list("ss13","rd","xeno") }, @@ -40196,14 +39141,12 @@ /area/science/xenobiology) "bhw" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -40235,7 +39178,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -40249,7 +39191,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/item/storage/box/lights/mixed, @@ -40295,9 +39236,7 @@ dir = 8 }, /obj/effect/turf_decal/bot, -/obj/structure/bodycontainer/morgue{ - dir = 4 - }, +/obj/structure/bodycontainer/morgue, /turf/open/floor/plasteel/dark, /area/science/robotics/lab) "bhD" = ( @@ -40312,7 +39251,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/showroomfloor, @@ -40326,7 +39264,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/grille/broken, @@ -40374,7 +39311,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -40448,7 +39384,6 @@ department = "Cargo Bay"; departmentType = 2; name = "Quartermaster RC"; - pixel_x = 0; pixel_y = 30 }, /obj/structure/extinguisher_cabinet{ @@ -40498,7 +39433,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -40541,7 +39475,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -40592,7 +39525,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -40609,7 +39541,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/structure/cable, @@ -40626,7 +39557,6 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -40651,7 +39581,6 @@ /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/blue, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/structure/disposalpipe/segment{ @@ -40671,7 +39600,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -40718,8 +39646,7 @@ /obj/structure/grille, /obj/structure/barricade/wooden, /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/cable, @@ -40824,7 +39751,7 @@ }, /obj/effect/turf_decal/tile/blue, /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/structure/mirror{ @@ -40841,10 +39768,8 @@ /area/medical/surgery) "bis" = ( /obj/machinery/computer/shuttle/mining{ - icon_state = "computer"; dir = 8; - req_access = null; - req_one_access = null + req_access = null }, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/neutral, @@ -40897,7 +39822,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/effect/turf_decal/stripes/line{ @@ -40916,7 +39840,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/effect/landmark/start/medical_doctor, @@ -40961,7 +39884,6 @@ /area/hallway/primary/starboard) "biA" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -40982,7 +39904,6 @@ }, /obj/effect/turf_decal/tile/blue, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -41011,7 +39932,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -41165,7 +40085,6 @@ "biO" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/virology{ @@ -41192,7 +40111,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/sink{ @@ -41265,7 +40183,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -41285,7 +40202,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /obj/structure/cable, @@ -41296,11 +40212,11 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, /obj/machinery/door/airlock/research{ - name = "Experimentation Lab"; - req_access_txt = "47" + name = "Genetics Lab"; + req_access_txt = "47, 9" }, /turf/open/floor/plasteel/dark, -/area/science/explab) +/area/science/genetics) "biV" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -41314,7 +40230,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/effect/turf_decal/stripes/line, @@ -41352,7 +40267,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -41364,7 +40278,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/research{ @@ -41388,7 +40301,6 @@ dir = 4 }, /obj/machinery/computer/bounty{ - icon_state = "computer"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -41405,7 +40317,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -41420,7 +40331,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -41435,7 +40345,6 @@ /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -41464,7 +40373,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /turf/open/floor/plasteel, @@ -41487,7 +40395,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/landmark/event_spawn, @@ -41559,7 +40466,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/cable, @@ -41744,7 +40650,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -41777,7 +40682,6 @@ }, /obj/item/toy/figure/clown, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/effect/turf_decal/tile/neutral, @@ -41807,7 +40711,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -41829,7 +40732,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/effect/decal/cleanable/dirt, @@ -41888,7 +40790,6 @@ "bjJ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -41941,9 +40842,9 @@ /obj/effect/turf_decal/bot, /obj/structure/closet/crate/freezer/blood, /obj/machinery/power/apc{ + areastring = "/area/medical/surgery"; dir = 4; name = "Surgery APC"; - areastring = "/area/medical/surgery"; pixel_x = 26 }, /obj/machinery/light/small{ @@ -41993,7 +40894,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 4 }, /obj/effect/turf_decal/box, @@ -42038,7 +40938,6 @@ dir = 1 }, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 4 }, /obj/effect/turf_decal/tile/neutral, @@ -42049,7 +40948,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -42113,7 +41011,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -42164,7 +41061,7 @@ dir = 4 }, /obj/machinery/camera{ - c_tag = "Departures Cargo Dock"; + c_tag = "Arrivals Shuttle Dock"; dir = 4; name = "shuttle camera" }, @@ -42223,10 +41120,7 @@ /area/quartermaster/storage) "bkm" = ( /obj/effect/turf_decal/bot, -/obj/machinery/computer/security/labor{ - dir = 2; - icon_state = "computer" - }, +/obj/machinery/computer/security/labor, /obj/effect/turf_decal/tile/neutral, /obj/machinery/requests_console{ department = "Security"; @@ -42371,7 +41265,6 @@ id = "Cabin_3"; name = "Cabin 3 Privacy Lock"; normaldoorcontrol = 1; - pixel_x = 0; pixel_y = 24; specialfunctions = 4 }, @@ -42504,15 +41397,12 @@ /obj/machinery/conveyor_switch/oneway{ id = "packageSort2"; name = "mail belt"; - pixel_x = 0; pixel_y = 6 }, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 1 }, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 4 }, /turf/open/floor/plasteel, @@ -42557,7 +41447,6 @@ /obj/machinery/light, /obj/machinery/requests_console{ department = "Mining"; - departmentType = 0; name = "Mining RC"; pixel_y = -30 }, @@ -42604,7 +41493,6 @@ /area/quartermaster/storage) "bkN" = ( /obj/machinery/door/poddoor{ - density = 1; id = "QMLoaddoor"; name = "Supply Dock Loading Door" }, @@ -42685,7 +41573,6 @@ }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -42770,7 +41657,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/showroomfloor, @@ -42840,7 +41726,6 @@ id = "Cabin_2"; name = "Cabin 2 Privacy Lock"; normaldoorcontrol = 1; - pixel_x = 0; pixel_y = 24; specialfunctions = 4 }, @@ -42923,7 +41808,6 @@ req_access_txt = "31" }, /obj/machinery/button/door{ - dir = 2; id = "QMLoaddoor2"; layer = 4; name = "On Ramp Toggle"; @@ -42952,7 +41836,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /turf/open/floor/plasteel, @@ -42990,8 +41873,7 @@ /area/quartermaster/storage) "blq" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -43011,7 +41893,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -43130,7 +42011,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -43148,15 +42028,12 @@ dir = 8; id = "QMLoad"; name = "off ramp"; - pixel_x = 0; pixel_y = 5 }, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 8 }, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 1 }, /turf/open/floor/plasteel, @@ -43176,7 +42053,6 @@ /area/medical/virology) "blC" = ( /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 8 }, /obj/effect/turf_decal/tile/neutral, @@ -43247,7 +42123,6 @@ /area/security/checkpoint/supply) "blH" = ( /obj/machinery/door/poddoor{ - density = 1; id = "QMLoaddoor2"; name = "Supply Dock Loading Door" }, @@ -43290,7 +42165,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -43312,9 +42186,7 @@ /turf/open/floor/plasteel, /area/quartermaster/storage) "blM" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -43336,15 +42208,12 @@ /obj/machinery/conveyor_switch/oneway{ id = "QMLoad2"; name = "on ramp"; - pixel_x = 0; pixel_y = 6 }, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 1 }, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 4 }, /turf/open/floor/plasteel, @@ -43502,7 +42371,6 @@ }, /obj/machinery/camera{ c_tag = "Quartermaster's Office"; - dir = 2; name = "cargo camera"; network = list("ss13","qm") }, @@ -43697,7 +42565,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/machinery/status_display/supply{ @@ -43911,9 +42778,7 @@ dir = 8 }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - pixel_x = 0; - pixel_y = 0 + icon_state = "plant-21" }, /turf/open/floor/plasteel/dark, /area/hallway/primary/aft) @@ -43990,8 +42855,7 @@ /area/crew_quarters/kitchen) "bmI" = ( /obj/machinery/door/airlock/external{ - name = "Medical Escape Pod"; - req_access_txt = "0" + name = "Medical Escape Pod" }, /obj/structure/cable, /turf/open/floor/plasteel/dark, @@ -44202,6 +43066,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel/dark, /area/crew_quarters/kitchen) "bna" = ( @@ -44319,7 +43184,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/effect/decal/cleanable/dirt, @@ -44351,8 +43215,7 @@ areastring = "/area/maintenance/port"; dir = 4; name = "Port Maintenance APC"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/decal/cleanable/dirt, @@ -44426,8 +43289,7 @@ dir = 8 }, /obj/structure/window/reinforced{ - dir = 1; - pixel_y = 0 + dir = 1 }, /turf/open/floor/grass, /area/hydroponics) @@ -44451,7 +43313,7 @@ dir = 1 }, /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12 }, /obj/machinery/airalarm{ @@ -44608,7 +43470,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/structure/cable, @@ -44766,11 +43627,9 @@ /area/hydroponics) "bnP" = ( /obj/structure/window/reinforced{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/structure/tank_dispenser/oxygen{ - layer = 2.9; pixel_x = -1; pixel_y = 2 }, @@ -44779,8 +43638,7 @@ /area/bridge) "bnQ" = ( /obj/structure/window/reinforced{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/structure/reagent_dispensers/watertank, /obj/effect/turf_decal/delivery, @@ -44845,7 +43703,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/disposalpipe/segment{ @@ -44878,7 +43735,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/structure/cable, @@ -44924,8 +43780,7 @@ dir = 8 }, /obj/structure/window/reinforced{ - dir = 1; - pixel_y = 0 + dir = 1 }, /turf/open/floor/grass, /area/hydroponics) @@ -45135,8 +43990,7 @@ dir = 8 }, /obj/structure/window/reinforced{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -45275,9 +44129,7 @@ pixel_y = 12 }, /obj/effect/spawner/lootdrop/donkpockets, -/obj/item/storage/box/donkpockets{ - - }, +/obj/item/storage/box/donkpockets, /turf/open/floor/plasteel/dark, /area/crew_quarters/kitchen) "boB" = ( @@ -45385,7 +44237,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/mining/glass{ @@ -45467,7 +44318,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/effect/landmark/start/quartermaster, @@ -45538,7 +44388,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/structure/disposalpipe/segment, @@ -45659,7 +44508,6 @@ dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 4 }, /turf/open/floor/plasteel, @@ -45815,7 +44663,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -45834,7 +44681,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/effect/turf_decal/stripes/line{ @@ -45900,7 +44746,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/effect/turf_decal/stripes/line{ @@ -45980,7 +44825,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/cable, @@ -46031,8 +44875,7 @@ }, /obj/structure/chair/comfy/brown{ buildstackamount = 0; - color = "#c45c57"; - dir = 2 + color = "#c45c57" }, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 @@ -46130,7 +44973,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -46328,8 +45170,7 @@ }, /obj/effect/turf_decal/tile/red, /obj/machinery/chem_master/condimaster{ - name = "CondiMaster Neo"; - pixel_x = 0 + name = "CondiMaster Neo" }, /turf/open/floor/plasteel/showroomfloor, /area/crew_quarters/kitchen) @@ -46349,7 +45190,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1, /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/machinery/light_switch{ @@ -46431,7 +45272,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/showroomfloor, @@ -46446,7 +45286,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/machinery/light_switch{ @@ -46505,14 +45344,12 @@ /area/crew_quarters/kitchen) "bqp" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "0"; req_one_access_txt = "12;5" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -46531,7 +45368,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -46566,7 +45402,6 @@ /area/crew_quarters/kitchen) "bqt" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ @@ -46621,7 +45456,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -46638,7 +45472,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/tile/neutral{ @@ -46648,9 +45481,9 @@ dir = 8 }, /obj/machinery/power/apc/highcap/five_k{ + areastring = "/area/medical/virology"; dir = 1; name = "Virology APC"; - areastring = "/area/medical/virology"; pixel_y = 24 }, /obj/effect/decal/cleanable/dirt, @@ -46668,7 +45501,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/item/surgical_drapes, @@ -46697,7 +45529,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/mining{ @@ -46718,7 +45549,6 @@ /obj/machinery/door/window/southleft{ dir = 8; name = "Atmospherics Delivery Access"; - req_access_txt = "0"; req_one_access_txt = "24;10" }, /obj/machinery/door/poddoor/preopen{ @@ -46809,7 +45639,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/medical/glass{ @@ -46819,13 +45648,13 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel/dark, /area/hydroponics) "bqK" = ( /obj/structure/chair/sofa/corner{ color = "#c45c57"; - dir = 1; - icon_state = "sofacorner" + dir = 1 }, /obj/machinery/light{ dir = 1 @@ -46855,7 +45684,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/disposalpipe/segment{ @@ -46883,7 +45711,6 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 4 }, /turf/open/floor/plasteel, @@ -46927,7 +45754,6 @@ /area/maintenance/central) "bqR" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{ - icon_state = "pipe11-3"; dir = 5 }, /obj/effect/decal/cleanable/blood/gibs/old, @@ -46948,7 +45774,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -47103,8 +45928,7 @@ /area/crew_quarters/theatre) "bre" = ( /obj/structure/chair/sofa/right{ - color = "#c45c57"; - dir = 2 + color = "#c45c57" }, /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -47149,8 +45973,7 @@ /area/bridge) "brg" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -47163,12 +45986,10 @@ req_access_txt = "55" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/sign/directions/evac{ dir = 4; - pixel_x = 0; pixel_y = -24 }, /turf/open/floor/plasteel/dark, @@ -47250,8 +46071,7 @@ /area/chapel/office) "brq" = ( /obj/structure/chair/sofa/right{ - color = "#c45c57"; - dir = 2 + color = "#c45c57" }, /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -47391,8 +46211,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, /obj/machinery/firealarm{ dir = 4; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /obj/effect/turf_decal/caution/stand_clear, /turf/open/floor/plasteel/dark, @@ -47513,7 +46332,6 @@ /obj/effect/turf_decal/tile/neutral, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /turf/open/floor/plasteel/dark, @@ -47591,7 +46409,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/showroomfloor, @@ -47647,7 +46464,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /turf/open/floor/plasteel/showroomfloor, @@ -47746,7 +46562,6 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /turf/open/floor/plasteel/showroomfloor, @@ -47780,7 +46595,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /turf/open/floor/plasteel/showroomfloor, @@ -47882,7 +46696,6 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -47901,7 +46714,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -47931,7 +46743,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -47941,8 +46752,7 @@ /obj/structure/flora/ausbushes/brflowers, /obj/structure/flora/ausbushes/grassybush, /obj/structure/window/reinforced{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/machinery/airalarm{ dir = 4; @@ -48059,7 +46869,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/mining/glass{ @@ -48096,11 +46905,9 @@ }, /obj/machinery/camera{ c_tag = "Fore Hallway Chapel"; - dir = 2; name = "fore camera" }, /turf/open/floor/plasteel/dark/corner{ - icon_state = "darkcorner"; dir = 4 }, /area/hallway/primary/fore) @@ -48131,6 +46938,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel/dark, /area/quartermaster/office) "bsA" = ( @@ -48151,7 +46959,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -48185,7 +46992,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/structure/disposalpipe/segment{ @@ -48215,7 +47021,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -48314,7 +47119,6 @@ /area/hydroponics) "bsM" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer3{ - icon_state = "manifold-3"; dir = 4 }, /obj/effect/decal/cleanable/blood/old, @@ -48334,8 +47138,7 @@ dir = 8 }, /obj/structure/window/reinforced{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/structure/window/reinforced, /turf/open/floor/grass, @@ -48347,8 +47150,7 @@ /obj/structure/flora/ausbushes/leafybush, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ - dir = 1; - pixel_y = 0 + dir = 1 }, /turf/open/floor/grass, /area/crew_quarters/heads/hop) @@ -48363,8 +47165,7 @@ }, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ - dir = 1; - pixel_y = 0 + dir = 1 }, /turf/open/floor/grass, /area/crew_quarters/heads/hop) @@ -48383,7 +47184,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/effect/landmark/event_spawn, @@ -48607,7 +47407,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/landmark/event_spawn, @@ -48632,9 +47431,7 @@ }, /obj/item/radio/intercom{ desc = "Talk through this. It looks like it has been modified to not broadcast."; - dir = 2; name = "Prison Intercom (General)"; - pixel_x = 0; pixel_y = 22; prison_radio = 1 }, @@ -48647,8 +47444,7 @@ /area/security/prison) "bti" = ( /obj/machinery/door/airlock/security/glass{ - name = "Prison Yard"; - req_access_txt = "0" + name = "Prison Yard" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/door/poddoor/shutters/preopen{ @@ -48662,7 +47458,7 @@ dir = 4 }, /turf/open/floor/plasteel/dark, -/area/security/prison) +/area/security/prison/toilet) "btj" = ( /obj/effect/turf_decal/tile/brown, /obj/effect/turf_decal/tile/brown{ @@ -48746,7 +47542,6 @@ "bto" = ( /obj/effect/turf_decal/delivery, /obj/structure/bodycontainer/crematorium{ - icon_state = "crema1"; dir = 8; id = "crematoriumChapel" }, @@ -48898,7 +47693,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -48919,7 +47713,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/airalarm{ @@ -48956,7 +47749,6 @@ /obj/effect/turf_decal/tile/neutral, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /obj/machinery/firealarm{ @@ -48977,7 +47769,6 @@ /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/bot, /obj/machinery/requests_console{ - announcementConsole = 0; department = "Engineering"; departmentType = 4; name = "Engineering RC"; @@ -48998,8 +47789,7 @@ /obj/structure/flora/ausbushes/leafybush, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/machinery/door/poddoor/shutters/preopen{ id = "bar_1"; @@ -49018,8 +47808,7 @@ /obj/structure/flora/ausbushes/sunnybush, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/machinery/door/poddoor/shutters/preopen{ id = "bar_1"; @@ -49084,8 +47873,7 @@ /area/maintenance/port) "btP" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/cable, @@ -49131,9 +47919,7 @@ /area/crew_quarters/bar) "btU" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - pixel_x = 0; - pixel_y = 0 + icon_state = "plant-21" }, /turf/open/floor/wood, /area/crew_quarters/bar) @@ -49148,8 +47934,7 @@ areastring = "/area/hallway/primary/port"; dir = 8; name = "Port Hallway APC"; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /obj/structure/cable, /turf/open/floor/plasteel/dark/corner{ @@ -49171,7 +47956,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment, @@ -49249,7 +48033,6 @@ }, /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-02"; - pixel_x = 0; pixel_y = 3 }, /turf/open/floor/plasteel/dark, @@ -49307,7 +48090,6 @@ departmentType = 2; name = "Bar RC"; pixel_x = 30; - pixel_y = 0; receive_ore_updates = 1 }, /turf/open/floor/plasteel/dark, @@ -49401,7 +48183,6 @@ /area/crew_quarters/bar) "buo" = ( /obj/machinery/chem_dispenser/drinks{ - icon_state = "soda_dispenser"; dir = 8 }, /obj/effect/turf_decal/tile/neutral{ @@ -49487,9 +48268,7 @@ dir = 1 }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - pixel_x = 0; - pixel_y = 0 + icon_state = "plant-21" }, /obj/effect/turf_decal/stripes/corner, /turf/open/floor/plasteel/dark, @@ -49525,7 +48304,6 @@ /obj/structure/flora/ausbushes/grassybush, /obj/structure/flora/ausbushes/ywflowers, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -49547,7 +48325,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /turf/open/floor/wood{ @@ -49620,7 +48397,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/wood, @@ -49755,7 +48531,6 @@ /obj/machinery/door/window/northright{ dir = 4; name = "Engineering Delivery Access"; - req_access_txt = "0"; req_one_access_txt = "10;24" }, /obj/machinery/door/poddoor/preopen{ @@ -49771,6 +48546,7 @@ req_access_txt = "37" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel/dark, /area/library) "buV" = ( @@ -49851,7 +48627,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -49913,7 +48688,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -49962,7 +48736,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -49979,7 +48752,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 4 }, /obj/effect/landmark/start/bartender, @@ -50013,7 +48785,6 @@ /area/hallway/secondary/exit/departure_lounge) "bvp" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/wood, @@ -50027,14 +48798,12 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 4 }, /turf/open/floor/plasteel/dark, /area/crew_quarters/bar) "bvr" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /obj/structure/chair/office, @@ -50102,7 +48871,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/structure/sign/warning/nosmoking{ @@ -50187,7 +48955,6 @@ /area/hallway/primary/starboard) "bvC" = ( /obj/machinery/chem_dispenser/drinks/beer{ - icon_state = "booze_dispenser"; dir = 8 }, /obj/effect/turf_decal/tile/neutral{ @@ -50258,7 +49025,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/effect/landmark/start/bartender, @@ -50273,7 +49039,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/effect/landmark/event_spawn, @@ -50285,7 +49050,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/caution/stand_clear, @@ -50319,7 +49083,6 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /turf/open/floor/plasteel/dark, @@ -50380,14 +49143,12 @@ "bvR" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /turf/open/floor/wood, /area/crew_quarters/bar) "bvS" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /turf/open/floor/wood{ @@ -50403,7 +49164,6 @@ }, /obj/machinery/button/crematorium{ id = "crematoriumChapel"; - pixel_x = 0; pixel_y = 24; req_access_txt = "27" }, @@ -50466,7 +49226,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /obj/effect/turf_decal/box, @@ -50557,7 +49316,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/effect/turf_decal/stripes/line{ @@ -50580,14 +49338,12 @@ /area/maintenance/central) "bwl" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "0"; req_one_access_txt = "12;5" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -50712,7 +49468,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -50753,7 +49508,6 @@ }, /obj/effect/turf_decal/tile/green, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /obj/effect/turf_decal/stripes/line, @@ -50782,7 +49536,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 4 }, /obj/structure/cable, @@ -50802,7 +49555,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -50828,7 +49580,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -50867,7 +49618,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -50908,7 +49658,6 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /turf/open/floor/plasteel/dark, @@ -50922,7 +49671,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -50977,7 +49725,6 @@ /obj/effect/turf_decal/tile/neutral, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/camera{ @@ -50998,7 +49745,6 @@ /area/chapel/main) "bwY" = ( /obj/structure/chair/pew/left{ - icon_state = "pewend_left"; dir = 1 }, /turf/open/floor/plasteel/chapel{ @@ -51007,7 +49753,6 @@ /area/chapel/main) "bwZ" = ( /obj/structure/chair/pew/right{ - icon_state = "pewend_right"; dir = 1 }, /turf/open/floor/plasteel/chapel, @@ -51024,14 +49769,12 @@ /area/chapel/main) "bxb" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "0"; req_one_access_txt = "12;5" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -51057,7 +49800,6 @@ }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, @@ -51071,7 +49813,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/chapel{ @@ -51090,8 +49831,7 @@ dir = 8 }, /obj/structure/window/reinforced{ - dir = 1; - pixel_y = 0 + dir = 1 }, /turf/open/floor/grass, /area/chapel/main) @@ -51140,7 +49880,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/item/radio/intercom{ @@ -51208,7 +49947,6 @@ /area/maintenance/port) "bxr" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer3{ - icon_state = "manifold-3"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -51268,7 +50006,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -51306,7 +50043,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/extinguisher_cabinet{ @@ -51335,12 +50071,10 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/sign/directions/evac{ dir = 1; - icon_state = "direction_evac"; pixel_y = 24 }, /obj/structure/cable, @@ -51362,14 +50096,13 @@ dir = 1 }, /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/effect/turf_decal/stripes/corner{ dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /obj/machinery/firealarm{ @@ -51380,7 +50113,6 @@ /area/chapel/main) "bxD" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/grass, @@ -51399,9 +50131,7 @@ /area/chapel/main) "bxF" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - pixel_x = 0; - pixel_y = 0 + icon_state = "plant-21" }, /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -51478,7 +50208,6 @@ }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/extinguisher_cabinet{ @@ -51498,7 +50227,6 @@ /obj/structure/flora/grass/jungle/b, /obj/structure/flora/ausbushes/ywflowers, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/grass, @@ -51610,7 +50338,6 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /obj/effect/landmark/start/assistant, @@ -51622,7 +50349,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/virology/glass{ @@ -51642,8 +50368,7 @@ }, /obj/machinery/chem_master/condimaster{ desc = "Used to separate out liquids - useful for purifying botanical extracts. Also dispenses condiments."; - name = "BrewMaster 2199"; - pixel_x = 0 + name = "BrewMaster 2199" }, /obj/machinery/light_switch{ pixel_y = 24 @@ -51670,7 +50395,6 @@ desc = "A remote control-switch for secure storage."; id = "Secure Storage"; name = "Secure Storage Toggle"; - pixel_x = 0; pixel_y = -24; req_access_txt = "11" }, @@ -51773,7 +50497,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -51803,7 +50526,6 @@ }, /obj/machinery/camera{ c_tag = "Supermatter Cooler"; - dir = 2; name = "engineering camera"; network = list("ss13","engine") }, @@ -51830,7 +50552,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/structure/cable, @@ -51852,7 +50573,6 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/effect/decal/cleanable/dirt, @@ -51918,12 +50638,10 @@ /obj/machinery/flasher{ id = "AI"; name = "Meatbag Pacifier"; - pixel_x = 0; pixel_y = 24 }, /obj/machinery/camera/motion{ c_tag = "AI Upload Turrets"; - dir = 2; name = "upload camera"; network = list("aiupload") }, @@ -51976,7 +50694,6 @@ "byu" = ( /obj/machinery/door/airlock/maintenance{ name = "command maintenance"; - req_access_txt = "0"; req_one_access_txt = "19;63" }, /obj/structure/disposalpipe/segment, @@ -52084,7 +50801,6 @@ /obj/effect/turf_decal/bot, /obj/machinery/camera{ c_tag = "Engineering Lockers"; - dir = 2; name = "engineering camera"; network = list("ss13","engine") }, @@ -52115,7 +50831,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/machinery/ai_slipper{ @@ -52128,7 +50843,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/engine, @@ -52198,8 +50912,8 @@ }, /obj/effect/spawner/lootdrop/aimodule_harmful{ fan_out_items = 1; - lootdoubles = 0; - lootcount = 2 + lootcount = 2; + lootdoubles = 0 }, /obj/item/aiModule/supplied/oxygen{ pixel_x = -3; @@ -52235,7 +50949,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/machinery/status_display/ai{ @@ -52253,9 +50966,7 @@ dir = 8 }, /obj/machinery/door/window/westleft{ - base_state = "left"; dir = 1; - icon_state = "left"; layer = 3.1; name = "Cyborg Upload Console Window"; req_access_txt = "16" @@ -52326,7 +51037,6 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/effect/turf_decal/stripes/corner{ @@ -52375,7 +51085,6 @@ }, /obj/effect/decal/cleanable/blood/old, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /turf/open/floor/engine, @@ -52451,9 +51160,7 @@ /turf/open/floor/engine, /area/ai_monitored/turret_protected/ai_upload) "bzh" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -52470,7 +51177,6 @@ /area/quartermaster/storage) "bzi" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -52504,8 +51210,8 @@ }, /obj/effect/spawner/lootdrop/aimodule_harmless{ fan_out_items = 1; - lootdoubles = 0; - lootcount = 3 + lootcount = 3; + lootdoubles = 0 }, /obj/structure/table, /obj/structure/window/reinforced, @@ -52540,8 +51246,7 @@ /area/hallway/secondary/exit/departure_lounge) "bzm" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, @@ -52618,8 +51323,7 @@ broadcasting = 1; frequency = 1447; name = "Private AI Channel"; - pixel_x = 28; - pixel_y = 0 + pixel_x = 28 }, /turf/open/floor/circuit/green{ luminosity = 2 @@ -52638,8 +51342,7 @@ "bzt" = ( /obj/machinery/chem_master/condimaster{ desc = "Used to separate out liquids - useful for purifying botanical extracts. Also dispenses condiments."; - name = "BrewMaster 2199"; - pixel_x = 0 + name = "BrewMaster 2199" }, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/bot, @@ -52679,7 +51382,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /turf/open/floor/plasteel/showroomfloor, @@ -52689,7 +51391,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/tile/red, @@ -52702,7 +51403,6 @@ }, /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-02"; - pixel_x = 0; pixel_y = 3 }, /turf/open/floor/plasteel/showroomfloor, @@ -52724,7 +51424,6 @@ id = "transittube"; name = "Transit Tube Lockdown Toggle"; pixel_x = 24; - pixel_y = 0; req_access_txt = "19" }, /obj/machinery/camera{ @@ -52770,11 +51469,9 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/junction/flip{ - icon_state = "pipe-j2"; dir = 4 }, /turf/open/floor/wood, @@ -52793,7 +51490,6 @@ pixel_x = -28 }, /obj/machinery/computer/prisoner/management{ - icon_state = "computer"; dir = 4 }, /turf/open/floor/wood, @@ -52801,8 +51497,7 @@ "bzE" = ( /obj/machinery/door/airlock/vault{ id_tag = "bank"; - name = "Bank Vault"; - req_access_txt = "0" + name = "Bank Vault" }, /obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plasteel/dark, @@ -52890,10 +51585,7 @@ /turf/open/floor/plasteel/dark, /area/bridge) "bzM" = ( -/obj/machinery/modular_computer/console/preset/command{ - dir = 2; - icon_state = "console" - }, +/obj/machinery/modular_computer/console/preset/command, /obj/effect/turf_decal/tile/yellow{ dir = 1 }, @@ -52934,7 +51626,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/cable, @@ -53049,7 +51740,6 @@ /area/crew_quarters/locker) "bAa" = ( /obj/effect/spawner/structure/window/hollow/reinforced/directional{ - icon_state = "hrwindow_spawner_directional"; dir = 9 }, /obj/structure/cable, @@ -53096,9 +51786,7 @@ }, /obj/effect/turf_decal/stripes/corner, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - pixel_x = 0; - pixel_y = 0 + icon_state = "plant-21" }, /turf/open/floor/plasteel/showroomfloor, /area/security/brig) @@ -53145,7 +51833,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -53202,8 +51889,7 @@ /obj/machinery/flasher{ id = "PCell 2"; name = "Prisoner Pacifier"; - pixel_x = 24; - pixel_y = 0 + pixel_x = 24 }, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -53223,7 +51909,7 @@ dir = 1 }, /turf/open/floor/plasteel/showroomfloor, -/area/security/prison) +/area/security/prison/toilet) "bAl" = ( /obj/effect/turf_decal/tile/green{ dir = 4 @@ -53288,12 +51974,10 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-02"; - pixel_x = 0; pixel_y = 3 }, /obj/effect/turf_decal/tile/red, @@ -53345,9 +52029,7 @@ }, /obj/effect/turf_decal/tile/blue, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - pixel_x = 0; - pixel_y = 0 + icon_state = "plant-21" }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, @@ -53485,8 +52167,7 @@ /obj/effect/turf_decal/tile/neutral, /obj/machinery/firealarm{ dir = 8; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/structure/chair/office{ dir = 8 @@ -53499,7 +52180,6 @@ /obj/machinery/requests_console{ department = "Detective's office"; name = "Detective RC"; - pixel_x = 0; pixel_y = 30 }, /obj/machinery/light_switch{ @@ -53698,7 +52378,6 @@ /obj/item/camera, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /turf/open/floor/plasteel/dark, @@ -53707,9 +52386,6 @@ /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door/airlock/public/glass/incinerator/atmos_interior, /obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 9 - }, /obj/machinery/embedded_controller/radio/airlock_controller/incinerator_atmos{ pixel_x = 38; pixel_y = 6 @@ -53751,7 +52427,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /obj/structure/cable, @@ -53791,7 +52466,6 @@ dir = 4 }, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 1 }, /obj/effect/turf_decal/tile/neutral, @@ -53805,7 +52479,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -53844,7 +52517,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -53902,14 +52574,12 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/power/apc{ areastring = "/area/quartermaster/storage"; dir = 1; name = "Cargo Bay APC"; - pixel_x = 0; pixel_y = 26 }, /obj/structure/cable, @@ -54036,13 +52706,12 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/machinery/power/apc{ + areastring = "/area/crew_quarters/fitness/recreation"; dir = 1; name = "Recreation Area APC"; - areastring = "/area/crew_quarters/fitness/recreation"; pixel_y = 24 }, /obj/structure/cable, @@ -54105,7 +52774,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -54166,7 +52834,6 @@ }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/structure/disposalpipe/segment{ @@ -54204,7 +52871,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -54216,7 +52882,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -54234,7 +52899,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/item/radio/intercom{ @@ -54352,7 +53016,6 @@ }, /obj/effect/turf_decal/tile/neutral, /obj/item/analyzer{ - pixel_x = 0; pixel_y = 4 }, /obj/item/analyzer{ @@ -54360,7 +53023,6 @@ }, /obj/machinery/requests_console{ department = "Tool Storage"; - departmentType = 0; name = "Tool Storage RC"; pixel_x = -30 }, @@ -54372,7 +53034,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, /obj/structure/sign/directions/medical{ dir = 1; - icon_state = "direction_med"; pixel_x = 32; pixel_y = 8 }, @@ -54418,7 +53079,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/item/twohanded/required/kirbyplants{ @@ -54476,7 +53136,6 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -54493,9 +53152,9 @@ }, /obj/item/twohanded/required/kirbyplants, /obj/machinery/power/apc/highcap/ten_k{ + areastring = "/area/bridge"; dir = 8; name = "Bridge APC"; - areastring = "/area/bridge"; pixel_x = -27 }, /obj/effect/turf_decal/stripes/line{ @@ -54562,7 +53221,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /turf/open/floor/plasteel/dark/corner{ @@ -54607,7 +53265,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/effect/turf_decal/stripes/line, @@ -54732,7 +53389,6 @@ pixel_y = 6 }, /obj/item/radio{ - pixel_x = 0; pixel_y = 4 }, /turf/open/floor/plasteel/dark, @@ -54753,7 +53409,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -54807,7 +53462,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line, @@ -54854,7 +53508,6 @@ }, /obj/effect/turf_decal/tile/yellow, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /obj/machinery/light_switch{ @@ -54877,7 +53530,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/command{ @@ -54968,7 +53620,6 @@ /area/hallway/primary/port) "bCI" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/structure/disposalpipe/segment{ @@ -55170,7 +53821,6 @@ helmet_type = /obj/item/clothing/head/helmet/space; suit_type = /obj/item/clothing/suit/space }, -/obj/structure/window/reinforced, /obj/item/radio/intercom{ pixel_x = 28 }, @@ -55199,7 +53849,6 @@ /obj/machinery/light/small, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /obj/machinery/atmospherics/components/unary/vent_pump/on{ @@ -55246,7 +53895,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/spawner/structure/window/reinforced, @@ -55290,7 +53938,6 @@ "bDe" = ( /obj/effect/turf_decal/bot, /obj/structure/tank_dispenser/oxygen{ - layer = 2.9; pixel_x = -1; pixel_y = 2 }, @@ -55353,7 +54000,6 @@ "bDl" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -55472,8 +54118,7 @@ /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/bot, /obj/structure/sign/warning/securearea{ - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /turf/open/floor/plasteel/dark, /area/storage/tech) @@ -55482,7 +54127,6 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /turf/open/floor/engine, @@ -55520,7 +54164,6 @@ /turf/open/floor/plasteel, /area/quartermaster/storage) "bDA" = ( -/obj/effect/turf_decal/bot, /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -55531,13 +54174,21 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/structure/closet/crate/rcd, -/obj/machinery/door/window/northleft{ - dir = 8; - name = "RCD Storage"; - pixel_x = 0; - req_access_txt = "19" +/obj/item/grenade/chem_grenade/smart_metal_foam{ + pixel_x = -4; + pixel_y = 6 }, +/obj/item/grenade/chem_grenade/smart_metal_foam{ + pixel_x = 4; + pixel_y = 2 + }, +/obj/item/grenade/chem_grenade/smart_metal_foam{ + pixel_x = 8 + }, +/obj/item/grenade/chem_grenade/smart_metal_foam{ + pixel_y = 4 + }, +/obj/structure/table, /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/eva) "bDB" = ( @@ -55593,8 +54244,7 @@ /area/storage/tech) "bDH" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -55664,8 +54314,7 @@ /obj/effect/turf_decal/bot, /obj/machinery/firealarm{ dir = 8; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /turf/open/floor/plasteel/dark, /area/storage/tech) @@ -55716,9 +54365,7 @@ /area/maintenance/port) "bDR" = ( /obj/machinery/light/floor, -/turf/open/floor/engine/co2{ - initial_gas_mix = "co2=1000;TEMP=293.15" - }, +/turf/open/floor/engine/co2, /area/engine/atmos) "bDS" = ( /obj/structure/table, @@ -55792,7 +54439,6 @@ }, /obj/machinery/camera{ c_tag = "Secure Tech Storage"; - dir = 2; name = "engineering camera"; network = list("ss13","engine") }, @@ -55821,7 +54467,6 @@ /obj/effect/spawner/lootdrop/techstorage/AI, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /turf/open/floor/circuit/green{ @@ -55924,8 +54569,7 @@ /area/hallway/primary/port) "bEi" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -56024,7 +54668,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/cable, @@ -56042,7 +54685,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -56215,7 +54857,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -56233,7 +54874,6 @@ }, /obj/effect/turf_decal/box, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -56308,7 +54948,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -56366,7 +55005,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/disposalpipe/segment{ @@ -56427,7 +55065,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -56453,7 +55090,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /turf/open/floor/plasteel, @@ -56502,7 +55138,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/grunge{ @@ -56535,7 +55170,6 @@ areastring = "/area/security/checkpoint/supply"; dir = 1; name = "Cargo Security APC"; - pixel_x = 0; pixel_y = 26 }, /obj/machinery/firealarm{ @@ -56691,7 +55325,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /turf/open/floor/plasteel, @@ -56702,7 +55335,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, /obj/machinery/door/airlock/security{ name = "Council Chamber"; - req_access_txt = "0"; req_one_access_txt = "38;63" }, /obj/structure/cable, @@ -56748,7 +55380,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/cable, @@ -56779,7 +55410,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -56799,7 +55429,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -56813,7 +55442,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/structure/cable, @@ -56824,8 +55452,7 @@ /obj/machinery/portable_atmospherics/scrubber/huge, /obj/machinery/firealarm{ dir = 8; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -56861,7 +55488,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -56897,7 +55523,6 @@ "bFE" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -56920,9 +55545,7 @@ /area/maintenance/port) "bFG" = ( /obj/machinery/light/floor, -/turf/open/floor/engine/plasma{ - initial_gas_mix = "plasma=1000;TEMP=293.15" - }, +/turf/open/floor/engine/plasma, /area/engine/atmos) "bFH" = ( /obj/effect/turf_decal/stripes/corner{ @@ -56933,7 +55556,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/item/radio/intercom{ @@ -57154,8 +55776,7 @@ "bGa" = ( /obj/machinery/door/airlock/maintenance{ id_tag = "bankvault"; - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -57194,7 +55815,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -57218,9 +55838,7 @@ }, /obj/effect/turf_decal/tile/neutral, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - pixel_x = 0; - pixel_y = 0 + icon_state = "plant-21" }, /turf/open/floor/plasteel/dark/corner{ dir = 8 @@ -57257,9 +55875,9 @@ /obj/structure/table, /obj/item/cartridge/lawyer, /obj/machinery/power/apc{ + areastring = "/area/lawoffice"; dir = 1; name = "Law Office APC"; - areastring = "/area/lawoffice"; pixel_y = 24 }, /obj/structure/cable, @@ -57269,8 +55887,7 @@ /obj/effect/turf_decal/bot, /obj/structure/closet/crate/hydroponics, /obj/structure/window/reinforced{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -57315,9 +55932,7 @@ dir = 4 }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - pixel_x = 0; - pixel_y = 0 + icon_state = "plant-21" }, /obj/structure/spider/stickyweb, /obj/effect/decal/cleanable/blood/old, @@ -57331,7 +55946,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/effect/decal/cleanable/dirt, @@ -57356,7 +55970,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -57410,8 +56023,7 @@ areastring = "/area/crew_quarters/heads/captain"; dir = 4; name = "Captain's Office APC"; - pixel_x = 24; - pixel_y = 0 + pixel_x = 24 }, /obj/structure/cable, /turf/open/floor/plasteel/dark, @@ -57419,7 +56031,6 @@ "bGv" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-02"; - pixel_x = 0; pixel_y = 3 }, /obj/effect/turf_decal/tile/red{ @@ -57513,7 +56124,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/camera{ @@ -57545,10 +56155,7 @@ /turf/open/floor/plating, /area/engine/atmos) "bGD" = ( -/obj/machinery/computer/security/labor{ - dir = 2; - icon_state = "computer" - }, +/obj/machinery/computer/security/labor, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, @@ -57576,7 +56183,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/landmark/start/assistant, @@ -57588,7 +56194,6 @@ "bGF" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /obj/structure/cable, @@ -57742,7 +56347,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/cable, @@ -57764,7 +56368,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -57800,7 +56403,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -57836,7 +56438,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -57847,7 +56448,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/structure/cable, @@ -57869,7 +56469,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -57889,7 +56488,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /turf/open/floor/plasteel/dark/corner, @@ -57965,7 +56563,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /obj/effect/turf_decal/box, @@ -58013,7 +56610,6 @@ /area/hallway/primary/aft) "bHp" = ( /obj/structure/chair/pew/right{ - icon_state = "pewend_right"; dir = 8 }, /obj/effect/turf_decal/stripes/corner, @@ -58109,9 +56705,8 @@ dir = 8 }, /obj/machinery/power/apc{ - dir = 2; - name = "Locker Room APC"; areastring = "/area/crew_quarters/locker"; + name = "Locker Room APC"; pixel_x = -1; pixel_y = -26 }, @@ -58242,6 +56837,7 @@ }, /obj/effect/turf_decal/delivery, /obj/structure/cable, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel/dark, /area/crew_quarters/locker) "bHH" = ( @@ -58254,7 +56850,6 @@ /obj/effect/turf_decal/tile/neutral, /obj/structure/sign/directions/evac{ dir = 4; - pixel_x = 0; pixel_y = -24 }, /turf/open/floor/plasteel/dark/corner{ @@ -58277,7 +56872,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /turf/open/floor/plasteel, @@ -58298,11 +56892,9 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /turf/open/floor/plasteel/dark/corner{ - icon_state = "darkcorner"; dir = 4 }, /area/hallway/primary/port) @@ -58316,7 +56908,6 @@ /obj/effect/turf_decal/tile/neutral, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /turf/open/floor/plasteel/dark/corner{ @@ -58328,7 +56919,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/effect/turf_decal/stripes/corner{ @@ -58355,7 +56945,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -58369,7 +56958,6 @@ "bHO" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -58447,7 +57035,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/structure/disposalpipe/segment{ @@ -58510,9 +57097,7 @@ /area/hallway/primary/port) "bId" = ( /obj/machinery/light/floor, -/turf/open/floor/engine/n2o{ - initial_gas_mix = "n2o=1000;TEMP=293.15" - }, +/turf/open/floor/engine/n2o, /area/engine/atmos) "bIe" = ( /obj/machinery/atmospherics/pipe/simple/purple/visible, @@ -58540,7 +57125,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment, @@ -58559,7 +57143,6 @@ }, /obj/effect/turf_decal/tile/neutral, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/machinery/airalarm{ @@ -58631,7 +57214,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/security{ @@ -58734,9 +57316,7 @@ dir = 8 }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - pixel_x = 0; - pixel_y = 0 + icon_state = "plant-21" }, /turf/open/floor/plasteel, /area/hallway/primary/aft) @@ -58792,7 +57372,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -58866,7 +57445,6 @@ }, /obj/effect/turf_decal/tile/neutral, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -58901,7 +57479,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/grunge{ @@ -58930,7 +57507,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/landmark/event_spawn, @@ -58951,7 +57527,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /turf/open/floor/plasteel, @@ -59009,7 +57584,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/tile/neutral{ @@ -59084,18 +57658,16 @@ dir = 1; pixel_y = -22 }, +/obj/effect/landmark/start/prisoner, /turf/open/floor/plasteel/showroomfloor, -/area/security/prison) +/area/security/prison/toilet) "bIU" = ( /obj/machinery/camera{ c_tag = "Atmospherics Tank - O2"; - dir = 2; name = "atmospherics camera"; network = list("ss13","engine") }, -/turf/open/floor/engine/o2{ - initial_gas_mix = "o2=1000;TEMP=293.15" - }, +/turf/open/floor/engine/o2, /area/engine/atmos) "bIV" = ( /turf/closed/wall, @@ -59112,8 +57684,7 @@ }, /obj/machinery/firealarm{ dir = 4; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /turf/open/floor/plasteel/dark, /area/crew_quarters/locker) @@ -59160,7 +57731,6 @@ }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -59229,7 +57799,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line, @@ -59262,7 +57831,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/corner{ @@ -59287,7 +57855,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -59306,7 +57873,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -59378,11 +57944,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/item/storage/toolbox/mechanical{ - pixel_x = 2; - pixel_y = 4 - }, -/obj/item/storage/toolbox/emergency, +/obj/item/razor, /turf/open/floor/plasteel, /area/crew_quarters/locker) "bJp" = ( @@ -59447,7 +58009,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /turf/open/floor/plasteel, @@ -59555,7 +58116,6 @@ }, /obj/machinery/camera{ c_tag = "Prison Yard Machines"; - dir = 2; name = "prison camera"; network = list("ss13","prison") }, @@ -59578,11 +58138,10 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/dark, -/area/security/prison) +/area/security/prison/toilet) "bJC" = ( /obj/machinery/status_display/ai, /turf/closed/wall, @@ -59613,9 +58172,7 @@ /obj/effect/turf_decal/tile/neutral, /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - pixel_x = 0; - pixel_y = 0 + icon_state = "plant-21" }, /obj/structure/extinguisher_cabinet{ pixel_y = 28 @@ -59624,7 +58181,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /turf/open/floor/plasteel/showroomfloor, @@ -59766,7 +58322,6 @@ id = "Cabin_4"; name = "Cabin 4 Privacy Lock"; normaldoorcontrol = 1; - pixel_x = 0; pixel_y = 24; specialfunctions = 4 }, @@ -59821,7 +58376,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/structure/disposalpipe/segment, @@ -59840,7 +58394,6 @@ /obj/effect/turf_decal/tile/red, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/structure/disposalpipe/segment{ @@ -59864,13 +58417,16 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/maintenance/port/aft) +"bJY" = ( +/obj/effect/mapping_helpers/iannewyear, +/turf/open/floor/wood, +/area/crew_quarters/heads/hop) "bKa" = ( /obj/structure/dresser, /obj/machinery/button/door{ id = "Cabin_1"; name = "Cabin 1 Privacy Lock"; normaldoorcontrol = 1; - pixel_x = 0; pixel_y = 24; specialfunctions = 4 }, @@ -59897,7 +58453,6 @@ /area/crew_quarters/locker) "bKi" = ( /obj/structure/chair/pew{ - icon_state = "pewmiddle"; dir = 8 }, /obj/effect/turf_decal/tile/blue{ @@ -60014,7 +58569,6 @@ }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/effect/turf_decal/stripes/line{ @@ -60057,7 +58611,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/corner{ @@ -60123,9 +58676,8 @@ }, /obj/effect/turf_decal/tile/red, /obj/machinery/power/apc{ - dir = 2; - name = "Restrooms APC"; areastring = "/area/crew_quarters/toilet/restrooms"; + name = "Restrooms APC"; pixel_y = -26 }, /obj/machinery/camera{ @@ -60219,7 +58771,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/structure/disposalpipe/segment{ @@ -60246,12 +58797,12 @@ dir = 1 }, /obj/structure/disposalpipe/segment, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel/dark, /area/bridge) "bKJ" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/dark, @@ -60369,7 +58920,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -60377,7 +58927,6 @@ "bKT" = ( /obj/effect/turf_decal/box, /obj/structure/toilet{ - icon_state = "toilet00"; dir = 8 }, /obj/structure/mirror{ @@ -60411,7 +58960,6 @@ "bKU" = ( /obj/effect/turf_decal/box, /obj/structure/toilet{ - icon_state = "toilet00"; dir = 8 }, /obj/structure/mirror{ @@ -60444,7 +58992,6 @@ "bKV" = ( /obj/effect/turf_decal/box, /obj/structure/toilet{ - icon_state = "toilet00"; dir = 8 }, /obj/structure/mirror{ @@ -60479,7 +59026,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -60490,7 +59036,6 @@ /area/security/courtroom) "bKX" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /turf/open/floor/plasteel/showroomfloor, @@ -60583,7 +59128,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/structure/disposalpipe/segment, @@ -60594,7 +59138,6 @@ dir = 8 }, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -60746,7 +59289,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -60812,7 +59354,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -60843,7 +59384,6 @@ dir = 8 }, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 8 }, /obj/structure/window/reinforced{ @@ -60870,7 +59410,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -60899,7 +59438,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -60927,7 +59465,6 @@ dir = 4 }, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 4 }, /obj/structure/window/reinforced, @@ -60947,7 +59484,6 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /obj/structure/extinguisher_cabinet{ @@ -60986,8 +59522,7 @@ output_dir = 8 }, /obj/structure/window/reinforced{ - dir = 1; - pixel_y = 0 + dir = 1 }, /turf/open/floor/plating, /area/quartermaster/office) @@ -61016,12 +59551,10 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/camera{ c_tag = "Central Hallway Courtroom"; - dir = 2; name = "central camera" }, /turf/open/floor/plasteel, @@ -61067,18 +59600,15 @@ dir = 1 }, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 1 }, /obj/structure/window/reinforced, /obj/machinery/door/window/eastright{ base_state = "left"; - dir = 4; icon_state = "left"; name = "Fitness Ring" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/structure/disposalpipe/segment{ @@ -61122,7 +59652,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -61179,7 +59708,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line, @@ -61242,8 +59770,7 @@ /obj/item/storage/backpack, /obj/machinery/firealarm{ dir = 8; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /turf/open/floor/plasteel/dark, /area/crew_quarters/fitness/recreation) @@ -61264,7 +59791,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -61297,7 +59823,6 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 4 }, /turf/open/floor/plasteel/dark, @@ -61337,7 +59862,6 @@ "bMe" = ( /obj/machinery/hydroponics/soil, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/item/seeds/ambrosia, @@ -61356,7 +59880,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/status_display/evac{ @@ -61390,7 +59913,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/effect/decal/cleanable/dirt, @@ -61406,7 +59928,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/structure/cable, @@ -61455,7 +59976,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /turf/open/floor/plasteel, @@ -61466,7 +59986,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/structure/cable, @@ -61561,7 +60080,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /turf/open/floor/plasteel/dark/corner{ @@ -61582,8 +60100,7 @@ /area/crew_quarters/fitness/recreation) "bMu" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/structure/cable, /turf/open/floor/plasteel/dark, @@ -61595,13 +60112,11 @@ /obj/effect/decal/cleanable/dirt, /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-02"; - pixel_x = 0; pixel_y = 3 }, /obj/machinery/firealarm{ dir = 4; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /turf/open/floor/plasteel/dark, /area/security/warden) @@ -61650,7 +60165,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/effect/decal/cleanable/dirt, @@ -61718,7 +60232,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/dark/corner{ @@ -61739,7 +60252,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/effect/turf_decal/stripes/line{ @@ -61805,7 +60317,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/blood/old, @@ -61834,7 +60345,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -61869,7 +60379,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /turf/open/floor/plasteel, @@ -61897,7 +60406,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/sign/nanotrasen{ @@ -61977,7 +60485,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/sorting/mail/flip{ @@ -62052,9 +60559,9 @@ /obj/structure/window/reinforced, /obj/effect/decal/cleanable/dirt, /obj/machinery/power/apc{ + areastring = "/area/quartermaster/sorting"; dir = 4; name = "Delivery Office APC"; - areastring = "/area/quartermaster/sorting"; pixel_x = 26 }, /obj/machinery/disposal/deliveryChute{ @@ -62167,15 +60674,13 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /turf/open/floor/plasteel, /area/security/processing) "bNo" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -62193,14 +60698,12 @@ }, /obj/machinery/camera{ c_tag = "Starboad Hallway Custodial Bay"; - dir = 2; name = "starboard camera" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -62213,7 +60716,6 @@ dir = 4 }, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -62304,12 +60806,10 @@ }, /obj/structure/sign/directions/engineering{ dir = 8; - icon_state = "direction_eng"; pixel_y = -40 }, /obj/structure/sign/directions/security{ dir = 8; - icon_state = "direction_sec"; pixel_y = -32 }, /obj/structure/sign/directions/medical{ @@ -62322,9 +60822,6 @@ }, /turf/open/floor/plasteel/dark, /area/hallway/primary/starboard) -"bNB" = ( -/turf/open/floor/wood, -/area/crew_quarters/heads/hop) "bNC" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/caution/stand_clear, @@ -62349,7 +60846,6 @@ }, /obj/machinery/atmospherics/pipe/simple/green/visible, /obj/machinery/computer/atmos_control/tank/air_tank{ - icon_state = "computer"; dir = 4 }, /turf/open/floor/plasteel/showroomfloor, @@ -62359,7 +60855,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/cable, @@ -62380,7 +60875,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/tile/blue{ @@ -62404,7 +60898,6 @@ /obj/structure/flora/ausbushes/grassybush, /obj/structure/flora/ausbushes/ppflowers, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /turf/open/floor/grass, @@ -62415,7 +60908,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/command{ @@ -62455,7 +60947,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/command{ @@ -62496,7 +60987,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -62609,8 +61099,7 @@ id = "commissaryshutter"; name = "Commissary Shutter Toggle"; pixel_x = 24; - pixel_y = 8; - req_access_txt = "0" + pixel_y = 8 }, /obj/machinery/button/door{ id = "commissarydoor"; @@ -62703,7 +61192,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -62765,7 +61253,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /turf/open/floor/plasteel, @@ -62816,7 +61303,6 @@ }, /obj/machinery/power/apc{ areastring = "/area/hydroponics"; - dir = 2; name = "Hydroponics APC"; pixel_y = -26 }, @@ -62884,7 +61370,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -62897,7 +61382,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/landmark/start/janitor, @@ -62911,7 +61395,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -62951,7 +61434,6 @@ /area/security/courtroom) "bOx" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -63023,7 +61505,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -63055,7 +61536,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/navbeacon{ @@ -63067,7 +61547,6 @@ /area/hallway/primary/starboard) "bOF" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -63076,7 +61555,6 @@ /area/crew_quarters/heads/hop) "bOG" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 4 }, /turf/open/floor/plasteel, @@ -63114,7 +61592,6 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 4 }, /obj/structure/cable, @@ -63146,7 +61623,6 @@ }, /obj/machinery/camera{ c_tag = "Fore Hallway Diner"; - dir = 2; name = "fore camera" }, /turf/open/floor/plasteel, @@ -63198,7 +61674,6 @@ "bOP" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 4 }, /obj/effect/turf_decal/tile/neutral, @@ -63362,7 +61837,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /turf/open/floor/plasteel, @@ -63470,7 +61944,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -63489,9 +61962,7 @@ dir = 1 }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - pixel_x = 0; - pixel_y = 0 + icon_state = "plant-21" }, /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -63500,7 +61971,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /turf/open/floor/plasteel, @@ -63520,7 +61990,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /turf/open/floor/plasteel, @@ -63542,7 +62011,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -63558,14 +62026,12 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, /area/hallway/primary/central) "bPp" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer3{ - icon_state = "vent_map_on-3"; dir = 8 }, /mob/living/simple_animal/hostile/asteroid/hivelord, @@ -63608,7 +62074,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/item/twohanded/required/kirbyplants{ @@ -63744,7 +62209,6 @@ "bPC" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/structure/cable, @@ -63778,7 +62242,6 @@ "bPE" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/structure/cable, @@ -63793,7 +62256,6 @@ /obj/effect/turf_decal/bot, /obj/machinery/holopad, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 4 }, /turf/open/floor/plasteel, @@ -63873,7 +62335,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/item/twohanded/required/kirbyplants{ @@ -63896,9 +62357,7 @@ pixel_x = 32 }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - pixel_x = 0; - pixel_y = 0 + icon_state = "plant-21" }, /turf/open/floor/plasteel, /area/security/processing) @@ -63911,7 +62370,6 @@ }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -63959,7 +62417,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -63993,7 +62450,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment, @@ -64059,19 +62515,11 @@ /obj/structure/sign/warning/docking, /turf/closed/wall, /area/hallway/secondary/entry) -"bQb" = ( -/obj/structure/flora/rock, -/turf/open/floor/plating/asteroid/airless{ - initial_gas_mix = "o2=14;n2=23;TEMP=300" - }, -/area/space/nearstation) "bQc" = ( /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/blood/gibs/old, /obj/effect/decal/remains/xeno, -/turf/open/floor/plating/asteroid/airless{ - initial_gas_mix = "o2=14;n2=23;TEMP=300" - }, +/turf/open/floor/plating/asteroid/lowpressure, /area/space/nearstation) "bQd" = ( /obj/effect/turf_decal/tile/neutral{ @@ -64090,7 +62538,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/dark/corner{ @@ -64108,7 +62555,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/light{ @@ -64131,7 +62577,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /turf/open/floor/plasteel, @@ -64140,20 +62585,16 @@ /mob/living/simple_animal/hostile/asteroid/basilisk{ environment_smash = 0 }, -/turf/open/floor/plating/asteroid/airless{ - initial_gas_mix = "o2=14;n2=23;TEMP=300" - }, +/turf/open/floor/plating/asteroid/lowpressure, /area/space/nearstation) "bQh" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -64171,7 +62612,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -64227,8 +62667,7 @@ /obj/item/clothing/head/welding, /obj/machinery/firealarm{ dir = 8; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -64246,13 +62685,12 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/power/apc/highcap/ten_k{ + areastring = "/area/hallway/primary/central"; dir = 1; name = "Central Primary Hallway APC"; - areastring = "/area/hallway/primary/central"; pixel_y = 24 }, /obj/structure/cable, @@ -64274,7 +62712,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 4 }, /turf/open/floor/plasteel, @@ -64298,14 +62735,12 @@ department = "Security"; departmentType = 5; name = "Security RC"; - pixel_x = 30; - pixel_y = 0 + pixel_x = 30 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /turf/open/floor/plasteel, @@ -64313,9 +62748,7 @@ "bQq" = ( /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/blood/gibs/limb, -/turf/open/floor/plating/asteroid/airless{ - initial_gas_mix = "o2=14;n2=23;TEMP=300" - }, +/turf/open/floor/plating/asteroid/lowpressure, /area/space/nearstation) "bQr" = ( /obj/effect/turf_decal/tile/neutral{ @@ -64325,7 +62758,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /turf/open/floor/plasteel/dark/corner{ @@ -64382,7 +62814,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/structure/disposalpipe/segment{ @@ -64403,7 +62834,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/structure/cable, @@ -64421,7 +62851,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /obj/structure/cable, @@ -64449,8 +62878,7 @@ }, /obj/machinery/camera{ c_tag = "Brig Prison Access"; - dir = 4; - name = "security camera" + dir = 4 }, /turf/open/floor/plasteel/dark, /area/security/warden) @@ -64474,7 +62902,6 @@ /obj/effect/turf_decal/tile/neutral, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/effect/turf_decal/stripes/line{ @@ -64526,7 +62953,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/disposalpipe/segment{ @@ -64637,7 +63063,6 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /obj/structure/chair/office{ @@ -64655,14 +63080,12 @@ /area/hallway/secondary/exit/departure_lounge) "bQM" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -64678,9 +63101,7 @@ /obj/effect/decal/remains/human, /obj/effect/decal/cleanable/blood/old, /obj/item/pickaxe, -/turf/open/floor/plating/asteroid/airless{ - initial_gas_mix = "o2=14;n2=23;TEMP=300" - }, +/turf/open/floor/plating/asteroid/lowpressure, /area/space/nearstation) "bQO" = ( /obj/effect/turf_decal/tile/neutral, @@ -64688,9 +63109,7 @@ dir = 8 }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - pixel_x = 0; - pixel_y = 0 + icon_state = "plant-21" }, /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -64712,7 +63131,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -64747,7 +63165,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -64762,7 +63179,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -64890,7 +63306,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -64930,7 +63345,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /turf/open/floor/plasteel, @@ -64947,14 +63361,12 @@ /area/hallway/primary/central) "bRe" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -64973,7 +63385,6 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /turf/open/floor/plasteel/dark/corner, @@ -65005,9 +63416,9 @@ /area/hallway/primary/central) "bRi" = ( /obj/machinery/power/apc{ + areastring = "/area/maintenance/port/aft"; dir = 1; name = "Port Quarter Maintenance APC"; - areastring = "/area/maintenance/port/aft"; pixel_y = 24 }, /obj/effect/decal/cleanable/dirt, @@ -65015,7 +63426,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -65032,7 +63442,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/effect/landmark/event_spawn, @@ -65074,7 +63483,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -65114,7 +63522,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -65148,7 +63555,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/ticket_machine{ @@ -65240,9 +63646,7 @@ "bRy" = ( /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/blood/gibs/old, -/turf/open/floor/plating/asteroid/airless{ - initial_gas_mix = "o2=14;n2=23;TEMP=300" - }, +/turf/open/floor/plating/asteroid/lowpressure, /area/space/nearstation) "bRz" = ( /obj/effect/turf_decal/tile/purple{ @@ -65321,7 +63725,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -65350,14 +63753,13 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, /area/hallway/primary/central) "bRJ" = ( /obj/effect/turf_decal/sand/plating, -/turf/open/floor/plating/airless, +/turf/open/floor/plating/lowpressure, /area/maintenance/port) "bRK" = ( /obj/effect/turf_decal/tile/neutral, @@ -65401,7 +63803,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -65455,7 +63856,6 @@ /area/hallway/primary/starboard) "bRQ" = ( /obj/docking_port/stationary{ - dheight = 0; dir = 4; dwidth = 11; height = 18; @@ -65466,9 +63866,7 @@ /turf/open/space/basic, /area/space/nearstation) "bRR" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -65518,7 +63916,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -65592,7 +63989,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/landmark/event_spawn, @@ -65600,7 +63996,6 @@ /area/hallway/secondary/exit/departure_lounge) "bSc" = ( /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 4 }, /obj/effect/turf_decal/tile/neutral, @@ -65617,7 +64012,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 4 }, /turf/open/floor/plasteel, @@ -65678,7 +64072,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -65725,8 +64118,7 @@ areastring = "/area/hallway/primary/starboard"; dir = 4; name = "Starboard Hallway APC"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/structure/cable, /turf/open/floor/plasteel/dark, @@ -65739,7 +64131,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment, @@ -65871,7 +64262,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ @@ -65959,7 +64349,6 @@ }, /obj/effect/turf_decal/bot, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /obj/effect/turf_decal/tile/neutral{ @@ -65995,8 +64384,7 @@ /obj/item/pen, /obj/machinery/firealarm{ dir = 4; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /turf/open/floor/plasteel/dark, /area/hallway/secondary/exit/departure_lounge) @@ -66060,9 +64448,7 @@ dir = 1 }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - pixel_x = 0; - pixel_y = 0 + icon_state = "plant-21" }, /obj/effect/turf_decal/stripes/corner, /turf/open/floor/plasteel/dark, @@ -66089,8 +64475,7 @@ /area/maintenance/starboard/aft) "bSL" = ( /obj/structure/sign/warning/securearea{ - name = "EMERGENCY STORAGE"; - pixel_y = 0 + name = "EMERGENCY STORAGE" }, /turf/closed/wall, /area/hallway/secondary/entry) @@ -66185,8 +64570,7 @@ /obj/structure/table, /obj/machinery/firealarm{ dir = 8; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/item/radio/intercom{ pixel_y = -28 @@ -66372,7 +64756,6 @@ "bTj" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/sign/warning/vacuum/external{ - pixel_x = 0; pixel_y = 32 }, /turf/open/floor/plating, @@ -66548,9 +64931,7 @@ pixel_x = -22 }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - pixel_x = 0; - pixel_y = 0 + icon_state = "plant-21" }, /turf/open/floor/plasteel/dark, /area/security/prison) @@ -66605,7 +64986,6 @@ dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 4 }, /turf/open/floor/plasteel, @@ -66639,7 +65019,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/effect/turf_decal/stripes/line{ @@ -66660,8 +65039,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/firealarm{ dir = 4; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /obj/item/clothing/mask/russian_balaclava, /obj/effect/turf_decal/stripes/corner{ @@ -66675,7 +65053,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/structure/disposalpipe/segment{ @@ -66755,7 +65132,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -66960,7 +65336,6 @@ dir = 4 }, /obj/structure/disposalpipe/junction/yjunction{ - icon_state = "pipe-y"; dir = 1 }, /turf/open/floor/plasteel, @@ -67001,7 +65376,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/structure/disposalpipe/segment{ @@ -67263,9 +65637,7 @@ /turf/open/space/basic, /area/space/nearstation) "bUH" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -67341,7 +65713,6 @@ /area/hallway/secondary/entry) "bUO" = ( /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 8 }, /turf/open/floor/plating/airless{ @@ -67362,9 +65733,7 @@ /turf/open/floor/engine/air, /area/engine/atmos) "bUR" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -67486,7 +65855,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -67545,7 +65913,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -67559,7 +65926,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -67615,7 +65981,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/structure/cable, @@ -67705,7 +66070,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -67795,8 +66159,7 @@ pixel_y = -24 }, /obj/structure/window/reinforced{ - dir = 1; - pixel_y = 0 + dir = 1 }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) @@ -67830,7 +66193,6 @@ "bVD" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/item/twohanded/required/kirbyplants, @@ -67923,12 +66285,10 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/machinery/camera{ c_tag = "Central Hallway Teleporter Access"; - dir = 2; name = "central camera" }, /turf/open/floor/plasteel, @@ -67950,7 +66310,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -67968,7 +66327,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1, /obj/effect/turf_decal/box/corners, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 8 }, /obj/effect/turf_decal/stripes/corner{ @@ -68104,7 +66462,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 4 }, /obj/structure/cable, @@ -68122,7 +66479,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -68180,7 +66536,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/effect/turf_decal/stripes/line{ @@ -68236,7 +66591,6 @@ /area/hallway/secondary/exit/departure_lounge) "bWg" = ( /obj/machinery/atmospherics/components/binary/pump/on{ - dir = 2; name = "Distro to Connector" }, /obj/effect/decal/cleanable/dirt, @@ -68253,8 +66607,7 @@ /area/maintenance/port) "bWh" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -68277,7 +66630,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/effect/decal/cleanable/dirt, @@ -68294,7 +66646,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/corner{ @@ -68326,7 +66677,6 @@ }, /obj/effect/turf_decal/tile/neutral, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/firealarm{ @@ -68350,7 +66700,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -68404,8 +66753,7 @@ /obj/machinery/door_timer{ id = "Cell 6"; name = "Cell 6"; - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /obj/structure/closet/secure_closet/brig{ id = "Cell 6"; @@ -68421,7 +66769,6 @@ /area/hallway/secondary/entry) "bWr" = ( /obj/effect/turf_decal/stripes/white/line{ - icon_state = "warningline_white"; dir = 1 }, /turf/closed/wall/r_wall/rust, @@ -68451,8 +66798,7 @@ /obj/machinery/door_timer{ id = "Cell 5"; name = "Cell 5"; - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /obj/structure/closet/secure_closet/brig{ id = "Cell 5"; @@ -68471,8 +66817,7 @@ /obj/machinery/door_timer{ id = "Cell 4"; name = "Cell 4"; - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /obj/structure/closet/secure_closet/brig{ id = "Cell 4"; @@ -68506,8 +66851,7 @@ }, /obj/machinery/firealarm{ dir = 4; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /obj/effect/landmark/start/assistant, /obj/structure/disposalpipe/segment{ @@ -68520,8 +66864,7 @@ /area/hallway/secondary/exit/departure_lounge) "bWy" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, @@ -68557,8 +66900,7 @@ /obj/machinery/door_timer{ id = "Cell 3"; name = "Cell 3"; - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /obj/structure/closet/secure_closet/brig{ id = "Cell 3"; @@ -68614,7 +66956,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -68645,8 +66986,7 @@ /obj/machinery/door_timer{ id = "Cell 2"; name = "Cell 2"; - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /obj/structure/closet/secure_closet/brig{ id = "Cell 2"; @@ -68677,8 +67017,7 @@ /obj/machinery/door_timer{ id = "Cell 1"; name = "Cell 1"; - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /obj/structure/closet/secure_closet/brig{ id = "Cell 1"; @@ -68808,7 +67147,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -68861,7 +67199,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /turf/open/floor/plasteel, @@ -68888,8 +67225,7 @@ /area/hallway/secondary/entry) "bXa" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/barricade/wooden/crude, @@ -68920,7 +67256,6 @@ dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /obj/effect/turf_decal/box, @@ -69129,7 +67464,6 @@ /area/bridge) "bXu" = ( /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 8 }, /obj/effect/turf_decal/tile/neutral, @@ -69158,7 +67492,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /turf/open/floor/plasteel, @@ -69348,7 +67681,6 @@ /obj/item/crowbar, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /obj/effect/turf_decal/stripes/corner{ @@ -69373,8 +67705,7 @@ /area/hallway/primary/aft) "bXK" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -69389,7 +67720,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -69447,7 +67777,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /obj/structure/cable, @@ -69627,7 +67956,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -69687,9 +68015,7 @@ /turf/open/floor/plasteel/dark, /area/hallway/secondary/exit/departure_lounge) "bYj" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -69834,8 +68160,7 @@ /area/maintenance/port/aft) "bYt" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -69945,9 +68270,7 @@ /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) "bYB" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -69975,7 +68298,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/structure/disposalpipe/segment{ @@ -70189,7 +68511,6 @@ dir = 9 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /obj/effect/turf_decal/stripes/corner, @@ -70358,7 +68679,6 @@ /mob/living/simple_animal/bot/cleanbot{ auto_patrol = 1; icon_state = "cleanbot1"; - mode = 0; name = "Mopficcer Sweepsky" }, /turf/open/floor/plasteel, @@ -70407,7 +68727,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -70462,7 +68781,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/poddoor/preopen{ @@ -70510,7 +68828,6 @@ /obj/effect/turf_decal/tile/red, /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-02"; - pixel_x = 0; pixel_y = 3 }, /obj/effect/turf_decal/tile/neutral{ @@ -70572,9 +68889,7 @@ }, /obj/effect/turf_decal/tile/yellow, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - pixel_x = 0; - pixel_y = 0 + icon_state = "plant-21" }, /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -70772,7 +69087,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/dark/corner{ @@ -70791,7 +69105,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -70838,7 +69151,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -70872,7 +69184,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -70887,8 +69198,7 @@ }, /obj/machinery/firealarm{ dir = 4; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /obj/item/grenade/clusterbuster/cleaner, /turf/open/floor/plasteel/dark, @@ -71034,7 +69344,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -71073,7 +69382,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 4 }, /obj/effect/turf_decal/box, @@ -71095,7 +69403,6 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 4 }, /turf/open/floor/plasteel, @@ -71161,14 +69468,12 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) "cak" = ( /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 1 }, /obj/effect/turf_decal/tile/neutral, @@ -71185,7 +69490,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -71205,7 +69509,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -71225,9 +69528,8 @@ pixel_x = 30 }, /obj/structure/sink{ - dir = 4; - pixel_x = 11; - pixel_y = 0 + dir = 8; + pixel_x = 11 }, /turf/open/floor/plasteel/dark, /area/security/prison) @@ -71339,7 +69641,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /turf/open/floor/plasteel, @@ -71359,7 +69660,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /turf/open/floor/plasteel, @@ -71398,7 +69698,6 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -71500,7 +69799,6 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/effect/landmark/start/janitor, @@ -71572,7 +69870,7 @@ /area/crew_quarters/locker) "caM" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11; pixel_y = 8 }, @@ -71669,7 +69967,6 @@ }, /obj/effect/turf_decal/tile/neutral, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -71688,16 +69985,13 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/dark, /area/hallway/secondary/entry) "caV" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - pixel_x = 0; - pixel_y = 0 + icon_state = "plant-21" }, /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -71765,8 +70059,7 @@ /area/engine/break_room) "caZ" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/structure/cable, /turf/open/floor/plasteel/dark, @@ -71777,7 +70070,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/cable, @@ -71791,7 +70083,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/structure/disposalpipe/segment, @@ -71997,9 +70288,7 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "cbu" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -72061,7 +70350,6 @@ }, /obj/structure/sign/directions/supply{ dir = 4; - icon_state = "direction_supply"; pixel_y = -32 }, /obj/structure/sign/directions/science{ @@ -72112,22 +70400,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/aft) -"cbD" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/aft) "cbE" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -72196,7 +70468,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /obj/machinery/light{ @@ -72212,7 +70483,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment, @@ -72229,7 +70499,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/effect/decal/cleanable/dirt, @@ -72305,8 +70574,7 @@ /obj/effect/turf_decal/tile/neutral, /obj/machinery/firealarm{ dir = 8; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/machinery/camera{ c_tag = "Aft Hallway Engineering Venders"; @@ -72338,7 +70606,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -72366,7 +70633,7 @@ "cbV" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/effect/decal/cleanable/cobweb/cobweb2, @@ -72530,7 +70797,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 4 }, /obj/machinery/shower{ @@ -72793,8 +71059,7 @@ /obj/structure/grille, /obj/structure/barricade/wooden, /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plasteel/dark, @@ -72904,7 +71169,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/delivery, @@ -73021,8 +71285,7 @@ /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/neutral, /obj/machinery/status_display/ai{ - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, @@ -73071,7 +71334,6 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -73108,7 +71370,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -73134,7 +71395,6 @@ pixel_y = -32 }, /obj/structure/transit_tube/horizontal{ - icon_state = "straight"; dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -73205,7 +71465,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/machinery/firealarm{ @@ -73415,7 +71674,6 @@ }, /obj/effect/turf_decal/box/corners, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 4 }, /turf/open/floor/plasteel, @@ -73452,8 +71710,7 @@ /area/security/prison) "cdU" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, @@ -73477,9 +71734,9 @@ /obj/machinery/door/window{ base_state = "leftsecure"; dir = 8; - obj_integrity = 300; icon_state = "leftsecure"; name = "Primary AI Core Access"; + obj_integrity = 300; req_access_txt = "16" }, /obj/machinery/door/poddoor/shutters/preopen{ @@ -73536,14 +71793,12 @@ pixel_y = 6 }, /obj/item/radio/intercom{ - anyai = 1; freerange = 1; listening = 0; name = "Custom Channel"; pixel_y = 22 }, /obj/item/radio/intercom{ - anyai = 1; freerange = 1; frequency = 1447; name = "Private Channel"; @@ -73588,7 +71843,6 @@ "cef" = ( /obj/effect/landmark/start/ai/secondary, /obj/item/radio/intercom{ - anyai = 1; freerange = 1; listening = 0; name = "Custom Channel"; @@ -73601,7 +71855,6 @@ pixel_x = -27 }, /obj/item/radio/intercom{ - anyai = 1; freerange = 1; frequency = 1447; name = "Private Channel"; @@ -73611,10 +71864,10 @@ /obj/machinery/door/window{ base_state = "rightsecure"; dir = 4; - obj_integrity = 300; icon_state = "rightsecure"; layer = 4.1; name = "Secondary AI Core Access"; + obj_integrity = 300; pixel_x = 4; req_access_txt = "16" }, @@ -73708,7 +71961,6 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/item/clothing/gloves/color/yellow, /obj/item/clothing/head/welding{ pixel_y = 4 }, @@ -73720,11 +71972,11 @@ }, /obj/machinery/camera{ c_tag = "Tool Storage"; - dir = 2; name = "engineering camera"; network = list("ss13","engine") }, /obj/structure/cable, +/obj/item/clothing/gloves/color/fyellow, /turf/open/floor/plasteel/dark, /area/storage/primary) "cen" = ( @@ -73741,7 +71993,6 @@ "ceo" = ( /obj/effect/landmark/start/ai/secondary, /obj/item/radio/intercom{ - anyai = 1; freerange = 1; listening = 0; name = "Custom Channel"; @@ -73754,7 +72005,6 @@ pixel_x = 27 }, /obj/item/radio/intercom{ - anyai = 1; freerange = 1; frequency = 1447; name = "Private Channel"; @@ -73764,10 +72014,10 @@ /obj/machinery/door/window{ base_state = "leftsecure"; dir = 8; - obj_integrity = 300; icon_state = "leftsecure"; layer = 4.1; name = "Tertiary AI Core Access"; + obj_integrity = 300; pixel_x = -3; req_access_txt = "16" }, @@ -73828,9 +72078,9 @@ /area/security/prison) "cet" = ( /obj/machinery/power/apc/highcap/five_k{ + areastring = "/area/security/prison"; dir = 1; name = "Prison Wing APC"; - areastring = "/area/security/prison"; pixel_x = 1; pixel_y = 24 }, @@ -73887,7 +72137,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -73946,7 +72195,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/tile/red, @@ -74013,7 +72261,6 @@ }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/item/radio/intercom{ @@ -74122,9 +72369,7 @@ }, /area/maintenance/starboard) "ceU" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -74143,7 +72388,6 @@ /obj/effect/turf_decal/bot, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/structure/cable, @@ -74186,7 +72430,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/dark/corner, @@ -74201,7 +72444,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/dark/corner, @@ -74286,7 +72528,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/purple/visible{ - icon_state = "pipe11-2"; dir = 10 }, /obj/effect/turf_decal/stripes/line{ @@ -74296,7 +72537,6 @@ /area/engine/atmos) "cfm" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line, @@ -74380,7 +72620,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /obj/structure/cable, @@ -74420,6 +72659,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/structure/cable, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) "cfv" = ( @@ -74453,7 +72693,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -74508,7 +72747,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -74535,7 +72773,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/bot, @@ -74579,7 +72816,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -74591,7 +72827,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/structure/cable, @@ -74601,9 +72836,9 @@ /obj/machinery/door/window{ base_state = "rightsecure"; dir = 4; - obj_integrity = 300; icon_state = "rightsecure"; name = "Primary AI Core Access"; + obj_integrity = 300; req_access_txt = "16" }, /obj/machinery/door/poddoor/shutters/preopen{ @@ -74639,7 +72874,6 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -74658,7 +72892,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/camera{ @@ -74681,7 +72914,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/poddoor/preopen{ @@ -74720,7 +72952,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -74735,7 +72966,6 @@ /area/security/prison) "cfS" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ @@ -74775,7 +73005,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -74789,7 +73018,6 @@ }, /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/junction/yjunction{ - icon_state = "pipe-y"; dir = 1 }, /obj/structure/cable, @@ -74828,7 +73056,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/dark/corner, @@ -74845,7 +73072,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/dark/corner, @@ -74856,6 +73082,7 @@ name = "Custodial Closet"; req_access_txt = "26" }, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel/dark, /area/janitor) "cge" = ( @@ -74884,7 +73111,6 @@ dir = 8 }, /obj/machinery/atmospherics/components/binary/pump{ - dir = 2; name = "Gas to Chamber" }, /turf/open/floor/circuit/green{ @@ -74893,8 +73119,7 @@ /area/engine/supermatter) "cgi" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable, @@ -74942,13 +73167,12 @@ dir = 8 }, /obj/machinery/power/apc{ + areastring = "/area/storage/tech"; dir = 8; name = "Tech Storage APC"; - areastring = "/area/storage/tech"; pixel_x = -27 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/cable, @@ -74992,6 +73216,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, +/obj/structure/cable, /turf/open/floor/engine, /area/ai_monitored/turret_protected/aisat_interior) "cgq" = ( @@ -75002,7 +73227,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /turf/open/floor/plasteel, @@ -75013,7 +73237,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/machinery/door/airlock/engineering/glass{ @@ -75044,7 +73267,6 @@ pixel_y = -22 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /turf/open/floor/engine, @@ -75061,7 +73283,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -75089,7 +73310,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 4 }, /obj/structure/cable, @@ -75128,7 +73348,6 @@ name = "Justice Door Lock"; normaldoorcontrol = 1; pixel_x = -24; - pixel_y = 0; req_access_txt = "3"; specialfunctions = 4 }, @@ -75140,9 +73359,9 @@ /obj/structure/closet/secure_closet/warden, /obj/effect/turf_decal/delivery, /obj/machinery/power/apc/highcap/five_k{ + areastring = "/area/security/warden"; dir = 8; name = "Brig Control APC"; - areastring = "/area/security/warden"; pixel_x = -26 }, /obj/machinery/firealarm{ @@ -75185,7 +73404,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, @@ -75202,7 +73420,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -75232,7 +73449,6 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/thermomachine/heater/on{ - icon_state = "heater_1"; dir = 8 }, /obj/effect/turf_decal/stripes/corner{ @@ -75246,7 +73462,6 @@ "cgH" = ( /obj/machinery/door/airlock/external{ name = "Engineering External Airlock"; - req_access_txt = "0"; req_one_access_txt = "10;24" }, /turf/open/floor/plasteel/dark, @@ -75271,6 +73486,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, +/obj/structure/cable, /turf/open/floor/engine, /area/ai_monitored/turret_protected/aisat_interior) "cgK" = ( @@ -75278,7 +73494,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/cable, @@ -75294,7 +73509,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/light, @@ -75366,7 +73580,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -75381,7 +73594,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -75398,7 +73610,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -75411,7 +73622,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -75430,7 +73640,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -75449,10 +73658,10 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel/dark, /area/storage/tech) "cgX" = ( @@ -75503,7 +73712,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -75516,7 +73724,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/structure/cable, @@ -75529,7 +73736,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 4 }, /turf/open/floor/plasteel/dark/corner, @@ -75601,8 +73807,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, /obj/machinery/firealarm{ dir = 8; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/structure/cable, /turf/open/floor/plasteel/showroomfloor, @@ -75683,6 +73888,7 @@ dir = 4 }, /obj/machinery/holopad/secure, +/obj/structure/cable, /turf/open/floor/engine, /area/ai_monitored/turret_protected/aisat_interior) "chq" = ( @@ -75716,7 +73922,6 @@ }, /obj/effect/turf_decal/tile/neutral, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /obj/effect/turf_decal/box, @@ -75814,7 +74019,6 @@ /obj/effect/decal/cleanable/blood/old, /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/light/small, @@ -75831,7 +74035,6 @@ dir = 10 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 4 }, /turf/open/floor/engine, @@ -75865,11 +74068,9 @@ /area/ai_monitored/storage/satellite) "chH" = ( /obj/structure/reflector/box/anchored{ - icon_state = "reflector_map"; dir = 1 }, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 8 }, /obj/effect/turf_decal/box/corners, @@ -75881,7 +74082,6 @@ "chJ" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -76035,7 +74235,6 @@ }, /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -76074,6 +74273,8 @@ dir = 5 }, /obj/structure/cable, +/obj/structure/cable_bridge, +/obj/structure/cable/layer3, /turf/open/floor/engine, /area/ai_monitored/storage/satellite) "cic" = ( @@ -76087,7 +74288,6 @@ "cie" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /obj/structure/cable, @@ -76111,9 +74311,9 @@ }, /obj/item/wrench, /obj/machinery/power/apc{ + areastring = "/area/ai_monitored/storage/eva"; dir = 8; name = "E.V.A. Storage APC"; - areastring = "/area/ai_monitored/storage/eva"; pixel_x = -24 }, /obj/effect/decal/cleanable/dirt, @@ -76143,7 +74343,6 @@ /obj/machinery/button/door{ id = "sidearmory"; name = "Armoury Shutter Toggle"; - pixel_x = 0; pixel_y = -24; req_access_txt = "3" }, @@ -76151,7 +74350,6 @@ /area/ai_monitored/security/armory) "cii" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer3{ - icon_state = "vent_map_on-3"; dir = 1 }, /obj/effect/turf_decal/stripes/corner{ @@ -76204,7 +74402,6 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /obj/effect/decal/cleanable/dirt, @@ -76301,7 +74498,6 @@ dir = 6 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /obj/machinery/camera{ @@ -76342,7 +74538,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/sorting/mail/flip{ @@ -76384,7 +74579,6 @@ /obj/machinery/atmospherics/pipe/manifold/cyan/visible, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /turf/open/floor/plasteel/dark, @@ -76434,7 +74628,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/sorting/mail/flip{ @@ -76464,8 +74657,7 @@ /obj/effect/turf_decal/tile/neutral, /obj/structure/table, /obj/machinery/computer/security/telescreen/minisat{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/machinery/light{ dir = 8 @@ -76616,9 +74808,9 @@ /obj/machinery/door/firedoor, /obj/effect/turf_decal/caution/stand_clear, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, +/obj/structure/cable, /turf/open/floor/plasteel/dark, /area/engine/engineering) "ciU" = ( @@ -76626,7 +74818,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/effect/turf_decal/stripes/corner{ @@ -76643,7 +74834,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -76667,7 +74857,6 @@ /area/engine/gravity_generator) "ciX" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 4 }, /obj/machinery/light/small{ @@ -76716,7 +74905,6 @@ "cja" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/effect/decal/cleanable/dirt, @@ -76737,8 +74925,7 @@ /obj/effect/turf_decal/tile/neutral, /obj/machinery/firealarm{ dir = 4; - pixel_x = -26; - pixel_y = 0 + pixel_x = -26 }, /obj/item/clipboard{ pixel_x = 4 @@ -76783,7 +74970,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/maintenance{ @@ -76900,7 +75086,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /turf/open/floor/plasteel, @@ -76937,7 +75122,7 @@ "cjr" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/effect/turf_decal/tile/yellow{ @@ -77074,7 +75259,6 @@ /area/engine/gravity_generator) "cjC" = ( /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 1 }, /obj/effect/turf_decal/tile/neutral{ @@ -77123,9 +75307,7 @@ }, /obj/machinery/light, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - pixel_x = 0; - pixel_y = 0 + icon_state = "plant-21" }, /obj/structure/sign/warning/electricshock{ pixel_y = -32 @@ -77148,7 +75330,6 @@ /area/engine/gravity_generator) "cjG" = ( /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 4 }, /obj/effect/turf_decal/tile/neutral, @@ -77171,9 +75352,9 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, +/obj/structure/cable, /turf/open/floor/plasteel/dark, /area/engine/engineering) "cjI" = ( @@ -77200,9 +75381,7 @@ }, /obj/item/radio/intercom{ desc = "Talk through this. It looks like it has been modified to not broadcast."; - dir = 2; name = "Prison Intercom (General)"; - pixel_x = 0; pixel_y = -28; prison_radio = 1 }, @@ -77211,8 +75390,7 @@ /area/security/prison) "cjK" = ( /obj/machinery/door/airlock/security/glass{ - name = "Prison Yard"; - req_access_txt = "0" + name = "Prison Yard" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/door/poddoor/shutters/preopen{ @@ -77227,7 +75405,7 @@ }, /obj/structure/cable, /turf/open/floor/plasteel/dark, -/area/security/prison) +/area/security/prison/toilet) "cjL" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -77251,8 +75429,9 @@ pixel_y = -22 }, /obj/structure/cable, +/obj/effect/landmark/start/prisoner, /turf/open/floor/plasteel/showroomfloor, -/area/security/prison) +/area/security/prison/toilet) "cjM" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -77271,7 +75450,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/machinery/camera{ @@ -77282,7 +75460,7 @@ }, /obj/structure/cable, /turf/open/floor/plasteel/showroomfloor, -/area/security/prison) +/area/security/prison/toilet) "cjN" = ( /obj/machinery/door/airlock/security/glass{ name = "Long-Term Cell 3"; @@ -77296,12 +75474,11 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, /turf/open/floor/plasteel/dark, -/area/security/prison) +/area/security/prison/toilet) "cjO" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -77322,7 +75499,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/cable, @@ -77345,7 +75521,6 @@ }, /obj/structure/window/reinforced, /obj/machinery/atmospherics/components/trinary/filter/atmos/plasma{ - icon_state = "filter_on"; dir = 4 }, /turf/open/floor/plasteel/showroomfloor, @@ -77362,7 +75537,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/corner, @@ -77384,7 +75558,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/structure/cable, @@ -77426,7 +75599,6 @@ /obj/effect/turf_decal/bot, /obj/machinery/power/apc{ areastring = "/area/security/execution/education"; - dir = 2; name = "Prisoner Education Chamber APC"; pixel_y = -26 }, @@ -77465,7 +75637,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/item/radio/intercom{ @@ -77479,7 +75650,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/effect/decal/cleanable/dirt, @@ -77497,7 +75667,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/structure/grille/broken, @@ -77540,7 +75709,6 @@ id = "gravity"; name = "Gravity Generator Lockdown"; pixel_x = -24; - pixel_y = 0; req_one_access_txt = "19;23" }, /turf/open/floor/engine, @@ -77632,7 +75800,6 @@ /obj/machinery/button/door{ id = "frontarmory"; name = "Armoury Shutter Toggle"; - pixel_x = 0; pixel_y = 24; req_access_txt = "58" }, @@ -77727,7 +75894,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/cable, @@ -77735,14 +75901,12 @@ /area/hallway/primary/aft) "cky" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -77761,7 +75925,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/effect/turf_decal/stripes/line{ @@ -77793,9 +75956,7 @@ /turf/open/floor/plasteel/dark, /area/security/prison) "ckE" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/green/visible, /obj/structure/lattice/catwalk, /turf/open/space/basic, /area/space/nearstation) @@ -77813,7 +75974,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, /obj/machinery/door/airlock/security/glass{ - id_tag = null; name = "Brig"; req_access_txt = "63" }, @@ -77842,6 +76002,7 @@ }, /obj/structure/disposalpipe/segment, /obj/structure/cable, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel/dark, /area/security/detectives_office) "ckJ" = ( @@ -77918,8 +76079,7 @@ /area/maintenance/aft) "ckP" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -77944,7 +76104,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -77990,7 +76149,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -78006,9 +76164,6 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/structure/window/reinforced{ - dir = 1 - }, /obj/machinery/camera{ c_tag = "E.V.A. Storage"; dir = 8; @@ -78041,7 +76196,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -78063,7 +76217,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -78219,7 +76372,6 @@ }, /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-02"; - pixel_x = 0; pixel_y = 3 }, /obj/effect/turf_decal/tile/red{ @@ -78307,9 +76459,7 @@ }, /area/maintenance/port/aft) "clu" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/yellow/visible, /obj/structure/lattice/catwalk, /turf/open/space/basic, /area/space/nearstation) @@ -78333,7 +76483,6 @@ dir = 4 }, /obj/machinery/computer/atmos_control/tank/toxin_tank{ - icon_state = "computer"; dir = 1 }, /turf/open/floor/plasteel/showroomfloor, @@ -78360,7 +76509,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/airalarm{ @@ -78384,7 +76532,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, @@ -78408,7 +76555,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/sign/warning/securearea{ @@ -78529,7 +76675,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -78573,7 +76718,6 @@ /area/maintenance/port/aft) "clP" = ( /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 8 }, /obj/effect/turf_decal/tile/neutral, @@ -78619,7 +76763,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /turf/open/floor/engine, @@ -78630,7 +76773,6 @@ /area/engine/gravity_generator) "clU" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 4 }, /obj/effect/turf_decal/tile/yellow{ @@ -78659,9 +76801,7 @@ /obj/item/clothing/glasses/meson, /obj/machinery/power/apc{ areastring = "/area/engine/gravity_generator"; - dir = 2; name = "Gravity Generator APC"; - pixel_x = 0; pixel_y = -26 }, /obj/structure/cable, @@ -78751,7 +76891,6 @@ /area/engine/gravity_generator) "cme" = ( /obj/effect/spawner/structure/window/hollow/reinforced/directional{ - icon_state = "hrwindow_spawner_directional"; dir = 4 }, /obj/structure/cable, @@ -78803,7 +76942,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -78817,7 +76955,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/tile/neutral, @@ -78844,7 +76981,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -78933,7 +77069,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/caution/stand_clear, @@ -78945,7 +77080,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/engine, @@ -78955,7 +77089,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -78983,7 +77116,6 @@ "cmy" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/tile/neutral, @@ -79020,7 +77152,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/effect/turf_decal/tile/neutral, @@ -79081,7 +77212,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /turf/open/floor/plasteel, @@ -79134,7 +77264,6 @@ /obj/effect/turf_decal/stripes/line, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -79175,7 +77304,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -79259,7 +77387,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -79521,6 +77648,7 @@ name = "Brig"; req_access_txt = "63" }, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel/dark, /area/security/brig) "cnu" = ( @@ -79618,7 +77746,6 @@ /area/hallway/primary/aft) "cnE" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - icon_state = "pipe11-3"; dir = 6 }, /obj/effect/turf_decal/stripes/line{ @@ -79653,7 +77780,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/effect/turf_decal/stripes/line{ @@ -79674,8 +77800,7 @@ /area/maintenance/aft) "cnJ" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /turf/open/floor/plasteel/dark, /area/maintenance/port) @@ -79807,7 +77932,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ @@ -79827,7 +77951,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/poddoor/shutters/preopen{ @@ -79848,7 +77971,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/command{ @@ -79871,7 +77993,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -79891,7 +78012,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -79907,7 +78027,6 @@ }, /obj/effect/turf_decal/tile/red, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -79930,7 +78049,6 @@ /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/red, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /obj/effect/landmark/start/chief_engineer, @@ -79990,7 +78108,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, /obj/machinery/door/airlock/security/glass{ - id_tag = null; name = "Brig"; req_access_txt = "63" }, @@ -80020,8 +78137,7 @@ /area/maintenance/port/fore) "coq" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/structure/cable, /turf/open/floor/plasteel/dark, @@ -80107,11 +78223,9 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/general/visible/layer3{ - icon_state = "pipe11-3"; dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -80161,7 +78275,6 @@ }, /obj/structure/window/reinforced, /obj/machinery/atmospherics/components/trinary/filter/atmos/n2o{ - icon_state = "filter_on"; dir = 4 }, /turf/open/floor/plasteel/showroomfloor, @@ -80235,7 +78348,6 @@ dir = 4 }, /obj/machinery/computer/atmos_control/tank/nitrous_tank{ - icon_state = "computer"; dir = 1 }, /obj/machinery/atmospherics/pipe/simple/orange/visible, @@ -80244,7 +78356,6 @@ "coN" = ( /obj/effect/turf_decal/tile/neutral, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/effect/turf_decal/tile/neutral{ @@ -80335,7 +78446,6 @@ dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /obj/effect/landmark/start/warden, @@ -80363,7 +78473,6 @@ "coW" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/mech_bay_recharge_port{ - icon_state = "recharge_port"; dir = 2 }, /obj/structure/cable, @@ -80521,7 +78630,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/effect/turf_decal/stripes/line{ @@ -80548,8 +78656,6 @@ dir = 4 }, /obj/machinery/door/window/northleft{ - dir = 1; - icon_state = "left"; name = "Inner Pipe Access"; req_access_txt = "24" }, @@ -80621,7 +78727,6 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /turf/open/floor/plasteel/dark, @@ -80767,8 +78872,6 @@ }, /obj/machinery/airalarm/engine{ dir = 1; - icon_state = "alarm0"; - pixel_x = 0; pixel_y = -24 }, /turf/open/floor/engine, @@ -80785,7 +78888,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/structure/disposalpipe/segment{ @@ -80999,7 +79101,6 @@ "cpR" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ - id_tag = null; name = "Brig"; req_access_txt = "63" }, @@ -81033,7 +79134,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /obj/structure/cable, @@ -81121,7 +79221,6 @@ }, /obj/machinery/door/airlock/atmos{ name = "Atmospherics Connector"; - req_access_txt = "0"; req_one_access_txt = "10;24" }, /obj/effect/turf_decal/delivery, @@ -81158,8 +79257,7 @@ dir = 4 }, /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/cable, @@ -81186,7 +79284,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -81308,7 +79405,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/airlock/atmos{ name = "Atmospherics Connector"; - req_access_txt = "0"; req_one_access_txt = "10;24" }, /obj/effect/turf_decal/delivery, @@ -81416,7 +79512,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -81464,7 +79559,6 @@ pixel_x = 24; req_one_access_txt = "10" }, -/obj/structure/cable, /turf/open/floor/engine, /area/engine/engineering) "cqF" = ( @@ -81572,7 +79666,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -81587,7 +79680,6 @@ }, /obj/effect/turf_decal/tile/neutral, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -81617,7 +79709,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/atmos{ @@ -81644,7 +79735,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -81691,7 +79781,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -81793,7 +79882,6 @@ "cre" = ( /obj/machinery/door/airlock/atmos{ name = "Atmospherics Connector"; - req_access_txt = "0"; req_one_access_txt = "10;24;5" }, /obj/effect/turf_decal/delivery, @@ -81808,7 +79896,6 @@ }, /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-02"; - pixel_x = 0; pixel_y = 3 }, /obj/structure/extinguisher_cabinet{ @@ -81864,9 +79951,7 @@ /obj/effect/turf_decal/tile/red, /obj/machinery/power/apc/highcap/five_k{ areastring = "/area/security/main"; - dir = 2; name = "Security Office APC"; - pixel_x = 0; pixel_y = -24 }, /obj/effect/turf_decal/tile/neutral, @@ -81908,7 +79993,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /obj/machinery/airalarm{ @@ -82003,7 +80087,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/sign/departments/security{ @@ -82052,7 +80135,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/airalarm{ @@ -82099,8 +80181,7 @@ /obj/effect/turf_decal/tile/red, /obj/machinery/firealarm{ dir = 8; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/machinery/light{ dir = 4 @@ -82123,8 +80204,7 @@ /obj/structure/grille, /obj/structure/barricade/wooden, /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -82135,7 +80215,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/tile/red, @@ -82145,9 +80224,7 @@ /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/stripes/corner, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - pixel_x = 0; - pixel_y = 0 + icon_state = "plant-21" }, /turf/open/floor/plasteel/showroomfloor, /area/security/brig) @@ -82191,7 +80268,6 @@ /area/hallway/secondary/entry) "crK" = ( /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 1 }, /turf/open/floor/plating/airless{ @@ -82236,7 +80312,6 @@ "crO" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -82265,7 +80340,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -82290,7 +80364,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, @@ -82313,7 +80387,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ @@ -82354,7 +80427,6 @@ }, /obj/effect/turf_decal/box, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 4 }, /obj/structure/disposalpipe/segment, @@ -82511,9 +80583,8 @@ "csk" = ( /obj/effect/turf_decal/bot, /obj/structure/frame/computer{ - icon_state = "0"; - dir = 1; - anchored = 1 + anchored = 1; + dir = 1 }, /turf/open/floor/plasteel/dark, /area/maintenance/port) @@ -82623,14 +80694,12 @@ /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/neutral, /obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/effect/turf_decal/stripes/line{ @@ -82662,12 +80731,10 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/engineering{ name = "Engineering Desk"; - req_access_txt = "0"; req_one_access_txt = "10;24" }, /obj/structure/disposalpipe/segment{ @@ -82698,7 +80765,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -82757,7 +80823,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -82787,7 +80852,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -82811,7 +80875,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -82830,8 +80893,7 @@ dir = 1 }, /obj/structure/sign/warning/fire{ - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /turf/open/floor/plasteel/dark, /area/maintenance/port) @@ -82851,7 +80913,7 @@ pixel_x = 28 }, /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/item/reagent_containers/glass/bucket, @@ -82863,7 +80925,6 @@ "csI" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/binary/pump/on{ - dir = 2; name = "Air to Room" }, /obj/effect/turf_decal/stripes/line{ @@ -82876,7 +80937,6 @@ "csJ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/binary/pump/on{ - dir = 2; name = "Connector to Room" }, /obj/effect/turf_decal/stripes/line{ @@ -82897,7 +80957,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/effect/landmark/start/station_engineer, @@ -82940,7 +80999,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/airlock/virology{ @@ -82996,7 +81054,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/effect/turf_decal/stripes/line, @@ -83107,7 +81164,6 @@ /obj/effect/turf_decal/tile/yellow, /obj/machinery/portable_atmospherics/scrubber, /obj/machinery/atmospherics/components/unary/portables_connector/visible/layer3{ - icon_state = "connector_map-3"; dir = 1 }, /obj/effect/turf_decal/box, @@ -83156,7 +81212,6 @@ /obj/effect/turf_decal/tile/yellow, /obj/machinery/portable_atmospherics/pump, /obj/machinery/atmospherics/components/unary/portables_connector/visible/layer1{ - icon_state = "connector_map-1"; dir = 1 }, /obj/machinery/power/apc{ @@ -83170,8 +81225,7 @@ /area/engine/break_room) "cti" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/barricade/wooden/crude, @@ -83373,7 +81427,6 @@ /area/maintenance/disposal) "ctz" = ( /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 1 }, /obj/effect/turf_decal/tile/neutral{ @@ -83445,7 +81498,6 @@ /area/maintenance/starboard/fore) "ctK" = ( /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 4 }, /obj/effect/turf_decal/tile/neutral, @@ -83468,7 +81520,6 @@ "ctL" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1{ - icon_state = "pipe11-1"; dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ @@ -83481,11 +81532,11 @@ req_access_txt = "24" }, /obj/structure/cable, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel/dark, -/area/engine/break_room) +/area/engine/atmos) "ctM" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/engine_waste{ - icon_state = "inje_map-2"; dir = 8 }, /obj/effect/turf_decal/stripes/line, @@ -83508,6 +81559,7 @@ req_access_txt = "10" }, /obj/structure/cable, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel/dark, /area/engine/engineering) "ctP" = ( @@ -83548,7 +81600,6 @@ pixel_y = 22 }, /obj/machinery/power/terminal{ - icon_state = "term"; dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -83661,7 +81712,6 @@ }, /obj/effect/turf_decal/tile/neutral, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 4 }, /obj/effect/turf_decal/stripes/line{ @@ -83676,14 +81726,12 @@ }, /obj/effect/turf_decal/tile/neutral, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/power/apc{ areastring = "/area/crew_quarters/heads/hos"; dir = 1; name = "Head of Security's Office APC"; - pixel_x = 0; pixel_y = 24 }, /obj/machinery/camera{ @@ -83701,7 +81749,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -83727,7 +81774,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -83766,7 +81812,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -83816,8 +81861,7 @@ /area/maintenance/port/aft) "cum" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -83904,7 +81948,6 @@ }, /obj/effect/turf_decal/tile/neutral, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -83939,7 +81982,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -83952,7 +81994,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/effect/decal/cleanable/dirt, @@ -83965,7 +82006,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -83978,7 +82018,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/effect/turf_decal/stripes/corner{ @@ -83997,7 +82036,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/light{ @@ -84031,7 +82069,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/structure/cable, @@ -84064,9 +82101,9 @@ dir = 4 }, /obj/machinery/power/apc/highcap/ten_k{ + areastring = "/area/engine/atmos"; dir = 1; name = "Atmospherics APC"; - areastring = "/area/engine/atmos"; pixel_y = 28 }, /obj/structure/cable, @@ -84164,6 +82201,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, /obj/structure/cable, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel, /area/engine/atmos) "cuK" = ( @@ -84228,7 +82266,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/table, @@ -84285,7 +82322,6 @@ "cuS" = ( /obj/structure/lattice/catwalk, /obj/effect/landmark/xeno_spawn, -/obj/structure/cable, /turf/open/floor/plating/airless, /area/solar/port/aft) "cuT" = ( @@ -84491,8 +82527,7 @@ }, /obj/structure/frame/computer{ anchored = 1; - dir = 4; - icon_state = "0" + dir = 4 }, /obj/effect/turf_decal/bot_white, /obj/machinery/newscaster{ @@ -84503,7 +82538,6 @@ /area/maintenance/port) "cvk" = ( /obj/effect/spawner/structure/window/hollow/reinforced/directional{ - icon_state = "hrwindow_spawner_directional"; dir = 6 }, /obj/structure/cable, @@ -84511,8 +82545,7 @@ /area/maintenance/port/fore) "cvl" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/barricade/wooden/crude, @@ -84588,7 +82621,6 @@ /area/maintenance/solars/port/aft) "cvs" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer3{ - icon_state = "vent_map_on-3"; dir = 1 }, /obj/effect/turf_decal/stripes/corner, @@ -84627,7 +82659,6 @@ /area/maintenance/port) "cvv" = ( /obj/effect/spawner/structure/window/hollow/reinforced/directional{ - icon_state = "hrwindow_spawner_directional"; dir = 10 }, /obj/structure/cable, @@ -84811,7 +82842,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -84969,7 +82999,6 @@ pixel_y = 6 }, /obj/item/radio{ - pixel_x = 0; pixel_y = 4 }, /obj/effect/decal/cleanable/dirt, @@ -85059,7 +83088,6 @@ icon_state = "secbot1"; idcheck = 1; name = "Warden Armsky"; - on = 1; weaponscheck = 1 }, /turf/open/floor/plasteel/showroomfloor, @@ -85088,8 +83116,7 @@ /area/maintenance/port/fore) "cwg" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/barricade/wooden/crude, @@ -85259,7 +83286,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -85420,7 +83446,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/tile/neutral{ @@ -85439,7 +83464,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/effect/turf_decal/tile/neutral{ @@ -85452,7 +83476,6 @@ /area/security/main) "cwM" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /obj/effect/landmark/start/depsec/engineering, @@ -85503,8 +83526,7 @@ /area/maintenance/port) "cwQ" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/barricade/wooden/crude, @@ -85553,7 +83575,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -85577,8 +83598,7 @@ }, /obj/structure/frame/computer{ anchored = 1; - dir = 4; - icon_state = "0" + dir = 4 }, /obj/effect/turf_decal/bot_white, /obj/structure/noticeboard{ @@ -85628,7 +83648,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -85742,8 +83761,7 @@ /obj/machinery/power/solar_control{ dir = 4; id = "aftport"; - name = "Port Quarter Solar Control"; - track = 0 + name = "Port Quarter Solar Control" }, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/stripes/line{ @@ -85773,8 +83791,7 @@ areastring = "/area/maintenance/solars/port/aft"; dir = 4; name = "Port Quarter Solar APC"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -85940,7 +83957,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 4 }, /obj/structure/cable, @@ -85992,8 +84008,7 @@ /area/maintenance/port/fore) "cxE" = ( /obj/machinery/camera/motion{ - c_tag = "Armoury External"; - dir = 2 + c_tag = "Armoury External" }, /obj/structure/lattice/catwalk, /turf/open/space, @@ -86035,7 +84050,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, /obj/effect/turf_decal/caution{ - icon_state = "caution"; dir = 1 }, /obj/structure/cable, @@ -86051,9 +84065,7 @@ dir = 8 }, /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - pixel_x = 0; - pixel_y = 0 + icon_state = "plant-21" }, /obj/machinery/light_switch{ pixel_x = 24; @@ -86068,9 +84080,8 @@ "cxK" = ( /obj/effect/turf_decal/bot, /obj/structure/frame/computer{ - icon_state = "0"; - dir = 1; - anchored = 1 + anchored = 1; + dir = 1 }, /obj/structure/cable, /turf/open/floor/plasteel/dark, @@ -86131,7 +84142,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/effect/turf_decal/tile/red, @@ -86186,7 +84196,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/structure/cable, @@ -86202,7 +84211,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -86236,7 +84244,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -86273,7 +84280,6 @@ /obj/effect/turf_decal/tile/blue, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/landmark/event_spawn, @@ -86302,7 +84308,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 4 }, /obj/structure/cable, @@ -86483,7 +84488,6 @@ }, /obj/machinery/camera{ c_tag = "Engineering Desk"; - dir = 2; name = "engineering camera"; network = list("ss13","engine") }, @@ -86804,7 +84808,6 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -86994,7 +84997,6 @@ /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 4 }, /turf/open/floor/plasteel/dark, @@ -87036,7 +85038,6 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 1 }, /turf/open/floor/plasteel/dark, @@ -87250,7 +85251,6 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /obj/effect/turf_decal/bot, @@ -87353,7 +85353,6 @@ "czK" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/structure/filingcabinet, @@ -87376,9 +85375,9 @@ pixel_y = -26 }, /obj/machinery/power/apc{ + areastring = "/area/security/checkpoint/engineering"; dir = 8; name = "Engineering Security APC"; - areastring = "/area/security/checkpoint/engineering"; pixel_x = -24 }, /obj/structure/cable, @@ -87386,8 +85385,7 @@ /area/security/checkpoint/engineering) "czL" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/barricade/wooden/crude, @@ -87407,7 +85405,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/blood/old, @@ -87437,9 +85434,7 @@ /obj/item/clothing/glasses/meson, /obj/machinery/power/apc/highcap/ten_k{ areastring = "/area/engine/engineering"; - dir = 2; name = "Engine Room APC"; - pixel_x = 0; pixel_y = -26 }, /obj/effect/turf_decal/tile/neutral{ @@ -87461,8 +85456,7 @@ /area/maintenance/port/aft) "czQ" = ( /obj/machinery/computer/card/minor/hos{ - dir = 1; - icon_state = "computer" + dir = 1 }, /turf/open/floor/wood, /area/crew_quarters/heads/hos) @@ -87560,7 +85554,6 @@ }, /obj/machinery/power/apc{ areastring = "/area/ai_monitored/security/armory"; - dir = 2; name = "Armoury APC"; pixel_y = -24 }, @@ -87713,9 +85706,7 @@ "cAo" = ( /obj/effect/turf_decal/bot, /obj/structure/frame/computer{ - anchored = 1; - dir = 2; - icon_state = "0" + anchored = 1 }, /obj/effect/decal/cleanable/dirt, /obj/machinery/status_display/evac{ @@ -87730,9 +85721,7 @@ "cAq" = ( /obj/effect/turf_decal/bot, /obj/structure/frame/computer{ - anchored = 1; - dir = 2; - icon_state = "0" + anchored = 1 }, /obj/effect/decal/cleanable/dirt, /obj/item/radio/intercom{ @@ -87798,9 +85787,7 @@ /obj/machinery/button/door{ id = "greylair"; name = "Lair Privacy Toggle"; - pixel_x = 0; - pixel_y = 24; - req_access_txt = "0" + pixel_y = 24 }, /obj/effect/decal/cleanable/blood/old, /obj/machinery/atmospherics/components/unary/vent_pump/on{ @@ -87916,7 +85903,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/cable, @@ -87951,7 +85937,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -87986,18 +85971,15 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/general/visible/layer3{ - icon_state = "pipe11-3"; dir = 4 }, /obj/effect/turf_decal/stripes/line{ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/machinery/power/terminal{ - icon_state = "term"; dir = 4 }, /obj/structure/cable, @@ -88008,7 +85990,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/general/visible/layer3{ - icon_state = "pipe11-3"; dir = 10 }, /obj/machinery/power/smes/engineering, @@ -88046,7 +86027,6 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, /obj/machinery/power/terminal{ - icon_state = "term"; dir = 4 }, /obj/structure/cable, @@ -88207,7 +86187,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -88232,6 +86211,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/structure/cable, /turf/open/floor/engine, /area/engine/engineering) "cBk" = ( @@ -88340,6 +86320,7 @@ /obj/machinery/light{ dir = 8 }, +/obj/structure/cable, /turf/open/floor/engine, /area/engine/engineering) "cBu" = ( @@ -88474,7 +86455,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, -/obj/structure/cable, /turf/open/floor/engine, /area/engine/engineering) "cBK" = ( @@ -88600,7 +86580,6 @@ "cBV" = ( /obj/machinery/power/rad_collector/anchored, /obj/structure/window/plasma/reinforced{ - icon_state = "plasmarwindow"; dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/general/visible{ @@ -88650,7 +86629,6 @@ "cCb" = ( /obj/machinery/power/rad_collector/anchored, /obj/structure/window/plasma/reinforced{ - icon_state = "plasmarwindow"; dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/general/visible{ @@ -88684,13 +86662,11 @@ /obj/structure/sign/warning/nosmoking{ pixel_x = 30 }, -/obj/structure/cable, /turf/open/floor/engine, /area/engine/engineering) "cCf" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/mapping_helpers/airlock/cyclelink_helper, @@ -88711,7 +86687,6 @@ /obj/structure/window/reinforced, /obj/machinery/door/window/northleft{ dir = 4; - icon_state = "left"; name = "Inner Pipe Access"; req_access_txt = "24" }, @@ -88731,7 +86706,6 @@ dir = 1 }, /obj/machinery/atmospherics/components/binary/pump{ - dir = 2; name = "N2 to Pure" }, /obj/effect/turf_decal/stripes/corner{ @@ -88757,6 +86731,7 @@ safety_mode = 1 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel/dark, /area/hallway/secondary/entry) "cCk" = ( @@ -88798,7 +86773,6 @@ }, /obj/effect/turf_decal/stripes/corner, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -88857,7 +86831,7 @@ }, /obj/effect/turf_decal/bot, /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, @@ -88874,15 +86848,14 @@ /obj/effect/decal/cleanable/blood/gibs/old, /obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/plasteel/showroomfloor, -/area/security/prison) +/area/security/prison/toilet) "cCv" = ( /obj/structure/bed, /obj/item/bedsheet/black, /obj/machinery/flasher{ id = "PCell 3"; name = "Prisoner Pacifier"; - pixel_x = 24; - pixel_y = 0 + pixel_x = 24 }, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -88902,7 +86875,7 @@ dir = 1 }, /turf/open/floor/plasteel/showroomfloor, -/area/security/prison) +/area/security/prison/toilet) "cCw" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -88919,7 +86892,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/machinery/camera{ @@ -88929,7 +86901,7 @@ network = list("ss13","prison") }, /turf/open/floor/plasteel/showroomfloor, -/area/security/prison) +/area/security/prison/toilet) "cCx" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -89000,7 +86972,6 @@ /obj/machinery/hydroponics/soil, /obj/item/seeds/tower, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/effect/turf_decal/stripes/corner{ @@ -89107,7 +87078,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -89149,7 +87119,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/binary/pump/on{ - dir = 2; name = "N2 to Airmix" }, /obj/effect/decal/cleanable/dirt, @@ -89179,7 +87148,6 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, -/obj/structure/cable, /turf/open/floor/engine, /area/engine/engineering) "cCR" = ( @@ -89280,7 +87248,6 @@ "cDc" = ( /obj/machinery/power/rad_collector/anchored, /obj/structure/window/plasma/reinforced{ - icon_state = "plasmarwindow"; dir = 4 }, /obj/machinery/atmospherics/pipe/simple/general/visible{ @@ -89294,7 +87261,6 @@ "cDd" = ( /obj/machinery/power/rad_collector/anchored, /obj/structure/window/plasma/reinforced{ - icon_state = "plasmarwindow"; dir = 8 }, /obj/machinery/atmospherics/pipe/simple/general/visible{ @@ -89311,9 +87277,9 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 8 }, +/obj/structure/cable, /turf/open/floor/engine, /area/engine/engineering) "cDf" = ( @@ -89329,7 +87295,6 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -89358,7 +87323,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/door/firedoor, @@ -89376,7 +87340,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -89416,7 +87379,6 @@ }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -89440,8 +87402,7 @@ /area/maintenance/starboard/aft) "cDq" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /turf/open/floor/plasteel/dark, /area/maintenance/fore) @@ -89455,7 +87416,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/binary/pump{ - dir = 2; name = "Cooling Loop Bypass" }, /obj/machinery/light{ @@ -89482,9 +87442,9 @@ pixel_x = 24 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, +/obj/structure/cable, /turf/open/floor/engine, /area/engine/engineering) "cDv" = ( @@ -89584,7 +87544,6 @@ }, /obj/effect/turf_decal/box/corners, /obj/effect/turf_decal/box/corners{ - icon_state = "box_corners"; dir = 4 }, /turf/open/floor/plasteel, @@ -89726,8 +87685,7 @@ /area/engine/engineering) "cDT" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-05"; - pixel_y = 0 + icon_state = "plant-05" }, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -89755,14 +87713,12 @@ dir = 4 }, /turf/open/floor/plasteel/dark/corner{ - icon_state = "darkcorner"; dir = 4 }, /area/hallway/primary/fore) "cDW" = ( /obj/structure/chair/sofa/right{ - color = "#c45c57"; - dir = 2 + color = "#c45c57" }, /turf/open/floor/wood{ icon_state = "wood-broken" @@ -89782,9 +87738,7 @@ /area/maintenance/starboard/fore) "cDY" = ( /obj/structure/chair/sofa/corner{ - color = "#c45c57"; - dir = 2; - icon_state = "sofacorner" + color = "#c45c57" }, /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/wood{ @@ -89793,8 +87747,7 @@ /area/maintenance/starboard/fore) "cDZ" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -89863,9 +87816,8 @@ /area/maintenance/starboard/fore) "cEf" = ( /obj/structure/chair/sofa/left{ - icon_state = "sofaend_left"; - dir = 8; - color = "#c45c57" + color = "#c45c57"; + dir = 8 }, /obj/effect/turf_decal/stripes/corner, /obj/effect/decal/cleanable/blood/old, @@ -89925,7 +87877,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ @@ -89951,8 +87902,7 @@ /area/maintenance/starboard/fore) "cEp" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/barricade/wooden/crude, @@ -89970,7 +87920,6 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/structure/cable, /turf/open/floor/engine, /area/engine/engineering) "cEr" = ( @@ -90014,7 +87963,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /obj/machinery/light/small{ @@ -90124,7 +88072,7 @@ /area/maintenance/fore) "cEC" = ( /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, @@ -90224,7 +88172,6 @@ /obj/machinery/atmospherics/pipe/manifold/general/visible, /obj/machinery/meter, /obj/effect/turf_decal/stripes/line, -/obj/structure/cable, /turf/open/floor/engine, /area/engine/engineering) "cEL" = ( @@ -90280,8 +88227,7 @@ "cEO" = ( /obj/structure/frame/computer{ anchored = 1; - dir = 8; - icon_state = "0" + dir = 8 }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/corner, @@ -90374,7 +88320,7 @@ /area/engine/engineering) "cEV" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/effect/decal/cleanable/blood/old, @@ -90473,6 +88419,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 10 }, +/obj/structure/cable, /turf/open/floor/engine, /area/engine/engineering) "cFf" = ( @@ -90481,9 +88428,9 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, +/obj/structure/cable, /turf/open/floor/engine, /area/engine/engineering) "cFg" = ( @@ -90522,8 +88469,7 @@ /area/maintenance/starboard/fore) "cFl" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-05"; - pixel_y = 0 + icon_state = "plant-05" }, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -90545,7 +88491,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ @@ -90658,7 +88603,6 @@ }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/cyan/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -90712,7 +88656,6 @@ /area/maintenance/disposal/incinerator) "cFB" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -90766,7 +88709,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/effect/decal/cleanable/dirt, @@ -90780,7 +88722,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -90794,7 +88735,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ @@ -90814,7 +88754,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -90876,7 +88815,6 @@ /obj/effect/decal/cleanable/dirt, /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-02"; - pixel_x = 0; pixel_y = 3 }, /obj/machinery/airalarm{ @@ -90936,7 +88874,7 @@ network = list("ss13","prison") }, /turf/open/floor/plasteel/showroomfloor, -/area/security/prison) +/area/security/prison/toilet) "cFS" = ( /obj/structure/lattice/catwalk, /obj/effect/landmark/carpspawn, @@ -90963,7 +88901,6 @@ dir = 1 }, /obj/machinery/power/terminal{ - icon_state = "term"; dir = 8 }, /obj/item/radio/intercom{ @@ -90972,7 +88909,6 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/camera{ c_tag = "Starboard Quarter Solar"; - dir = 2; name = "engineering camera"; network = list("ss13","engine") }, @@ -91322,7 +89258,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/effect/decal/cleanable/blood/gibs/up, @@ -91370,7 +89305,6 @@ "cGG" = ( /obj/structure/lattice/catwalk, /obj/effect/landmark/xeno_spawn, -/obj/structure/cable, /turf/open/floor/plating/airless, /area/solar/starboard/aft) "cGH" = ( @@ -91419,8 +89353,7 @@ "cGM" = ( /obj/structure/frame/computer{ anchored = 1; - dir = 4; - icon_state = "0" + dir = 4 }, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/stripes/line{ @@ -91449,10 +89382,8 @@ }, /area/engine/engineering) "cGO" = ( -/obj/machinery/power/emitter/anchored{ - icon_state = "emitter"; - dir = 4; - state = 2 +/obj/machinery/power/emitter/welded{ + dir = 4 }, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -91461,10 +89392,8 @@ }, /area/engine/engineering) "cGP" = ( -/obj/machinery/power/emitter/anchored{ - icon_state = "emitter"; - dir = 8; - state = 2 +/obj/machinery/power/emitter/welded{ + dir = 8 }, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -91472,7 +89401,6 @@ /area/engine/engineering) "cGQ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 1 }, /obj/machinery/airalarm{ @@ -91533,7 +89461,6 @@ "cGU" = ( /obj/machinery/power/apc{ areastring = "/area/maintenance/solars/starboard/aft"; - dir = 2; name = "Starboard Quarter Solar APC"; pixel_y = -26 }, @@ -91553,8 +89480,7 @@ /obj/machinery/power/solar_control{ dir = 8; id = "aftstarboard"; - name = "Starboard Quarter Solar Control"; - track = 0 + name = "Starboard Quarter Solar Control" }, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/stripes/line{ @@ -91579,10 +89505,8 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/power/emitter/anchored{ - icon_state = "emitter"; - dir = 4; - state = 2 +/obj/machinery/power/emitter/welded{ + dir = 4 }, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -91654,7 +89578,6 @@ dir = 10 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -91726,8 +89649,7 @@ /area/quartermaster/warehouse) "cHm" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -91745,7 +89667,6 @@ areastring = "/area/maintenance/disposal"; dir = 1; name = "Disposals APC"; - pixel_x = 0; pixel_y = 26 }, /obj/effect/decal/cleanable/dirt, @@ -92030,7 +89951,6 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /obj/machinery/newscaster{ @@ -92110,8 +90030,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, /obj/machinery/firealarm{ dir = 8; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/effect/turf_decal/tile/neutral, /obj/structure/disposalpipe/segment, @@ -92338,7 +90257,6 @@ /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/holopad, @@ -92390,7 +90308,6 @@ /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /obj/item/radio/intercom{ @@ -92406,7 +90323,6 @@ /obj/item/stock_parts/subspace/treatment, /obj/machinery/camera{ c_tag = "Telecomms Storage"; - dir = 2; name = "engineering camera"; network = list("ss13","engine") }, @@ -92433,7 +90349,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel, @@ -92466,7 +90381,6 @@ /obj/effect/turf_decal/tile/neutral, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/machinery/light/small{ @@ -92667,7 +90581,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/engine, @@ -92690,11 +90603,9 @@ }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/binary/pump{ - dir = 2; name = "Fuel Pipe to Incinerator" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/cable, @@ -92876,7 +90787,6 @@ /area/quartermaster/warehouse) "cIO" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /obj/structure/sign/warning/securearea, @@ -92911,7 +90821,6 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer3{ - icon_state = "vent_map_on-3"; dir = 4 }, /turf/open/floor/plating, @@ -92922,7 +90831,6 @@ }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer3{ - icon_state = "manifold-3"; dir = 4 }, /turf/open/floor/plating, @@ -93116,7 +91024,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/tile/red{ @@ -93154,7 +91061,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /turf/open/floor/plasteel, @@ -93163,8 +91069,7 @@ /obj/effect/turf_decal/bot, /obj/machinery/computer/shuttle/mining{ dir = 4; - req_access = null; - req_one_access = null + req_access = null }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral, @@ -93233,8 +91138,7 @@ }, /obj/effect/turf_decal/tile/neutral, /obj/structure/window/reinforced{ - dir = 1; - pixel_y = 0 + dir = 1 }, /turf/open/floor/plasteel/dark, /area/security/prison) @@ -93286,7 +91190,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -93332,7 +91235,6 @@ /area/maintenance/starboard/fore) "cJJ" = ( /obj/effect/mapping_helpers/airlock/unres{ - icon_state = "airlock_unres_helper"; dir = 8 }, /obj/machinery/door/airlock/medical/glass{ @@ -93364,7 +91266,6 @@ }, /obj/effect/decal/cleanable/oil, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer3{ - icon_state = "manifold-3"; dir = 8 }, /turf/open/floor/plating, @@ -93377,7 +91278,6 @@ "cJP" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{ - icon_state = "pipe11-3"; dir = 4 }, /obj/machinery/door/airlock/mining/glass{ @@ -93401,7 +91301,6 @@ /area/construction/mining/aux_base) "cJS" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{ - icon_state = "pipe11-3"; dir = 4 }, /obj/effect/turf_decal/stripes/line{ @@ -93411,7 +91310,6 @@ /area/quartermaster/warehouse) "cJT" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer3{ - icon_state = "manifold-3"; dir = 4 }, /obj/effect/turf_decal/stripes/line, @@ -93427,7 +91325,6 @@ }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 5 }, /turf/open/floor/plasteel, @@ -93517,7 +91414,6 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ - icon_state = "scrub_map_on-1"; dir = 8 }, /obj/effect/turf_decal/tile/red{ @@ -93537,7 +91433,6 @@ }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line{ @@ -93547,8 +91442,7 @@ /area/hallway/primary/fore) "cKi" = ( /obj/machinery/computer/shuttle/labor{ - dir = 1; - icon_state = "computer" + dir = 1 }, /obj/structure/sign/warning/vacuum/external{ pixel_y = -32 @@ -93577,7 +91471,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -93653,7 +91546,6 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{ - icon_state = "pipe11-3"; dir = 6 }, /obj/structure/sign/warning/vacuum/external{ @@ -93667,7 +91559,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{ - icon_state = "pipe11-3"; dir = 4 }, /obj/machinery/conveyor_switch/oneway{ @@ -93682,7 +91573,6 @@ /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer3{ - icon_state = "manifold-3"; dir = 1 }, /turf/open/floor/plating, @@ -93703,7 +91593,6 @@ "cKv" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{ - icon_state = "pipe11-3"; dir = 4 }, /turf/open/floor/plating, @@ -93712,7 +91601,6 @@ /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{ - icon_state = "pipe11-3"; dir = 4 }, /turf/open/floor/plating, @@ -93721,7 +91609,6 @@ /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/blood/old, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{ - icon_state = "pipe11-3"; dir = 9 }, /turf/open/floor/plating, @@ -93794,7 +91681,6 @@ /area/quartermaster/warehouse) "cKC" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{ - icon_state = "pipe11-3"; dir = 5 }, /obj/effect/decal/cleanable/dirt, @@ -93810,7 +91696,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/camera{ @@ -93825,7 +91710,6 @@ /area/hallway/primary/fore) "cKE" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer3{ - icon_state = "vent_map_on-3"; dir = 8 }, /obj/effect/decal/cleanable/blood/old, @@ -93869,9 +91753,7 @@ /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/hos) "cKI" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -93879,7 +91761,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer3{ - icon_state = "vent_map_on-3"; dir = 4 }, /turf/open/floor/plasteel, @@ -93896,7 +91777,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{ - icon_state = "pipe11-3"; dir = 4 }, /turf/open/floor/plasteel/dark, @@ -93913,7 +91793,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{ - icon_state = "pipe11-3"; dir = 9 }, /obj/machinery/button/door{ @@ -93926,7 +91805,6 @@ /area/quartermaster/warehouse) "cKL" = ( /obj/machinery/conveyor{ - dir = 2; id = "NTMSLoad2"; name = "on ramp" }, @@ -93966,7 +91844,6 @@ /obj/structure/window/reinforced, /obj/machinery/door/window/northleft{ dir = 4; - icon_state = "left"; name = "Inner Pipe Access"; req_access_txt = "24" }, @@ -94163,7 +92040,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 6 }, /obj/structure/disposalpipe/segment{ @@ -94175,7 +92051,6 @@ /obj/effect/turf_decal/stripes/corner, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/light/small, @@ -94199,7 +92074,6 @@ /area/maintenance/starboard/aft) "cLd" = ( /obj/docking_port/stationary{ - dir = 1; dwidth = 1; height = 4; roundstart_template = /datum/map_template/shuttle/escape_pod/default; @@ -94303,8 +92177,7 @@ "cLo" = ( /obj/structure/frame/computer{ anchored = 1; - dir = 8; - icon_state = "0" + dir = 8 }, /obj/item/stack/cable_coil/cut, /turf/open/floor/wood, @@ -94327,7 +92200,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - icon_state = "manifold-1"; dir = 1 }, /obj/effect/turf_decal/stripes/line, @@ -94345,7 +92217,6 @@ /area/maintenance/starboard) "cLu" = ( /obj/machinery/conveyor{ - dir = 2; id = "NTMSLoad2"; name = "on ramp" }, @@ -94403,8 +92274,7 @@ "cLB" = ( /obj/structure/frame/computer{ anchored = 1; - dir = 8; - icon_state = "0" + dir = 8 }, /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/dirt, @@ -94416,7 +92286,6 @@ "cLC" = ( /obj/structure/plasticflaps, /obj/machinery/conveyor{ - dir = 2; id = "NTMSLoad2"; name = "on ramp" }, @@ -94430,7 +92299,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer3{ - icon_state = "vent_map_on-3"; dir = 1 }, /turf/open/floor/plasteel, @@ -94538,7 +92406,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plating, @@ -94665,7 +92532,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/structure/spider/stickyweb, @@ -94698,7 +92564,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 10 }, /obj/effect/decal/cleanable/blood/old, @@ -94783,7 +92648,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plating, @@ -94794,7 +92658,6 @@ dir = 8; icon_state = "left"; name = "Library Desk Door"; - pixel_x = 0; req_access_txt = "37" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -94857,8 +92720,7 @@ dir = 8 }, /obj/structure/window/reinforced{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/structure/sign/poster/official/pda_ad{ pixel_y = -32 @@ -94867,9 +92729,7 @@ /area/library) "cMJ" = ( /obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - pixel_x = 0; - pixel_y = 0 + icon_state = "plant-21" }, /obj/machinery/light_switch{ pixel_y = -24 @@ -95118,8 +92978,7 @@ department = "Head of Personnel's Desk"; departmentType = 5; name = "Head of Personnel RC"; - pixel_x = -30; - pixel_y = 0 + pixel_x = -30 }, /obj/machinery/light{ dir = 8 @@ -95162,7 +93021,6 @@ "cNs" = ( /obj/machinery/door/airlock/atmos{ name = "Atmospherics Connector"; - req_access_txt = "0"; req_one_access_txt = "10;24;5" }, /obj/effect/turf_decal/delivery, @@ -95211,7 +93069,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /turf/open/floor/carpet/green, @@ -95359,7 +93216,6 @@ "cNO" = ( /obj/machinery/door/airlock/atmos{ name = "Atmospherics Connector"; - req_access_txt = "0"; req_one_access_txt = "10;24;5" }, /obj/effect/turf_decal/delivery, @@ -95413,7 +93269,7 @@ "cNZ" = ( /obj/effect/decal/cleanable/blood/old, /obj/effect/turf_decal/sand/plating, -/turf/open/floor/plating/airless, +/turf/open/floor/plating/lowpressure, /area/space/nearstation) "cOb" = ( /obj/structure/sign/warning/biohazard, @@ -95507,7 +93363,6 @@ }, /obj/machinery/airalarm/mixingchamber{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/light/small{ @@ -95544,8 +93399,7 @@ /area/bridge) "cPa" = ( /obj/machinery/door/airlock/security/glass{ - name = "Prison Yard"; - req_access_txt = "0" + name = "Prison Yard" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/door/poddoor/shutters/preopen{ @@ -95556,11 +93410,10 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/dark, -/area/security/prison) +/area/security/prison/toilet) "cPb" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -95580,7 +93433,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/effect/turf_decal/stripes/line, @@ -95605,7 +93457,7 @@ /obj/structure/sign/warning/securearea{ pixel_x = -32 }, -/turf/open/floor/plating/asteroid/airless, +/turf/open/floor/plating/asteroid/lowpressure, /area/space/nearstation) "cQs" = ( /obj/effect/turf_decal/tile/red, @@ -95627,15 +93479,15 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /obj/machinery/airalarm{ dir = 1; pixel_y = -22 }, +/obj/effect/landmark/start/prisoner, /turf/open/floor/plasteel/showroomfloor, -/area/security/prison) +/area/security/prison/toilet) "cQP" = ( /obj/machinery/door/airlock/security/glass{ name = "Long-Term Cell 2"; @@ -95649,11 +93501,10 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 8 }, /turf/open/floor/plasteel/dark, -/area/security/prison) +/area/security/prison/toilet) "cRB" = ( /obj/structure/table, /obj/item/paper_bin, @@ -95747,7 +93598,7 @@ }, /obj/effect/turf_decal/bot, /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, @@ -95764,7 +93615,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/plasteel/showroomfloor, -/area/security/prison) +/area/security/prison/toilet) "cTl" = ( /obj/machinery/button/flasher{ id = "PCell 3"; @@ -95794,7 +93645,6 @@ /obj/effect/decal/cleanable/dirt, /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-02"; - pixel_x = 0; pixel_y = 3 }, /turf/open/floor/plasteel/showroomfloor, @@ -95812,7 +93662,6 @@ "cTD" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - icon_state = "pipe11-1"; dir = 9 }, /obj/effect/decal/cleanable/dirt, @@ -95835,11 +93684,113 @@ }, /turf/open/space/basic, /area/space/nearstation) +"cYF" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/engine, +/area/engine/engineering) +"dgX" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Tool Storage" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/navbeacon/wayfinding, +/turf/open/floor/plasteel/dark, +/area/storage/primary) +"dvN" = ( +/turf/open/floor/plating/asteroid/lowpressure, +/area/space/nearstation) +"dSr" = ( +/obj/machinery/portable_atmospherics/canister/air, +/turf/open/floor/engine/air, +/area/engine/atmos) "fhz" = ( /obj/structure/cable, /obj/machinery/holopad/secure, /turf/open/floor/wood, /area/crew_quarters/heads/captain) +"llk" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, +/turf/open/floor/engine, +/area/engine/engineering) +"ogA" = ( +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/plating/lowpressure, +/area/space/nearstation) +"prO" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/external{ + name = "Departure Shuttle Airlock" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/machinery/navbeacon/wayfinding, +/turf/open/floor/plasteel/dark, +/area/hallway/secondary/exit/departure_lounge) +"pSI" = ( +/obj/effect/mapping_helpers/airlock/unres{ + dir = 8 + }, +/obj/machinery/door/airlock/medical/glass{ + id_tag = "medbay_front_door"; + name = "Medbay"; + req_access_txt = "5" + }, +/obj/machinery/navbeacon/wayfinding, +/turf/open/floor/plasteel/dark, +/area/medical/medbay/central) +"qvq" = ( +/obj/structure/flora/rock, +/turf/open/floor/plating/asteroid/lowpressure, +/area/space/nearstation) +"rkn" = ( +/obj/item/stack/cable_coil, +/turf/open/floor/plating/asteroid/airless, +/area/space/nearstation) +"thU" = ( +/mob/living/simple_animal/hostile/asteroid/goliath, +/turf/open/floor/plating/asteroid/lowpressure, +/area/space/nearstation) +"utx" = ( +/obj/machinery/door/firedoor/heavy, +/obj/machinery/door/airlock/research{ + id_tag = "ResearchInt"; + name = "Research Division"; + req_one_access_txt = "47" + }, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 4 + }, +/obj/machinery/navbeacon/wayfinding, +/turf/open/floor/plasteel/dark, +/area/science/research) +"vQL" = ( +/turf/open/floor/plating/airless, +/area/solar/starboard/aft) +"wDI" = ( +/obj/structure/flora/rock/pile, +/turf/open/floor/plating/asteroid/lowpressure, +/area/space/nearstation) +"xIs" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/pinpointer_dispenser, +/turf/open/floor/plating, +/area/hallway/secondary/exit/departure_lounge) +"ycp" = ( +/mob/living/simple_animal/hostile/asteroid/hivelord, +/turf/open/floor/plating/asteroid/lowpressure, +/area/space/nearstation) (1,1,1) = {" aaa @@ -106553,7 +104504,7 @@ coS coS coS coS -coT +cCa coS coS coS @@ -106764,7 +104715,7 @@ aeU aeu aeu aeu -bKl +wDI aeu aeu bUG @@ -106810,7 +104761,7 @@ coT coT coT coT -coT +cCa coT coT coT @@ -107067,7 +105018,7 @@ coS coS coS coS -coT +cCa coS coS coS @@ -107255,7 +105206,7 @@ ahG ahG ahG ahG -ahG +cjl ahG ahG ahG @@ -107276,7 +105227,7 @@ aUz aeU aeu aeu -bKl +wDI bQg aeu aeu @@ -107324,7 +105275,7 @@ ckk aaa aaa ckk -coT +cCa ckk aaa aaa @@ -107512,7 +105463,7 @@ ahF ahF ahF ahF -ahG +cjl ahF ahF ahF @@ -107581,7 +105532,7 @@ coS coS coS ckj -coT +cCa ckj coS coS @@ -107769,7 +105720,7 @@ ckk aaa aaa ckk -ahG +cjl ckk aaa aaa @@ -107791,7 +105742,7 @@ aeu aeu aeu bQc -aDQ +dvN aeu aeu aeu @@ -107837,9 +105788,9 @@ coT coT coT coT -coT +cCa cuS -coT +cCa coT coT cAm @@ -108026,7 +105977,7 @@ ahF ahF ahF cFS -ahG +cjl ctE ahF ahF @@ -108046,7 +105997,7 @@ aeU aeu aeu aeu -aDQ +dvN bQg aeu aeu @@ -108095,7 +106046,7 @@ coS coS coS ckj -coT +cCa ckj coS coS @@ -108282,9 +106233,9 @@ ahG ahG ahG ahG -ahG +cjl ans -ahG +cjl ahG ahG ahG @@ -108304,8 +106255,8 @@ aeu aeu aeu aeu -aDQ -aDQ +dvN +dvN aeu aeu aeu @@ -108352,7 +106303,7 @@ ckk aaa aaa ckk -coT +cCa ckk aaa aaa @@ -108540,7 +106491,7 @@ ahF ahF ahF ctE -ahG +cjl ctE ahF ahF @@ -108559,11 +106510,11 @@ aeu aeu aeu aeu -aDQ -bKl +dvN +wDI bQq -bQb -aDQ +qvq +dvN aeu aeu amA @@ -108609,7 +106560,7 @@ coS coS coS coS -coT +cCa coS coS coS @@ -108797,7 +106748,7 @@ ckk aaa aaa ckk -ahG +cjl ckk aaa aaa @@ -108815,12 +106766,12 @@ aeu aeu aeu aeu -bKl -aDQ -aDQ -aDQ -aDQ -aDQ +wDI +dvN +dvN +dvN +dvN +dvN aeu aeu amR @@ -108866,7 +106817,7 @@ coT coT coT coT -coT +cCa coT coT coT @@ -109054,7 +107005,7 @@ ahF ahF ahF ahF -ahG +cjl ahF ahF ahF @@ -109072,12 +107023,12 @@ aeu aeu aeu aeu -aDQ -aDQ -aTd -bKl -aDQ -aDQ +dvN +dvN +aoz +wDI +dvN +dvN aeu aeu amA @@ -109123,7 +107074,7 @@ coS coS coS coS -coT +cCa coS coS coS @@ -109311,7 +107262,7 @@ ahG ahG ahG ahG -ahG +cjl ahG ahG ahG @@ -109330,10 +107281,10 @@ aeu aeu aeu aeu -aDQ -bQb -aDQ -aDQ +dvN +qvq +dvN +dvN amA amR amA @@ -109380,7 +107331,7 @@ cmU cmU cmU aDS -coT +cCa bFI cmU cmU @@ -109568,7 +107519,7 @@ ahF ahF ahF ahF -ahG +cjl ahF ahF ahF @@ -109588,8 +107539,8 @@ aeu aeu aeu aeu -aDQ -aDQ +dvN +dvN aUq amA cug @@ -109635,9 +107586,9 @@ aeU aeU aeU aeU -aeU +rkn aDS -coT +cCa bFI aeU coy @@ -109825,7 +107776,7 @@ cmU cmU cmU aDS -ahG +cjl bFI cmU cmU @@ -109846,7 +107797,7 @@ aeu aeu aeu aeu -aDQ +dvN baQ bdl beN @@ -110082,9 +108033,9 @@ aeU coy aeU aDS -ahG +cjl bFI -aeU +rkn aeU aeU aeu @@ -113682,11 +111633,11 @@ cxf cxw aar apY -aNG -aNG +aOZ +aOZ atL -aOL -aNG +aPy +aOZ aPA azU aAE @@ -113939,7 +111890,7 @@ cxf cxw cxN apZ -aNG +aOZ ajY atM aFb @@ -114196,7 +112147,7 @@ cwp cxx cxG aqa -aOL +aPy aOa atN aOC @@ -114453,7 +112404,7 @@ cwp cwq cwy aqb -aNG +aOZ aOb atQ aOE @@ -114710,7 +112661,7 @@ cwq cwp anP aqe -aNG +aOZ akq atR avx @@ -114967,11 +112918,11 @@ bgN cwp anQ ail -aNt +aPa aWm -aNx +aPx avB -aNx +aPx aPA abl agH @@ -115223,13 +113174,13 @@ ajI alb cwq anR -aDB -aDB +aPc +aPc aOl aPe avC aNM -aNx +aPx aNR aOj aOp @@ -115480,13 +113431,13 @@ cvv cvJ amh anV -aDB +aPc and apW aBi avG aNS -aNG +aOZ aOe aJW aOh @@ -115737,13 +113688,13 @@ cvk czM cwy anW -aNt -aNJ +aPa +and aqo aMd avI auA -aOL +aPy aOd aNT aPh @@ -115994,7 +113945,7 @@ arT cxA czL anX -aNt +aPa aqP ass atS @@ -116251,13 +114202,13 @@ cvI cxB cwp ajv -aDB -aDB +aPc +aPc aOx aPu aWf aNV -aNx +aPx aFr aNY aOv @@ -116514,12 +114465,12 @@ aNN asi aVj asi -aNH -aVH -aNO +aPc +aOW +aPx aCI -aNL -aNL +aOZ +aOZ aQd aQC aNn @@ -116771,12 +114722,12 @@ aVY aWe aIB aWu -aNL +aOZ aNv aOH aOB aJU -aNO +aPx aQh aQX aQb @@ -117028,14 +114979,14 @@ asv atU avT aWv -aNL +aOZ aBA aOI aOG aWo -aNP -cJJ +aPy cJJ +pSI aNn ayC aRH @@ -117285,12 +115236,12 @@ aVZ aWg avW aWw -aNP +aPy aVK aOK aFt aPr -aNL +aOZ aYB aYB aNn @@ -117542,8 +115493,8 @@ aWb aWh avX aWz -aNL -aNL +aOZ +aOZ aPd aFx aPG @@ -118315,10 +116266,10 @@ arM avK aWF aNu -aNL -aNP -aNL -aNL +aOZ +aPy +aOZ +aOZ aSx aQt aQr @@ -121723,8 +119674,8 @@ aDD aMO aFM aMY +dSr bUQ -aMY bFP cCX bUZ @@ -123171,19 +121122,19 @@ adR adZ aec aee -aen +cHu cHu aeS aeS -aen +cHu aeS aeS -aen +cHu aeS aeS -aen -aen -aen +cHu +cHu +cHu ahY aiD akO @@ -123275,7 +121226,7 @@ cIG bPG byz aFU -aNe +aFO cyP bKO coj @@ -123499,7 +121450,7 @@ bOX cbi ceb ceS -cbD +cgk bZZ cao bEA @@ -124516,7 +122467,7 @@ adJ bnP atj avV -bNB +bJY bOx atr bVw @@ -125284,7 +123235,7 @@ bEN bFu bHB aGG -auc +bMV atj atj bNI @@ -126312,7 +124263,7 @@ bEP bFH atj aHU -auc +bMV atj atj bNL @@ -129952,8 +127903,8 @@ cBs cBP cBi cCQ -cBi -cBi +llk +llk cEq aAQ axW @@ -130434,7 +128385,7 @@ bIB bZM bGx bYK -bQI +dgX aVw aYV bji @@ -132776,7 +130727,7 @@ cAO cAV cBj cBt -cCG +cCd cCd cCG cDt @@ -132970,7 +130921,7 @@ aZB aOM aZr bdJ -bdJ +utx aZr aYd aYK @@ -133037,7 +130988,7 @@ cCe cqE cDe cDu -azw +cYF cFf axa cki @@ -135842,7 +133793,7 @@ bYe bTs bSQ bXB -bPe +xIs bYN bWX bXc @@ -136896,9 +134847,9 @@ aeu aeu aeU aDS -cDr +ctQ bFI -aeU +rkn coy aeU aeU @@ -137153,7 +135104,7 @@ aeU aeU aUz aDS -cDr +ctQ bFI aeU aeU @@ -137410,7 +135361,7 @@ cmU cmU cmU aDS -cDr +ctQ bFI cmU cmU @@ -137667,7 +135618,7 @@ cDo cDo cDo cDo -cDr +ctQ cDo cDo cDo @@ -137924,7 +135875,7 @@ cDr cDr cDr cDr -cDr +ctQ cDr cDr cDr @@ -138181,7 +136132,7 @@ cDo cDo cDo cDo -cDr +ctQ cDo cDo cDo @@ -138438,7 +136389,7 @@ ckk aaa aaa ckk -cDr +ctQ ckk aaa aaa @@ -138667,7 +136618,7 @@ bPe bTE bPe bPe -bWf +prO bRF bWf bPe @@ -138695,7 +136646,7 @@ cDo cDo cDo ckA -cDr +ctQ ckA cDo cDo @@ -138951,9 +136902,9 @@ cDr cDr cDr cDr -cDr +ctQ cGG -cDr +ctQ cDr cDr cDr @@ -139209,7 +137160,7 @@ cDo cDo cDo ckA -cDr +ctQ ckA cDo cDo @@ -139466,7 +137417,7 @@ ckk aaa aaa ckk -cDr +ctQ ckk aaa aaa @@ -139723,7 +137674,7 @@ cDo cDo cDo cDo -cDr +ctQ cDo cDo cDo @@ -139980,7 +137931,7 @@ cDr cFh cDr cDr -cDr +vQL cDr cDr cDr @@ -140408,7 +138359,7 @@ aeU aUz coy aeU -aeU +rkn aDS ajH bFI @@ -140667,7 +138618,7 @@ cmU cmU cmU aDS -ajH +cMU bFI cmU cmU @@ -140924,7 +138875,7 @@ ajG ajG ajG ajG -ajH +cMU ajG ajG ajG @@ -141181,7 +139132,7 @@ amb ajH ajH ajH -ajH +cMU ajH ajH ajH @@ -141438,7 +139389,7 @@ ajG ajG ajG ajG -ajH +cMU ajG ajG ajG @@ -141695,7 +139646,7 @@ ckk aaa aaa ckk -ajH +cMU ckk aaa aaa @@ -141952,7 +139903,7 @@ ajG ajG ajG cLN -ajH +cMU cLN ajG ajG @@ -142208,9 +140159,9 @@ ajH ajH ajH ajH -ajH +cMU ase -ajH +cMU ajH ajH ajH @@ -142466,7 +140417,7 @@ ajG ajG ajG cLN -ajH +cMU cLN ajG ajG @@ -142723,7 +140674,7 @@ ckk aaa aaa ckk -ajH +cMU ckk aaa aaa @@ -142929,9 +140880,9 @@ aeu aeu aeu cPY -cmU -cmU -cmU +ogA +ogA +ogA aeu aeu aeu @@ -142980,7 +140931,7 @@ ajG ajG ajG ajG -ajH +cMU ajG ajG ajG @@ -143184,12 +141135,12 @@ aeu aeu aeu aap -aeU -aeU -cmU +dvN +dvN +ogA cNZ -cmU -aeU +ogA +dvN aeu aeu aeu @@ -143237,7 +141188,7 @@ ajH ajH ajH ajH -ajH +cMU ajH ajH ajH @@ -143441,12 +141392,12 @@ aeu aeu aeu aeu -aeU -aUz -aeU -coy -aeU -aeU +dvN +wDI +dvN +qvq +dvN +dvN aap aeu aeu @@ -143697,13 +141648,13 @@ aeu aeu aeu aeu -aeU -aeU -aeU -cuj -aeU -aeU -aeU +dvN +dvN +dvN +ycp +dvN +dvN +dvN aeu aeu aeu @@ -143953,13 +141904,13 @@ aeu aeu aeu aeu -aeU +dvN arz -aeU -aeU -aeU -aeU -aUz +dvN +dvN +dvN +dvN +wDI aeu aeu aeu @@ -144209,13 +142160,13 @@ aeu aeu aeu aeu -aeU -aeU -aeU -aeU +dvN +dvN +dvN +dvN aoz -aeU -aeU +dvN +dvN aeu aeu aeu @@ -144466,12 +142417,12 @@ aeu aeu aeu aeu -aeU -aeU -aUz +dvN +dvN +wDI apm -aeU -aeU +dvN +dvN aeu aeu aeu @@ -144724,11 +142675,11 @@ aeu aeu aeu aeu -aeU -aeU +dvN +dvN aoz bQN -aeU +dvN aap aeu aeu @@ -144982,9 +142933,9 @@ aeu aeu aap aoz -cui -aeU -aeU +thU +dvN +dvN aeu aeu aeu @@ -145238,9 +143189,9 @@ aeu aeu aeu aeu -aeU -aeU -aUz +dvN +dvN +wDI aeu aeu aeu @@ -145494,10 +143445,10 @@ aeu aeu aeu aeu -aeU +dvN bRy -aeU -aeU +dvN +dvN aeu aeu aeu @@ -145751,8 +143702,8 @@ aeu aeu aeu aap -aeU -aeU +dvN +dvN aoz aap aeu @@ -146009,7 +143960,7 @@ aeu aeu aeu aeu -aeU +dvN aeu aeu aeu @@ -161376,65539 +159327,3 @@ aaa aaa aaa "} - -(1,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(2,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(3,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(4,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(5,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(6,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(7,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(8,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(9,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(10,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(11,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(12,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(13,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(14,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(15,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(16,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(17,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(18,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(19,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(20,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(21,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(22,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(23,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(24,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(25,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(26,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(27,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(28,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(29,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(30,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(31,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(32,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(33,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(34,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(35,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(36,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(37,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(38,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(39,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(40,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(41,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(42,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(43,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(44,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(45,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(46,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(47,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(48,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(49,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(50,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(51,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(52,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(53,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(54,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(55,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(56,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(57,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(58,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(59,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(60,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(61,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(62,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(63,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(64,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(65,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(66,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(67,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(68,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(69,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(70,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(71,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(72,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(73,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(74,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(75,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(76,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(77,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(78,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(79,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(80,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(81,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(82,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(83,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(84,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(85,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(86,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(87,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(88,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(89,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(90,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(91,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(92,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(93,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(94,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(95,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(96,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(97,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(98,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(99,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(100,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(101,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(102,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(103,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(104,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(105,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(106,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(107,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(108,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(109,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(110,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(111,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(112,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(113,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(114,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(115,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(116,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(117,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(118,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(119,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(120,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(121,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(122,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(123,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(124,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(125,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(126,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(127,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(128,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(129,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(130,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(131,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(132,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(133,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(134,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(135,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(136,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(137,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(138,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(139,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(140,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(141,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(142,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(143,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(144,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(145,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(146,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(147,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(148,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(149,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(150,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(151,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(152,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(153,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(154,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(155,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(156,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(157,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(158,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(159,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(160,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(161,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(162,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(163,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(164,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(165,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(166,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(167,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(168,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(169,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(170,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(171,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(172,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(173,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(174,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(175,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(176,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(177,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(178,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(179,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(180,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(181,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(182,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(183,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(184,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(185,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(186,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(187,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(188,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(189,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(190,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(191,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(192,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(193,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(194,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(195,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(196,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(197,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(198,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(199,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(200,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(201,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(202,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(203,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(204,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(205,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(206,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(207,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(208,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(209,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(210,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(211,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(212,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(213,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(214,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(215,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(216,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(217,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(218,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(219,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(220,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(221,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(222,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(223,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(224,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(225,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(226,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(227,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(228,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(229,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(230,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(231,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(232,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(233,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(234,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(235,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(236,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(237,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(238,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(239,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(240,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(241,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(242,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(243,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(244,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(245,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(246,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(247,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(248,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(249,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(250,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(251,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(252,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(253,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(254,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(255,1,2) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 67aa166d8d8..d0048c09749 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -213,6 +213,7 @@ icon_state = "plant-03" }, /obj/effect/decal/cleanable/dirt, +/obj/structure/cable, /turf/open/floor/plasteel, /area/security/prison) "aaC" = ( @@ -794,6 +795,12 @@ dir = 5 }, /area/crew_quarters/kitchen) +"abU" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/grass, +/area/science/genetics) "abV" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/light/small{ @@ -833,7 +840,7 @@ name = "Unisex Restroom" }, /turf/open/floor/plasteel/freezer, -/area/security/prison) +/area/security/prison/toilet) "abZ" = ( /obj/structure/table, /obj/item/book/manual/chef_recipes{ @@ -917,6 +924,15 @@ /obj/structure/lattice/catwalk, /turf/open/space, /area/space/nearstation) +"acl" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/bodycontainer/morgue{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/medical/morgue) "acm" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 @@ -951,7 +967,7 @@ dir = 4 }, /turf/open/floor/plasteel/freezer, -/area/security/prison) +/area/security/prison/toilet) "acq" = ( /obj/structure/table, /obj/item/storage/box/donkpockets{ @@ -966,6 +982,13 @@ icon_state = "panelscorched" }, /area/security/prison) +"acr" = ( +/obj/structure/chair/office/light{ + dir = 4 + }, +/obj/effect/landmark/start/geneticist, +/turf/open/floor/plasteel/white, +/area/science/genetics) "acs" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 @@ -993,6 +1016,12 @@ /obj/structure/cable, /turf/open/floor/plasteel, /area/security/prison) +"acw" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/obj/structure/cable, +/obj/effect/mapping_helpers/iannewyear, +/turf/open/floor/carpet, +/area/crew_quarters/heads/hop) "acx" = ( /obj/machinery/airalarm{ dir = 8; @@ -1624,13 +1653,16 @@ /turf/open/floor/plasteel/white, /area/security/prison) "adD" = ( -/obj/structure/lattice, -/obj/machinery/camera/motion{ - c_tag = "Armory - External"; - dir = 1 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 4 }, -/turf/open/space, -/area/space/nearstation) +/obj/effect/turf_decal/tile/red, +/obj/machinery/status_display/evac{ + pixel_x = 32; + pixel_y = null + }, +/turf/open/floor/plasteel, +/area/hallway/primary/fore) "adE" = ( /turf/open/floor/plating, /area/crew_quarters/fitness/recreation) @@ -1971,43 +2003,31 @@ /area/ai_monitored/security/armory) "aer" = ( /obj/structure/rack, -/obj/item/gun/energy/ionrifle, -/obj/machinery/light{ - dir = 1 +/obj/item/storage/box/flashes{ + pixel_x = 3 }, -/obj/item/gun/energy/temperature/security, -/obj/item/clothing/suit/hooded/ablative, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 +/obj/item/storage/box/teargas{ + pixel_x = 1; + pixel_y = -2 }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ +/obj/item/gun/grenadelauncher, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "aes" = ( -/obj/structure/closet/secure_closet{ - name = "contraband locker"; - req_access_txt = "3" +/obj/structure/extinguisher_cabinet{ + pixel_y = 30 }, -/obj/effect/spawner/lootdrop/maintenance/three, -/obj/effect/spawner/lootdrop/armory_contraband/metastation, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ +/obj/structure/closet/secure_closet/security/sec, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, /turf/open/floor/plasteel/dark, -/area/ai_monitored/security/armory) +/area/security/warden) "aet" = ( /obj/structure/table/wood, /obj/machinery/newscaster/security_unit{ @@ -2041,19 +2061,21 @@ /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/hos) "aex" = ( -/obj/structure/closet/secure_closet/lethalshots, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 +/obj/structure/closet/secure_closet/security/sec, +/obj/machinery/airalarm{ + pixel_y = 28 }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/tile/red{ dir = 8 }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/machinery/light{ + dir = 4 + }, /turf/open/floor/plasteel/dark, -/area/ai_monitored/security/armory) +/area/security/warden) "aey" = ( /turf/closed/wall, /area/security/range) @@ -2394,26 +2416,41 @@ /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/hos) "aff" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/obj/item/storage/secure/safe{ - name = "armory safe A"; - pixel_x = 6; - pixel_y = 28 +/obj/structure/filingcabinet/security{ + pixel_x = 4 + }, +/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 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 }, /turf/open/floor/plasteel/dark, -/area/ai_monitored/security/armory) +/area/security/brig) "afg" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 5 + }, +/turf/open/floor/plasteel/dark, +/area/security/warden) +"afh" = ( +/obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plasteel/dark, -/area/ai_monitored/security/armory) -"afh" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 6 - }, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/security/armory) +/area/security/warden) "afi" = ( /obj/structure/closet/secure_closet/hos, /obj/machinery/light{ @@ -2804,7 +2841,6 @@ /obj/effect/turf_decal/tile/red{ dir = 1 }, -/obj/structure/cable, /turf/open/floor/plasteel, /area/security/prison) "afS" = ( @@ -2841,64 +2877,96 @@ /turf/open/floor/plasteel, /area/security/prison) "afX" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/item/storage/secure/safe{ - name = "armory safe B"; - pixel_x = 6; - pixel_y = 28 - }, -/obj/structure/extinguisher_cabinet{ - pixel_x = 27 - }, -/turf/open/floor/plasteel/dark, +/turf/closed/wall, /area/ai_monitored/security/armory) "afY" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/power/apc/highcap/five_k{ + areastring = "/area/security/warden"; + dir = 8; + name = "Gear Room APC"; + pixel_x = -25 + }, +/obj/structure/cable, /turf/open/floor/plasteel/dark, -/area/ai_monitored/security/armory) +/area/security/warden) "afZ" = ( -/obj/item/radio/intercom{ - pixel_y = 24 +/obj/structure/table, +/obj/item/storage/box/evidence, +/obj/item/storage/box/evidence, +/obj/item/storage/box/evidence, +/obj/item/hand_labeler, +/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/brig) +"aga" = ( /obj/structure/rack, -/obj/item/grenade/barrier{ - pixel_x = -3; - pixel_y = 1 - }, -/obj/item/grenade/barrier, -/obj/item/grenade/barrier{ +/obj/item/clothing/suit/armor/riot{ pixel_x = 3; - pixel_y = -1 + pixel_y = 2 }, -/obj/item/grenade/barrier{ - pixel_x = 6; +/obj/item/clothing/suit/armor/riot{ + pixel_y = 2 + }, +/obj/item/clothing/suit/armor/riot{ + pixel_x = -3; + pixel_y = 2 + }, +/obj/item/clothing/suit/armor/bulletproof{ + pixel_x = 3; pixel_y = -2 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 +/obj/item/clothing/suit/armor/bulletproof{ + pixel_y = -2 }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 +/obj/item/clothing/suit/armor/bulletproof{ + pixel_x = -3; + pixel_y = -2 }, -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/machinery/requests_console{ + department = "Security"; + departmentType = 5; + pixel_y = 30 + }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) -"aga" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 +"agb" = ( +/obj/structure/rack, +/obj/item/shield/riot{ + pixel_x = -3; + pixel_y = 3 }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 +/obj/item/shield/riot, +/obj/item/shield/riot{ + pixel_x = 3; + pixel_y = -3 }, -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/security/armory) +"agc" = ( +/obj/effect/turf_decal/bot, /mob/living/simple_animal/bot/secbot{ arrest_type = 1; health = 45; @@ -2909,52 +2977,19 @@ }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) -"agb" = ( -/obj/structure/rack, -/obj/item/gun/energy/disabler{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/gun/energy/disabler, -/obj/item/gun/energy/disabler{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/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/ai_monitored/security/armory) -"agc" = ( -/turf/open/floor/plasteel/dark, -/area/ai_monitored/security/armory) "agd" = ( /obj/structure/rack, -/obj/item/gun/energy/laser{ - pixel_x = -3; +/obj/item/gun/ballistic/shotgun/riot, +/obj/item/gun/ballistic/shotgun/riot{ + pixel_y = 6 + }, +/obj/item/gun/ballistic/shotgun/riot{ pixel_y = 3 }, -/obj/item/gun/energy/laser, -/obj/item/gun/energy/laser{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/tile/red{ dir = 1 }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/tile/red{ dir = 8 }, /turf/open/floor/plasteel/dark, @@ -3036,7 +3071,7 @@ /area/maintenance/fore) "agr" = ( /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, @@ -3235,13 +3270,14 @@ req_access_txt = "1" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/structure/cable, /turf/open/floor/plasteel, /area/security/prison) "agL" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/security/prison) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/closed/wall, +/area/security/brig) "agM" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -3298,13 +3334,10 @@ /turf/open/floor/plasteel/dark, /area/security/prison) "agQ" = ( -/obj/structure/rack, -/obj/item/clothing/suit/armor/bulletproof, -/obj/item/clothing/head/helmet/alt, -/obj/item/clothing/suit/armor/bulletproof, -/obj/item/clothing/head/helmet/alt, -/obj/item/clothing/suit/armor/bulletproof, -/obj/item/clothing/head/helmet/alt, +/obj/structure/table, +/obj/machinery/recharger{ + pixel_y = 4 + }, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -3316,92 +3349,38 @@ dir = 8 }, /turf/open/floor/plasteel/dark, -/area/ai_monitored/security/armory) +/area/security/brig) "agR" = ( -/obj/machinery/airalarm{ - dir = 4; - pixel_x = -22 +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = 28 }, -/obj/structure/rack, -/obj/item/storage/fancy/donut_box, -/obj/item/gun/energy/e_gun/dragnet, -/obj/item/gun/energy/e_gun/dragnet, -/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/ai_monitored/security/armory) +/turf/open/floor/plasteel, +/area/security/brig) "agS" = ( -/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 - }, -/obj/machinery/holopad/secure, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/security/armory) +/obj/structure/lattice, +/turf/closed/wall/r_wall, +/area/security/warden) "agT" = ( -/obj/structure/rack, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/item/storage/box/rubbershot, -/obj/item/storage/box/rubbershot, -/obj/item/storage/box/rubbershot, -/obj/item/storage/box/rubbershot, -/obj/item/storage/box/rubbershot, -/obj/item/storage/box/rubbershot, -/obj/item/gun/ballistic/shotgun/riot{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/gun/ballistic/shotgun/riot, -/obj/item/gun/ballistic/shotgun/riot, -/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{ +/obj/effect/turf_decal/trimline/red/filled/line{ dir = 8 }, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/security/armory) +/turf/open/floor/plasteel, +/area/security/brig) "agU" = ( -/obj/structure/rack, -/obj/item/gun/energy/e_gun{ - pixel_x = -3; - pixel_y = 3 +/obj/item/radio/intercom{ + pixel_y = 26 }, -/obj/item/gun/energy/e_gun, -/obj/item/gun/energy/e_gun{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 +/obj/machinery/light{ + dir = 1 }, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/security/armory) +/turf/open/floor/plasteel, +/area/security/brig) "agW" = ( /obj/structure/table/wood, /obj/machinery/recharger, @@ -3463,6 +3442,7 @@ pixel_y = 3 }, /obj/structure/cable, +/obj/item/storage/box/deputy, /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/hos) "ahc" = ( @@ -3610,7 +3590,6 @@ name = "Security Blast Door" }, /obj/effect/turf_decal/delivery, -/obj/structure/cable, /turf/open/floor/plasteel, /area/security/brig) "ahz" = ( @@ -3619,6 +3598,7 @@ name = "Security Blast Door" }, /obj/effect/turf_decal/delivery, +/obj/structure/cable, /turf/open/floor/plasteel, /area/security/brig) "ahA" = ( @@ -3634,132 +3614,67 @@ /turf/closed/wall, /area/security/warden) "ahC" = ( -/obj/structure/rack, -/obj/item/clothing/suit/armor/riot, -/obj/item/clothing/suit/armor/riot, -/obj/item/clothing/suit/armor/riot, -/obj/item/clothing/head/helmet/riot, -/obj/item/clothing/head/helmet/riot, -/obj/item/clothing/head/helmet/riot, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 28 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/trimline/red/filled/corner{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 }, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/security/armory) +/turf/open/floor/plasteel, +/area/security/brig) "ahE" = ( -/obj/structure/rack, -/obj/item/storage/box/flashes{ - pixel_x = 3 - }, -/obj/item/storage/box/teargas{ - pixel_x = 1; - pixel_y = -2 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ +/obj/structure/closet/l3closet/security, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/security/armory) +/obj/structure/cable, +/turf/open/floor/plasteel, +/area/security/brig) "ahF" = ( -/obj/machinery/power/apc/highcap/five_k{ - areastring = "/area/ai_monitored/security/armory"; - name = "Armory APC"; - pixel_x = 1; - pixel_y = -23 - }, -/obj/machinery/light, -/obj/machinery/camera/motion{ - c_tag = "Armory - Internal"; - dir = 1 - }, -/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 +/obj/structure/disposalpipe/segment{ + dir = 6 }, /obj/structure/cable, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/security/armory) +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/security/brig) "ahG" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/trimline/red/filled/corner, +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, /obj/structure/cable, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/security/armory) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/security/brig) "ahH" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/trimline/red/filled/line, +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 }, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/security/armory) +/turf/open/floor/plasteel, +/area/security/brig) "ahI" = ( -/obj/structure/rack, -/obj/item/shield/riot{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/shield/riot, -/obj/item/shield/riot{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/machinery/button/door{ - id = "armory"; - name = "Armory Shutters"; - pixel_x = 28; - req_access_txt = "3" - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/trimline/red/filled/line, +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 }, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/security/armory) +/turf/open/floor/plasteel, +/area/security/brig) "ahJ" = ( /obj/machinery/disposal/bin, /obj/machinery/firealarm{ @@ -3833,26 +3748,21 @@ /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/hos) "ahP" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security{ - name = "Armory"; - req_access_txt = "3" +/obj/structure/rack, +/obj/item/storage/toolbox/mechanical{ + pixel_x = -4; + pixel_y = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 +/obj/item/storage/toolbox/emergency{ + pixel_x = 2; + pixel_y = -3 }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 +/obj/item/wirecutters{ + pixel_y = 2 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/structure/cable, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/security/armory) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/security/brig) "ahQ" = ( /obj/item/clothing/head/festive, /obj/effect/decal/cleanable/cobweb/cobweb2, @@ -3875,8 +3785,7 @@ "ahU" = ( /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/structure/table, -/obj/item/stock_parts/manipulator, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating, /area/maintenance/fore) "ahV" = ( @@ -4117,6 +4026,7 @@ /obj/effect/turf_decal/tile/red{ dir = 4 }, +/obj/structure/cable, /turf/open/floor/plasteel, /area/security/brig) "aiw" = ( @@ -4152,8 +4062,18 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, /turf/open/floor/plasteel/dark, -/area/security/warden) +/area/security/brig) "aiy" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/machinery/light/small{ @@ -4179,7 +4099,7 @@ dir = 8 }, /turf/open/floor/plasteel/dark, -/area/security/warden) +/area/security/brig) "aiz" = ( /obj/structure/closet/secure_closet/evidence, /obj/effect/turf_decal/tile/neutral{ @@ -4192,25 +4112,39 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, /turf/open/floor/plasteel/dark, -/area/security/warden) +/area/security/brig) "aiA" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable, -/turf/open/floor/plating, +/obj/item/storage/secure/safe{ + name = "armory safe A"; + pixel_x = 6; + pixel_y = 28 + }, +/turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "aiB" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, /obj/structure/cable, -/turf/open/floor/plating, -/area/security/warden) +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel, +/area/security/brig) "aiC" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/cable, -/turf/open/floor/plating, -/area/ai_monitored/security/armory) +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 10 + }, +/turf/open/floor/plasteel, +/area/security/brig) "aiD" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -4484,7 +4418,6 @@ /obj/effect/turf_decal/tile/red{ dir = 8 }, -/obj/structure/cable, /turf/open/floor/plasteel, /area/security/brig) "ajo" = ( @@ -4525,8 +4458,12 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red, /turf/open/floor/plasteel/dark, -/area/security/warden) +/area/security/brig) "ajr" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/tile/neutral{ @@ -4539,25 +4476,16 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/turf/open/floor/plasteel/dark, -/area/security/warden) -"ajs" = ( -/obj/machinery/door/poddoor/shutters{ - id = "armory"; - name = "armory shutters" - }, -/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{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 8 }, /turf/open/floor/plasteel/dark, -/area/ai_monitored/security/armory) +/area/security/brig) +"ajs" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/obj/structure/cable, +/turf/open/floor/plasteel/dark, +/area/security/warden) "ajt" = ( /obj/structure/closet{ name = "Evidence Closet 5" @@ -4576,8 +4504,14 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, /turf/open/floor/plasteel/dark, -/area/security/warden) +/area/security/brig) "aju" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 10 @@ -4587,44 +4521,63 @@ /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "ajv" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/obj/effect/turf_decal/trimline/neutral/filled/corner{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/cable, -/turf/open/floor/plasteel, -/area/security/warden) +/obj/item/radio/intercom{ + pixel_y = 25 + }, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/security/armory) "ajw" = ( -/obj/structure/closet/bombcloset/security, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 4 +/obj/structure/closet/secure_closet{ + name = "contraband locker"; + req_access_txt = "3" }, -/obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, -/area/security/warden) +/obj/effect/spawner/lootdrop/maintenance/three, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/spawner/lootdrop/armory_contraband/metastation, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/security/armory) "ajx" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, /turf/open/floor/plating, /area/security/warden) "ajy" = ( -/obj/structure/extinguisher_cabinet{ - pixel_y = 30 +/obj/structure/table, +/obj/machinery/recharger{ + pixel_y = 4 }, -/obj/structure/closet/secure_closet/security/sec, -/obj/effect/turf_decal/bot, -/turf/open/floor/plasteel/showroomfloor, -/area/security/warden) -"ajz" = ( -/turf/open/floor/plasteel/showroomfloor, +/obj/structure/cable, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, /area/security/warden) "ajA" = ( -/obj/structure/closet/secure_closet/security/sec, -/obj/machinery/airalarm{ - pixel_y = 28 +/obj/structure/table, +/obj/machinery/recharger{ + pixel_y = 4 }, -/obj/effect/turf_decal/bot, -/turf/open/floor/plasteel/showroomfloor, +/obj/structure/cable, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, /area/security/warden) "ajB" = ( /obj/machinery/computer/secure_data, @@ -4830,10 +4783,9 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 8 }, -/obj/effect/turf_decal/tile/red{ +/obj/effect/turf_decal/trimline/red/filled/line{ dir = 4 }, -/obj/structure/cable, /turf/open/floor/plasteel, /area/security/brig) "ajR" = ( @@ -5174,27 +5126,28 @@ /turf/open/floor/plasteel/white, /area/security/brig) "akx" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/effect/turf_decal/tile/red{ +/obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 }, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 8 }, -/obj/structure/cable, /turf/open/floor/plasteel, /area/security/brig) "aky" = ( -/obj/effect/turf_decal/tile/red{ +/obj/structure/cable, +/obj/effect/turf_decal/trimline/red/filled/corner{ dir = 1 }, -/obj/effect/turf_decal/tile/red{ +/obj/effect/turf_decal/trimline/red/filled/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/structure/cable, /turf/open/floor/plasteel, /area/security/brig) "akz" = ( @@ -5202,32 +5155,31 @@ /obj/structure/sign/warning/pods{ pixel_x = 32 }, -/obj/effect/turf_decal/tile/red{ +/obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ +/obj/effect/turf_decal/trimline/red/filled/corner, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plasteel, /area/security/brig) "akA" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/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 }, -/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/plasteel/dark, -/area/security/warden) +/area/security/brig) "akB" = ( /obj/structure/closet{ name = "Evidence Closet 4" @@ -5242,62 +5194,98 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, /turf/open/floor/plasteel/dark, -/area/security/warden) +/area/security/brig) "akC" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = -27 +/obj/structure/rack, +/obj/item/grenade/barrier{ + pixel_x = -3; + pixel_y = 1 }, -/obj/machinery/camera{ - c_tag = "Security - Secure Gear Storage"; +/obj/item/grenade/barrier, +/obj/item/grenade/barrier{ + pixel_x = 3; + pixel_y = -1 + }, +/obj/item/grenade/barrier{ + pixel_x = 6; + pixel_y = -2 + }, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/machinery/flasher/portable, -/obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, -/area/security/warden) +/turf/open/floor/plasteel/dark, +/area/ai_monitored/security/armory) "akD" = ( -/obj/machinery/flasher/portable, -/obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, -/area/security/warden) +/obj/effect/turf_decal/trimline/red/filled/corner, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/security/armory) "akE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/cable, -/turf/open/floor/plasteel, -/area/security/warden) -"akF" = ( -/obj/structure/closet/l3closet/security, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, -/area/security/warden) -"akI" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 +/obj/effect/turf_decal/trimline/red/filled/corner{ + dir = 1 }, -/turf/open/floor/plasteel/showroomfloor, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/security/armory) +"akF" = ( +/obj/structure/rack, +/obj/item/gun/energy/laser{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/gun/energy/laser, +/obj/item/gun/energy/laser{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/security/armory) +"akI" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel/dark, /area/security/warden) "akJ" = ( /obj/structure/closet/secure_closet/security/sec, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 +/obj/effect/turf_decal/tile/red{ + dir = 8 }, -/obj/effect/turf_decal/bot, -/turf/open/floor/plasteel/showroomfloor, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, /area/security/warden) "akK" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/structure/cable, -/turf/open/floor/plating, -/area/security/warden) +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 9 + }, +/turf/open/floor/plasteel/dark, +/area/security/brig) "akL" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -5311,9 +5299,6 @@ /turf/open/floor/plasteel, /area/security/main) "akM" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 1 - }, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -5321,6 +5306,9 @@ dir = 4 }, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 + }, /turf/open/floor/plasteel, /area/security/main) "akN" = ( @@ -5891,8 +5879,8 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/effect/turf_decal/tile/red{ - dir = 1 +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 }, /turf/open/floor/plasteel, /area/security/brig) @@ -5905,9 +5893,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -5918,87 +5903,54 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/structure/cable, /turf/open/floor/plasteel/dark, -/area/security/warden) +/area/security/brig) "alS" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/security/brig) -"alT" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, -/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 - }, -/obj/structure/cable, -/turf/open/floor/plasteel/dark, -/area/security/warden) "alU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/structure/rack, +/obj/item/gun/energy/disabler{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/gun/energy/disabler, +/obj/item/gun/energy/disabler{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/structure/cable, -/turf/open/floor/plasteel, -/area/security/warden) -"alV" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/machinery/door/airlock/security{ - name = "Evidence Storage"; - req_access_txt = "3" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, -/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 - }, -/obj/structure/cable, /turf/open/floor/plasteel/dark, +/area/ai_monitored/security/armory) +"alV" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plating, /area/security/warden) "alW" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 4 +/obj/effect/turf_decal/trimline/neutral/filled/corner{ + dir = 8 }, -/obj/structure/cable, -/turf/open/floor/plasteel, -/area/security/warden) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/security/armory) "alX" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/effect/turf_decal/delivery, +/obj/structure/cable, /obj/machinery/door/airlock/security/glass{ name = "Gear Room"; req_one_access_txt = "1;4" }, -/obj/effect/turf_decal/delivery, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, -/obj/structure/cable, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark, /area/security/warden) "alY" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -6014,34 +5966,35 @@ /turf/open/floor/plasteel, /area/security/main) "alZ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 5 +/obj/structure/rack, +/obj/item/gun/energy/ionrifle, +/obj/item/gun/energy/temperature/security, +/obj/effect/turf_decal/tile/red{ + dir = 1 }, -/obj/structure/cable, -/turf/open/floor/plasteel, -/area/security/warden) +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/item/clothing/suit/hooded/ablative, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/security/armory) "ama" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security/glass{ - name = "Secure Gear Storage"; - req_access_txt = "3" +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/delivery, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel, -/area/security/warden) +/area/security/brig) "amb" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/structure/closet/secure_closet/security/sec, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ dir = 4 }, -/obj/structure/cable, -/turf/open/floor/plasteel/showroomfloor, +/turf/open/floor/plasteel/dark, /area/security/warden) "amd" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -6057,22 +6010,12 @@ /turf/open/floor/plasteel, /area/security/main) "ame" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, /obj/structure/cable, -/turf/open/floor/plasteel/showroomfloor, +/turf/open/floor/plasteel/dark, /area/security/warden) "amf" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/power/apc/highcap/five_k{ - areastring = "/area/security/warden"; - dir = 8; - name = "Brig Control APC"; - pixel_x = -25 - }, -/obj/structure/cable, -/turf/open/floor/plasteel/showroomfloor, +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/turf/open/floor/plasteel/dark, /area/security/warden) "amg" = ( /obj/effect/turf_decal/tile/red{ @@ -6578,8 +6521,8 @@ /area/security/brig) "anh" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/effect/turf_decal/tile/red{ - dir = 1 +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 }, /turf/open/floor/plasteel, /area/security/brig) @@ -6601,122 +6544,116 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 4 }, -/obj/effect/turf_decal/tile/red{ +/obj/effect/turf_decal/trimline/red/filled/corner{ dir = 4 }, /turf/open/floor/plasteel, /area/security/brig) "ank" = ( -/obj/structure/table, -/obj/item/storage/box/evidence, -/obj/item/storage/box/evidence, -/obj/item/storage/box/evidence, -/obj/item/hand_labeler, -/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{ +/obj/structure/lattice, +/obj/machinery/camera/motion{ + c_tag = "E.V.A. Storage"; dir = 8 }, -/turf/open/floor/plasteel/dark, -/area/security/warden) +/turf/open/space/basic, +/area/space/nearstation) "anl" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/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/warden) +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/ai_monitored/security/armory) "anm" = ( -/obj/structure/filingcabinet/security{ - pixel_x = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 +/obj/effect/turf_decal/trimline/red/filled/corner{ + dir = 1 }, -/turf/open/floor/plasteel/dark, -/area/security/warden) +/turf/open/floor/plasteel, +/area/security/brig) "ann" = ( /obj/structure/rack, -/obj/item/storage/box/chemimp{ - pixel_x = 4; - pixel_y = 3 - }, -/obj/item/storage/box/trackimp, -/obj/item/storage/lockbox/loyalty, -/obj/item/reagent_containers/glass/bottle/morphine, -/obj/machinery/light/small, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -26 - }, -/obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, -/area/security/warden) -"ano" = ( -/obj/structure/rack, -/obj/item/storage/box/handcuffs, -/obj/item/storage/box/flashbangs{ - pixel_x = -2; +/obj/item/clothing/glasses/hud/security/sunglasses/gars{ + pixel_x = 3; pixel_y = -2 }, -/obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, -/area/security/warden) -"anp" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 1 +/obj/item/clothing/glasses/hud/security/sunglasses/gars{ + pixel_x = 3; + pixel_y = 2 }, -/obj/structure/cable, -/turf/open/floor/plasteel, -/area/security/warden) +/obj/item/clothing/glasses/hud/security/sunglasses{ + pixel_x = -3; + pixel_y = -2 + }, +/obj/item/clothing/glasses/hud/security/sunglasses{ + pixel_x = -3; + pixel_y = 2 + }, +/obj/machinery/airalarm{ + dir = 4; + pixel_x = -22 + }, +/obj/machinery/camera/motion{ + c_tag = "Armory - Internal"; + dir = 4 + }, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/security/armory) +"ano" = ( +/obj/effect/turf_decal/trimline/neutral/filled/corner{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/security/armory) "anq" = ( /obj/structure/rack, -/obj/item/storage/box/firingpins{ - pixel_x = 3; +/obj/item/gun/energy/e_gun{ + pixel_x = -3; pixel_y = 3 }, -/obj/item/storage/box/firingpins, -/obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, -/area/security/warden) -"ans" = ( -/obj/structure/cable, -/turf/open/floor/plasteel/showroomfloor, -/area/security/warden) -"ant" = ( -/obj/structure/table, -/obj/machinery/recharger{ - pixel_y = 4 +/obj/item/gun/energy/e_gun, +/obj/item/gun/energy/e_gun{ + pixel_x = 3; + pixel_y = -3 }, -/obj/structure/cable, -/turf/open/floor/plasteel/showroomfloor, -/area/security/warden) +/obj/machinery/firealarm{ + dir = 8; + pixel_x = 28 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/security/armory) "anu" = ( /obj/machinery/vending/security, /obj/machinery/firealarm{ dir = 8; pixel_x = 28 }, -/turf/open/floor/plasteel/showroomfloor, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, /area/security/warden) "anv" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -6780,13 +6717,11 @@ /turf/open/floor/plasteel, /area/security/main) "anB" = ( -/obj/structure/table, -/obj/item/paper_bin{ - pixel_x = -3; - pixel_y = 7 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 }, /turf/open/floor/plasteel, -/area/security/main) +/area/security/brig) "anC" = ( /obj/machinery/power/apc/highcap/five_k{ areastring = "/area/security/main"; @@ -7159,10 +7094,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/tile/red{ +/obj/structure/cable, +/obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 1 }, -/obj/structure/cable, /turf/open/floor/plasteel, /area/security/brig) "aos" = ( @@ -7172,28 +7107,40 @@ /obj/structure/cable, /turf/open/floor/plasteel, /area/security/brig) -"aot" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 28 - }, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/security/brig) "aou" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/door/airlock/security{ - name = "Evidence Storage"; - req_access_txt = "3" +/obj/structure/rack, +/obj/machinery/light{ + dir = 8 + }, +/obj/item/clothing/head/helmet/riot{ + pixel_x = 3; + pixel_y = 2 + }, +/obj/item/clothing/head/helmet/riot{ + pixel_y = 2 + }, +/obj/item/clothing/head/helmet/riot{ + pixel_x = -3; + pixel_y = 2 + }, +/obj/item/clothing/head/helmet/alt{ + pixel_x = 3; + pixel_y = -2 + }, +/obj/item/clothing/head/helmet/alt{ + pixel_y = -2 + }, +/obj/item/clothing/head/helmet/alt{ + pixel_x = -3; + pixel_y = -2 + }, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 8 }, -/obj/effect/turf_decal/delivery, /obj/structure/cable, -/turf/open/floor/plasteel, -/area/security/warden) +/turf/open/floor/plasteel/dark, +/area/ai_monitored/security/armory) "aov" = ( /obj/structure/extinguisher_cabinet{ pixel_y = -31 @@ -7205,19 +7152,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) -"aow" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security/glass{ - name = "Secure Gear Storage"; - req_access_txt = "3" - }, -/obj/effect/turf_decal/delivery, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, -/obj/structure/cable, -/turf/open/floor/plasteel, -/area/security/warden) "aox" = ( /obj/structure/grille, /turf/open/floor/plating{ @@ -7225,19 +7159,25 @@ }, /area/maintenance/port/fore) "aoy" = ( -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 28 +/obj/structure/closet/secure_closet/lethalshots, +/obj/effect/turf_decal/tile/red{ + dir = 1 }, -/obj/structure/closet/secure_closet/warden, -/obj/item/gun/energy/laser, -/turf/open/floor/plasteel/showroomfloor, -/area/security/warden) +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/security/armory) "aoz" = ( /obj/structure/closet/secure_closet/security/sec, -/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, /obj/structure/cable, -/turf/open/floor/plasteel/showroomfloor, +/turf/open/floor/plasteel/dark, /area/security/warden) "aoB" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -7539,17 +7479,13 @@ /area/maintenance/starboard/fore) "ape" = ( /obj/structure/rack, -/obj/item/storage/belt{ - desc = "Can hold quite a lot of stuff."; - name = "multi-belt" - }, /obj/item/clothing/gloves/color/fyellow, -/obj/effect/spawner/lootdrop/maintenance, /obj/structure/sink/kitchen{ desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; name = "old sink"; pixel_y = 28 }, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating, /area/maintenance/starboard/fore) "apf" = ( @@ -7726,13 +7662,10 @@ /area/maintenance/port/fore) "apD" = ( /obj/item/storage/box/lights/mixed, -/obj/item/flashlight{ - pixel_x = 1; - pixel_y = 5 - }, /obj/machinery/light/small{ dir = 4 }, +/obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/port/fore) "apE" = ( @@ -7740,8 +7673,8 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -27 }, -/obj/effect/turf_decal/tile/red{ - dir = 1 +/obj/effect/turf_decal/trimline/red/filled/corner{ + dir = 8 }, /turf/open/floor/plasteel, /area/security/brig) @@ -7750,70 +7683,38 @@ /obj/structure/cable, /turf/open/floor/plasteel, /area/security/brig) -"apG" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/security/brig) -"apI" = ( -/obj/machinery/computer/prisoner/management{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/plasteel/showroomfloor, -/area/security/warden) "apJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable, -/turf/open/floor/plasteel/showroomfloor, -/area/security/warden) -"apK" = ( -/obj/machinery/photocopier{ - pixel_y = 3 - }, -/turf/open/floor/plasteel/showroomfloor, -/area/security/warden) +/turf/open/floor/plasteel/dark, +/area/ai_monitored/security/armory) "apL" = ( -/obj/machinery/requests_console{ - department = "Security"; - departmentType = 5; - pixel_y = 30 +/obj/machinery/button/door{ + id = "armory"; + name = "Armory Shutters"; + pixel_y = -28; + req_access_txt = "3" }, -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/camera{ - c_tag = "Warden's Office" - }, -/obj/structure/rack, -/obj/item/storage/toolbox/mechanical{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/storage/toolbox/emergency{ - pixel_x = 2; - pixel_y = -3 - }, -/obj/item/wirecutters{ - pixel_y = 2 - }, -/turf/open/floor/plasteel/showroomfloor, -/area/security/warden) +/obj/structure/cable, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/security/armory) "apM" = ( -/obj/structure/table, -/obj/machinery/recharger, -/obj/machinery/airalarm{ - pixel_y = 28 +/obj/machinery/power/apc/highcap/five_k{ + areastring = "/area/ai_monitored/security/armory"; + name = "Armory APC"; + pixel_x = 1; + pixel_y = -23 }, -/turf/open/floor/plasteel/showroomfloor, -/area/security/warden) +/obj/structure/cable, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/security/armory) "apN" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk, -/turf/open/floor/plasteel/showroomfloor, -/area/security/warden) +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/obj/effect/turf_decal/trimline/neutral/filled/corner{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/security/armory) "apP" = ( /obj/machinery/atmospherics/components/trinary/filter/flipped, /obj/effect/decal/cleanable/dirt, @@ -7828,7 +7729,13 @@ dir = 8 }, /obj/machinery/vending/wardrobe/sec_wardrobe, -/turf/open/floor/plasteel/showroomfloor, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, /area/security/warden) "apR" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -8371,49 +8278,58 @@ /turf/open/floor/plasteel/dark, /area/security/brig) "ara" = ( -/obj/machinery/computer/secure_data{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/computer/security/telescreen{ - desc = "Used for watching Prison Wing holding areas."; - name = "Prison Monitor"; - network = list("prison"); - pixel_x = -30 +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 }, -/turf/open/floor/plasteel/showroomfloor, -/area/security/warden) +/obj/machinery/camera{ + c_tag = "Brig - Hallway - Port" + }, +/turf/open/floor/plasteel, +/area/security/brig) "arb" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 8 +/obj/machinery/door/poddoor/shutters{ + id = "armory"; + name = "armory shutters" }, -/obj/structure/cable, -/turf/open/floor/plasteel/showroomfloor, -/area/security/warden) -"arc" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 8 +/obj/effect/turf_decal/tile/neutral{ + dir = 1 }, -/obj/structure/cable, -/turf/open/floor/plasteel/showroomfloor, -/area/security/warden) -"are" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/turf/open/floor/plasteel/showroomfloor, -/area/security/warden) -"arf" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/obj/structure/cable, -/turf/open/floor/plasteel/showroomfloor, -/area/security/warden) -"arg" = ( -/obj/structure/chair/office{ +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/effect/landmark/start/warden, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/security/armory) +"arf" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/security{ + name = "Armory"; + req_access_txt = "3" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/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 + }, /obj/structure/cable, -/turf/open/floor/plasteel/showroomfloor, -/area/security/warden) +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/security/armory) "arh" = ( /obj/item/reagent_containers/glass/bottle/toxin{ pixel_x = 4; @@ -8430,15 +8346,22 @@ /turf/open/floor/plating, /area/maintenance/starboard/secondary) "ari" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/delivery, /obj/structure/cable, -/obj/machinery/holopad/secure, -/turf/open/floor/plasteel/showroomfloor, +/obj/machinery/door/airlock/security/glass{ + name = "Gear Room"; + req_one_access_txt = "1;4" + }, +/turf/open/floor/plasteel/dark, /area/security/warden) "arj" = ( /obj/structure/closet/secure_closet/security/sec, -/obj/effect/turf_decal/bot, -/turf/open/floor/plasteel/showroomfloor, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, /area/security/warden) "ark" = ( /obj/machinery/newscaster/security_unit, @@ -8650,8 +8573,7 @@ /area/maintenance/starboard/fore) "arH" = ( /obj/structure/rack, -/obj/item/extinguisher, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating, /area/maintenance/starboard/fore) "arI" = ( @@ -8662,9 +8584,8 @@ /area/maintenance/starboard/fore) "arJ" = ( /obj/structure/rack, -/obj/item/clothing/suit/poncho, -/obj/item/clothing/head/sombrero, /obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/lootdrop/costume, /turf/open/floor/plating, /area/maintenance/starboard/fore) "arK" = ( @@ -8943,102 +8864,89 @@ /turf/open/floor/plasteel/dark, /area/security/brig) "asp" = ( -/obj/machinery/computer/security{ +/obj/structure/closet/bombcloset/security, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ dir = 4 }, -/obj/structure/cable, -/turf/open/floor/plasteel/showroomfloor, -/area/security/warden) +/turf/open/floor/plasteel, +/area/security/brig) "asq" = ( -/obj/effect/landmark/start/warden, -/obj/structure/chair/office, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/cable, -/turf/open/floor/plasteel/showroomfloor, -/area/security/warden) +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 + }, +/turf/open/floor/plasteel, +/area/security/brig) "asr" = ( -/obj/machinery/computer/crew{ - dir = 8 +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 1 }, -/turf/open/floor/plasteel/showroomfloor, -/area/security/warden) +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/security/brig) "ass" = ( -/obj/machinery/newscaster/security_unit{ - pixel_y = -30 +/obj/effect/turf_decal/trimline/red/filled/corner{ + dir = 1 }, -/obj/item/folder/red, -/obj/item/folder/red, -/obj/structure/table, -/obj/item/book/manual/wiki/security_space_law{ - pixel_x = -3; - pixel_y = 5 +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 }, -/turf/open/floor/plasteel/showroomfloor, -/area/security/warden) +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/security/brig) "ast" = ( -/obj/structure/table, -/obj/item/paper_bin{ - pixel_x = -3; - pixel_y = 7 +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 }, -/obj/item/pen, -/obj/structure/reagent_dispensers/peppertank{ - pixel_y = -32 +/obj/machinery/camera{ + c_tag = "Brig - Hallway - Entrance" }, -/turf/open/floor/plasteel/showroomfloor, -/area/security/warden) +/turf/open/floor/plasteel, +/area/security/brig) "asu" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/filingcabinet/chestdrawer{ - pixel_y = 2 +/obj/effect/turf_decal/trimline/red/filled/corner{ + dir = 4 }, -/turf/open/floor/plasteel/showroomfloor, -/area/security/warden) +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/turf/open/floor/plasteel, +/area/security/brig) "asv" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/cable, -/turf/open/floor/plasteel/showroomfloor, -/area/security/warden) -"asw" = ( -/obj/structure/table, -/obj/machinery/button/door{ - id = "Prison Gate"; - name = "Prison Wing Lockdown"; - pixel_y = 7; - req_access_txt = "2" +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 1 }, -/obj/machinery/button/door{ - id = "Secure Gate"; - name = "Cell Window Control"; - pixel_x = -5; - pixel_y = -3; - specialfunctions = 4 - }, -/obj/machinery/button/door{ - id = "briglockdown"; - name = "Brig Lockdown Control"; - pixel_x = 5; - pixel_y = -3 - }, -/obj/item/radio/intercom{ - dir = 4; - pixel_x = 29; - pixel_y = -28 - }, -/turf/open/floor/plasteel/showroomfloor, -/area/security/warden) -"asx" = ( -/obj/structure/table, -/obj/machinery/recharger{ - pixel_y = 4 +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable, -/turf/open/floor/plasteel/showroomfloor, -/area/security/warden) +/turf/open/floor/plasteel, +/area/security/brig) +"asw" = ( +/obj/effect/turf_decal/trimline/red/filled/corner{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/security/brig) +"asx" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 10 + }, +/turf/open/floor/plasteel, +/area/security/brig) "asy" = ( -/obj/vehicle/ridden/secway, -/obj/item/key/security, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -9046,35 +8954,20 @@ /obj/effect/turf_decal/tile/red{ dir = 8 }, +/obj/vehicle/ridden/secway, +/obj/structure/cable, /turf/open/floor/plasteel, /area/security/main) "asz" = ( +/obj/effect/turf_decal/trimline/red/filled/corner{ + dir = 1 + }, /obj/structure/table, -/obj/item/folder/red, -/obj/item/restraints/handcuffs, -/obj/item/clothing/head/cone{ - pixel_x = -4; +/obj/machinery/recharger{ pixel_y = 4 }, -/obj/item/clothing/head/cone{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/clothing/head/cone{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/clothing/head/cone{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/clothing/head/cone{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/structure/cable, -/turf/open/floor/plasteel/showroomfloor, -/area/security/warden) +/turf/open/floor/plasteel, +/area/security/brig) "asB" = ( /obj/machinery/light/small{ dir = 8 @@ -9089,6 +8982,7 @@ /obj/effect/turf_decal/tile/red{ dir = 8 }, +/obj/structure/cable, /turf/open/floor/plasteel, /area/security/main) "asD" = ( @@ -9645,15 +9539,18 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 4 }, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, /turf/open/floor/plasteel, /area/security/brig) "atO" = ( -/obj/structure/sign/warning/pods, -/turf/closed/wall/r_wall, -/area/security/warden) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/security/brig) "atP" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -9665,31 +9562,38 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "atQ" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/trimline/red/filled/line, /obj/structure/cable, -/turf/open/floor/plating, -/area/security/warden) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/disposalpipe/junction{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/security/brig) "atR" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security/glass{ - name = "Brig Control"; - req_access_txt = "3" +/obj/effect/turf_decal/trimline/red/filled/line, +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/turf_decal/delivery, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, /turf/open/floor/plasteel, -/area/security/warden) +/area/security/brig) "atS" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security/glass{ - name = "Gear Room"; - req_one_access_txt = "1;4" +/obj/effect/turf_decal/trimline/red/filled/corner{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 10 }, -/obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, -/area/security/warden) +/area/security/brig) "atU" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -10027,24 +9931,22 @@ /obj/structure/sign/warning/vacuum/external{ pixel_x = -32 }, -/obj/effect/turf_decal/tile/red{ +/obj/effect/turf_decal/trimline/red/filled/corner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/red/filled/corner{ dir = 8 }, /turf/open/floor/plasteel, /area/security/brig) "auV" = ( -/obj/structure/disposalpipe/junction, /obj/structure/cable, +/obj/structure/disposalpipe/junction, /turf/open/floor/plasteel, /area/security/brig) "auW" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/turf/open/floor/plasteel, +/obj/structure/sign/warning/pods, +/turf/closed/wall/r_wall, /area/security/brig) "auX" = ( /obj/machinery/photocopier, @@ -10077,78 +9979,47 @@ /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/hos) "auY" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel, /area/security/brig) "auZ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, /obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/red{ +/turf/open/floor/plating, +/area/security/warden) +"ava" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/security/brig) -"ava" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/window/westleft{ - base_state = "right"; - dir = 2; - icon_state = "right"; - name = "Reception Window" - }, -/obj/machinery/door/window/brigdoor{ - dir = 1; - name = "Brig Control Desk"; - req_access_txt = "3" - }, -/obj/item/paper, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/cable, -/turf/open/floor/plasteel/showroomfloor, -/area/security/warden) "avb" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 1 - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/camera{ - c_tag = "Brig - Hallway - Entrance" - }, -/obj/effect/turf_decal/tile/red{ - dir = 4 +/obj/structure/disposalpipe/segment{ + dir = 9 }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel, /area/security/brig) "avc" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/effect/turf_decal/tile/red{ - dir = 4 + dir = 5 }, /turf/open/floor/plasteel, /area/security/brig) "avd" = ( -/obj/item/radio/intercom{ - pixel_y = 26 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, /turf/open/floor/plasteel, /area/security/brig) "ave" = ( @@ -10158,8 +10029,8 @@ /obj/structure/extinguisher_cabinet{ pixel_y = 30 }, -/obj/effect/turf_decal/tile/red{ - dir = 4 +/obj/machinery/light{ + dir = 1 }, /turf/open/floor/plasteel, /area/security/brig) @@ -10167,20 +10038,17 @@ /obj/machinery/firealarm{ pixel_y = 28 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 }, /turf/open/floor/plasteel, /area/security/brig) "avg" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/red{ - dir = 4 +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 1 }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/open/floor/plasteel, /area/security/brig) "avh" = ( @@ -10188,10 +10056,11 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, /obj/structure/cable, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 1 + }, +/obj/effect/landmark/event_spawn, /turf/open/floor/plasteel, /area/security/brig) "avi" = ( @@ -10202,13 +10071,7 @@ dir = 8; pixel_x = 30 }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, +/obj/effect/turf_decal/trimline/red/filled/corner, /turf/open/floor/plasteel, /area/security/brig) "avj" = ( @@ -10566,7 +10429,7 @@ "awa" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/red{ +/obj/effect/turf_decal/trimline/red/filled/line{ dir = 8 }, /turf/open/floor/plasteel, @@ -10576,48 +10439,45 @@ dir = 5 }, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 + }, /turf/open/floor/plasteel, /area/security/brig) "awc" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/cable, -/turf/open/floor/plasteel, -/area/security/brig) -"awd" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/open/floor/plasteel, /area/security/brig) "awe" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 9 + }, /turf/open/floor/plasteel, /area/security/brig) "awf" = ( -/obj/structure/disposalpipe/junction/flip{ - dir = 4 - }, /obj/structure/cable, -/turf/open/floor/plasteel, -/area/security/brig) +/obj/structure/disposalpipe/segment, +/turf/open/floor/plasteel/showroomfloor, +/area/security/warden) "awg" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/obj/structure/disposalpipe/segment{ +/obj/structure/chair/office{ dir = 4 }, /obj/structure/cable, -/turf/open/floor/plasteel, -/area/security/brig) +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, +/turf/open/floor/plasteel/showroomfloor, +/area/security/warden) "awh" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -10625,10 +10485,10 @@ /turf/open/floor/plasteel, /area/security/brig) "awi" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 8 }, -/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /mob/living/simple_animal/bot/secbot/beepsky{ desc = "It's Officer Beepsky! Powered by a potato and a shot of whiskey, and with a sturdier reinforced chassis, too."; health = 45; @@ -10638,21 +10498,20 @@ /turf/open/floor/plasteel, /area/security/brig) "awj" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, /turf/open/floor/plasteel, /area/security/brig) "awl" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, /turf/open/floor/plasteel, /area/security/brig) "awn" = ( @@ -10688,8 +10547,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ +/obj/effect/turf_decal/trimline/red/filled/line{ dir = 4 }, /turf/open/floor/plasteel, @@ -10740,7 +10598,7 @@ /obj/structure/closet/crate{ icon_state = "crateopen" }, -/obj/item/storage/box/donkpockets, +/obj/effect/spawner/lootdrop/donkpockets, /turf/open/floor/plating, /area/maintenance/fore) "awB" = ( @@ -10875,7 +10733,7 @@ /area/maintenance/port/fore) "awS" = ( /obj/structure/closet/crate, -/obj/item/coin/silver, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating, /area/maintenance/port/fore) "awT" = ( @@ -10909,8 +10767,8 @@ /obj/structure/disposalpipe/trunk{ dir = 1 }, -/obj/effect/turf_decal/tile/red{ - dir = 8 +/obj/effect/turf_decal/trimline/red/filled/corner{ + dir = 1 }, /turf/open/floor/plasteel, /area/security/brig) @@ -10919,120 +10777,124 @@ dir = 4 }, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/security/brig) "axc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/machinery/light, -/obj/machinery/camera{ - c_tag = "Brig - Hallway - Port"; +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 1 }, -/obj/machinery/door_timer{ - id = "Cell 1"; - name = "Cell 1"; - pixel_y = -32 - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, /turf/open/floor/plasteel, /area/security/brig) "axd" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/security/brig) -"axe" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/obj/structure/cable, -/turf/open/floor/plasteel, -/area/security/brig) -"axf" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/structure/cable, +/turf/open/floor/plasteel, +/area/security/brig) +"axe" = ( /obj/machinery/door_timer{ id = "Cell 2"; name = "Cell 2"; pixel_y = -32 }, /obj/effect/landmark/event_spawn, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 }, +/obj/machinery/light, +/turf/open/floor/plasteel, +/area/security/brig) +"axf" = ( +/obj/machinery/door_timer{ + id = "Cell 3"; + name = "Cell 3"; + pixel_x = 32; + pixel_y = -32 + }, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/security/brig) "axg" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/turf_decal/tile/red, +/obj/machinery/light, +/obj/machinery/door_timer{ + id = "Cell 1"; + name = "Cell 1"; + pixel_y = -32 + }, /turf/open/floor/plasteel, /area/security/brig) "axh" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/obj/machinery/door_timer{ - id = "Cell 3"; - name = "Cell 3"; - pixel_y = -32 - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/security/brig) +/obj/structure/closet/secure_closet/warden, +/obj/item/gun/energy/laser, +/turf/open/floor/plasteel/showroomfloor, +/area/security/warden) "axi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/effect/turf_decal/trimline/red/filled/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/security/brig) "axj" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 8 + }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/security/brig) -"axk" = ( -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 4 + dir = 5 }, /turf/open/floor/plasteel, /area/security/brig) "axl" = ( +/obj/structure/closet/crate/secure/weapon{ + desc = "A secure clothing crate."; + name = "formal uniform crate"; + req_access_txt = "3" + }, +/obj/item/clothing/under/rank/security/officer/formal, +/obj/item/clothing/under/rank/security/officer/formal, +/obj/item/clothing/under/rank/security/officer/formal, +/obj/item/clothing/under/rank/security/officer/formal, +/obj/item/clothing/under/rank/security/officer/formal, +/obj/item/clothing/under/rank/security/officer/formal, +/obj/item/clothing/suit/security/officer, +/obj/item/clothing/suit/security/officer, +/obj/item/clothing/suit/security/officer, +/obj/item/clothing/suit/security/officer, +/obj/item/clothing/suit/security/officer, +/obj/item/clothing/suit/security/officer, +/obj/item/clothing/under/rank/security/warden/formal, +/obj/item/clothing/suit/security/warden, +/obj/item/clothing/under/rank/security/head_of_security/formal, +/obj/item/clothing/suit/security/hos, +/obj/item/clothing/head/beret/sec/navyofficer, +/obj/item/clothing/head/beret/sec/navyofficer, +/obj/item/clothing/head/beret/sec/navyofficer, +/obj/item/clothing/head/beret/sec/navyofficer, +/obj/item/clothing/head/beret/sec/navyofficer, +/obj/item/clothing/head/beret/sec/navyofficer, +/obj/item/clothing/head/beret/sec/navywarden, +/obj/item/clothing/head/beret/sec/navyhos, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/structure/extinguisher_cabinet{ + pixel_x = 27 + }, +/obj/effect/turf_decal/tile/blue, +/obj/structure/cable, +/turf/open/floor/plasteel/dark, +/area/security/warden) +"axm" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -11045,53 +10907,28 @@ /obj/machinery/button/flasher{ id = "secentranceflasher"; name = "Brig Entrance Flasher"; - pixel_x = -3; + pixel_x = -6; pixel_y = -38; req_access_txt = "1" }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 +/obj/machinery/button/flasher{ + id = "holdingflash"; + name = "Holding Cell Flasher"; + pixel_x = 6; + pixel_y = -38; + req_access_txt = "1" }, /obj/structure/cable, /turf/open/floor/plasteel, /area/security/brig) -"axm" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/security/brig) "axn" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/security/brig) -"axo" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/cable, /turf/open/floor/plasteel, /area/security/brig) -"axp" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red, -/turf/open/floor/plasteel, -/area/security/brig) -"axq" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/obj/effect/turf_decal/tile/red, -/turf/open/floor/plasteel, -/area/security/brig) -"axr" = ( +"axo" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -11100,8 +10937,24 @@ pixel_y = -26; req_access_txt = "1" }, +/turf/open/floor/plasteel, +/area/security/brig) +"axp" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/plasteel, +/area/security/brig) +"axq" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, +/turf/open/floor/plasteel, +/area/security/brig) +"axr" = ( /obj/effect/landmark/event_spawn, -/obj/effect/turf_decal/tile/red, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 1 + }, /turf/open/floor/plasteel, /area/security/brig) "axs" = ( @@ -11117,7 +10970,6 @@ c_tag = "Brig - Hallway - Starboard"; dir = 1 }, -/obj/effect/turf_decal/tile/red, /turf/open/floor/plasteel, /area/security/brig) "axt" = ( @@ -11125,15 +10977,17 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/effect/turf_decal/tile/red, /obj/structure/cable, +/obj/effect/turf_decal/trimline/red/filled/line, /turf/open/floor/plasteel, /area/security/brig) "axu" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 1 }, -/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/trimline/red/filled/corner{ + dir = 8 + }, /turf/open/floor/plasteel, /area/security/brig) "axv" = ( @@ -11143,13 +10997,9 @@ /obj/structure/extinguisher_cabinet{ pixel_x = 27 }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ +/obj/effect/turf_decal/trimline/red/filled/corner{ dir = 4 }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, /turf/open/floor/plasteel, /area/security/brig) "axw" = ( @@ -11318,13 +11168,11 @@ }, /area/maintenance/starboard/fore) "axR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 8 }, -/obj/machinery/holopad, -/obj/effect/turf_decal/tile/red{ - dir = 4 +/obj/machinery/photocopier{ + pixel_y = 3 }, /turf/open/floor/plasteel, /area/security/brig) @@ -11547,82 +11395,71 @@ dir = 8 }, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/security/brig) "ayy" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/cable, -/turf/open/floor/plating, -/area/security/brig) -"ayz" = ( -/obj/machinery/door/window/brigdoor/security/cell{ - id = "Cell 2"; - name = "Cell 2" - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/structure/cable, -/turf/open/floor/plasteel, -/area/security/brig) -"ayA" = ( -/obj/machinery/door/window/brigdoor/security/cell{ - id = "Cell 3"; - name = "Cell 3" - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/structure/cable, -/turf/open/floor/plasteel, -/area/security/brig) -"ayB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/machinery/door/airlock/security/glass{ - id_tag = "innerbrig"; - name = "Brig"; - req_access_txt = "63" - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/structure/cable, -/turf/open/floor/plasteel, -/area/security/brig) -"ayC" = ( -/obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/structure/cable, +/turf/open/floor/plasteel/showroomfloor, +/area/security/warden) +"ayz" = ( /obj/machinery/door/airlock/security/glass{ - id_tag = "innerbrig"; - name = "Brig"; - req_access_txt = "63" + name = "Brig Control"; + req_access_txt = "3" }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 +/obj/structure/cable, +/obj/machinery/door/firedoor, +/turf/open/floor/plasteel/showroomfloor, +/area/security/warden) +"ayA" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 1 }, +/obj/machinery/camera{ + c_tag = "Warden's Office"; + dir = 4 + }, +/turf/open/floor/plasteel/showroomfloor, +/area/security/warden) +"ayB" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel/showroomfloor, +/area/security/warden) +"ayC" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plasteel, /area/security/brig) "ayE" = ( -/obj/machinery/door/window/brigdoor/security/holding{ - id = "Holding Cell"; - name = "Holding Cell" +/obj/structure/table/reinforced, +/obj/machinery/door/window/westleft{ + base_state = "right"; + dir = 4; + icon_state = "right"; + name = "Outer Window" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 +/obj/machinery/door/window/brigdoor{ + dir = 8; + name = "Brig Control Desk"; + req_access_txt = "3" }, +/obj/item/folder/red, +/obj/item/folder/red, +/obj/item/poster/random_official, /obj/structure/cable, -/turf/open/floor/plasteel, -/area/security/brig) +/obj/item/book/manual/wiki/security_space_law{ + pixel_x = -3; + pixel_y = 5 + }, +/turf/open/floor/plasteel/showroomfloor, +/area/security/warden) "ayF" = ( /turf/closed/wall/r_wall, /area/security/detectives_office) @@ -11643,6 +11480,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel, /area/security/detectives_office) "ayI" = ( @@ -11783,13 +11621,18 @@ /turf/open/floor/plasteel/dark, /area/engine/engineering) "azb" = ( -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, -/obj/effect/turf_decal/tile/red{ - dir = 4 +/obj/machinery/door/airlock/security/glass{ + name = "Brig Control"; + req_access_txt = "3" }, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/machinery/door/firedoor, /turf/open/floor/plasteel, -/area/security/brig) +/area/security/warden) "azd" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple, /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ @@ -12043,9 +11886,12 @@ "azE" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, /turf/open/floor/plasteel, /area/security/brig) -"azF" = ( +"azG" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, @@ -12053,137 +11899,54 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel, -/area/security/brig) -"azG" = ( -/obj/machinery/flasher{ - id = "Cell 2"; - pixel_x = -28 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel, -/area/security/brig) -"azH" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 1 - }, -/obj/machinery/flasher{ - id = "Cell 3"; - pixel_x = -28 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel, -/area/security/brig) -"azI" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, +/obj/effect/landmark/event_spawn, /obj/structure/cable, /turf/open/floor/plasteel, /area/security/brig) -"azJ" = ( -/obj/machinery/holopad, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/security/brig) "azK" = ( -/obj/machinery/light/small{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/effect/turf_decal/tile/red{ +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/security/brig) -"azL" = ( -/obj/structure/chair, -/obj/machinery/flasher{ - id = "holdingflash"; - pixel_x = -25 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel, -/area/security/brig) -"azM" = ( -/obj/structure/chair, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/security/brig) "azN" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/machinery/door/airlock/security/glass{ + id_tag = "innerbrig"; + name = "Brig"; + req_access_txt = "63" + }, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 9 + }, /turf/open/floor/plasteel, /area/security/brig) "azO" = ( -/obj/structure/chair, -/obj/effect/landmark/event_spawn, +/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/security/brig) "azP" = ( -/obj/structure/rack, -/obj/machinery/flasher{ - id = "holdingflash"; - pixel_x = 25 - }, -/obj/item/clothing/under/rank/prisoner, -/obj/item/clothing/under/rank/prisoner, -/obj/item/clothing/under/rank/prisoner, -/obj/item/clothing/under/rank/prisoner, -/obj/item/clothing/under/rank/prisoner, -/obj/item/clothing/shoes/sneakers/orange, -/obj/item/clothing/shoes/sneakers/orange, -/obj/item/clothing/shoes/sneakers/orange, -/obj/item/clothing/shoes/sneakers/orange, -/obj/item/clothing/shoes/sneakers/orange, -/obj/item/restraints/handcuffs, -/obj/item/restraints/handcuffs, -/obj/item/restraints/handcuffs, -/obj/item/restraints/handcuffs, -/obj/item/restraints/handcuffs, +/obj/effect/decal/cleanable/dirt, +/obj/structure/chair, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/security/brig) "azQ" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plating, +/area/security/brig) +"azR" = ( /obj/machinery/firealarm{ dir = 4; pixel_x = -24 }, -/obj/structure/filingcabinet, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/light_switch{ - pixel_y = 25 - }, -/turf/open/floor/plasteel/grimy, -/area/security/detectives_office) -"azR" = ( /turf/open/floor/plasteel/grimy, /area/security/detectives_office) "azS" = ( @@ -12697,129 +12460,90 @@ /turf/open/floor/plasteel/dark, /area/hallway/primary/fore) "aAY" = ( +/obj/effect/decal/cleanable/dirt, /obj/structure/bed, /obj/item/bedsheet, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel, -/area/security/brig) -"aAZ" = ( -/obj/structure/closet/secure_closet/brig{ - id = "Cell 1"; - name = "Cell 1 Locker" - }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/security/brig) "aBa" = ( -/obj/structure/closet/secure_closet/brig{ - id = "Cell 2"; - name = "Cell 2 Locker" - }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/flasher{ + id = "Cell 3"; + pixel_x = -23; + pixel_y = -23 + }, +/obj/structure/bed, +/obj/item/bedsheet, /turf/open/floor/plasteel, /area/security/brig) "aBb" = ( -/obj/structure/closet/secure_closet/brig{ - id = "Cell 3"; - name = "Cell 3 Locker" - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel, -/area/security/brig) -"aBc" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -26 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, +/obj/effect/landmark/start/warden, +/obj/structure/chair/office, /obj/structure/cable, -/turf/open/floor/plasteel, -/area/security/brig) +/turf/open/floor/plasteel/showroomfloor, +/area/security/warden) +"aBc" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + id = "briglockdown"; + name = "brig shutters" + }, +/turf/open/floor/plating, +/area/security/warden) "aBd" = ( -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 9 }, /turf/open/floor/plasteel, /area/security/brig) "aBe" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/extinguisher_cabinet{ - pixel_x = 27 - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, +/obj/machinery/holopad, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/trimline/red/filled/line, /turf/open/floor/plasteel, /area/security/brig) "aBf" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 4 - }, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel, -/area/security/brig) -"aBg" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel, +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plating, /area/security/brig) "aBh" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 - }, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 5 + }, /turf/open/floor/plasteel, /area/security/brig) "aBi" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/machinery/airalarm{ - dir = 1; - pixel_y = -22 - }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/security/brig) "aBj" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 8 - }, -/obj/machinery/light/small{ +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/security/brig) "aBk" = ( -/obj/structure/closet/secure_closet/detective, -/obj/effect/landmark/blobstart, -/obj/machinery/camera{ - c_tag = "Detective's Office"; - dir = 4 - }, -/turf/open/floor/plasteel/grimy, -/area/security/detectives_office) +/obj/effect/decal/cleanable/dirt, +/obj/structure/chair, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/security/brig) "aBl" = ( -/obj/machinery/holopad, +/obj/machinery/light_switch{ + pixel_x = -25 + }, /turf/open/floor/plasteel/grimy, /area/security/detectives_office) "aBn" = ( @@ -13267,86 +12991,56 @@ /turf/open/floor/plating, /area/security/brig) "aCn" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, -/obj/machinery/door/airlock/security/glass{ - id_tag = "outerbrig"; - name = "Brig"; - req_access_txt = "63" - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ +/obj/structure/disposalpipe/segment{ dir = 4 }, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel, /area/security/brig) "aCp" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/door/firedoor, -/obj/machinery/flasher{ - id = "secentranceflasher"; - pixel_x = 25 - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, -/obj/machinery/door/airlock/security/glass{ - id_tag = "outerbrig"; - name = "Brig"; - req_access_txt = "63" - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 4 +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + id = "briglockdown"; + name = "brig shutters" }, /turf/open/floor/plasteel, /area/security/brig) "aCq" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security/glass{ - name = "Security Desk"; - req_access_txt = "63" +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel, /area/security/brig) "aCr" = ( -/obj/machinery/door/airlock/security{ - name = "Court Cell"; - req_access_txt = "63" +/obj/structure/chair{ + dir = 1 }, -/turf/open/floor/plasteel/dark, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, /area/security/brig) "aCs" = ( -/obj/structure/table/wood, +/obj/effect/decal/cleanable/dirt, +/obj/structure/chair, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/security/brig) +"aCt" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 + }, +/obj/structure/cable, /obj/machinery/power/apc{ areastring = "/area/security/detectives_office"; dir = 8; name = "Detective APC"; pixel_x = -25 }, -/obj/item/taperecorder{ - pixel_x = 3 - }, -/obj/item/storage/box/evidence, -/obj/item/flashlight/seclite, -/obj/structure/cable, -/turf/open/floor/plasteel/grimy, -/area/security/detectives_office) -"aCt" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 6 - }, -/obj/structure/cable, /turf/open/floor/plasteel/grimy, /area/security/detectives_office) "aCu" = ( @@ -13586,12 +13280,6 @@ "aDb" = ( /turf/closed/wall, /area/construction/mining/aux_base) -"aDc" = ( -/obj/structure/closet/crate, -/obj/item/coin/silver, -/obj/effect/spawner/lootdrop/maintenance, -/turf/open/floor/plating, -/area/maintenance/port/fore) "aDh" = ( /obj/machinery/firealarm{ dir = 4; @@ -13690,6 +13378,7 @@ "aDr" = ( /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door/airlock/vault{ + name = "Vault"; req_access_txt = "53" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -13705,6 +13394,7 @@ dir = 8 }, /obj/structure/cable, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel/dark, /area/security/nuke_storage) "aDs" = ( @@ -13729,57 +13419,59 @@ /turf/open/floor/plasteel, /area/hallway/primary/fore) "aDw" = ( -/obj/effect/turf_decal/tile/red{ +/obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 }, /turf/open/floor/plasteel, /area/hallway/primary/fore) "aDx" = ( -/obj/structure/chair/stool, -/obj/effect/turf_decal/tile/red{ +/obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 }, +/obj/structure/chair/stool, /turf/open/floor/plasteel, /area/hallway/primary/fore) "aDy" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 1 + }, /obj/structure/sign/warning/electricshock{ pixel_y = 32 }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, /turf/open/floor/plasteel, /area/hallway/primary/fore) "aDz" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 1 + }, /obj/structure/sign/warning/electricshock{ pixel_y = 32 }, /obj/machinery/camera{ c_tag = "Fore Primary Hallway Cells" }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, /turf/open/floor/plasteel, /area/hallway/primary/fore) "aDA" = ( /obj/machinery/light{ dir = 1 }, -/obj/machinery/status_display/evac{ - pixel_y = 32 - }, -/obj/effect/turf_decal/tile/red{ +/obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 }, /turf/open/floor/plasteel, /area/hallway/primary/fore) "aDB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/turf_decal/tile/red{ +/obj/structure/cable, +/obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 }, -/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 + }, +/obj/structure/sign/warning/electricshock{ + pixel_y = 32 + }, /turf/open/floor/plasteel, /area/hallway/primary/fore) "aDC" = ( @@ -13787,92 +13479,49 @@ /area/hallway/primary/fore) "aDD" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/effect/turf_decal/tile/red{ - dir = 4 +/obj/structure/cable, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 1 }, /turf/open/floor/plasteel, /area/hallway/primary/fore) "aDE" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/preopen{ - id = "briglockdown"; - name = "brig shutters" +/obj/machinery/computer/prisoner/management{ + dir = 4 }, -/obj/structure/cable, -/turf/open/floor/plating, -/area/security/brig) +/obj/structure/disposalpipe/segment, +/turf/open/floor/plasteel/showroomfloor, +/area/security/warden) "aDF" = ( -/obj/machinery/computer/secure_data, -/obj/machinery/button/flasher{ - id = "secentranceflasher"; - name = "Brig Entrance Flash Control"; - pixel_x = -24; - pixel_y = 24; - req_access_txt = "1" - }, -/obj/machinery/button/door{ - id = "Secure Gate"; - name = "Cell Window Control"; - pixel_x = 5; - pixel_y = 27; - specialfunctions = 4 - }, -/obj/machinery/button/door{ - id = "briglockdown"; - name = "Brig Lockdown Control"; - pixel_x = 5; - pixel_y = 37 +/obj/machinery/flasher{ + id = "holdingflash"; + pixel_x = 25 }, /obj/machinery/light/small{ - dir = 1 + dir = 4 }, -/obj/machinery/button/door{ - desc = "A remote control switch for the medbay foyer."; - id = "innerbrig"; - name = "Brig Interior Doors Control"; - normaldoorcontrol = 1; - pixel_x = -5; - pixel_y = 37; - req_access_txt = "63" +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 9 }, -/obj/machinery/button/door{ - desc = "A remote control switch for the medbay foyer."; - id = "outerbrig"; - name = "Brig Exterior Doors Control"; - normaldoorcontrol = 1; - pixel_x = -5; - pixel_y = 27; - req_access_txt = "63" - }, -/turf/open/floor/plasteel/dark, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, /area/security/brig) "aDG" = ( -/obj/structure/filingcabinet/chestdrawer{ +/obj/structure/rack, +/obj/item/storage/box/firingpins{ + pixel_x = 3; pixel_y = 3 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/item/storage/box/firingpins, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue, /turf/open/floor/plasteel/dark, -/area/security/brig) +/area/security/warden) "aDH" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 1 - }, -/obj/machinery/button/flasher{ - id = "holdingflash"; - name = "holding cell flasher button"; - pixel_x = 23; - pixel_y = 23; - req_access_txt = "1" - }, -/obj/machinery/camera{ - c_tag = "Brig - Desk"; - dir = 8 - }, -/obj/item/radio/intercom{ - pixel_x = 29; - pixel_y = -2 - }, -/obj/structure/cable, +/obj/structure/closet/secure_closet/brig, /turf/open/floor/plasteel/dark, /area/security/brig) "aDI" = ( @@ -13887,6 +13536,10 @@ dir = 4 }, /obj/machinery/disposal/bin, +/obj/machinery/camera{ + c_tag = "Detective's Office"; + dir = 4 + }, /turf/open/floor/plasteel/grimy, /area/security/detectives_office) "aDJ" = ( @@ -13906,6 +13559,7 @@ dir = 4 }, /obj/structure/cable, +/obj/machinery/holopad, /turf/open/floor/plasteel/grimy, /area/security/detectives_office) "aDL" = ( @@ -14405,65 +14059,36 @@ /turf/open/floor/plasteel, /area/hallway/primary/fore) "aEV" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/window/westleft{ - base_state = "right"; - icon_state = "right"; - name = "Outer Window" - }, -/obj/machinery/door/window/brigdoor{ - dir = 4; - name = "Security Desk"; - req_access_txt = "1" - }, -/obj/item/radio/off, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "briglockdown"; - name = "brig shutters" - }, -/obj/structure/cable, -/turf/open/floor/plasteel/dark, -/area/security/brig) -"aEW" = ( -/obj/structure/chair/office{ - dir = 8 - }, -/obj/structure/cable, -/turf/open/floor/plasteel/dark, -/area/security/brig) -"aEX" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 1 - }, -/obj/structure/cable, -/turf/open/floor/plasteel/dark, -/area/security/brig) -"aEY" = ( -/obj/machinery/airalarm{ - dir = 8; - pixel_x = 24 - }, -/obj/machinery/light/small{ +/obj/machinery/light{ dir = 4 }, -/obj/structure/cable, +/turf/open/floor/plasteel, +/area/hallway/primary/fore) +"aEW" = ( +/obj/machinery/flasher/portable, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/security/warden) +"aEX" = ( +/obj/effect/landmark/event_spawn, /turf/open/floor/plasteel/dark, /area/security/brig) "aEZ" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/table, -/obj/item/bodybag, -/obj/item/clothing/gloves/color/latex, -/obj/item/clothing/mask/surgical, -/turf/open/floor/plasteel/dark, -/area/security/detectives_office) -"aFa" = ( /obj/machinery/door/window{ dir = 1 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/grimy, +/area/security/detectives_office) +"aFa" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/open/floor/plasteel/grimy, /area/security/detectives_office) "aFb" = ( /obj/machinery/door/airlock/maintenance{ @@ -14965,9 +14590,6 @@ /turf/open/floor/plasteel, /area/hallway/primary/fore) "aGo" = ( -/obj/machinery/computer/warrant{ - dir = 8 - }, /obj/effect/turf_decal/tile/red, /turf/open/floor/plasteel, /area/hallway/primary/fore) @@ -14983,62 +14605,53 @@ /turf/open/floor/plasteel/white, /area/medical/chemistry) "aGq" = ( -/obj/machinery/computer/security{ +/obj/machinery/door/firedoor, +/obj/machinery/flasher{ + id = "secentranceflasher"; + pixel_x = 25 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, -/obj/machinery/newscaster/security_unit{ - pixel_y = -30 +/obj/machinery/door/airlock/security/glass{ + id_tag = "outerbrig"; + name = "Brig"; + req_access_txt = "63" }, -/turf/open/floor/plasteel/dark, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/turf/open/floor/plasteel, /area/security/brig) "aGr" = ( -/obj/structure/table, -/obj/item/folder/red{ - pixel_x = 3 - }, -/obj/item/folder/white{ - pixel_x = -4; - pixel_y = 2 - }, -/obj/machinery/computer/security/telescreen{ - desc = "Used for watching Prison Wing holding areas."; - dir = 1; - name = "Prison Monitor"; - network = list("prison"); - pixel_y = -30 - }, +/obj/structure/rack, +/obj/item/clothing/under/rank/prisoner, +/obj/item/clothing/under/rank/prisoner, +/obj/item/clothing/under/rank/prisoner, +/obj/item/clothing/under/rank/prisoner, +/obj/item/clothing/under/rank/prisoner, +/obj/item/clothing/shoes/sneakers/orange, +/obj/item/clothing/shoes/sneakers/orange, +/obj/item/clothing/shoes/sneakers/orange, +/obj/item/clothing/shoes/sneakers/orange, +/obj/item/clothing/shoes/sneakers/orange, /obj/item/restraints/handcuffs, -/turf/open/floor/plasteel/dark, -/area/security/brig) -"aGs" = ( -/obj/structure/table, -/obj/item/paper_bin{ - pixel_x = -3; - pixel_y = 7 - }, -/obj/item/pen, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 24 - }, -/obj/structure/reagent_dispensers/peppertank{ - pixel_y = -30 - }, -/turf/open/floor/plasteel/dark, -/area/security/brig) -"aGt" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, +/obj/item/restraints/handcuffs, +/obj/item/restraints/handcuffs, +/obj/item/restraints/handcuffs, +/obj/item/restraints/handcuffs, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, /area/security/brig) "aGu" = ( -/obj/structure/bodycontainer/morgue, -/turf/open/floor/plasteel/dark, +/obj/structure/filingcabinet, +/turf/open/floor/plasteel/grimy, /area/security/detectives_office) "aGv" = ( /obj/machinery/light/small, -/turf/open/floor/plasteel/dark, +/obj/effect/landmark/blobstart, +/obj/structure/closet/secure_closet/detective, +/turf/open/floor/plasteel/grimy, /area/security/detectives_office) "aGw" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -15557,16 +15170,20 @@ /turf/closed/wall, /area/security/courtroom) "aHE" = ( -/turf/closed/wall/r_wall, -/area/security/courtroom) +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, +/obj/effect/turf_decal/trimline/red/filled/corner, +/turf/open/floor/plasteel, +/area/security/brig) "aHF" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security{ - name = "Court Cell"; - req_access_txt = "63" +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 1 }, -/turf/open/floor/plasteel/dark, -/area/security/courtroom) +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 9 + }, +/obj/structure/cable, +/turf/open/floor/plasteel, +/area/hallway/primary/fore) "aHG" = ( /turf/closed/wall, /area/lawoffice) @@ -15575,6 +15192,7 @@ name = "Law Office Maintenance"; req_access_txt = "38" }, +/obj/structure/cable, /turf/open/floor/plating, /area/maintenance/fore) "aHI" = ( @@ -15588,7 +15206,7 @@ /area/crew_quarters/toilet/restrooms) "aHJ" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/structure/mirror{ @@ -15687,8 +15305,8 @@ /area/crew_quarters/dorms) "aHV" = ( /obj/structure/closet, -/obj/item/storage/box/donkpockets, /obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/lootdrop/donkpockets, /turf/open/floor/plating, /area/maintenance/starboard/fore) "aHX" = ( @@ -16662,6 +16280,7 @@ dir = 1 }, /obj/structure/cable, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel, /area/crew_quarters/dorms) "aKn" = ( @@ -16759,9 +16378,7 @@ /obj/structure/closet/crate{ icon_state = "crateopen" }, -/obj/item/wirecutters, -/obj/item/weldingtool, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/lootdrop/maintenance/three, /turf/open/floor/plating, /area/maintenance/starboard/fore) "aKx" = ( @@ -17071,10 +16688,6 @@ /obj/structure/table, /obj/item/assembly/signaler, /obj/item/assembly/signaler, -/obj/item/multitool, -/obj/item/multitool{ - pixel_x = 4 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 }, @@ -17256,7 +16869,7 @@ /area/crew_quarters/locker) "aLJ" = ( /obj/structure/rack, -/obj/item/stock_parts/matter_bin, +/obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating{ icon_state = "platingdmg2" }, @@ -17343,7 +16956,7 @@ /area/crew_quarters/locker) "aLU" = ( /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, @@ -18015,8 +17628,12 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red, /turf/open/floor/plasteel/dark, -/area/security/warden) +/area/security/brig) "aNB" = ( /obj/structure/window/reinforced{ dir = 4 @@ -19034,18 +18651,11 @@ /area/crew_quarters/locker) "aPM" = ( /obj/structure/rack, -/obj/item/storage/toolbox/mechanical{ - pixel_x = -2; - pixel_y = -1 - }, -/obj/item/storage/toolbox/mechanical{ - pixel_x = 4; - pixel_y = -4 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 }, /obj/effect/turf_decal/tile/neutral, +/obj/effect/spawner/lootdrop/costume, /turf/open/floor/plasteel, /area/crew_quarters/locker) "aPN" = ( @@ -19183,6 +18793,7 @@ }, /obj/item/storage/belt/utility, /obj/item/storage/belt/utility, +/obj/item/storage/belt/utility, /turf/open/floor/plasteel, /area/engine/engineering) "aQd" = ( @@ -19355,12 +18966,12 @@ dir = 4; pixel_x = 27 }, -/obj/item/clothing/gloves/color/yellow, /obj/item/t_scanner, /obj/effect/turf_decal/tile/brown, /obj/effect/turf_decal/tile/brown{ dir = 4 }, +/obj/item/clothing/gloves/color/fyellow, /turf/open/floor/plasteel, /area/storage/primary) "aQz" = ( @@ -19621,7 +19232,6 @@ "aRa" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/costume, -/obj/effect/spawner/lootdrop/costume, /obj/item/clothing/mask/balaclava, /obj/machinery/airalarm{ dir = 8; @@ -19641,7 +19251,7 @@ dir = 5 }, /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, @@ -20204,6 +19814,14 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/engine/engineering) +"aSy" = ( +/obj/machinery/dna_scannernew, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple, +/turf/open/floor/plasteel/white, +/area/science/genetics) "aSA" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -20552,6 +20170,7 @@ name = "Locker Room" }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel, /area/crew_quarters/locker) "aTv" = ( @@ -20692,6 +20311,12 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/machinery/light, /obj/structure/cable, +/obj/machinery/requests_console{ + department = "Engineering"; + departmentType = 3; + name = "Engineering RC"; + pixel_y = -30 + }, /turf/open/floor/plasteel, /area/engine/engineering) "aTI" = ( @@ -21403,14 +21028,6 @@ dir = 1 }, /area/engine/engineering) -"aVa" = ( -/obj/machinery/requests_console{ - department = "Engineering"; - departmentType = 3; - name = "Engineering RC" - }, -/turf/closed/wall, -/area/engine/engineering) "aVc" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -21437,16 +21054,18 @@ /turf/closed/wall/r_wall, /area/engine/engineering) "aVf" = ( -/obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/machinery/door/airlock/engineering{ - name = "Supermatter Engine"; - req_access_txt = "10" +/obj/effect/spawner/structure/window/plasma/reinforced, +/obj/structure/cable, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/preopen{ + id = "Engineering"; + name = "Engineering Security Doors" }, /turf/open/floor/plating, -/area/maintenance/starboard) +/area/engine/engineering) "aVh" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -21492,7 +21111,6 @@ pixel_y = 20 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/cable, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai) "aVq" = ( @@ -21500,6 +21118,7 @@ pixel_y = 32 }, /obj/machinery/atmospherics/components/unary/vent_pump/on, +/obj/structure/cable, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai) "aVr" = ( @@ -21737,6 +21356,7 @@ dir = 4 }, /obj/structure/cable, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel, /area/storage/primary) "aVT" = ( @@ -22169,9 +21789,8 @@ }, /area/engine/engineering) "aWH" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 10 - }, +/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating, /area/maintenance/starboard) "aWK" = ( @@ -22206,7 +21825,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 }, -/obj/structure/cable, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) "aWQ" = ( @@ -23526,59 +23144,39 @@ /turf/open/floor/plasteel, /area/engine/engineering) "aZL" = ( -/obj/structure/filingcabinet, -/obj/structure/reagent_dispensers/peppertank{ - pixel_y = 30 - }, -/obj/machinery/airalarm{ - dir = 4; - pixel_x = -23 - }, /obj/effect/turf_decal/tile/red{ dir = 1 }, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, /obj/effect/turf_decal/tile/red{ dir = 8 }, -/turf/open/floor/plasteel, -/area/security/checkpoint/engineering) -"aZM" = ( -/obj/structure/table, -/obj/item/radio/intercom{ - dir = 4; - pixel_y = 29 - }, -/obj/machinery/recharger{ - pixel_y = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/security/checkpoint/engineering) -"aZN" = ( /obj/structure/table, /obj/item/paper_bin{ pixel_x = -1; pixel_y = 5 }, /obj/item/pen, +/obj/structure/cable, +/turf/open/floor/plasteel, +/area/security/checkpoint/engineering) +"aZM" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable, +/obj/structure/chair/office{ + dir = 8 + }, +/obj/effect/landmark/start/depsec/engineering, +/turf/open/floor/plasteel, +/area/security/checkpoint/engineering) +"aZN" = ( /obj/machinery/newscaster/security_unit{ pixel_x = 30 }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ dir = 4 }, +/obj/structure/cable, /turf/open/floor/plasteel, /area/security/checkpoint/engineering) "aZO" = ( @@ -24557,6 +24155,13 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, +/obj/machinery/camera{ + c_tag = "Engineering - Entrance"; + dir = 4 + }, +/obj/machinery/light/small{ + dir = 8 + }, /turf/open/floor/plasteel, /area/engine/engineering) "bbz" = ( @@ -24572,45 +24177,33 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 9 }, -/obj/machinery/light/small{ - dir = 4 - }, -/obj/machinery/camera{ - c_tag = "Engineering - Entrance"; - dir = 8 - }, /obj/effect/turf_decal/stripes/line{ dir = 6 }, +/obj/structure/cable, /turf/open/floor/plasteel, /area/engine/engineering) "bbB" = ( -/obj/item/screwdriver{ - pixel_y = 10 - }, -/obj/item/radio/off, -/obj/machinery/computer/security/telescreen/minisat{ - dir = 4; - pixel_x = -29 - }, /obj/effect/turf_decal/tile/red{ dir = 1 }, /obj/effect/turf_decal/tile/red{ dir = 8 }, +/obj/structure/table, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 + }, +/obj/item/book/manual/wiki/security_space_law, /turf/open/floor/plasteel, /area/security/checkpoint/engineering) "bbC" = ( -/obj/structure/chair/office{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 9 }, -/obj/effect/landmark/start/depsec/engineering, /turf/open/floor/plasteel, /area/security/checkpoint/engineering) "bbD" = ( -/obj/structure/table, -/obj/item/book/manual/wiki/security_space_law, /obj/machinery/light{ dir = 4 }, @@ -24623,6 +24216,7 @@ /obj/effect/turf_decal/tile/red{ dir = 4 }, +/obj/structure/cable, /turf/open/floor/plasteel, /area/security/checkpoint/engineering) "bbF" = ( @@ -25194,40 +24788,52 @@ }, /area/engine/engineering) "bcL" = ( -/obj/machinery/power/apc{ - areastring = "/area/security/checkpoint/engineering"; - dir = 8; - name = "Engineering Security APC"; - pixel_x = -25 - }, /obj/effect/turf_decal/tile/red{ dir = 1 }, /obj/effect/turf_decal/tile/red{ dir = 8 }, -/obj/structure/cable, +/obj/machinery/computer/security/telescreen{ + desc = "Used for monitoring the engine."; + dir = 4; + name = "Engine Monitor"; + network = list("engine"); + pixel_x = -32 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/stripes/corner, /turf/open/floor/plasteel, /area/security/checkpoint/engineering) "bcM" = ( -/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/security/checkpoint/engineering) "bcN" = ( -/obj/machinery/computer/secure_data{ - dir = 8 - }, -/obj/machinery/computer/security/telescreen{ - desc = "Used for monitoring the engine."; - dir = 8; - name = "Engine Monitor"; - network = list("engine"); - pixel_x = 32 - }, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ dir = 4 }, +/obj/structure/cable, +/obj/machinery/power/apc{ + areastring = "/area/security/checkpoint/engineering"; + dir = 4; + name = "Engineering Security APC"; + pixel_x = 26 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/structure/closet/secure_closet/security/engine, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, /turf/open/floor/plasteel, /area/security/checkpoint/engineering) "bcO" = ( @@ -26015,72 +25621,17 @@ dir = 1 }, /area/engine/engineering) -"bem" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/obj/machinery/camera/autoname{ - dir = 4 - }, -/obj/machinery/button/door{ - desc = "A remote control-switch for the engineering security doors."; - id = "Engineering"; - name = "Engineering Lockdown"; - pixel_x = -24; - pixel_y = -6; - req_one_access_txt = "1;10" - }, -/obj/machinery/button/door{ - id = "atmos"; - name = "Atmospherics Lockdown"; - pixel_x = -24; - pixel_y = 5; - req_one_access_txt = "1;24" - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/security/checkpoint/engineering) -"ben" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/structure/cable, -/turf/open/floor/plasteel, -/area/security/checkpoint/engineering) -"beo" = ( -/obj/structure/closet/secure_closet/security/engine, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 24 - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/security/checkpoint/engineering) "bep" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/machinery/power/apc/auto_name/west, +/obj/structure/cable, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, -/obj/structure/cable, -/turf/open/floor/plasteel/dark/corner{ +/obj/effect/turf_decal/tile/yellow{ dir = 1 }, -/area/engine/storage_shared) +/obj/structure/filingcabinet, +/turf/open/floor/plasteel, +/area/engine/break_room) "beq" = ( /obj/structure/sign/warning/vacuum/external, /turf/closed/wall/r_wall, @@ -26534,6 +26085,7 @@ req_access_txt = "12" }, /obj/effect/landmark/event_spawn, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel, /area/storage/tools) "bfJ" = ( @@ -26611,6 +26163,7 @@ dir = 8 }, /obj/structure/cable, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel/dark, /area/storage/tech) "bfQ" = ( @@ -26643,13 +26196,14 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/effect/turf_decal/delivery, /obj/structure/cable, -/turf/open/floor/plasteel, +/obj/effect/turf_decal/caution/stand_clear, +/turf/open/floor/plasteel/dark, /area/engine/break_room) "bfV" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable, /turf/open/floor/plating, /area/security/checkpoint/engineering) "bfW" = ( @@ -26664,6 +26218,7 @@ /area/security/checkpoint/engineering) "bfX" = ( /obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, /turf/open/floor/plating, /area/security/checkpoint/engineering) "bfY" = ( @@ -26895,44 +26450,15 @@ /turf/open/floor/plasteel, /area/security/checkpoint/customs) "bgB" = ( -/obj/machinery/light/small{ - dir = 1 +/obj/structure/rack, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 4 }, -/obj/machinery/airalarm{ - pixel_y = 28 - }, -/obj/structure/closet/crate/secure/weapon{ - desc = "A secure clothing crate."; - name = "formal uniform crate"; - req_access_txt = "3" - }, -/obj/item/clothing/under/rank/security/officer/formal, -/obj/item/clothing/under/rank/security/officer/formal, -/obj/item/clothing/under/rank/security/officer/formal, -/obj/item/clothing/under/rank/security/officer/formal, -/obj/item/clothing/under/rank/security/officer/formal, -/obj/item/clothing/under/rank/security/officer/formal, -/obj/item/clothing/suit/security/officer, -/obj/item/clothing/suit/security/officer, -/obj/item/clothing/suit/security/officer, -/obj/item/clothing/suit/security/officer, -/obj/item/clothing/suit/security/officer, -/obj/item/clothing/suit/security/officer, -/obj/item/clothing/under/rank/security/warden/formal, -/obj/item/clothing/suit/security/warden, -/obj/item/clothing/under/rank/security/head_of_security/formal, -/obj/item/clothing/suit/security/hos, -/obj/item/clothing/head/beret/sec/navyofficer, -/obj/item/clothing/head/beret/sec/navyofficer, -/obj/item/clothing/head/beret/sec/navyofficer, -/obj/item/clothing/head/beret/sec/navyofficer, -/obj/item/clothing/head/beret/sec/navyofficer, -/obj/item/clothing/head/beret/sec/navyofficer, -/obj/item/clothing/head/beret/sec/navywarden, -/obj/item/clothing/head/beret/sec/navyhos, -/obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, -/area/security/warden) +/obj/item/gun/energy/e_gun/dragnet, +/obj/item/gun/energy/e_gun/dragnet, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/security/armory) "bgC" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 @@ -27103,6 +26629,7 @@ }, /obj/effect/turf_decal/delivery, /obj/structure/cable, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel, /area/quartermaster/office) "bgU" = ( @@ -27616,6 +27143,9 @@ dir = 1 }, /obj/structure/cable, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) "bhR" = ( @@ -27664,16 +27194,9 @@ /turf/open/floor/plasteel, /area/engine/break_room) "bhV" = ( -/obj/item/book/manual/wiki/engineering_hacking{ - pixel_x = 4; - pixel_y = 5 - }, /obj/item/book/manual/wiki/engineering_construction{ pixel_y = 3 }, -/obj/item/book/manual/wiki/engineering_guide{ - pixel_x = -4 - }, /obj/structure/table/glass, /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -27692,15 +27215,15 @@ }, /obj/structure/table/glass, /obj/item/folder/yellow, -/obj/item/storage/firstaid/fire{ - pixel_y = 6 - }, /obj/effect/turf_decal/tile/yellow{ dir = 1 }, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engine/break_room) "bhX" = ( @@ -27710,6 +27233,9 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, /turf/open/floor/plasteel, /area/engine/break_room) "bhY" = ( @@ -27724,6 +27250,9 @@ dir = 4 }, /obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/engine/break_room) "bhZ" = ( @@ -27736,6 +27265,9 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/engine/break_room) "bia" = ( @@ -27751,49 +27283,34 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, /turf/open/floor/plasteel, /area/engine/break_room) "bib" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/turf_decal/tile/yellow{ dir = 1 }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 8 }, /turf/open/floor/plasteel, /area/engine/break_room) "bic" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/structure/cable, /turf/open/floor/plasteel, /area/engine/break_room) "bid" = ( -/obj/machinery/disposal/bin{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/structure/disposalpipe/trunk{ +/obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 }, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, /turf/open/floor/plasteel, /area/engine/break_room) "bie" = ( @@ -28449,12 +27966,10 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 }, -/obj/machinery/holopad, /obj/structure/cable, /turf/open/floor/plasteel, /area/engine/break_room) "bjL" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, /turf/open/floor/plasteel, /area/engine/break_room) "bjM" = ( @@ -28500,12 +28015,10 @@ /turf/closed/wall/r_wall, /area/ai_monitored/storage/satellite) "bjV" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 - }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "bjW" = ( @@ -29299,20 +28812,13 @@ /obj/structure/cable, /turf/open/floor/plasteel, /area/engine/break_room) -"bll" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/obj/structure/cable, -/turf/open/floor/plasteel, -/area/engine/break_room) "bln" = ( -/obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable, +/obj/machinery/holopad, /turf/open/floor/plasteel, /area/engine/break_room) "blo" = ( /obj/structure/table/glass, -/obj/item/storage/box/donkpockets, /obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko{ pixel_x = -6; pixel_y = 6 @@ -29322,15 +28828,7 @@ "blp" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/table/glass, -/turf/open/floor/plasteel, -/area/engine/break_room) -"blr" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 4 - }, +/obj/effect/spawner/lootdrop/donkpockets, /turf/open/floor/plasteel, /area/engine/break_room) "bls" = ( @@ -29514,6 +29012,7 @@ /obj/machinery/power/terminal{ dir = 8 }, +/obj/structure/cable, /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/satellite) "blL" = ( @@ -30046,7 +29545,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 + }, /turf/open/floor/plasteel, /area/engine/break_room) "bnb" = ( @@ -30065,28 +29567,24 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel, /area/engine/break_room) "bnd" = ( /obj/structure/table/glass, -/obj/item/lightreplacer{ - pixel_y = 7 - }, -/obj/item/storage/belt/utility, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/item/reagent_containers/food/snacks/chips, /turf/open/floor/plasteel, /area/engine/break_room) "bne" = ( -/obj/machinery/newscaster{ - pixel_y = -30 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 }, /turf/open/floor/plasteel, /area/engine/break_room) "bnf" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/machinery/power/apc/auto_name/south, +/obj/structure/cable, /turf/open/floor/plasteel, /area/engine/break_room) "bng" = ( @@ -30098,6 +29596,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/effect/turf_decal/stripes/corner, /turf/open/floor/plasteel, /area/engine/break_room) "bnh" = ( @@ -30430,8 +29929,9 @@ /area/hallway/primary/port) "bnP" = ( /obj/machinery/door/airlock/external{ - name = "Auxiliary Airlock" + name = "Common Mining Dock" }, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plating, /area/hallway/primary/port) "bnR" = ( @@ -31029,36 +30529,10 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) -"bpg" = ( -/obj/structure/table/reinforced, -/obj/machinery/microwave{ - pixel_y = 6 - }, -/turf/open/floor/plasteel, -/area/engine/break_room) -"bph" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plating, -/area/engine/storage_shared) -"bpi" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/turf/closed/wall, -/area/engine/storage_shared) "bpk" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable, -/turf/open/floor/plasteel, -/area/engine/break_room) -"bpl" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/effect/turf_decal/box/red, -/obj/effect/turf_decal/arrows/red{ - dir = 4 - }, +/obj/effect/landmark/event_spawn, /turf/open/floor/plasteel, /area/engine/break_room) "bpm" = ( @@ -31066,9 +30540,9 @@ id = "transittube"; name = "Transit Tube Blast Door" }, -/obj/effect/turf_decal/delivery, /obj/structure/cable, -/turf/open/floor/plasteel, +/obj/effect/turf_decal/caution/stand_clear, +/turf/open/floor/plasteel/dark, /area/engine/break_room) "bpn" = ( /obj/structure/window/reinforced{ @@ -31078,6 +30552,9 @@ /area/aisat) "bpp" = ( /obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/engine/break_room) "bpq" = ( @@ -31449,10 +30926,10 @@ /turf/open/floor/plasteel, /area/crew_quarters/toilet/auxiliary) "bqi" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 - }, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 + }, /turf/open/floor/plating, /area/maintenance/port) "bqj" = ( @@ -31646,6 +31123,9 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/engine/break_room) "bqG" = ( @@ -32077,20 +31557,30 @@ /obj/structure/sign/warning/securearea{ pixel_x = 32 }, -/turf/open/floor/plasteel/dark/corner, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/plasteel, /area/hallway/primary/starboard) "brE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/cable, -/turf/open/floor/plasteel, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/structure/rack, +/obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/rnd/production/protolathe/department/engineering, +/turf/open/floor/plasteel/dark/corner{ + dir = 1 + }, /area/engine/storage_shared) "brI" = ( /obj/machinery/firealarm{ dir = 4; pixel_x = -26 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/engine/break_room) "brJ" = ( @@ -32115,6 +31605,7 @@ req_one_access_txt = "32;19" }, /obj/structure/cable, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel/dark, /area/engine/break_room) "brL" = ( @@ -32674,11 +32165,6 @@ /obj/effect/mapping_helpers/ianbirthday, /turf/open/floor/carpet, /area/crew_quarters/heads/hop) -"bsN" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/obj/structure/cable, -/turf/open/floor/carpet, -/area/crew_quarters/heads/hop) "bsO" = ( /obj/structure/cable, /obj/machinery/photocopier, @@ -32960,9 +32446,8 @@ }, /area/maintenance/starboard) "btu" = ( -/obj/item/storage/toolbox/emergency, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/lootdrop/maintenance/three, /turf/open/floor/plating, /area/maintenance/starboard) "btv" = ( @@ -32983,27 +32468,23 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, -/turf/open/floor/plasteel/dark/corner{ - dir = 1 - }, +/turf/open/floor/plasteel, /area/hallway/primary/starboard) "bty" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/open/floor/plasteel/dark/corner, +/obj/effect/turf_decal/bot, +/turf/open/floor/plasteel, /area/hallway/primary/starboard) "btB" = ( +/obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/turf_decal/tile/yellow{ +/obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/structure/sign/poster/official/random{ - pixel_x = -32 - }, -/obj/structure/cable, -/turf/open/floor/plasteel/dark/corner, +/turf/open/floor/plasteel, /area/engine/break_room) "btC" = ( /obj/machinery/requests_console{ @@ -33019,11 +32500,7 @@ /turf/open/floor/wood, /area/crew_quarters/heads/hop) "btD" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/sign/warning/securearea{ - pixel_x = 32 - }, -/obj/machinery/light{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 }, /turf/open/floor/plasteel, @@ -33046,6 +32523,9 @@ /obj/machinery/light{ dir = 8 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/engine/break_room) "btG" = ( @@ -33124,6 +32604,7 @@ dir = 8 }, /obj/structure/cable, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel/dark, /area/tcommsat/computer) "btO" = ( @@ -33316,6 +32797,7 @@ dir = 4 }, /obj/structure/cable, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/wood, /area/crew_quarters/heads/hop) "bun" = ( @@ -33492,6 +32974,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/wood, /area/crew_quarters/bar) "buP" = ( @@ -33567,15 +33050,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard) -"buZ" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/turf/open/floor/plasteel/dark/corner{ - dir = 1 - }, -/area/hallway/primary/starboard) "bva" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ @@ -33589,7 +33063,8 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/dark/corner, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plasteel, /area/hallway/primary/starboard) "bvd" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -33600,13 +33075,11 @@ /turf/open/floor/plating, /area/maintenance/starboard) "bve" = ( -/obj/effect/turf_decal/tile/yellow{ - dir = 8 +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 }, -/obj/machinery/rnd/production/circuit_imprinter, -/obj/effect/turf_decal/bot, -/turf/open/floor/plasteel/dark/corner, -/area/engine/storage_shared) +/turf/open/floor/plasteel, +/area/engine/break_room) "bvf" = ( /obj/item/radio/intercom{ freerange = 1; @@ -33644,30 +33117,24 @@ }, /turf/open/floor/circuit/green, /area/ai_monitored/turret_protected/ai) -"bvg" = ( -/obj/effect/turf_decal/bot{ - dir = 1 - }, -/obj/machinery/rnd/production/protolathe/department/engineering, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/turf/open/floor/plasteel/dark/corner, -/area/engine/storage_shared) "bvh" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 }, -/obj/structure/table/reinforced, -/turf/open/floor/plasteel/dark/corner, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/turf/open/floor/plasteel/dark/corner{ + dir = 1 + }, /area/engine/storage_shared) "bvi" = ( -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/structure/table/reinforced, -/obj/effect/spawner/lootdrop/maintenance, -/turf/open/floor/plasteel/dark/corner, +/obj/structure/cable, +/obj/effect/landmark/event_spawn, +/turf/open/floor/plasteel, /area/engine/storage_shared) "bvj" = ( /obj/structure/table, @@ -33680,28 +33147,28 @@ /turf/open/floor/plasteel/dark, /area/science/nanite) "bvk" = ( -/obj/machinery/door/poddoor/preopen{ - id = "atmos"; - name = "Atmospherics Blast Door" - }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 8 }, -/obj/effect/turf_decal/delivery, /obj/structure/cable, -/turf/open/floor/plasteel, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/plasteel/dark/corner, /area/engine/break_room) "bvl" = ( -/obj/machinery/door/poddoor/preopen{ - id = "atmos"; - name = "Atmospherics Blast Door" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel/dark/corner, /area/engine/break_room) "bvm" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -33710,13 +33177,12 @@ /turf/closed/wall/r_wall, /area/engine/break_room) "bvn" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 6 }, -/turf/open/floor/plasteel/dark/corner, +/turf/open/floor/plasteel, /area/engine/break_room) -"bvo" = ( +"bvp" = ( /obj/structure/table/glass, /obj/item/wrench, /obj/item/crowbar, @@ -33724,49 +33190,22 @@ pixel_x = 1; pixel_y = 5 }, -/turf/open/floor/plasteel/dark, -/area/engine/break_room) -"bvp" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/obj/machinery/camera{ - c_tag = "Engineering - Transit Tube Access"; - dir = 8 +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 6 }, -/obj/effect/turf_decal/stripes/corner, /turf/open/floor/plasteel/dark, /area/engine/break_room) "bvq" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/closed/wall/r_wall, /area/engine/break_room) -"bvr" = ( -/obj/structure/table/glass, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +"bvs" = ( +/obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/item/tank/internals/emergency_oxygen{ - pixel_x = -8 - }, -/obj/item/clothing/mask/breath{ - pixel_x = 4 - }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -26 - }, -/turf/open/floor/plasteel/dark, -/area/engine/break_room) -"bvs" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/obj/machinery/door/airlock/external{ - name = "MiniSat Space Access Airlock"; - req_access_txt = "32" - }, /turf/open/floor/plasteel/dark, /area/engine/break_room) "bvt" = ( @@ -33786,13 +33225,21 @@ /turf/open/floor/plasteel/grimy, /area/tcommsat/computer) "bvv" = ( +/obj/structure/table/glass, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/effect/turf_decal/stripes/line{ - dir = 4 +/obj/item/tank/internals/emergency_oxygen{ + pixel_x = -8 }, +/obj/item/clothing/mask/breath{ + pixel_x = 4 + }, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = -26 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /turf/open/floor/plasteel/dark, /area/engine/break_room) "bvw" = ( @@ -34376,9 +33823,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, -/turf/open/floor/plasteel/dark/corner{ - dir = 1 - }, +/turf/open/floor/plasteel, /area/hallway/primary/starboard) "bxa" = ( /obj/structure/disposalpipe/segment, @@ -34401,7 +33846,8 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/open/floor/plasteel/dark/corner, +/obj/effect/turf_decal/loading_area, +/turf/open/floor/plasteel, /area/hallway/primary/starboard) "bxc" = ( /turf/closed/wall/r_wall, @@ -34420,11 +33866,16 @@ /turf/open/floor/plasteel, /area/engine/atmos) "bxf" = ( +/obj/machinery/door/poddoor/preopen{ + id = "atmos"; + name = "Atmospherics Blast Door" + }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 5 }, -/turf/closed/wall, -/area/engine/atmos) +/obj/effect/turf_decal/caution/stand_clear, +/turf/open/floor/plasteel/dark, +/area/engine/break_room) "bxg" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -34462,16 +33913,14 @@ /turf/closed/wall/r_wall, /area/engine/atmos) "bxm" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/machinery/door/airlock/external{ + name = "MiniSat Space Access Airlock"; + req_access_txt = "32" + }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 - }, -/obj/structure/sign/warning/vacuum/external{ - pixel_y = -32 - }, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line{ dir = 4 }, /turf/open/floor/plasteel/dark, @@ -35001,8 +34450,8 @@ id = "Engineering"; name = "Engineering Security Doors" }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, +/obj/effect/turf_decal/caution/stand_clear, +/turf/open/floor/plasteel/dark, /area/engine/break_room) "byL" = ( /obj/machinery/power/apc{ @@ -35068,136 +34517,6 @@ }, /turf/open/floor/plasteel/dark/corner, /area/hallway/primary/starboard) -"byR" = ( -/obj/item/radio/intercom{ - pixel_x = -30 - }, -/obj/item/crowbar/red, -/obj/item/wrench, -/obj/item/clothing/mask/gas, -/obj/machinery/airalarm{ - pixel_y = 23 - }, -/obj/structure/table, -/obj/item/storage/box, -/obj/item/storage/box, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/turf/open/floor/plasteel/dark/corner{ - dir = 1 - }, -/area/engine/atmos) -"byS" = ( -/obj/machinery/status_display/evac{ - pixel_y = 32 - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/computer/atmos_alert, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/turf/open/floor/plasteel/dark/corner{ - dir = 1 - }, -/area/engine/atmos) -"byT" = ( -/obj/structure/sign/map/left{ - desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; - icon_state = "map-left-MS"; - pixel_y = 32 - }, -/obj/machinery/camera{ - c_tag = "Atmospherics - Control Room" - }, -/obj/machinery/computer/station_alert, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/turf/open/floor/plasteel/dark/corner{ - dir = 1 - }, -/area/engine/atmos) -"byU" = ( -/obj/structure/sign/map/right{ - desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; - icon_state = "map-right-MS"; - pixel_y = 32 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/turf/open/floor/plasteel/dark/corner{ - dir = 1 - }, -/area/engine/atmos) -"byV" = ( -/obj/structure/sign/plaques/atmos{ - pixel_y = 32 - }, -/obj/item/phone{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/cigbutt/cigarbutt{ - pixel_x = 5; - pixel_y = -1 - }, -/obj/structure/table, -/obj/machinery/light_switch{ - pixel_x = 26 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/turf/open/floor/plasteel/checker, -/area/engine/atmos) -"byW" = ( -/obj/structure/table, -/obj/item/clothing/head/welding{ - pixel_x = -3; - pixel_y = 7 - }, -/obj/item/clothing/head/welding{ - pixel_x = -5; - pixel_y = 3 - }, -/obj/machinery/airalarm{ - pixel_y = 23 - }, -/obj/machinery/light_switch{ - pixel_x = -26 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/turf/open/floor/plasteel/dark/corner{ - dir = 1 - }, -/area/engine/atmos) -"byX" = ( -/obj/machinery/power/apc/highcap/ten_k{ - areastring = "/area/engine/atmos"; - dir = 1; - name = "Atmospherics APC"; - pixel_y = 23 - }, -/obj/machinery/camera{ - c_tag = "Atmospherics - Entrance" - }, -/obj/structure/cable, -/turf/open/floor/plasteel, -/area/engine/atmos) -"byY" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/cable, -/turf/open/floor/plasteel, -/area/engine/atmos) "byZ" = ( /obj/machinery/space_heater, /obj/machinery/firealarm{ @@ -35871,6 +35190,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, +/obj/effect/turf_decal/bot, /turf/open/floor/plasteel/dark/corner, /area/hallway/primary/starboard) "bAA" = ( @@ -35892,32 +35212,92 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/machinery/airalarm{ + pixel_y = 23 + }, +/obj/item/radio/intercom{ + pixel_x = -30; + pixel_y = 24 + }, /turf/open/floor/plasteel/dark/corner{ dir = 1 }, /area/engine/atmos) "bAC" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/status_display/evac{ + pixel_y = 32 + }, +/obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/open/floor/plasteel, +/obj/structure/table, +/obj/item/crowbar/red, +/obj/item/wrench, +/obj/item/clothing/mask/gas, +/obj/item/storage/box{ + pixel_x = 2; + pixel_y = 4 + }, +/obj/item/storage/box, +/turf/open/floor/plasteel/dark/corner{ + dir = 1 + }, /area/engine/atmos) "bAD" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 10 +/obj/machinery/computer/station_alert, +/obj/structure/sign/map/left{ + desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; + icon_state = "map-left-MS"; + pixel_y = 32 }, -/turf/open/floor/plasteel, -/area/engine/atmos) -"bAE" = ( -/obj/structure/chair/office{ +/obj/machinery/camera{ + c_tag = "Atmospherics - Control Room" + }, +/obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/effect/landmark/start/atmospheric_technician, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark/corner{ + dir = 1 + }, +/area/engine/atmos) +"bAE" = ( +/obj/structure/sign/map/right{ + desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; + icon_state = "map-right-MS"; + pixel_y = 32 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/machinery/computer/atmos_alert, +/turf/open/floor/plasteel/dark/corner{ + dir = 1 + }, /area/engine/atmos) "bAF" = ( -/obj/machinery/computer/atmos_control{ - dir = 8 +/obj/structure/sign/plaques/atmos{ + pixel_y = 32 + }, +/obj/item/phone{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/cigbutt/cigarbutt{ + pixel_x = 5; + pixel_y = -1 + }, +/obj/structure/table, +/obj/machinery/light_switch{ + pixel_x = 26 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 }, /obj/machinery/requests_console{ department = "Atmospherics"; @@ -35925,10 +35305,7 @@ name = "Atmos RC"; pixel_x = 30 }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/turf/open/floor/plasteel/dark/corner, +/turf/open/floor/plasteel/checker, /area/engine/atmos) "bAG" = ( /obj/machinery/light{ @@ -35942,18 +35319,30 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/machinery/airalarm{ + pixel_y = 23 + }, /turf/open/floor/plasteel/dark/corner{ dir = 1 }, /area/engine/atmos) "bAH" = ( /obj/structure/cable, -/turf/open/floor/plasteel, -/area/engine/atmos) -"bAJ" = ( -/obj/machinery/space_heater, -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/obj/machinery/power/apc/highcap/ten_k{ + areastring = "/area/engine/atmos"; + dir = 1; + name = "Atmospherics APC"; + pixel_y = 23 + }, +/obj/machinery/camera{ + c_tag = "Atmospherics - Entrance" + }, +/obj/machinery/light_switch{ + pixel_x = -10; + pixel_y = 24 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 }, /turf/open/floor/plasteel, /area/engine/atmos) @@ -36163,8 +35552,7 @@ /area/crew_quarters/toilet/auxiliary) "bBq" = ( /obj/structure/rack, -/obj/item/flashlight, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating, /area/maintenance/port) "bBr" = ( @@ -36278,6 +35666,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel/dark, /area/bridge) "bBF" = ( @@ -36484,6 +35873,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, +/obj/effect/turf_decal/delivery, /turf/open/floor/plasteel/dark/corner, /area/hallway/primary/starboard) "bCg" = ( @@ -36522,16 +35912,20 @@ /turf/open/floor/plasteel, /area/engine/atmos) "bCj" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 8 - }, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 1 + }, /turf/open/floor/plasteel, /area/engine/atmos) "bCk" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/structure/chair/office{ + dir = 4 + }, +/obj/effect/landmark/start/atmospheric_technician, /turf/open/floor/plasteel, /area/engine/atmos) "bCl" = ( @@ -36566,6 +35960,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/item/storage/belt/utility, /turf/open/floor/plasteel/dark/corner{ dir = 1 }, @@ -36586,11 +35981,10 @@ /area/engine/atmos) "bCq" = ( /obj/machinery/space_heater, -/obj/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 10 - }, /obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 10 }, /turf/open/floor/plasteel, @@ -36708,6 +36102,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 5 }, +/obj/structure/cable, /turf/open/floor/plasteel/white/corner, /area/hallway/secondary/entry) "bCJ" = ( @@ -37216,13 +36611,19 @@ /obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engine/atmos) "bDQ" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/structure/cable, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, /turf/open/floor/plasteel/dark/corner, /area/engine/atmos) "bDR" = ( @@ -37251,7 +36652,11 @@ /turf/open/floor/plasteel, /area/engine/atmos) "bDV" = ( -/obj/structure/closet/crate, +/obj/machinery/space_heater, +/obj/structure/window/reinforced, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel, /area/engine/atmos) @@ -37376,7 +36781,6 @@ /turf/open/floor/plasteel/white/corner, /area/hallway/secondary/entry) "bEo" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/airlock{ name = "Port Emergency Storage" }, @@ -37990,24 +37394,16 @@ /turf/open/floor/plasteel, /area/engine/atmos) "bFI" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/cable, /turf/open/floor/plasteel, /area/engine/atmos) "bFJ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/components/unary/vent_pump/on, +/obj/structure/cable, /turf/open/floor/plasteel/dark/corner, /area/engine/atmos) "bFK" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, /obj/machinery/firealarm{ dir = 1; pixel_y = -24 @@ -38025,6 +37421,11 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/machinery/light_switch{ + pixel_x = 35; + pixel_y = -25 + }, +/obj/structure/cable, /turf/open/floor/plasteel/dark/corner, /area/engine/atmos) "bFL" = ( @@ -38032,6 +37433,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/structure/cable, /turf/open/floor/plasteel/dark/corner{ dir = 1 }, @@ -38298,6 +37700,7 @@ }, /obj/effect/turf_decal/delivery, /obj/structure/cable, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel, /area/ai_monitored/storage/eva) "bGC" = ( @@ -38313,6 +37716,7 @@ /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/delivery, /obj/structure/cable, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel, /area/teleporter) "bGE" = ( @@ -39452,9 +38856,6 @@ /turf/open/floor/circuit/telecomms/mainframe, /area/tcommsat/server) "bJo" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/effect/turf_decal/tile/blue{ dir = 4 }, @@ -39914,6 +39315,7 @@ req_access_txt = "28" }, /obj/structure/cable, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/kitchen) "bKl" = ( @@ -40221,8 +39623,7 @@ /area/maintenance/port) "bLd" = ( /obj/structure/closet, -/obj/item/clothing/shoes/jackboots, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/lootdrop/maintenance/three, /turf/open/floor/plating, /area/maintenance/port) "bLe" = ( @@ -40643,6 +40044,7 @@ /area/storage/tcom) "bLX" = ( /obj/structure/closet, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating{ icon_state = "panelscorched" }, @@ -41018,20 +40420,6 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "bMS" = ( -/obj/structure/closet/crate/rcd{ - pixel_y = 4 - }, -/obj/machinery/door/window/northleft{ - dir = 4; - name = "RCD Storage"; - pixel_x = 1; - req_access_txt = "19" - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1; - pixel_y = 1 - }, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -41045,6 +40433,21 @@ /obj/machinery/light{ dir = 8 }, +/obj/structure/table, +/obj/item/grenade/chem_grenade/smart_metal_foam{ + pixel_x = -4; + pixel_y = 6 + }, +/obj/item/grenade/chem_grenade/smart_metal_foam{ + pixel_x = 4; + pixel_y = 2 + }, +/obj/item/grenade/chem_grenade/smart_metal_foam{ + pixel_x = 8 + }, +/obj/item/grenade/chem_grenade/smart_metal_foam{ + pixel_y = 4 + }, /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/eva) "bMT" = ( @@ -41394,14 +40797,16 @@ /turf/open/floor/plasteel/kitchen_coldroom/freezerfloor, /area/crew_quarters/kitchen/coldroom) "bNE" = ( -/obj/structure/sink/kitchen{ - desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - name = "old sink"; - pixel_y = 28 - }, /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 6 }, +/obj/machinery/power/apc{ + areastring = "/area/crew_quarters/kitchen/coldroom"; + dir = 1; + name = "Kitchen Cold Room APC"; + pixel_y = 23 + }, +/obj/structure/cable, /turf/open/floor/plasteel/kitchen_coldroom/freezerfloor, /area/crew_quarters/kitchen/coldroom) "bNF" = ( @@ -41643,6 +41048,7 @@ name = "Private Study"; req_access_txt = "37" }, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/engine/cult, /area/library) "bOn" = ( @@ -42267,6 +41673,7 @@ "bPJ" = ( /obj/structure/rack, /obj/item/clothing/mask/horsehead, +/obj/effect/spawner/lootdrop/costume, /turf/open/floor/plating, /area/maintenance/port) "bPK" = ( @@ -43554,7 +42961,6 @@ req_access_txt = "28" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/item/paper, /obj/machinery/door/window/eastleft{ dir = 2; @@ -43744,8 +43150,8 @@ /area/maintenance/port) "bTv" = ( /obj/structure/rack, -/obj/item/paper, /obj/effect/spawner/lootdrop/maintenance, +/obj/item/paper, /turf/open/floor/plating, /area/maintenance/port) "bTw" = ( @@ -44396,11 +43802,6 @@ /obj/machinery/camera/autoname, /turf/open/floor/plating, /area/maintenance/solars/port/aft) -"bUP" = ( -/obj/machinery/power/smes, -/obj/structure/cable, -/turf/open/floor/plating, -/area/maintenance/solars/port/aft) "bUQ" = ( /obj/item/cigbutt, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ @@ -44413,9 +43814,9 @@ /area/maintenance/port) "bUR" = ( /obj/structure/closet, -/obj/item/storage/box/donkpockets, /obj/effect/spawner/lootdrop/maintenance/two, /obj/effect/decal/cleanable/dirt/dust, +/obj/effect/spawner/lootdrop/donkpockets, /turf/open/floor/plating, /area/maintenance/port) "bUS" = ( @@ -44683,7 +44084,7 @@ /area/hydroponics) "bVy" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/effect/turf_decal/bot, @@ -44718,8 +44119,7 @@ /area/maintenance/starboard) "bVE" = ( /obj/structure/closet/crate, -/obj/item/storage/belt/utility, -/obj/item/stack/cable_coil, +/obj/effect/spawner/lootdrop/maintenance/three, /turf/open/floor/plating, /area/maintenance/starboard) "bVF" = ( @@ -44843,7 +44243,6 @@ /turf/open/floor/engine/co2, /area/engine/atmos) "bVQ" = ( -/obj/structure/cable, /obj/machinery/light/small{ brightness = 3; dir = 8 @@ -45580,6 +44979,9 @@ "bXu" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/cable, +/obj/machinery/power/terminal{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "bXv" = ( @@ -45587,6 +44989,7 @@ pixel_x = 32 }, /obj/structure/cable, +/obj/machinery/power/smes, /turf/open/floor/plating{ icon_state = "platingdmg1" }, @@ -45600,7 +45003,7 @@ /area/maintenance/port) "bXy" = ( /obj/structure/closet, -/obj/item/flashlight, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating, /area/maintenance/port/aft) "bXz" = ( @@ -45613,7 +45016,7 @@ /area/maintenance/port/aft) "bXA" = ( /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, @@ -45650,16 +45053,7 @@ /area/maintenance/port) "bXH" = ( /obj/structure/closet/crate, -/obj/item/coin/silver, -/obj/item/flashlight, -/obj/effect/spawner/lootdrop/maintenance, -/turf/open/floor/plating, -/area/maintenance/port) -"bXI" = ( -/obj/structure/closet, -/obj/item/clothing/neck/stethoscope, -/obj/item/hemostat, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/lootdrop/maintenance/three, /turf/open/floor/plating, /area/maintenance/port) "bXJ" = ( @@ -45805,14 +45199,8 @@ /turf/open/floor/plating, /area/maintenance/starboard/secondary) "bYc" = ( -/obj/structure/window/spawner/east, -/obj/structure/window/spawner/north, -/obj/structure/window/spawner, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/leafybush, -/obj/structure/flora/ausbushes/palebush, -/turf/open/floor/grass, +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, /area/hallway/primary/central) "bYd" = ( /obj/machinery/door/firedoor, @@ -46121,8 +45509,8 @@ /obj/structure/closet/crate{ icon_state = "crateopen" }, -/obj/item/storage/box/donkpockets, /obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/lootdrop/donkpockets, /turf/open/floor/plating, /area/maintenance/port/aft) "bYQ" = ( @@ -46252,7 +45640,6 @@ dir = 4 }, /obj/structure/closet/crate/freezer/surplus_limbs, -/obj/item/reagent_containers/glass/beaker/instabitaluri, /turf/open/floor/plasteel/white, /area/medical/storage) "bYY" = ( @@ -46279,7 +45666,8 @@ dir = 4 }, /obj/machinery/airalarm{ - pixel_y = 24 + dir = 4; + pixel_x = -22 }, /turf/open/floor/plasteel, /area/security/checkpoint/medical) @@ -46430,7 +45818,7 @@ /area/hallway/primary/central) "bZt" = ( /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, @@ -46733,7 +46121,6 @@ dir = 8 }, /obj/structure/cable, -/obj/structure/cable, /turf/open/floor/plasteel, /area/security/checkpoint/medical) "caf" = ( @@ -46766,14 +46153,6 @@ /obj/structure/table, /turf/open/floor/plasteel/white, /area/medical/medbay/central) -"caj" = ( -/obj/machinery/requests_console{ - department = "Medbay"; - departmentType = 1; - name = "Medbay RC" - }, -/turf/closed/wall, -/area/security/checkpoint/medical) "cak" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -47045,7 +46424,7 @@ pixel_x = -24 }, /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, @@ -47058,6 +46437,7 @@ req_access_txt = "35" }, /obj/structure/cable, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel, /area/hydroponics) "caK" = ( @@ -47663,24 +47043,24 @@ dir = 4; network = list("ss13","medbay") }, -/obj/structure/chair/greyscale, /obj/item/radio/intercom{ pixel_x = -28 }, /obj/effect/turf_decal/tile/blue{ - dir = 1 + dir = 8 }, -/obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ dir = 4 }, /obj/effect/turf_decal/tile/blue{ - dir = 8 + dir = 1 }, +/obj/structure/chair, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "cbS" = ( /obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, /turf/open/floor/plating, /area/security/checkpoint/medical) "cbT" = ( @@ -48074,7 +47454,6 @@ /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "ccK" = ( -/obj/structure/cable, /obj/machinery/power/terminal{ dir = 1 }, @@ -48264,7 +47643,7 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "cdk" = ( -/obj/item/trash/semki, +/obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/plating, /area/maintenance/port/aft) "cdl" = ( @@ -48397,37 +47776,25 @@ /turf/open/floor/plasteel/white, /area/medical/storage) "cdw" = ( -/obj/machinery/computer/security/telescreen{ - desc = "Used for monitoring medbay to ensure patient safety."; - dir = 1; - name = "Medbay Monitor"; - network = list("medbay"); - pixel_x = -29 - }, /obj/machinery/computer/med_data{ dir = 4 }, -/obj/machinery/light{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/computer/security/telescreen{ + desc = "Used for monitoring medbay to ensure patient safety."; + dir = 4; + name = "Medbay Monitor"; + network = list("medbay"); + pixel_x = -32 + }, +/obj/structure/cable, /turf/open/floor/plasteel, /area/security/checkpoint/medical) "cdx" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 1 - }, /obj/structure/cable, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "cdy" = ( @@ -48436,16 +47803,6 @@ }, /obj/structure/cable, /obj/effect/landmark/start/medical_doctor, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "cdz" = ( @@ -48539,16 +47896,6 @@ /obj/structure/cable, /turf/open/floor/plasteel/white, /area/science/research) -"cdL" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/obj/structure/cable, -/turf/open/floor/plasteel/white, -/area/science/research) "cdM" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -48787,6 +48134,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 }, +/obj/effect/landmark/start/paramedic, /turf/open/floor/plasteel/white, /area/medical/storage) "cey" = ( @@ -48838,6 +48186,10 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 1 }, +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/cable, /turf/open/floor/plasteel, /area/security/checkpoint/medical) "ceB" = ( @@ -49017,7 +48369,7 @@ pixel_x = 24 }, /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/effect/turf_decal/tile/purple, @@ -49201,6 +48553,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel, /area/maintenance/starboard) "cfl" = ( @@ -49260,11 +48613,9 @@ /turf/open/space, /area/space/nearstation) "cfC" = ( -/obj/item/trash/pistachios, /obj/structure/closet, -/obj/item/stack/sheet/glass, /obj/item/extinguisher, -/obj/item/storage/belt/utility, +/obj/effect/spawner/lootdrop/maintenance/three, /turf/open/floor/plating, /area/maintenance/port/aft) "cfD" = ( @@ -49274,6 +48625,7 @@ "cfE" = ( /obj/structure/closet/crate, /obj/item/reagent_containers/dropper, +/obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/port/aft) "cfF" = ( @@ -49281,20 +48633,6 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "cfG" = ( -/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 - }, -/obj/machinery/computer/med_data, -/turf/open/floor/plasteel/dark, -/area/medical/sleeper) -"cfH" = ( /obj/structure/closet/wardrobe/pjs, /obj/machinery/airalarm{ pixel_y = 24 @@ -49311,6 +48649,20 @@ }, /turf/open/floor/plasteel/dark, /area/medical/sleeper) +"cfH" = ( +/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 + }, +/obj/machinery/computer/med_data, +/turf/open/floor/plasteel/dark, +/area/medical/sleeper) "cfI" = ( /obj/machinery/light{ dir = 1 @@ -49328,7 +48680,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/structure/closet/wardrobe/pjs, +/obj/machinery/computer/crew, /turf/open/floor/plasteel/dark, /area/medical/sleeper) "cfJ" = ( @@ -49424,10 +48776,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, -/mob/living/simple_animal/bot/cleanbot{ - name = "Scrubs, MD"; - on = 0 - }, +/mob/living/simple_animal/bot/cleanbot/medbay, /turf/open/floor/plasteel/white, /area/medical/storage) "cfO" = ( @@ -49439,44 +48788,13 @@ /turf/open/floor/plasteel/white, /area/medical/storage) "cfP" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 1 - }, /obj/machinery/medical_kiosk, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/effect/turf_decal/tile/blue, /turf/open/floor/plasteel/white, /area/medical/medbay/central) -"cfQ" = ( -/obj/structure/cable, -/obj/structure/window/reinforced/spawner/north, -/obj/structure/window/reinforced/spawner, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/reedbush, -/obj/structure/flora/ausbushes/sunnybush, -/obj/structure/window/reinforced/spawner/west, -/turf/open/floor/grass, -/area/security/checkpoint/medical) -"cfR" = ( -/obj/structure/cable, -/obj/structure/window/reinforced/spawner/east, -/obj/structure/window/reinforced/spawner/north, -/obj/structure/window/reinforced/spawner, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/reedbush, -/obj/structure/flora/ausbushes/sunnybush, -/turf/open/floor/grass, -/area/security/checkpoint/medical) "cfT" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical/glass{ @@ -49514,6 +48832,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "cfV" = ( @@ -49714,11 +49033,12 @@ req_access_txt = "47" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "cgq" = ( /turf/closed/wall/r_wall, -/area/science/explab) +/area/science/genetics) "cgs" = ( /turf/open/floor/plating{ icon_state = "platingdmg2" @@ -49975,32 +49295,13 @@ /turf/open/floor/plasteel/white, /area/medical/storage) "cgX" = ( -/obj/structure/chair/greyscale, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/medical/medbay/central) -"cgY" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/obj/structure/chair/greyscale, /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, +/obj/structure/chair, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "cgZ" = ( @@ -50009,30 +49310,28 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 4 }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "cha" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 12 }, /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 +/obj/effect/turf_decal/tile/yellow, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 4 }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) @@ -50279,6 +49578,7 @@ /area/science/research) "chv" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/cafeteria{ dir = 5 }, @@ -50288,21 +49588,32 @@ /turf/closed/wall/r_wall, /area/bridge/showroom/corporate) "chx" = ( -/turf/open/floor/engine, -/area/science/explab) +/obj/structure/flora/ausbushes/brflowers, +/mob/living/carbon/monkey, +/turf/open/floor/grass, +/area/science/genetics) "chy" = ( -/obj/structure/sign/warning/nosmoking{ - pixel_y = 32 - }, -/obj/machinery/camera{ - c_tag = "Experimentation Lab - Test Chamber"; - network = list("ss13","rd") - }, /obj/machinery/light{ dir = 1 }, -/turf/open/floor/engine, -/area/science/explab) +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/item/twohanded/required/kirbyplants/random, +/obj/machinery/airalarm{ + pixel_y = 28 + }, +/turf/open/floor/plasteel/white, +/area/science/genetics) "chz" = ( /obj/structure/window/reinforced{ dir = 1; @@ -50311,11 +49622,23 @@ /turf/open/floor/plasteel/dark, /area/aisat) "chA" = ( -/obj/item/radio/intercom{ - pixel_y = 25 +/obj/structure/table/glass, +/obj/item/storage/box/disks{ + pixel_x = 4; + pixel_y = 4 }, -/turf/open/floor/engine, -/area/science/explab) +/obj/item/storage/box/syringes{ + pixel_x = -2; + pixel_y = 3 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/science/genetics) "chB" = ( /obj/machinery/space_heater, /obj/effect/landmark/blobstart, @@ -50326,23 +49649,20 @@ /area/maintenance/starboard) "chC" = ( /obj/structure/closet/crate, -/obj/item/storage/belt/utility, -/obj/item/stack/cable_coil, -/obj/effect/spawner/lootdrop/maintenance, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/effect/spawner/lootdrop/maintenance/four, /turf/open/floor/plating, /area/maintenance/starboard) "chD" = ( /obj/structure/closet/crate{ icon_state = "crateopen" }, -/obj/item/cane, -/obj/effect/spawner/lootdrop/maintenance, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating, /area/maintenance/starboard) "chE" = ( @@ -50473,6 +49793,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/effect/landmark/start/paramedic, /turf/open/floor/plasteel/white, /area/medical/sleeper) "cif" = ( @@ -50601,10 +49922,6 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, @@ -50620,50 +49937,20 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) -"cir" = ( -/obj/machinery/atmospherics/pipe/manifold/supply, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/medical/medbay/central) "cit" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 - }, /obj/structure/cable, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 4 }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "ciu" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ +/obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 +/obj/effect/turf_decal/tile/yellow, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 5 }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) @@ -50887,6 +50174,7 @@ "ciQ" = ( /obj/item/cigbutt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/cafeteria{ dir = 5 }, @@ -50901,40 +50189,19 @@ dir = 4 }, /area/science/research) -"ciS" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, -/mob/living/simple_animal/pet/dog/pug{ - desc = "It's Pugley IV, the research department's lovable pug clone. Hopefully nothing happens to this one - fourth time lucky!"; - name = "Pugley IV"; - real_name = "Pugley IV" - }, -/turf/open/floor/engine, -/area/science/explab) -"ciT" = ( -/obj/item/beacon, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 - }, -/turf/open/floor/engine, -/area/science/explab) -"ciU" = ( -/obj/machinery/rnd/experimentor, -/turf/open/floor/engine, -/area/science/explab) -"ciV" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/open/floor/engine, -/area/science/explab) "ciW" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 10 +/obj/machinery/computer/scan_consolenew{ + dir = 8 }, -/turf/open/floor/engine, -/area/science/explab) +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple, +/turf/open/floor/plasteel/white, +/area/science/genetics) "ciX" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable, @@ -51272,29 +50539,16 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "cjR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 9 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, /obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ +/obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "cjS" = ( @@ -51439,7 +50693,7 @@ dir = 4 }, /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, @@ -51457,7 +50711,7 @@ /area/science/research) "ckg" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -51511,7 +50765,7 @@ pixel_x = -24 }, /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, @@ -51537,6 +50791,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/cafeteria{ dir = 5 }, @@ -51551,34 +50806,20 @@ }, /area/science/research) "ckr" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/engine, -/area/science/explab) -"cks" = ( -/obj/machinery/button/door{ - id = "telelab"; - name = "Test Chamber Blast Doors"; - pixel_y = -25 - }, -/turf/open/floor/engine, -/area/science/explab) -"ckt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/engine, -/area/science/explab) +/turf/open/floor/plasteel/white, +/area/science/genetics) "cku" = ( /obj/structure/closet, -/obj/item/storage/box/donkpockets, /obj/effect/spawner/lootdrop/maintenance/three, /obj/effect/turf_decal/stripes/line, +/obj/effect/spawner/lootdrop/donkpockets, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "ckv" = ( /obj/structure/closet/crate, /obj/machinery/atmospherics/components/unary/vent_pump/on, -/obj/item/assembly/infra, -/obj/effect/spawner/lootdrop/maintenance, /obj/effect/turf_decal/stripes/line, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "ckw" = ( @@ -51851,7 +51092,7 @@ /area/medical/sleeper) "clj" = ( /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, @@ -51888,7 +51129,6 @@ id = "cmoprivacy"; name = "privacy shutter" }, -/obj/structure/cable, /obj/effect/turf_decal/tile/blue{ dir = 1 }, @@ -51902,39 +51142,34 @@ /turf/open/floor/plating, /area/medical/medbay/central) "clo" = ( -/obj/structure/chair/greyscale{ - dir = 1 - }, /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/effect/turf_decal/tile/blue, +/obj/structure/chair{ + dir = 1 + }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "clp" = ( /obj/structure/table, -/obj/item/storage/firstaid{ +/obj/machinery/light, +/obj/item/storage/firstaid/regular{ pixel_x = 4; pixel_y = 4 }, -/obj/machinery/light, -/obj/item/storage/firstaid, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/regular{ + pixel_x = -4; + pixel_y = -4 }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/effect/turf_decal/tile/blue, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "clq" = ( @@ -51943,28 +51178,19 @@ pixel_y = -24 }, /obj/item/twohanded/required/kirbyplants, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, /obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "clr" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ - dir = 4 + dir = 8 }, /obj/effect/turf_decal/tile/blue{ - dir = 8 + dir = 4 }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) @@ -52207,9 +51433,6 @@ }, /area/science/research) "clO" = ( -/obj/structure/disposalpipe/segment{ - dir = 6 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 }, @@ -52218,9 +51441,6 @@ }, /area/science/research) "clP" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -52230,9 +51450,6 @@ }, /area/science/research) "clQ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 8 }, @@ -52245,6 +51462,9 @@ dir = 1; network = list("ss13","rd") }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, /turf/open/floor/plasteel/cafeteria{ dir = 5 }, @@ -52259,34 +51479,37 @@ }, /area/science/research) "clS" = ( -/obj/structure/sign/warning/electricshock, -/turf/closed/wall/r_wall, -/area/science/explab) +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/grass, +/area/science/genetics) "clT" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/preopen{ - id = "telelab"; - name = "test chamber blast door" +/obj/effect/turf_decal/stripes/line{ + dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plating, -/area/science/explab) -"clU" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/preopen{ - id = "telelab"; - name = "test chamber blast door" +/obj/effect/turf_decal/stripes/line{ + dir = 4 }, -/turf/open/floor/plating, -/area/science/explab) +/turf/open/floor/grass, +/area/science/genetics) "clV" = ( -/obj/machinery/door/poddoor/preopen{ - id = "telelab"; - name = "test chamber blast door" +/obj/structure/table/glass, +/obj/effect/turf_decal/tile/purple{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/engine, -/area/science/explab) +/obj/effect/turf_decal/tile/purple, +/obj/item/storage/box/disks{ + pixel_x = -5; + pixel_y = 4 + }, +/obj/item/storage/box/rxglasses{ + pixel_x = 3; + pixel_y = 4 + }, +/obj/item/radio/intercom{ + pixel_x = 28 + }, +/turf/open/floor/plasteel/white, +/area/science/genetics) "clW" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 8 @@ -52586,7 +51809,6 @@ /area/maintenance/starboard/secondary) "cmN" = ( /obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/medical{ name = "Research Break Room"; req_one_access_txt = "47" @@ -52604,94 +51826,40 @@ /area/science/research) "cmP" = ( /turf/closed/wall, -/area/science/explab) +/area/science/genetics) "cmQ" = ( /obj/structure/extinguisher_cabinet{ pixel_x = -27 }, -/obj/machinery/requests_console{ - department = "Science"; - departmentType = 2; - name = "Science Requests Console"; - pixel_y = 30; - receive_ore_updates = 1 +/obj/structure/window/reinforced{ + dir = 1; + layer = 2.9 }, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plasteel, -/area/science/explab) -"cmR" = ( -/obj/structure/table/reinforced, -/obj/item/paper_bin{ - pixel_x = -2; - pixel_y = 6 - }, -/obj/item/pen, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plasteel, -/area/science/explab) -"cmS" = ( -/obj/structure/table/reinforced, -/obj/item/hand_labeler, -/obj/item/stack/packageWrap, -/obj/item/stack/packageWrap, -/obj/item/stack/packageWrap, -/obj/item/taperecorder, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plasteel, -/area/science/explab) -"cmT" = ( -/obj/machinery/computer/rdconsole/experiment, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plasteel, -/area/science/explab) -"cmU" = ( -/obj/structure/table/reinforced, -/obj/item/clipboard, -/obj/item/book/manual/wiki/experimentor, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plasteel, -/area/science/explab) -"cmV" = ( -/obj/machinery/button/door{ - id = "telelab"; - name = "Test Chamber Blast Doors"; - pixel_y = 25 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 6 - }, -/obj/structure/table/reinforced, -/obj/item/reagent_containers/glass/bottle/epinephrine{ - pixel_x = 7; - pixel_y = 2 - }, -/obj/item/reagent_containers/glass/bottle/multiver{ - pixel_x = -2; - pixel_y = -1 - }, -/obj/item/reagent_containers/dropper, -/obj/item/stack/medical/suture{ - pixel_x = -2; - pixel_y = 6 - }, -/obj/item/stack/medical/mesh, -/obj/item/healthanalyzer, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plasteel, -/area/science/explab) -"cmW" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 9 - }, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/light{ +/obj/effect/turf_decal/tile/purple{ dir = 4 }, -/turf/open/floor/plasteel, -/area/science/explab) +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/machinery/shower{ + dir = 4 + }, +/obj/effect/turf_decal/box, +/turf/open/floor/plasteel/white, +/area/science/genetics) +"cmS" = ( +/obj/machinery/holopad, +/turf/open/floor/plasteel/white, +/area/science/genetics) +"cmT" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/science/genetics) "cmX" = ( /obj/structure/window/reinforced, /obj/machinery/holopad, @@ -53309,8 +52477,10 @@ /area/science/research) "coe" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/disposalpipe/junction/flip, /obj/structure/cable, +/obj/structure/disposalpipe/sorting/mail/flip{ + sortType = 23 + }, /turf/open/floor/plasteel/white/side, /area/science/research) "cof" = ( @@ -53331,7 +52501,6 @@ /turf/open/floor/plasteel/white, /area/science/research) "coh" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/tile/purple{ dir = 1 @@ -53356,86 +52525,19 @@ /turf/open/floor/plasteel/white, /area/science/research) "cok" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -26 +/obj/effect/turf_decal/tile/purple{ + dir = 1 }, -/obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/purple{ dir = 8 }, /turf/open/floor/plasteel/white, -/area/science/explab) -"col" = ( -/obj/structure/chair/office/light{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/science/explab) -"com" = ( -/obj/structure/table/reinforced, -/obj/item/folder/white{ - pixel_x = 4; - pixel_y = -3 - }, -/obj/item/folder/white{ - pixel_x = 4; - pixel_y = -3 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 - }, -/obj/item/stack/sheet/mineral/plasma{ - pixel_y = 4 - }, -/turf/open/floor/plasteel/white, -/area/science/explab) +/area/science/genetics) "con" = ( -/obj/effect/landmark/start/scientist, -/obj/structure/chair/office/light{ - dir = 1; - pixel_y = 3 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/obj/effect/landmark/event_spawn, /turf/open/floor/plasteel/white, -/area/science/explab) -"coo" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/structure/table/reinforced, -/obj/item/wrench, -/obj/item/crowbar, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, -/obj/item/clothing/glasses/science, -/obj/item/multitool{ - pixel_x = 3 - }, -/turf/open/floor/plasteel/white, -/area/science/explab) -"cop" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/machinery/holopad, -/turf/open/floor/plasteel/white, -/area/science/explab) -"coq" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 27 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/science/explab) +/area/science/genetics) "cor" = ( /obj/structure/girder, /obj/structure/grille, @@ -53900,10 +53002,8 @@ /area/science/research) "cpq" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden, -/obj/structure/disposalpipe/sorting/mail/flip{ - sortType = 25 - }, /obj/structure/cable, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/white, /area/science/research) "cpr" = ( @@ -53917,14 +53017,14 @@ /turf/open/floor/plasteel/white, /area/science/research) "cpt" = ( -/obj/structure/disposalpipe/junction{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/science/research) "cpu" = ( @@ -53968,10 +53068,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/machinery/door/airlock/research{ - name = "Experimentation Lab"; - req_access_txt = "8" - }, /obj/effect/turf_decal/tile/purple{ dir = 1 }, @@ -53983,15 +53079,16 @@ dir = 8 }, /obj/structure/cable, +/obj/machinery/door/airlock/research/glass{ + name = "Genetics Lab"; + req_access_txt = "9, 30" + }, /turf/open/floor/plasteel/white, -/area/science/explab) +/area/science/genetics) "cpy" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, /obj/effect/turf_decal/tile/purple{ dir = 1 }, @@ -53999,54 +53096,45 @@ dir = 8 }, /obj/structure/cable, -/turf/open/floor/plasteel/white, -/area/science/explab) -"cpz" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 10 }, -/obj/structure/cable, /turf/open/floor/plasteel/white, -/area/science/explab) -"cpA" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 - }, -/obj/structure/cable, -/turf/open/floor/plasteel/white, -/area/science/explab) +/area/science/genetics) "cpB" = ( /obj/structure/cable, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/open/floor/plasteel/white, -/area/science/explab) +/area/science/genetics) "cpC" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 6 - }, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/plasteel/white, -/area/science/explab) +/area/science/genetics) "cpD" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/structure/cable, /turf/open/floor/plasteel/white, -/area/science/explab) +/area/science/genetics) "cpE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 4 }, /obj/structure/cable, -/turf/open/floor/plasteel, -/area/science/explab) +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/science/genetics) "cpF" = ( /obj/machinery/door/airlock/maintenance{ - name = "Experimentation Lab Maintenance"; - req_access_txt = "8" + name = "Genetics Lab Maintenance"; + req_access_txt = "9, 30" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -54568,7 +53656,7 @@ pixel_y = -22 }, /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, @@ -54597,27 +53685,12 @@ /turf/open/floor/plasteel/white, /area/science/research) "cqG" = ( -/obj/structure/disposalpipe/segment{ - dir = 6 - }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 8 }, /turf/open/floor/plasteel/white, /area/science/research) -"cqH" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/science/research) "cqI" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -54625,12 +53698,12 @@ /turf/open/floor/plasteel/white, /area/science/research) "cqJ" = ( -/obj/structure/disposalpipe/segment{ - dir = 9 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/structure/disposalpipe/sorting/mail/flip{ + sortType = 24 + }, /turf/open/floor/plasteel/white, /area/science/research) "cqK" = ( @@ -54697,78 +53770,87 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/closed/wall, -/area/science/explab) +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/science/genetics) "cqQ" = ( /obj/machinery/light_switch{ - pixel_x = -23 + pixel_y = -23 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, /obj/effect/turf_decal/tile/purple{ dir = 1 }, -/turf/open/floor/plasteel/white, -/area/science/explab) -"cqR" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ +/obj/structure/disposalpipe/trunk{ dir = 1 }, +/obj/machinery/disposal/bin, +/turf/open/floor/plasteel/white, +/area/science/genetics) +"cqR" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /obj/machinery/power/apc{ - areastring = "/area/science/explab"; - name = "Experimentation Lab APC"; + areastring = "/area/science/genetics"; + name = "Genetics Lab APC"; pixel_y = -23 }, /obj/structure/cable, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, /turf/open/floor/plasteel/white, -/area/science/explab) +/area/science/genetics) "cqS" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/item/radio/intercom{ - pixel_y = -29 - }, /obj/machinery/camera{ - c_tag = "Experimentation Lab"; + c_tag = "Genetics Lab"; dir = 1; network = list("ss13","rd") }, /obj/machinery/light, -/turf/open/floor/plasteel/white, -/area/science/explab) -"cqT" = ( +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/machinery/firealarm{ + pixel_y = -24 + }, /turf/open/floor/plasteel/white, -/area/science/explab) +/area/science/genetics) "cqU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 9 - }, -/turf/open/floor/plasteel/white, -/area/science/explab) -"cqV" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/open/floor/plasteel/white, -/area/science/explab) -"cqW" = ( -/obj/machinery/airalarm{ - dir = 8; - pixel_x = 24 - }, -/obj/effect/turf_decal/stripes/line{ +/obj/effect/turf_decal/tile/purple{ dir = 8 }, -/turf/open/floor/plasteel, -/area/science/explab) +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/science/genetics) +"cqW" = ( +/obj/structure/sink{ + dir = 8; + pixel_x = 11 + }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/structure/mirror{ + pixel_x = 28 + }, +/turf/open/floor/plasteel/white, +/area/science/genetics) "cqX" = ( /obj/structure/bed/roller, /obj/effect/decal/cleanable/blood/old, @@ -54833,12 +53915,22 @@ icon_state = "wood-broken4" }, /area/maintenance/port/aft) +"cri" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue, +/obj/structure/chair{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/central) "crj" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 }, /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, @@ -55131,12 +54223,6 @@ /obj/structure/cable, /turf/open/floor/plasteel/white, /area/science/research) -"crM" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/door/firedoor, -/turf/open/floor/plasteel/white, -/area/science/research) "crN" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -55168,6 +54254,7 @@ name = "privacy shutter" }, /obj/structure/cable, +/obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/crew_quarters/heads/hor) "crQ" = ( @@ -55197,35 +54284,43 @@ /turf/open/floor/plasteel, /area/science/storage) "crU" = ( -/obj/structure/closet/emcloset, -/obj/effect/turf_decal/stripes/line{ +/obj/structure/table/glass, +/obj/effect/turf_decal/tile/purple{ dir = 1 }, -/turf/open/floor/plasteel, -/area/science/explab) +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple, +/obj/item/storage/box/monkeycubes{ + pixel_x = -6; + pixel_y = 2 + }, +/obj/item/storage/box/monkeycubes{ + pixel_x = 6; + pixel_y = 1 + }, +/turf/open/floor/plasteel/white, +/area/science/genetics) "crV" = ( -/obj/structure/closet/radiation, -/obj/effect/turf_decal/stripes/line{ +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple, +/obj/machinery/computer/scan_consolenew{ + icon_state = "computer"; dir = 1 }, -/turf/open/floor/plasteel, -/area/science/explab) +/turf/open/floor/plasteel/white, +/area/science/genetics) "crW" = ( -/obj/structure/closet/l3closet/scientist{ - pixel_x = -2 +/obj/effect/turf_decal/tile/purple{ + dir = 8 }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/science/explab) -"crX" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/vending/wardrobe/science_wardrobe, -/turf/open/floor/plasteel, -/area/science/explab) +/obj/effect/turf_decal/tile/purple, +/obj/machinery/dna_scannernew, +/turf/open/floor/plasteel/white, +/area/science/genetics) "crZ" = ( /obj/structure/table, /obj/structure/bedsheetbin{ @@ -55285,14 +54380,12 @@ /area/maintenance/starboard/secondary) "csi" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 4 - }, /obj/structure/cable, /obj/effect/decal/cleanable/dirt, /obj/structure/sign/poster/contraband/random{ pixel_x = -32 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, /area/maintenance/port/aft) "csj" = ( @@ -55762,23 +54855,27 @@ }, /area/science/research) "csW" = ( -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 8; - sortType = 13 - }, /obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/science/research) "csX" = ( -/obj/structure/disposalpipe/segment{ - dir = 9 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/disposalpipe/sorting/mail/flip{ + dir = 8; + sortType = 25 + }, /turf/open/floor/plasteel/white, /area/science/research) "csZ" = ( /obj/structure/table/reinforced, /obj/machinery/computer/security/telescreen/rd, +/obj/structure/disposalpipe/sorting/mail/flip{ + dir = 8; + sortType = 13 + }, /turf/open/floor/plasteel/cafeteria{ dir = 5 }, @@ -55951,6 +55048,13 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/machinery/power/apc{ + areastring = "/area/medical/medbay/central"; + dir = 4; + name = "Medbay Central APC"; + pixel_x = 24 + }, +/obj/structure/cable, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "ctx" = ( @@ -55999,23 +55103,22 @@ /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/heads/cmo) "ctA" = ( -/turf/closed/wall/r_wall, -/area/medical/genetics) -"ctB" = ( -/turf/closed/wall, -/area/medical/genetics) +/obj/machinery/firealarm{ + pixel_y = 24 + }, +/turf/open/floor/plasteel/dark, +/area/medical/morgue) "ctC" = ( /obj/machinery/door/airlock/maintenance{ - name = "Genetics Maintenance"; - req_access_txt = "9" + name = "Morgue Maintenance"; + req_access_txt = "6" }, -/obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/department/medical/central) "ctD" = ( /obj/structure/sign/directions/evac, /turf/closed/wall, -/area/medical/genetics) +/area/medical/morgue) "ctE" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/firedoor, @@ -56077,11 +55180,6 @@ dir = 6 }, /area/science/research) -"ctO" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/turf/open/floor/plasteel/white, -/area/science/research) "ctP" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/white, @@ -56115,6 +55213,7 @@ pixel_y = -5; req_access_txt = "47" }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/cafeteria{ dir = 5 }, @@ -56186,18 +55285,15 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/structure/disposalpipe/junction/flip{ - dir = 8 - }, /obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, /turf/open/floor/plasteel, /area/science/storage) "ctZ" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /obj/effect/turf_decal/bot, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable, /turf/open/floor/plasteel, /area/science/storage) @@ -56208,9 +55304,6 @@ pixel_x = 24 }, /obj/effect/turf_decal/bot, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/open/floor/plasteel, /area/science/storage) "cub" = ( @@ -56221,16 +55314,24 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "cuc" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 - }, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "cud" = ( -/obj/machinery/light{ +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/cable, /turf/open/floor/plasteel/white, /area/science/misc_lab/range) "cue" = ( @@ -56253,18 +55354,14 @@ /area/maintenance/port/aft) "cuh" = ( /obj/structure/closet/crate, -/obj/item/stack/cable_coil, -/obj/item/grenade/chem_grenade, -/obj/item/flashlight, /obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/lootdrop/maintenance/five, /turf/open/floor/plating, /area/maintenance/port/aft) "cui" = ( /obj/structure/closet/crate, -/obj/item/coin/silver, -/obj/item/reagent_containers/spray/weedspray, /obj/item/paper, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/lootdrop/maintenance/four, /turf/open/floor/plating, /area/maintenance/port/aft) "cuj" = ( @@ -56355,193 +55452,74 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/central) "cur" = ( -/obj/item/storage/box/rxglasses{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/box/bodybags, -/obj/item/radio/intercom{ - pixel_x = -29 - }, -/obj/structure/table/glass, -/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/medical/genetics) +/turf/open/floor/grass, +/area/science/genetics) "cus" = ( -/obj/item/clothing/gloves/color/latex, -/obj/item/clothing/gloves/color/latex, -/obj/item/storage/box/disks{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/structure/table/glass, -/obj/effect/turf_decal/tile/neutral{ +/obj/machinery/light/small{ 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/medical/genetics) +/area/medical/morgue) "cut" = ( -/obj/machinery/requests_console{ - department = "Genetics"; - name = "Genetics Requests Console"; - pixel_y = 30 - }, -/obj/item/storage/box/monkeycubes, -/obj/item/radio/headset/headset_medsci, -/obj/item/flashlight/pen{ - pixel_x = 4; - pixel_y = 3 - }, -/obj/item/flashlight/pen{ - pixel_x = 4; - pixel_y = 3 - }, -/obj/structure/noticeboard{ - pixel_x = -32; - pixel_y = 32 - }, -/obj/structure/table/glass, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ +/obj/structure/flora/ausbushes/fernybush, +/obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/medical/genetics) +/mob/living/carbon/monkey, +/turf/open/floor/grass, +/area/science/genetics) "cuu" = ( -/obj/machinery/power/apc{ - areastring = "/area/medical/genetics"; - dir = 1; - name = "Genetics Lab APC"; - pixel_y = 23 +/obj/machinery/camera{ + c_tag = "Morgue Fore"; + network = list("ss13","medbay") }, -/obj/item/folder/white{ - pixel_x = 4; - pixel_y = -3 - }, -/obj/item/folder/white{ - pixel_x = 4; - pixel_y = -3 - }, -/obj/item/storage/pill_bottle/mutadone, -/obj/item/storage/pill_bottle/mannitol, -/obj/structure/table/glass, -/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{ +/obj/structure/bodycontainer/morgue{ dir = 8 }, -/obj/structure/cable, /turf/open/floor/plasteel/dark, -/area/medical/genetics) +/area/medical/morgue) "cuv" = ( -/obj/item/reagent_containers/dropper, -/obj/item/reagent_containers/glass/beaker{ - pixel_x = 8; - pixel_y = 2 - }, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 24 - }, -/obj/structure/sign/warning/nosmoking{ - pixel_y = 32 - }, -/obj/structure/table/glass, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/tile/purple{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/machinery/vending/wardrobe/gene_wardrobe, +/turf/open/floor/plasteel/white, +/area/science/genetics) +"cuw" = ( +/obj/machinery/airalarm{ + pixel_y = 32 }, /turf/open/floor/plasteel/dark, -/area/medical/genetics) -"cuw" = ( -/obj/structure/filingcabinet/chestdrawer, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/medical/genetics) +/area/medical/morgue) "cux" = ( -/obj/structure/noticeboard{ - desc = "A board for pinning important notices upon. Probably helpful for keeping track of requests."; - name = "requests board"; - pixel_x = -32; - pixel_y = 32 - }, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ +/obj/structure/table/glass, +/obj/effect/turf_decal/tile/purple{ dir = 4 }, -/turf/open/floor/plasteel, -/area/medical/genetics) -"cuy" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "genetics_shutters"; - name = "genetics shutters" +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 1 }, -/turf/open/floor/plating, -/area/medical/genetics) +/obj/item/reagent_containers/spray/cleaner{ + pixel_x = -8 + }, +/obj/item/storage/box/bodybags{ + pixel_x = 4; + pixel_y = 4 + }, +/turf/open/floor/plasteel/white, +/area/science/genetics) "cuz" = ( -/obj/structure/table/reinforced, -/obj/item/paper_bin{ - pixel_x = -2; - pixel_y = 6 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ +/obj/machinery/light{ dir = 8 }, -/turf/open/floor/plasteel, -/area/medical/genetics) +/obj/item/reagent_containers/food/snacks/grown/banana, +/obj/effect/landmark/start/geneticist, +/turf/open/floor/grass, +/area/science/genetics) "cuA" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/tile/blue{ @@ -56600,23 +55578,17 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plasteel/dark, /area/science/nanite) -"cuJ" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 8 - }, -/obj/structure/cable, -/turf/open/floor/plasteel/white, -/area/science/research) "cuK" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/tile/blue, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/white, /area/science/research) "cuM" = ( /obj/machinery/computer/card/minor/rd{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/cafeteria{ dir = 5 }, @@ -56687,10 +55659,10 @@ /area/science/storage) "cuU" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/disposalpipe/segment, /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/science/storage) "cuV" = ( @@ -56714,10 +55686,8 @@ "cuY" = ( /obj/structure/rack, /obj/item/extinguisher, -/obj/item/storage/belt/utility, -/obj/item/clothing/mask/gas, /obj/item/storage/box/lights/mixed, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/lootdrop/maintenance/four, /turf/open/floor/plating, /area/maintenance/starboard/secondary) "cuZ" = ( @@ -56788,211 +55758,72 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/white, /area/medical/medbay/central) -"cvt" = ( -/turf/closed/wall, -/area/medical/genetics/cloning) "cvu" = ( -/obj/machinery/shower{ - dir = 4 - }, -/obj/machinery/door/window/southleft{ - name = "Cloning Shower" - }, -/obj/structure/mirror{ - pixel_x = -28 - }, -/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{ +/obj/effect/turf_decal/tile/blue{ dir = 8 }, -/turf/open/floor/plasteel/dark, -/area/medical/genetics/cloning) +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/structure/closet/wardrobe/pjs, +/turf/open/floor/plasteel/white, +/area/medical/medbay/aft) "cvv" = ( -/obj/machinery/door/window/southleft{ - base_state = "right"; - icon_state = "right"; - name = "Cloning Shower" - }, -/obj/structure/sink/kitchen{ - desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - name = "sink"; - pixel_y = 28 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 +/obj/effect/turf_decal/tile/blue{ + dir = 1 }, -/turf/open/floor/plasteel/dark, -/area/medical/genetics/cloning) +/obj/structure/closet/wardrobe/mixed, +/turf/open/floor/plasteel/white, +/area/medical/medbay/aft) "cvw" = ( -/obj/machinery/clonepod{ - pixel_y = 2 - }, /obj/item/radio/intercom{ pixel_x = 29 }, -/obj/structure/window/reinforced, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue, +/obj/structure/closet/wardrobe/pjs, +/turf/open/floor/plasteel/white, +/area/medical/medbay/aft) +"cvx" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/turf/open/floor/grass, +/area/science/genetics) +"cvy" = ( +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/plasteel/white, +/area/science/genetics) +"cvz" = ( +/obj/structure/flora/ausbushes/grassybush, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/grass, +/area/science/genetics) +"cvA" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/science/genetics) +"cvB" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 5 }, /turf/open/floor/plasteel/dark, -/area/medical/genetics/cloning) -"cvx" = ( -/obj/machinery/computer/scan_consolenew{ - dir = 4 - }, -/obj/machinery/camera{ - c_tag = "Genetics Lab"; - dir = 4; - network = list("ss13","medbay") - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/machinery/light{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"cvy" = ( -/obj/structure/chair/office/light{ - dir = 8 - }, -/obj/effect/landmark/start/geneticist, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"cvz" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"cvA" = ( -/obj/structure/chair/office/light{ - dir = 4 - }, -/obj/effect/landmark/start/geneticist, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"cvB" = ( -/obj/machinery/computer/scan_consolenew{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/machinery/light{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"cvC" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -24 - }, -/obj/item/storage/box/syringes, -/obj/item/storage/box/beakers{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/structure/table/glass, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/medical/genetics) -"cvD" = ( -/obj/structure/chair/office/light{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/obj/effect/landmark/start/geneticist, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/medical/genetics) +/area/medical/morgue) "cvE" = ( -/obj/structure/table/reinforced, -/obj/item/folder/white{ - pixel_x = 4; - pixel_y = -3 +/obj/machinery/light/small{ + dir = 4 }, -/obj/item/pen, -/obj/machinery/door/firedoor, -/obj/machinery/door/window/eastright{ - dir = 8; - name = "Genetics Desk"; - req_access_txt = "5;9" - }, -/obj/machinery/door/window/southleft{ - dir = 4; - name = "Outer Window" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "genetics_shutters"; - name = "genetics shutters" - }, -/turf/open/floor/plating, -/area/medical/genetics) +/turf/open/floor/plasteel/dark, +/area/medical/morgue) "cvF" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -57004,8 +55835,8 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, -/turf/open/floor/plasteel, -/area/medical/genetics) +/turf/closed/wall, +/area/medical/morgue) "cvG" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/extinguisher_cabinet{ @@ -57056,17 +55887,7 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/white, /area/science/research) -"cvN" = ( -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/structure/cable, -/turf/open/floor/plasteel/white, -/area/science/research) "cvO" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 8 }, @@ -57075,12 +55896,10 @@ dir = 4 }, /obj/structure/cable, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/white, /area/science/research) "cvP" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -57095,13 +55914,13 @@ }, /area/crew_quarters/heads/hor) "cvQ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, /turf/open/floor/plasteel/cafeteria{ dir = 5 }, @@ -57158,11 +55977,11 @@ /area/science/storage) "cvW" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/disposalpipe/segment, /obj/effect/landmark/blobstart, /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/science/storage) "cvX" = ( @@ -57186,7 +56005,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/science/misc_lab/range) "cwc" = ( /obj/effect/turf_decal/stripes/line, @@ -57196,16 +56015,8 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 }, -/obj/structure/table, -/obj/item/clothing/ears/earmuffs, -/obj/item/clothing/ears/earmuffs, -/obj/item/gun/energy/laser/practice{ - pixel_x = 2; - pixel_y = -2 - }, -/obj/item/gun/energy/laser/practice{ - pixel_x = -3; - pixel_y = 3 +/obj/effect/turf_decal/tile/purple{ + dir = 4 }, /turf/open/floor/plasteel/white, /area/science/misc_lab/range) @@ -57231,7 +56042,7 @@ "cwn" = ( /obj/structure/rack, /obj/item/flashlight/pen, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/lootdrop/maintenance/three, /turf/open/floor/plating, /area/maintenance/port/aft) "cwo" = ( @@ -57303,7 +56114,7 @@ "cwu" = ( /obj/structure/disposalpipe/segment, /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ @@ -57312,149 +56123,34 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/aft) "cwv" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = -12; - pixel_y = 2 - }, -/obj/machinery/light_switch{ - pixel_x = -23 - }, /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, /turf/open/floor/plasteel/white, -/area/medical/genetics/cloning) +/area/medical/medbay/aft) "cww" = ( -/obj/effect/landmark/start/geneticist, /obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, /turf/open/floor/plasteel/white, -/area/medical/genetics/cloning) +/area/medical/medbay/aft) "cwx" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 10 }, -/obj/machinery/computer/cloning{ - dir = 8 - }, /obj/machinery/light{ dir = 4 }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ dir = 4 }, /turf/open/floor/plasteel/white, -/area/medical/genetics/cloning) -"cwy" = ( -/obj/machinery/dna_scannernew, -/obj/machinery/light_switch{ - pixel_x = -23 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"cwz" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"cwA" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"cwB" = ( -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"cwC" = ( -/obj/machinery/dna_scannernew, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"cwD" = ( -/obj/item/storage/box/disks{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/radio/intercom{ - pixel_x = -29 - }, -/obj/machinery/camera{ - c_tag = "Genetics Desk"; - dir = 4; - network = list("ss13","medbay") - }, -/obj/structure/table/glass, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/medical/genetics) -"cwE" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/button/door{ - id = "genetics_shutters"; - name = "genetics shutters control"; - pixel_x = 28; - req_access_txt = "9" - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/medical/genetics) +/area/medical/medbay/aft) "cwF" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/firealarm{ @@ -57524,6 +56220,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/white, /area/science/research) "cwP" = ( @@ -57652,19 +56349,14 @@ /turf/open/floor/plasteel, /area/science/storage) "cwZ" = ( -/obj/structure/target_stake, -/obj/item/target/syndicate, -/turf/open/floor/plasteel, +/obj/machinery/rnd/experimentor, +/turf/open/floor/engine, /area/science/misc_lab/range) "cxa" = ( /obj/item/stack/cable_coil, /obj/structure/lattice/catwalk, /turf/open/space, /area/solar/port/aft) -"cxc" = ( -/obj/item/trash/chips, -/turf/open/floor/plating, -/area/maintenance/port/aft) "cxd" = ( /obj/structure/reagent_dispensers/watertank, /obj/effect/landmark/blobstart, @@ -57743,7 +56435,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/medical/genetics/cloning) +/area/medical/medbay/aft) "cxm" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -57754,8 +56446,9 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/white, -/area/medical/genetics/cloning) +/area/medical/medbay/aft) "cxn" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 1 @@ -57764,125 +56457,51 @@ dir = 4 }, /turf/open/floor/plasteel/white, -/area/medical/genetics/cloning) +/area/medical/medbay/aft) "cxo" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/obj/machinery/dna_scannernew, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ dir = 4 }, /turf/open/floor/plasteel/white, -/area/medical/genetics/cloning) +/area/medical/medbay/aft) "cxp" = ( -/obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plating, -/area/medical/genetics) +/turf/closed/wall, +/area/medical/morgue) "cxq" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/medical/genetics) +/obj/structure/bodycontainer/morgue, +/turf/open/floor/plasteel/dark, +/area/medical/morgue) "cxr" = ( +/obj/effect/landmark/event_spawn, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/effect/landmark/event_spawn, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/turf/open/floor/plasteel/white, -/area/medical/genetics) +/turf/open/floor/plasteel/dark, +/area/medical/morgue) "cxs" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"cxt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"cxu" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/medical/genetics) +/turf/open/floor/plasteel/dark, +/area/medical/morgue) "cxv" = ( -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/medical/genetics) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 10 + }, +/turf/open/floor/plasteel/dark, +/area/medical/morgue) "cxw" = ( -/obj/item/folder/white{ - pixel_x = 4; - pixel_y = -3 - }, -/obj/item/stack/packageWrap, -/obj/item/pen, -/obj/item/reagent_containers/spray/cleaner, -/obj/structure/table/glass, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/medical/genetics) -"cxx" = ( -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/medical/genetics) -"cxy" = ( -/obj/structure/sign/warning/nosmoking{ - pixel_x = 28 - }, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/medical/genetics) +/obj/effect/landmark/xeno_spawn, +/turf/open/floor/plasteel/dark, +/area/medical/morgue) "cxz" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/light{ @@ -57964,10 +56583,11 @@ pixel_x = 29 }, /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/white, /area/science/research) "cxK" = ( @@ -57996,13 +56616,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"cxP" = ( -/obj/structure/table, -/obj/machinery/recharger{ - pixel_y = 4 - }, -/turf/open/floor/plasteel/white, -/area/science/misc_lab/range) "cxQ" = ( /obj/machinery/computer/slot_machine{ pixel_y = 2 @@ -58054,16 +56667,12 @@ "cxY" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical/glass{ - id_tag = "CloningDoor"; - name = "Cloning Lab"; - req_access_txt = "5; 68" + name = "Storage"; + req_access_txt = "5" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, -/obj/effect/mapping_helpers/airlock/unres{ - dir = 4 - }, /obj/effect/turf_decal/tile/blue{ dir = 1 }, @@ -58076,7 +56685,7 @@ }, /obj/structure/cable, /turf/open/floor/plasteel/white, -/area/medical/genetics/cloning) +/area/medical/medbay/aft) "cxZ" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -58086,32 +56695,22 @@ }, /obj/structure/cable, /turf/open/floor/plasteel/white, -/area/medical/genetics/cloning) +/area/medical/medbay/aft) "cya" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/structure/cable, /turf/open/floor/plasteel/white, -/area/medical/genetics/cloning) +/area/medical/medbay/aft) "cyb" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 6 - }, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ dir = 4 }, /obj/structure/cable, /turf/open/floor/plasteel/white, -/area/medical/genetics/cloning) +/area/medical/medbay/aft) "cyc" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/research/glass{ - name = "Genetics Lab"; - req_access_txt = "5; 9; 68" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, @@ -58125,107 +56724,37 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, -/obj/structure/cable, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"cyd" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 +/obj/machinery/door/airlock/grunge{ + name = "Morgue"; + req_access_txt = "5" }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/structure/cable, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"cye" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"cyf" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 - }, -/obj/effect/landmark/start/geneticist, -/obj/structure/cable, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"cyg" = ( -/obj/structure/cable, -/turf/open/floor/plasteel/white, -/area/medical/genetics) +/turf/open/floor/plasteel/dark, +/area/medical/morgue) "cyh" = ( -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 }, -/turf/open/floor/plasteel/white, -/area/medical/genetics) +/turf/open/floor/plasteel/dark, +/area/medical/morgue) "cyi" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/research{ - id_tag = "AuxGenetics"; - name = "Genetics Lab"; - req_access_txt = "9" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plasteel, -/area/medical/genetics) -"cyj" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/medical/genetics) -"cyk" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/medical/genetics) -"cyl" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/medical/genetics) +/turf/open/floor/plasteel/dark, +/area/medical/morgue) "cym" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/research{ - id_tag = "AuxGenetics"; - name = "Genetics Access"; - req_access_txt = "9" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 +/obj/machinery/door/airlock/grunge{ + name = "Morgue"; + req_access_txt = "6" }, /turf/open/floor/plasteel, -/area/medical/genetics) +/area/medical/morgue) "cyn" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/hallway/primary/aft) "cyo" = ( @@ -58303,6 +56832,7 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/white, /area/science/research) "cyy" = ( @@ -58394,8 +56924,8 @@ /area/science/mixing) "cyI" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/disposalpipe/segment, /obj/effect/turf_decal/delivery, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/science/mixing) "cyJ" = ( @@ -58419,6 +56949,9 @@ dir = 1; layer = 2.9 }, +/obj/structure/table, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/plasteel/white, /area/science/misc_lab/range) "cyN" = ( @@ -58491,35 +57024,19 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/white, -/area/medical/genetics/cloning) +/area/medical/medbay/aft) "cyW" = ( -/obj/effect/landmark/start/geneticist, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/white, -/area/medical/genetics/cloning) +/area/medical/medbay/aft) "cyX" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 - }, -/obj/machinery/power/apc/unlocked{ - areastring = "/area/medical/genetics/cloning"; - dir = 4; - name = "Cloning Lab APC"; - pixel_x = 24 - }, /obj/machinery/camera{ - c_tag = "Genetics Cloning Lab"; + c_tag = "Medbay Aux Storage"; dir = 8; network = list("ss13","medbay") }, @@ -58527,91 +57044,16 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, /obj/structure/cable, /turf/open/floor/plasteel/white, -/area/medical/genetics/cloning) +/area/medical/medbay/aft) "cyY" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ +/obj/structure/bodycontainer/morgue, +/obj/machinery/light/small{ dir = 8 }, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"cyZ" = ( -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"cza" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 11 - }, -/obj/structure/mirror{ - pixel_x = 28 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"czb" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 6 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/medical/genetics) -"czc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/medical/genetics) -"czd" = ( -/obj/machinery/light_switch{ - pixel_x = 23 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/medical/genetics) -"cze" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/closed/wall, -/area/medical/genetics) +/turf/open/floor/plasteel/dark, +/area/medical/morgue) "czf" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/item/radio/intercom{ @@ -58711,6 +57153,7 @@ dir = 4 }, /obj/effect/turf_decal/tile/purple, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/white, /area/science/research) "czr" = ( @@ -58941,15 +57384,10 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/aft) "czX" = ( -/obj/item/book/manual/wiki/medical_cloning{ - pixel_y = 6 - }, -/obj/item/paper, /obj/machinery/firealarm{ dir = 4; pixel_x = -24 }, -/obj/structure/table/glass, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -58960,17 +57398,18 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/turf/open/floor/plasteel/dark, -/area/medical/genetics/cloning) +/obj/structure/closet/secure_closet/personal/patient, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/plasteel/white, +/area/medical/medbay/aft) "czY" = ( -/obj/item/storage/box/rxglasses{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/box/bodybags, -/obj/item/pen, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/table/glass, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -58981,8 +57420,13 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/turf/open/floor/plasteel/dark, -/area/medical/genetics/cloning) +/obj/structure/closet/secure_closet/personal/patient, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/plasteel/white, +/area/medical/medbay/aft) "czZ" = ( /obj/structure/closet/secure_closet/personal/patient, /obj/machinery/airalarm{ @@ -58999,108 +57443,15 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/turf/open/floor/plasteel/dark, -/area/medical/genetics/cloning) -"cAa" = ( -/obj/machinery/airalarm{ - dir = 1; - pixel_y = -22 - }, -/obj/machinery/vending/wardrobe/gene_wardrobe, -/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{ +/obj/effect/turf_decal/tile/blue{ dir = 8 }, -/turf/open/floor/plasteel/dark, -/area/medical/genetics) -"cAb" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/bed/roller, -/obj/structure/window/reinforced{ - dir = 1; - pixel_y = 1 - }, -/mob/living/carbon/monkey, -/turf/open/floor/plasteel/freezer, -/area/medical/genetics) -"cAc" = ( -/obj/structure/bed/roller, -/obj/machinery/door/window/westleft{ - dir = 1; - name = "Monkey Pen"; - pixel_y = 2; - req_access_txt = "9" - }, -/turf/open/floor/plasteel/freezer, -/area/medical/genetics) -"cAd" = ( -/obj/machinery/light, -/obj/machinery/door/window/westleft{ - base_state = "right"; - dir = 1; - icon_state = "right"; - name = "Monkey Pen"; - pixel_y = 2; - req_access_txt = "9" - }, -/obj/structure/bed/roller, -/mob/living/carbon/monkey, -/turf/open/floor/plasteel/freezer, -/area/medical/genetics) -"cAe" = ( -/obj/structure/window/reinforced{ - dir = 1; - pixel_y = 1 - }, -/obj/structure/window/reinforced{ +/obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/structure/bed/roller, -/mob/living/carbon/monkey, -/turf/open/floor/plasteel/freezer, -/area/medical/genetics) -"cAf" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 1 - }, -/obj/machinery/airalarm{ - dir = 4; - pixel_x = -22 - }, -/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/medical/genetics) -"cAg" = ( -/obj/structure/closet/secure_closet/personal/patient, -/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/medical/genetics) +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/plasteel/white, +/area/medical/medbay/aft) "cAh" = ( /obj/machinery/airalarm{ dir = 4; @@ -59214,6 +57565,9 @@ dir = 4 }, /obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, /turf/open/floor/plasteel/white, /area/science/research) "cAw" = ( @@ -59228,6 +57582,9 @@ }, /obj/effect/turf_decal/delivery, /obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/science/mixing) "cAx" = ( @@ -59238,11 +57595,17 @@ dir = 5 }, /obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/science/mixing) "cAy" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/science/mixing) "cAz" = ( @@ -59250,6 +57613,9 @@ dir = 4 }, /obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/science/mixing) "cAB" = ( @@ -59258,22 +57624,22 @@ }, /obj/effect/landmark/event_spawn, /obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/science/mixing) "cAC" = ( -/obj/structure/disposalpipe/segment{ - dir = 6 - }, /obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, /turf/open/floor/plasteel/white, /area/science/mixing) "cAD" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable, /turf/open/floor/plasteel/white, /area/science/mixing) @@ -59283,18 +57649,13 @@ }, /obj/machinery/holopad, /obj/effect/landmark/start/scientist, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/open/floor/plasteel/white, /area/science/mixing) "cAF" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/white, /area/science/mixing) "cAG" = ( @@ -59332,6 +57693,12 @@ /obj/machinery/light{ dir = 4 }, +/obj/machinery/button/door{ + id = "Experimentor"; + name = "emergency blast door button"; + pixel_x = 25; + req_one_access_txt = "47" + }, /turf/open/floor/plasteel, /area/maintenance/department/science) "cAL" = ( @@ -59350,6 +57717,7 @@ req_one_access_txt = "47" }, /obj/effect/turf_decal/delivery, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel, /area/science/research) "cAN" = ( @@ -59422,7 +57790,7 @@ dir = 4 }, /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /turf/open/floor/plasteel/cafeteria{ @@ -59462,15 +57830,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, -/area/medical/genetics/cloning) -"cBc" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/grunge{ - name = "Genetics"; - req_access_txt = "9" - }, -/turf/open/floor/plasteel/dark, -/area/medical/genetics) +/area/medical/medbay/aft) "cBd" = ( /obj/structure/sign/directions/evac, /turf/closed/wall, @@ -59552,7 +57912,7 @@ dir = 4 }, /turf/open/floor/plasteel/dark, -/area/maintenance/port/aft) +/area/medical/chemistry) "cBs" = ( /turf/open/floor/plasteel/white, /area/science/mixing) @@ -59620,6 +57980,9 @@ /area/science/mixing) "cBA" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, /turf/open/floor/plasteel/white, /area/science/mixing) "cBB" = ( @@ -59627,6 +57990,9 @@ dir = 4 }, /obj/effect/turf_decal/delivery, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/science/mixing) "cBC" = ( @@ -59634,7 +58000,7 @@ dir = 4 }, /obj/machinery/door/airlock/research{ - name = "Toxins Launch Room Access"; + name = "Toxins Launch Room and Experimentor Access"; req_access_txt = "8" }, /obj/machinery/door/poddoor/shutters/preopen{ @@ -59642,6 +58008,9 @@ name = "biohazard containment shutters" }, /obj/effect/turf_decal/delivery, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/maintenance/department/science) "cBD" = ( @@ -59651,6 +58020,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/maintenance/department/science) "cBE" = ( @@ -59659,6 +58031,9 @@ dir = 4 }, /obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/plasteel, /area/maintenance/department/science) "cBF" = ( @@ -59877,22 +58252,10 @@ /obj/effect/landmark/blobstart, /turf/open/floor/plasteel/dark, /area/medical/morgue) -"cCi" = ( -/obj/machinery/firealarm{ - pixel_y = 24 - }, -/obj/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/medical/morgue) "cCj" = ( /turf/open/floor/plasteel/dark, /area/medical/morgue) "cCk" = ( -/obj/machinery/airalarm{ - pixel_y = 32 - }, /obj/structure/table, /obj/item/paper_bin{ pixel_x = 6; @@ -60249,17 +58612,8 @@ /obj/effect/landmark/xeno_spawn, /turf/open/floor/plasteel/dark, /area/medical/morgue) -"cCW" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/medical/morgue) "cCX" = ( /obj/effect/landmark/start/medical_doctor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 10 - }, /turf/open/floor/plasteel/dark, /area/medical/morgue) "cCY" = ( @@ -60269,6 +58623,11 @@ /obj/item/radio/intercom{ pixel_x = 29 }, +/obj/machinery/camera{ + c_tag = "Morgue Aft"; + dir = 8; + network = list("ss13","medbay") + }, /turf/open/floor/plasteel/dark, /area/medical/morgue) "cCZ" = ( @@ -60745,9 +59104,6 @@ /turf/open/floor/plasteel/dark, /area/medical/morgue) "cEc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 5 - }, /obj/structure/cable, /turf/open/floor/plasteel/dark, /area/medical/morgue) @@ -60764,29 +59120,14 @@ pixel_y = -3 }, /obj/item/clothing/gloves/color/latex, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/structure/cable, /turf/open/floor/plasteel/dark, /area/medical/morgue) -"cEe" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/closed/wall, -/area/medical/morgue) "cEf" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /turf/closed/wall, /area/hallway/primary/aft) "cEg" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/machinery/firealarm{ dir = 4; pixel_x = -24 @@ -60797,13 +59138,11 @@ /turf/open/floor/plasteel, /area/hallway/primary/aft) "cEh" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 4 - }, /obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel, /area/hallway/primary/aft) "cEi" = ( @@ -61211,6 +59550,7 @@ name = "Morgue"; req_access_txt = "6" }, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel/dark, /area/medical/morgue) "cEZ" = ( @@ -61501,7 +59841,6 @@ /area/medical/virology) "cFE" = ( /obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -61511,6 +59850,9 @@ /obj/effect/turf_decal/tile/green{ dir = 8 }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/medical/virology) "cFF" = ( @@ -61518,10 +59860,17 @@ dir = 1 }, /obj/structure/cable, +/obj/structure/disposalpipe/sorting/mail/flip{ + dir = 8; + sortType = 1 + }, /turf/open/floor/plasteel/white, /area/medical/virology) "cFG" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, /turf/open/floor/plasteel/white, /area/medical/virology) "cFH" = ( @@ -61844,7 +60193,7 @@ /area/science/mixing) "cGo" = ( /obj/structure/closet/crate, -/obj/item/clothing/mask/gas, +/obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/aft) "cGp" = ( @@ -61925,9 +60274,6 @@ /turf/open/floor/plasteel/white, /area/medical/virology) "cGw" = ( -/obj/structure/disposalpipe/junction{ - dir = 1 - }, /obj/effect/turf_decal/tile/green{ dir = 1 }, @@ -61935,16 +60281,19 @@ dir = 8 }, /obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/plasteel/white, /area/medical/virology) "cGx" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/plasteel/white, /area/medical/virology) "cGy" = ( @@ -61952,10 +60301,10 @@ dir = 10 }, /obj/machinery/holopad, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, /turf/open/floor/plasteel/white, /area/medical/virology) "cGz" = ( @@ -62498,7 +60847,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/effect/turf_decal/tile/green, @@ -62521,7 +60870,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/green{ dir = 1 }, @@ -62529,6 +60877,7 @@ /obj/effect/turf_decal/tile/green{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/white, /area/medical/virology) "cHs" = ( @@ -62571,7 +60920,7 @@ network = list("ss13","medbay") }, /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/machinery/light_switch{ @@ -62603,7 +60952,7 @@ network = list("ss13","medbay") }, /obj/machinery/light, -/obj/structure/closet/l3closet, +/obj/structure/closet/l3closet/virology, /obj/machinery/firealarm{ dir = 1; pixel_y = -24 @@ -62612,7 +60961,7 @@ /turf/open/floor/plasteel/white, /area/medical/virology) "cHy" = ( -/obj/structure/closet/l3closet, +/obj/structure/closet/l3closet/virology, /obj/effect/turf_decal/stripes/line{ dir = 6 }, @@ -62707,7 +61056,7 @@ /area/medical/medbay/aft) "cHF" = ( /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, @@ -62960,11 +61309,11 @@ "cIh" = ( /obj/structure/closet, /obj/item/storage/box/lights/mixed, -/obj/item/flashlight, /obj/effect/decal/cleanable/cobweb, /obj/structure/sign/warning/biohazard{ pixel_y = 32 }, +/obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/aft) "cIi" = ( @@ -63252,7 +61601,7 @@ "cIJ" = ( /obj/effect/landmark/start/roboticist, /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, @@ -63527,9 +61876,8 @@ }, /obj/structure/closet/crate, /obj/item/clothing/gloves/color/fyellow, -/obj/item/wrench, -/obj/effect/spawner/lootdrop/maintenance/two, /obj/structure/cable, +/obj/effect/spawner/lootdrop/maintenance/three, /turf/open/floor/plating, /area/maintenance/aft) "cJs" = ( @@ -63542,11 +61890,8 @@ /area/maintenance/aft) "cJt" = ( /obj/structure/rack, -/obj/item/screwdriver{ - pixel_y = 6 - }, -/obj/item/crowbar, /obj/item/storage/pill_bottle, +/obj/effect/spawner/lootdrop/maintenance/three, /turf/open/floor/plating, /area/maintenance/aft) "cJu" = ( @@ -63795,7 +62140,7 @@ /area/science/robotics/lab) "cJO" = ( /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, @@ -63886,9 +62231,8 @@ /area/maintenance/starboard/aft) "cKa" = ( /obj/structure/closet, -/obj/item/clothing/glasses/science, -/obj/effect/spawner/lootdrop/maintenance, /obj/effect/turf_decal/stripes/line, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating, /area/maintenance/starboard/aft) "cKb" = ( @@ -64349,7 +62693,7 @@ /area/medical/virology) "cKZ" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/effect/turf_decal/tile/green, @@ -64755,11 +63099,6 @@ }, /turf/open/floor/plasteel/dark, /area/chapel/office) -"cLU" = ( -/obj/effect/landmark/blobstart, -/obj/effect/landmark/xeno_spawn, -/turf/open/floor/engine, -/area/science/explab) "cLV" = ( /obj/item/radio/intercom{ pixel_y = 25 @@ -64891,6 +63230,7 @@ /obj/effect/turf_decal/stripes/line, /obj/machinery/power/apc/auto_name/south, /obj/structure/cable, +/obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/aft/secondary) "cMl" = ( @@ -65458,9 +63798,8 @@ /area/maintenance/port/aft) "cNg" = ( /obj/structure/rack, -/obj/item/flashlight, -/obj/effect/spawner/lootdrop/maintenance, /obj/machinery/light/small, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating, /area/maintenance/port/aft) "cNh" = ( @@ -65556,6 +63895,7 @@ dir = 8 }, /obj/structure/cable, +/obj/machinery/light/small, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "cNq" = ( @@ -66101,11 +64441,10 @@ /area/hallway/secondary/exit/departure_lounge) "cOA" = ( /obj/structure/rack, -/obj/item/clothing/mask/gas, -/obj/effect/spawner/lootdrop/maintenance, /obj/machinery/light/small{ dir = 4 }, +/obj/effect/spawner/lootdrop/maintenance/three, /turf/open/floor/plating, /area/maintenance/starboard/aft) "cOB" = ( @@ -66368,6 +64707,7 @@ name = "Chapel Office"; req_access_txt = "22" }, +/obj/machinery/navbeacon/wayfinding, /turf/open/floor/plasteel/dark, /area/chapel/office) "cPm" = ( @@ -66446,8 +64786,7 @@ /area/maintenance/starboard/aft) "cPz" = ( /obj/structure/closet, -/obj/item/flashlight, -/obj/effect/spawner/lootdrop/maintenance/three, +/obj/effect/spawner/lootdrop/maintenance/four, /turf/open/floor/plating, /area/maintenance/starboard/aft) "cPA" = ( @@ -67137,7 +65476,7 @@ /area/science/xenobiology) "cRh" = ( /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, @@ -67168,10 +65507,11 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable, +/obj/structure/disposalpipe/sorting/mail{ + dir = 4; + sortType = 1 + }, /turf/open/floor/plasteel/white, /area/science/xenobiology) "cRl" = ( @@ -67983,7 +66323,7 @@ /area/science/xenobiology) "cSW" = ( /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, @@ -68150,6 +66490,7 @@ /area/chapel/main) "cTp" = ( /obj/structure/closet, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating, /area/maintenance/department/science/xenobiology) "cTq" = ( @@ -68245,6 +66586,17 @@ /obj/structure/disposalpipe/segment, /turf/closed/wall/r_wall, /area/science/xenobiology) +"cTY" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/flasher{ + id = "Cell 2"; + pixel_x = -23; + pixel_y = -23 + }, +/obj/structure/bed, +/obj/item/bedsheet, +/turf/open/floor/plasteel, +/area/security/brig) "cUH" = ( /obj/structure/table/optable, /turf/open/floor/plasteel/white, @@ -68463,7 +66815,9 @@ /turf/open/floor/plasteel, /area/construction/mining/aux_base) "cXI" = ( -/obj/effect/spawner/lootdrop/maintenance, +/obj/structure/chair{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/starboard) "cXR" = ( @@ -68482,14 +66836,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/vacant_room/commissary) -"cXZ" = ( -/obj/structure/reagent_dispensers/watertank, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/effect/spawner/lootdrop/maintenance, -/turf/open/floor/plating, -/area/maintenance/starboard) "cYc" = ( /obj/structure/table/optable{ name = "Robotics Operating Table" @@ -68623,6 +66969,23 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) +"cZk" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/window/brigdoor{ + dir = 1; + name = "Weapon Distribution"; + req_access_txt = "3" + }, +/obj/item/paper, +/obj/machinery/door/firedoor, +/obj/structure/cable, +/obj/machinery/door/window/southleft{ + name = "Requests Window" + }, +/obj/item/pen, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/security/armory) "cZq" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -68898,6 +67261,7 @@ /area/ai_monitored/storage/eva) "dbn" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple, +/obj/structure/cable, /turf/open/floor/plasteel/kitchen_coldroom/freezerfloor, /area/crew_quarters/kitchen/coldroom) "dbo" = ( @@ -68927,16 +67291,6 @@ icon_state = "wood-broken6" }, /area/maintenance/port/aft) -"dbr" = ( -/obj/machinery/camera{ - c_tag = "Morgue"; - network = list("ss13","medbay") - }, -/obj/structure/bodycontainer/morgue{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/medical/morgue) "dbs" = ( /obj/machinery/light/small{ dir = 8 @@ -69072,7 +67426,7 @@ "dbX" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, @@ -69224,7 +67578,7 @@ /area/science/xenobiology) "dcf" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/effect/turf_decal/tile/purple{ @@ -69494,18 +67848,16 @@ /turf/open/floor/plasteel/white, /area/science/xenobiology) "dcH" = ( -/obj/structure/disposalpipe/segment{ - dir = 6 - }, /obj/effect/turf_decal/stripes/line, /obj/structure/cable, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/white, /area/science/xenobiology) "dcI" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/stripes/line, -/obj/structure/disposalpipe/junction/flip{ - dir = 4 +/obj/structure/disposalpipe/segment{ + dir = 5 }, /turf/open/floor/plasteel/white, /area/science/xenobiology) @@ -69575,7 +67927,7 @@ /area/science/xenobiology) "dcO" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/machinery/camera{ @@ -69757,6 +68109,7 @@ /area/maintenance/department/science/xenobiology) "ddi" = ( /obj/structure/rack, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating, /area/maintenance/department/science/xenobiology) "ddj" = ( @@ -70151,9 +68504,7 @@ /turf/open/floor/engine, /area/engine/engineering) "deK" = ( -/obj/machinery/power/emitter/anchored{ - state = 2 - }, +/obj/machinery/power/emitter/welded, /obj/structure/cable, /turf/open/floor/plating, /area/engine/engineering) @@ -70363,17 +68714,15 @@ /turf/open/floor/engine, /area/engine/engineering) "dfB" = ( -/obj/machinery/power/emitter/anchored{ - dir = 1; - state = 2 +/obj/machinery/power/emitter/welded{ + dir = 1 }, /obj/structure/cable, /turf/open/floor/plating, /area/engine/engineering) "dfC" = ( -/obj/machinery/power/emitter/anchored{ - dir = 1; - state = 2 +/obj/machinery/power/emitter/welded{ + dir = 1 }, /obj/machinery/light{ dir = 4 @@ -70395,24 +68744,23 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/green/visible{ - dir = 1 - }, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/green/visible{ + dir = 4 + }, /turf/open/floor/engine, /area/engine/engineering) "dfF" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/meter, /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 4 - }, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/manifold/green/visible{ + dir = 1 + }, /turf/open/floor/engine, /area/engine/engineering) "dfI" = ( @@ -70446,15 +68794,6 @@ }, /turf/open/floor/engine, /area/engine/engineering) -"dfQ" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/turf/open/floor/engine, -/area/engine/engineering) "dfR" = ( /obj/machinery/atmospherics/components/binary/pump/on{ name = "Gas to Cold Loop" @@ -70501,13 +68840,6 @@ dir = 1 }, /area/engine/engineering) -"dfY" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/closed/wall/r_wall, -/area/engine/engineering) "dfZ" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/closed/wall/r_wall, @@ -70562,6 +68894,8 @@ /area/space/nearstation) "dgi" = ( /obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/structure/rack, +/obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/starboard) "dgj" = ( @@ -70674,6 +69008,7 @@ /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 10 }, +/obj/structure/lattice, /turf/open/space, /area/space/nearstation) "dgN" = ( @@ -70767,15 +69102,13 @@ dir = 1 }, /obj/structure/closet/crate, -/obj/item/coin/silver, -/obj/item/grenade/chem_grenade, /obj/item/storage/box/lights/mixed, /obj/item/watertank, -/obj/item/storage/box/donkpockets, /obj/item/poster/random_contraband, /obj/item/poster/random_contraband, /obj/item/poster/random_contraband, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/lootdrop/maintenance/four, +/obj/effect/spawner/lootdrop/donkpockets, /turf/open/floor/plating, /area/maintenance/port/fore) "dhp" = ( @@ -70855,24 +69188,18 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "dhv" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/window/westleft{ - base_state = "right"; - dir = 4; - icon_state = "right"; - name = "Outer Window" +/obj/machinery/door/window/brigdoor/security/cell{ + id = "Cell 2"; + name = "Cell 2" }, -/obj/machinery/door/window/brigdoor{ - dir = 8; - name = "Brig Control Desk"; - req_access_txt = "3" +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 8 }, -/obj/item/folder/red, -/obj/item/folder/red, -/obj/item/poster/random_official, /obj/structure/cable, -/turf/open/floor/plasteel/showroomfloor, -/area/security/warden) +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel, +/area/security/brig) "dhw" = ( /obj/structure/closet, /obj/item/poster/random_contraband, @@ -70930,10 +69257,9 @@ /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/dorms) "dhB" = ( -/obj/item/clothing/glasses/meson, /obj/structure/closet/crate, /obj/item/poster/random_contraband, -/obj/effect/spawner/lootdrop/maintenance/two, +/obj/effect/spawner/lootdrop/maintenance/three, /turf/open/floor/plating, /area/maintenance/starboard/fore) "dhC" = ( @@ -71445,7 +69771,7 @@ "diz" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/structure/sign/poster/official/cleanliness{ @@ -71866,6 +70192,12 @@ }, /turf/open/floor/plasteel, /area/quartermaster/sorting) +"dmU" = ( +/obj/machinery/computer/crew{ + dir = 8 + }, +/turf/open/floor/plasteel/showroomfloor, +/area/security/warden) "dnd" = ( /obj/structure/closet/firecloset, /turf/open/floor/plating, @@ -72008,6 +70340,16 @@ /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating, /area/maintenance/port/fore) +"dql" = ( +/obj/machinery/door/poddoor/preopen{ + id = "atmos"; + name = "Atmospherics Blast Door" + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/turf_decal/caution/stand_clear, +/turf/open/floor/plasteel/dark, +/area/engine/break_room) "dqp" = ( /turf/open/floor/plating{ icon_state = "platingdmg1" @@ -72187,15 +70529,11 @@ /obj/structure/sign/warning/nosmoking{ pixel_y = 28 }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ dir = 4 }, /obj/effect/turf_decal/tile/blue{ - dir = 8 + dir = 1 }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) @@ -72258,15 +70596,6 @@ icon_state = "panelscorched" }, /area/maintenance/port/aft) -"dyp" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/light{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/science/misc_lab/range) "dyw" = ( /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, @@ -72303,7 +70632,7 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "dAh" = ( -/obj/item/storage/box, +/obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/aft) "dAn" = ( @@ -72415,7 +70744,15 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, -/obj/structure/cable, +/obj/structure/table, +/obj/item/clothing/head/welding{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/item/clothing/head/welding{ + pixel_x = -3; + pixel_y = 7 + }, /turf/open/floor/plasteel/dark/corner{ dir = 1 }, @@ -72435,9 +70772,21 @@ /turf/open/floor/plasteel/white, /area/medical/virology) "dBX" = ( -/obj/effect/landmark/event_spawn, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/security/armory) +/obj/machinery/door/window/brigdoor/security/cell{ + id = "Cell 2"; + name = "Cell 2" + }, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/turf_decal/trimline/red/filled/corner{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/security/brig) "dBY" = ( /obj/effect/landmark/event_spawn, /obj/effect/turf_decal/tile/neutral{ @@ -72459,15 +70808,7 @@ dir = 8 }, /turf/open/floor/plasteel/dark, -/area/security/warden) -"dCa" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/effect/landmark/event_spawn, -/obj/structure/cable, -/turf/open/floor/plasteel, -/area/security/warden) +/area/security/brig) "dCb" = ( /obj/effect/landmark/event_spawn, /obj/effect/turf_decal/tile/red{ @@ -72498,20 +70839,70 @@ /turf/open/floor/plating, /area/maintenance/fore) "dCf" = ( -/obj/effect/landmark/event_spawn, -/turf/open/floor/plasteel/showroomfloor, +/obj/structure/table, +/obj/item/folder/red, +/obj/item/restraints/handcuffs, +/obj/item/clothing/head/cone{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/clothing/head/cone{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/clothing/head/cone{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/clothing/head/cone{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/clothing/head/cone{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/dark, /area/security/warden) "dCg" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/landmark/event_spawn, -/obj/effect/turf_decal/tile/red{ - dir = 1 +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 8 }, /turf/open/floor/plasteel, /area/security/brig) "dCh" = ( -/obj/effect/landmark/event_spawn, -/obj/structure/cable, +/obj/structure/table, +/obj/machinery/button/door{ + id = "Prison Gate"; + name = "Prison Wing Lockdown"; + pixel_y = -3; + req_access_txt = "2" + }, +/obj/machinery/button/door{ + id = "Secure Gate"; + name = "Cell Window Control"; + pixel_x = -5; + pixel_y = 7; + specialfunctions = 4 + }, +/obj/machinery/button/door{ + id = "briglockdown"; + name = "Brig Lockdown Control"; + pixel_x = 5; + pixel_y = 7 + }, +/obj/item/key/security, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = 28 + }, +/obj/machinery/light{ + dir = 4 + }, /turf/open/floor/plasteel/showroomfloor, /area/security/warden) "dCi" = ( @@ -72520,12 +70911,6 @@ icon_state = "platingdmg3" }, /area/maintenance/starboard/fore) -"dCj" = ( -/obj/effect/landmark/event_spawn, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/turf/open/floor/plasteel, -/area/security/brig) "dCk" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -72712,6 +71097,9 @@ /area/library) "dCY" = ( /obj/effect/landmark/event_spawn, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/plasteel, /area/engine/atmos) "dCZ" = ( @@ -72875,6 +71263,9 @@ dir = 4 }, /obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/science/mixing) "dDB" = ( @@ -72980,10 +71371,6 @@ "dGH" = ( /obj/effect/landmark/event_spawn, /obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 - }, /turf/open/floor/plasteel/white, /area/science/misc_lab/range) "dIs" = ( @@ -72996,6 +71383,14 @@ }, /turf/open/floor/plating, /area/quartermaster/storage) +"dJG" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/white, +/area/medical/medbay/central) "dLK" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -73008,28 +71403,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, /area/maintenance/port) -"dOB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/turf/open/floor/plasteel/white, -/area/science/research) "dQV" = ( /obj/structure/grille/broken, /turf/open/space/basic, /area/space/nearstation) -"dVQ" = ( -/obj/structure/window/spawner/west, -/obj/structure/window/spawner/north, -/obj/structure/window/spawner, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/fernybush, -/turf/open/floor/grass, -/area/hallway/primary/central) "dVT" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -73055,12 +71432,20 @@ }, /turf/open/floor/plasteel/white, /area/medical/chemistry) +"ece" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 10 + }, +/turf/open/floor/plasteel, +/area/security/brig) "ecs" = ( /obj/structure/chair/stool{ pixel_y = 8 }, /obj/structure/disposalpipe/segment, -/obj/structure/cable, /turf/open/floor/plasteel, /area/engine/break_room) "ecJ" = ( @@ -73077,6 +71462,25 @@ dir = 5 }, /area/crew_quarters/kitchen) +"edM" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/science/genetics) +"eeh" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/security/brig) "eew" = ( /obj/structure/rack, /obj/item/reagent_containers/food/drinks/bottle/vodka{ @@ -73090,6 +71494,16 @@ /obj/item/reagent_containers/food/drinks/bottle/whiskey, /turf/open/floor/wood, /area/maintenance/port/aft) +"ehi" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/security/glass{ + name = "Secure Gear Storage"; + req_access_txt = "3" + }, +/obj/effect/turf_decal/delivery, +/obj/structure/cable, +/turf/open/floor/plasteel/dark, +/area/security/warden) "enV" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/tile/neutral{ @@ -73110,6 +71524,28 @@ /obj/structure/cable, /turf/open/floor/plating, /area/maintenance/starboard) +"eoT" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 6 + }, +/turf/open/floor/plasteel, +/area/security/brig) +"eph" = ( +/obj/structure/rack, +/obj/item/storage/box/handcuffs, +/obj/item/storage/box/flashbangs{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue, +/obj/structure/cable, +/turf/open/floor/plasteel/dark, +/area/security/warden) "eqt" = ( /obj/structure/girder, /obj/structure/grille, @@ -73125,24 +71561,13 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/science/misc_lab/range) "eyv" = ( /obj/structure/grille/broken, /obj/structure/lattice, /turf/open/space/basic, /area/space/nearstation) -"eza" = ( -/obj/structure/window/spawner/west, -/obj/structure/window/spawner/east, -/obj/structure/window/spawner/north, -/obj/structure/window/spawner, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/stalkybush, -/turf/open/floor/grass, -/area/hallway/primary/central) "eAa" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -73255,6 +71680,15 @@ icon_state = "wood-broken4" }, /area/maintenance/port/aft) +"eYX" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/secure_closet/brig{ + id = "Cell 2"; + name = "Cell 2 Locker" + }, +/obj/structure/cable, +/turf/open/floor/plasteel, +/area/security/brig) "eZe" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 @@ -73262,6 +71696,15 @@ /obj/structure/cable, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"eZU" = ( +/turf/closed/wall/r_wall, +/area/security/courtroom) +"fam" = ( +/obj/structure/chair/office/light{ + dir = 1 + }, +/turf/open/floor/circuit, +/area/science/misc_lab/range) "fcn" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -73276,6 +71719,15 @@ /obj/structure/closet/firecloset, /turf/open/floor/plating, /area/engine/engineering) +"fdM" = ( +/obj/machinery/door/airlock/engineering{ + name = "Shared Engineering Storage"; + req_one_access_txt = "32;19" + }, +/obj/machinery/door/firedoor, +/obj/structure/cable, +/turf/open/floor/plasteel, +/area/engine/storage_shared) "ffD" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 1 @@ -73320,16 +71772,26 @@ }, /turf/open/floor/plasteel/white, /area/medical/chemistry) +"fos" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/start/prisoner, +/turf/open/floor/plasteel, +/area/security/prison) "ftu" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 }, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, /obj/structure/cable, /turf/open/floor/plating, /area/maintenance/starboard/secondary) +"fvl" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/effect/spawner/lootdrop/maintenance, +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/plating, +/area/maintenance/starboard) "fvT" = ( /obj/structure/cable, /obj/structure/sign/poster/contraband/random{ @@ -73361,21 +71823,50 @@ }, /turf/open/floor/plasteel/white, /area/medical/chemistry) -"fDD" = ( -/obj/machinery/light_switch{ - pixel_y = -25 +"fCe" = ( +/obj/machinery/door/airlock/security{ + name = "Court Cell"; + req_access_txt = "63" }, +/obj/machinery/door/firedoor, +/turf/open/floor/plasteel, +/area/security/brig) +"fDD" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 9 }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/machinery/button/door{ + id = "Experimentor"; + name = "emergency blast door button"; + pixel_y = -28; + req_one_access_txt = "47" + }, /turf/open/floor/plasteel/white, /area/science/misc_lab/range) "fEQ" = ( /turf/closed/wall, /area/science/nanite) +"fEU" = ( +/obj/machinery/camera{ + c_tag = "Engineering - Transit Tube Access"; + dir = 8 + }, +/obj/effect/turf_decal/stripes/corner, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/engine/break_room) "fFJ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, @@ -73385,10 +71876,8 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "fFM" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/structure/cable, +/obj/structure/closet/firecloset, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/science/misc_lab/range) "fGm" = ( @@ -73438,7 +71927,17 @@ dir = 1 }, /turf/open/floor/plasteel/dark, -/area/maintenance/port/aft) +/area/medical/chemistry) +"fMA" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/preopen{ + id = "Engineering"; + name = "Engineering Security Doors" + }, +/turf/open/floor/plating, +/area/security/checkpoint/engineering) "fUt" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -73447,10 +71946,10 @@ /turf/open/floor/plasteel, /area/engine/engineering) "fUC" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 27 +/obj/machinery/light{ + dir = 4 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/circuit, /area/science/misc_lab/range) "fWc" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -73460,6 +71959,21 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/maintenance/port/aft) +"gbb" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/starboard) +"gbA" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plasteel, +/area/maintenance/department/science) "gcu" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 @@ -73478,6 +71992,17 @@ }, /turf/open/floor/plasteel/white, /area/science/research) +"gjM" = ( +/obj/machinery/vending/cigarette, +/obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/engine/break_room) "gka" = ( /obj/structure/lattice/catwalk, /turf/open/space/basic, @@ -73501,6 +72026,10 @@ pixel_y = -30 }, /obj/machinery/light, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, /turf/open/floor/plasteel/white, /area/science/misc_lab/range) "gqA" = ( @@ -73524,6 +72053,21 @@ dir = 5 }, /area/crew_quarters/kitchen) +"gtf" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/door/airlock/maintenance{ + req_access_txt = "47" + }, +/obj/machinery/door/firedoor, +/obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + id = "Experimentor"; + name = "containment blast door" + }, +/turf/open/floor/plasteel, +/area/maintenance/starboard/secondary) "gtr" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -73555,15 +72099,14 @@ }, /turf/open/floor/plasteel/white, /area/medical/chemistry) -"gHh" = ( +"gGf" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;47" - }, -/obj/structure/disposalpipe/segment, /obj/structure/cable, -/turf/open/floor/plating, -/area/maintenance/department/science) +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/engine/atmos) "gJs" = ( /obj/effect/spawner/structure/window/plasma/reinforced, /turf/open/floor/plating, @@ -73590,6 +72133,13 @@ }, /turf/open/floor/plasteel/white, /area/medical/chemistry) +"gPT" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/plasteel, +/area/hallway/primary/fore) "gUb" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 @@ -73602,6 +72152,21 @@ }, /turf/closed/wall/r_wall, /area/maintenance/disposal/incinerator) +"gZR" = ( +/obj/structure/lattice/catwalk, +/obj/structure/cable, +/turf/open/space/basic, +/area/solar/port/aft) +"hdb" = ( +/obj/structure/bed, +/obj/item/clothing/suit/straight_jacket, +/obj/item/clothing/glasses/blindfold, +/obj/item/clothing/mask/muzzle, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/security/brig) "hdh" = ( /obj/structure/closet/crate, /obj/item/storage/box/lights/mixed, @@ -73626,23 +72191,86 @@ /turf/open/floor/plasteel/white, /area/medical/chemistry) "hfn" = ( -/obj/machinery/vending/cigarette, -/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{ +/obj/effect/turf_decal/tile/yellow{ dir = 8 }, -/turf/open/floor/plasteel/dark, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/machinery/light_switch{ + pixel_x = -26 + }, +/obj/item/twohanded/required/kirbyplants/random, +/turf/open/floor/plasteel, /area/engine/break_room) -"hkq" = ( +"hiA" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/maintenance/port) +"hjl" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, /obj/structure/cable, /turf/open/floor/plasteel, +/area/security/brig) +"hkq" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 6 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel/dark/corner{ + dir = 1 + }, /area/engine/storage_shared) +"hql" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/window/westleft{ + base_state = "right"; + dir = 2; + icon_state = "right"; + name = "Reception Window" + }, +/obj/machinery/door/window/brigdoor{ + dir = 1; + name = "Brig Control Desk"; + req_access_txt = "3" + }, +/obj/item/paper, +/obj/machinery/door/firedoor, +/obj/structure/cable, +/obj/item/storage/fancy/donut_box, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "briglockdown"; + name = "Warden Desk Shutters" + }, +/turf/open/floor/plasteel/showroomfloor, +/area/security/warden) +"htB" = ( +/obj/machinery/door/window/northleft{ + name = "monkey pen"; + req_one_access_txt = "9" + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/science/genetics) "hvf" = ( /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/yellow{ @@ -73669,6 +72297,13 @@ }, /turf/open/floor/plasteel/white, /area/medical/chemistry) +"hxX" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/maintenance/port/aft) "hyP" = ( /obj/machinery/door/airlock/external{ name = "Escape Pod Two" @@ -73691,8 +72326,7 @@ /area/crew_quarters/kitchen) "hEP" = ( /obj/structure/rack, -/obj/item/clothing/mask/gas, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating{ icon_state = "panelscorched" }, @@ -73713,25 +72347,23 @@ }, /turf/open/floor/plasteel/white, /area/medical/chemistry) -"hFE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/structure/girder, -/obj/structure/grille, -/turf/open/floor/plating, -/area/maintenance/port/aft) "hFV" = ( -/obj/effect/turf_decal/stripes/line{ +/obj/machinery/door/window/westleft{ + name = "safety door"; + req_access_txt = "0"; + req_one_access_txt = "47" + }, +/turf/open/floor/plasteel/white, +/area/science/misc_lab/range) +"hHS" = ( +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ dir = 4 }, -/obj/machinery/door/window/westleft{ - base_state = "right"; - dir = 4; - icon_state = "right"; - name = "Testing Range" +/obj/effect/turf_decal/tile/purple{ + dir = 1 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/white, /area/science/misc_lab/range) "hIt" = ( /obj/structure/table/reinforced, @@ -73750,6 +72382,25 @@ /obj/structure/sign/poster/random, /turf/closed/wall, /area/medical/chemistry) +"hMx" = ( +/obj/structure/table, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple, +/obj/item/storage/bag/bio, +/turf/open/floor/plasteel/white, +/area/science/misc_lab/range) +"hMM" = ( +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red, +/obj/structure/reagent_dispensers/peppertank{ + pixel_x = 30 + }, +/turf/open/floor/plasteel, +/area/security/checkpoint/engineering) "hOP" = ( /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/yellow{ @@ -73778,6 +72429,32 @@ /obj/structure/cable, /turf/open/floor/plating, /area/engine/supermatter) +"hYz" = ( +/obj/structure/table/reinforced, +/obj/item/paper_bin, +/obj/item/folder/yellow{ + pixel_x = 4 + }, +/obj/item/pen, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow, +/obj/machinery/requests_console{ + department = "Engineering"; + departmentType = 3; + name = "Engineering RC"; + pixel_y = -30 + }, +/obj/item/clipboard{ + pixel_x = 4; + pixel_y = -4 + }, +/turf/open/floor/plasteel, +/area/engine/break_room) "ibr" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -73851,15 +72528,30 @@ dir = 4 }, /obj/machinery/door/airlock/research/glass{ - name = "Research Testing Range"; + name = "Experimentation Lab"; req_access_txt = "47" }, /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/door/poddoor/preopen{ + id = "Experimentor"; + name = "containment blast door" + }, /turf/open/floor/plasteel, /area/science/misc_lab/range) +"ixj" = ( +/obj/machinery/flasher/portable, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/plasteel/dark, +/area/security/warden) "ixo" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, @@ -73920,12 +72612,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/chemistry) -"iHl" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/vending/tool, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, -/area/engine/storage_shared) "iKA" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -73953,6 +72639,11 @@ /obj/structure/cable, /turf/open/floor/plasteel, /area/security/main) +"iSU" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plating, +/area/maintenance/starboard/secondary) "jah" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -73978,7 +72669,13 @@ dir = 4 }, /turf/open/floor/plasteel/dark, -/area/maintenance/port/aft) +/area/medical/chemistry) +"jnI" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/open/floor/plating, +/area/engine/break_room) "jnW" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -74032,13 +72729,11 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "jLY" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 - }, /obj/structure/sign/poster/official/random{ pixel_y = 32 }, -/obj/structure/cable, +/obj/structure/closet/radiation, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/science/misc_lab/range) "jMc" = ( @@ -74087,6 +72782,11 @@ /obj/machinery/light, /turf/open/floor/plasteel/white, /area/medical/chemistry) +"jQh" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/turf/open/floor/engine, +/area/engine/engineering) "jUe" = ( /obj/structure/cable, /obj/effect/decal/cleanable/dirt, @@ -74101,6 +72801,20 @@ }, /turf/open/floor/plasteel/white, /area/medical/chemistry) +"jUn" = ( +/obj/effect/turf_decal/tile/yellow, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/structure/rack, +/obj/effect/turf_decal/bot, +/obj/effect/spawner/lootdrop/maintenance, +/obj/structure/extinguisher_cabinet{ + pixel_x = 27 + }, +/obj/item/storage/belt/utility, +/turf/open/floor/plasteel, +/area/engine/break_room) "jYJ" = ( /obj/item/reagent_containers/food/drinks/bottle/tequila, /obj/structure/table/wood, @@ -74125,10 +72839,6 @@ /obj/effect/landmark/start/janitor, /turf/open/floor/plasteel, /area/janitor) -"kfu" = ( -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel/white, -/area/science/misc_lab/range) "kfZ" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt/dust, @@ -74193,7 +72903,9 @@ /area/janitor) "kxk" = ( /obj/machinery/power/apc/auto_name/west, -/obj/structure/window/reinforced, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, /obj/structure/cable, /turf/open/floor/plasteel/white, /area/science/misc_lab/range) @@ -74211,6 +72923,12 @@ /obj/structure/cable, /turf/open/floor/plasteel, /area/hallway/secondary/service) +"kyI" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/open/floor/engine, +/area/science/misc_lab/range) "kyW" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -74242,19 +72960,22 @@ /turf/open/floor/plasteel/white, /area/medical/chemistry) "kCw" = ( -/obj/machinery/vending/coffee, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel, +/area/engine/break_room) +"kCU" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + id = "rdprivacy"; + name = "privacy shutter" }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/engine/break_room) +/turf/open/floor/plating, +/area/crew_quarters/heads/hor) "kDM" = ( /obj/machinery/door/airlock/external{ req_access_txt = "13" @@ -74265,12 +72986,34 @@ /obj/structure/cable, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"kIL" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/engine/break_room) "kKo" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 }, /turf/open/floor/plasteel/white, /area/medical/chemistry) +"kKH" = ( +/obj/structure/table/wood, +/obj/item/taperecorder{ + pixel_x = 3 + }, +/obj/item/storage/box/evidence, +/obj/item/flashlight/seclite, +/turf/open/floor/plasteel/grimy, +/area/security/detectives_office) "kMC" = ( /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, @@ -74279,16 +73022,51 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/science/misc_lab/range) "kPN" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, /obj/structure/sign/poster/contraband/random{ pixel_y = 32 }, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating, /area/maintenance/port) +"kRO" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/window/northleft{ + dir = 4; + name = "Engineering Desk"; + req_access_txt = "10;24" + }, +/obj/item/folder/yellow, +/obj/item/folder/yellow, +/obj/item/pen, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plasteel, +/area/engine/break_room) +"kSe" = ( +/obj/structure/sign/warning/securearea{ + pixel_x = 32 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/engine/break_room) "kSB" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/trunk, @@ -74302,12 +73080,6 @@ }, /turf/open/floor/plasteel, /area/janitor) -"kVo" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/turf/open/floor/plating, -/area/maintenance/starboard/secondary) "kWu" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -74320,7 +73092,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/turf/open/floor/plasteel, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/engine, /area/science/misc_lab/range) "laN" = ( /obj/structure/cable, @@ -74336,9 +73111,22 @@ dir = 1 }, /turf/open/floor/plasteel/dark, -/area/maintenance/port/aft) +/area/medical/chemistry) +"lci" = ( +/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/tile/yellow, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/structure/rack, +/obj/item/storage/box, +/obj/effect/turf_decal/bot, +/obj/item/radio/off{ + pixel_x = 6 + }, +/turf/open/floor/plasteel, +/area/engine/break_room) "lcm" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable, /obj/machinery/door/airlock/engineering{ name = "Port Quarter Solar Access"; @@ -74407,6 +73195,15 @@ }, /turf/open/floor/plating, /area/maintenance/port/aft) +"lwx" = ( +/obj/effect/turf_decal/delivery, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/machinery/door/airlock/external{ + name = "Departure Lounge Airlock" + }, +/obj/machinery/navbeacon/wayfinding, +/turf/open/floor/plasteel, +/area/hallway/secondary/exit/departure_lounge) "lwA" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -74429,17 +73226,49 @@ /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/kitchen) "lzk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/cable, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 10 + }, +/obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel/white, /area/science/misc_lab/range) "lAu" = ( /turf/open/space/basic, /area/space/nearstation) +"lDf" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/pinpointer_dispenser, +/turf/open/floor/plating, +/area/quartermaster/sorting) +"lFr" = ( +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/plasteel, +/area/engine/atmos) "lGS" = ( /obj/docking_port/stationary/public_mining_dock, /turf/open/floor/plating, /area/construction/mining/aux_base) +"lIw" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/engine, +/area/science/misc_lab/range) +"lJY" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 5 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/security/brig) "lKu" = ( /obj/effect/landmark/carpspawn, /turf/open/space/basic, @@ -74448,6 +73277,11 @@ /obj/structure/falsewall, /turf/open/floor/plating, /area/science/misc_lab/range) +"lMB" = ( +/obj/structure/chair/office/light, +/obj/effect/landmark/start/geneticist, +/turf/open/floor/plasteel/white, +/area/science/genetics) "lMJ" = ( /obj/structure/lattice, /turf/open/space/basic, @@ -74468,6 +73302,34 @@ /obj/effect/turf_decal/tile/bar, /turf/open/floor/plasteel, /area/hallway/primary/central) +"lTA" = ( +/obj/structure/table/glass, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/item/storage/pill_bottle/mutadone{ + pixel_x = -3 + }, +/obj/machinery/requests_console{ + department = "Science"; + departmentType = 2; + name = "Science Requests Console"; + pixel_y = -30; + receive_ore_updates = 1 + }, +/obj/item/reagent_containers/glass/beaker{ + pixel_x = 8; + pixel_y = 4 + }, +/obj/item/reagent_containers/dropper{ + pixel_y = 9 + }, +/turf/open/floor/plasteel/white, +/area/science/genetics) "lUr" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -74491,7 +73353,11 @@ }, /obj/effect/turf_decal/tile/yellow, /turf/open/floor/plasteel/dark, -/area/maintenance/port/aft) +/area/medical/chemistry) +"lVD" = ( +/obj/effect/spawner/lootdrop/maintenance, +/turf/open/floor/plating, +/area/maintenance/starboard) "lWY" = ( /obj/machinery/door/airlock/hatch{ name = "Telecomms Server Room" @@ -74522,6 +73388,13 @@ /obj/structure/cable, /turf/open/floor/plating, /area/maintenance/port) +"mbL" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple, +/turf/open/floor/plasteel/white, +/area/science/misc_lab/range) "mjJ" = ( /obj/machinery/nuclearbomb/beer{ pixel_x = 2; @@ -74572,9 +73445,15 @@ /turf/open/floor/plasteel/white, /area/medical/chemistry) "msD" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/engine/storage_shared) +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/machinery/photocopier, +/turf/open/floor/plasteel, +/area/engine/break_room) "mtp" = ( /obj/structure/chair/office/light{ dir = 4 @@ -74623,13 +73502,16 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 9 }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel/white, /area/science/misc_lab/range) "mzU" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 9 }, -/obj/structure/cable, /turf/open/floor/plasteel, /area/engine/storage_shared) "mCX" = ( @@ -74637,6 +73519,25 @@ /obj/machinery/door/firedoor, /turf/open/floor/plasteel, /area/hydroponics) +"mDQ" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/plasteel/showroomfloor, +/area/security/warden) +"mEn" = ( +/obj/machinery/door/window/brigdoor/security/holding{ + id = "Holding Cell"; + name = "Holding Cell" + }, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/plasteel, +/area/security/brig) "mGS" = ( /obj/machinery/light/small{ dir = 4 @@ -74653,6 +73554,18 @@ /obj/structure/cable, /turf/open/floor/plating, /area/maintenance/starboard/secondary) +"mHR" = ( +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/machinery/light_switch{ + pixel_x = 26 + }, +/obj/machinery/computer/rdconsole/production, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/checker, +/area/engine/storage_shared) "mKO" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/tank/toxins{ @@ -74738,8 +73651,15 @@ /obj/structure/cable, /turf/open/floor/plasteel/white, /area/medical/chemistry) +"neo" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plating, +/area/engine/break_room) "nfn" = ( /obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable, /turf/open/floor/plating, /area/maintenance/port) "njJ" = ( @@ -74749,6 +73669,11 @@ }, /turf/open/floor/plating, /area/maintenance/port/aft) +"nmA" = ( +/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/structure/lattice, +/turf/open/space, +/area/space/nearstation) "nnV" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -74765,6 +73690,16 @@ }, /turf/open/floor/plasteel/white, /area/medical/chemistry) +"noe" = ( +/obj/structure/table/reinforced, +/obj/machinery/microwave{ + pixel_y = 6 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 10 + }, +/turf/open/floor/plasteel, +/area/engine/break_room) "npl" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -74777,10 +73712,14 @@ }, /turf/open/floor/plasteel/white, /area/medical/chemistry) -"ntG" = ( -/obj/machinery/power/terminal{ - dir = 1 +"npx" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 5 }, +/turf/open/floor/plasteel/showroomfloor, +/area/security/warden) +"ntG" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -74810,13 +73749,22 @@ /obj/structure/disposalpipe/segment, /turf/closed/wall, /area/medical/chemistry) -"nHj" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/disposalpipe/segment{ - dir = 5 +"nEv" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/secure_closet/brig{ + id = "Cell 3"; + name = "Cell 3 Locker" }, /obj/structure/cable, /turf/open/floor/plasteel, +/area/security/brig) +"nHj" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/plasteel, /area/maintenance/department/science) "nIa" = ( /obj/structure/table/optable, @@ -74844,6 +73792,14 @@ }, /turf/open/floor/plasteel, /area/construction/storage_wing) +"nLi" = ( +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/item/twohanded/required/kirbyplants/random, +/turf/open/floor/plasteel/white, +/area/science/misc_lab/range) "nLv" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -74854,6 +73810,17 @@ /obj/structure/cable, /turf/open/floor/plasteel/white, /area/science/research) +"nLx" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/table/reinforced, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/item/trash/popcorn, +/turf/open/floor/plasteel, +/area/engine/break_room) "nMe" = ( /turf/closed/wall, /area/medical/surgery/room_b) @@ -74901,8 +73868,8 @@ /turf/open/floor/wood, /area/maintenance/port/aft) "obb" = ( -/obj/structure/target_stake, -/turf/open/floor/plasteel/white, +/obj/machinery/rnd/bepis, +/turf/open/floor/circuit, /area/science/misc_lab/range) "obv" = ( /obj/structure/sign/poster/contraband/random{ @@ -74922,6 +73889,14 @@ }, /turf/open/floor/plating, /area/construction/mining/aux_base) +"ocA" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, +/turf/open/floor/engine, +/area/engine/engineering) "ocT" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -74948,6 +73923,25 @@ /obj/machinery/vending/modularpc, /turf/open/floor/plasteel/white, /area/science/research) +"ofB" = ( +/obj/machinery/door/airlock/security{ + name = "Court Cell"; + req_access_txt = "63" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/plasteel/dark, +/area/security/courtroom) +"ofT" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow, +/obj/machinery/light, +/obj/machinery/computer/station_alert{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/engine/break_room) "ogE" = ( /obj/structure/closet/firecloset, /turf/open/floor/plating, @@ -74985,6 +73979,13 @@ }, /turf/open/floor/plasteel, /area/science/mixing) +"ooY" = ( +/obj/machinery/computer/warrant{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red, +/turf/open/floor/plasteel, +/area/hallway/primary/fore) "otq" = ( /obj/structure/closet/emcloset, /obj/structure/sign/warning/vacuum/external{ @@ -75015,7 +74016,7 @@ /obj/effect/decal/cleanable/cobweb, /obj/machinery/vending/cola/random, /turf/open/floor/plasteel/dark, -/area/maintenance/port/aft) +/area/medical/chemistry) "owR" = ( /turf/closed/wall, /area/engine/storage_shared) @@ -75061,6 +74062,23 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/port) +"oBU" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/bot, +/obj/structure/extinguisher_cabinet{ + pixel_x = 27 + }, +/obj/structure/closet/toolcloset, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/turf/open/floor/plasteel/dark/corner, +/area/engine/storage_shared) "oFI" = ( /obj/machinery/door/window/eastright{ dir = 8; @@ -75076,19 +74094,47 @@ /obj/machinery/door/firedoor, /turf/open/floor/plasteel/white, /area/medical/chemistry) -"oJW" = ( -/obj/machinery/camera{ - c_tag = "Engineering - Foyer - Shared Storage"; - dir = 8 +"oJL" = ( +/obj/effect/turf_decal/tile/red{ + dir = 1 }, -/obj/machinery/light/small{ +/obj/structure/filingcabinet, +/obj/effect/turf_decal/tile/red{ dir = 4 }, +/obj/effect/turf_decal/tile/red, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = 24 + }, +/obj/machinery/button/door{ + id = "atmos"; + name = "Atmospherics Lockdown"; + pixel_x = 5; + pixel_y = 24; + req_one_access_txt = "1;24" + }, +/obj/machinery/button/door{ + desc = "A remote control-switch for the engineering security doors."; + id = "Engineering"; + name = "Engineering Lockdown"; + pixel_x = -5; + pixel_y = 24; + req_one_access_txt = "1;10" + }, +/turf/open/floor/plasteel, +/area/security/checkpoint/engineering) +"oJW" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/structure/sign/poster/official/random{ - pixel_y = 32 +/obj/effect/turf_decal/stripes/corner, +/obj/machinery/airalarm{ + dir = 8; + pixel_x = 24 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 }, /turf/open/floor/plasteel/dark/corner, /area/engine/storage_shared) @@ -75098,10 +74144,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, /area/maintenance/port/aft) -"oPU" = ( -/obj/structure/sign/warning/biohazard, -/turf/closed/wall, -/area/maintenance/port/aft) "oRL" = ( /obj/docking_port/stationary{ dir = 2; @@ -75125,16 +74167,33 @@ }, /obj/machinery/vending/snack/random, /turf/open/floor/plasteel/dark, -/area/maintenance/port/aft) +/area/medical/chemistry) +"oVO" = ( +/obj/machinery/airalarm{ + dir = 4; + pixel_x = -22 + }, +/obj/structure/rack, +/obj/effect/turf_decal/tile/blue, +/obj/item/reagent_containers/glass/bottle/morphine, +/obj/item/storage/box/chemimp{ + pixel_x = 4; + pixel_y = 3 + }, +/obj/item/storage/box/trackimp, +/obj/item/storage/lockbox/loyalty, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/security/warden) "oXP" = ( /obj/structure/closet/crate, -/obj/item/crowbar/red, -/obj/item/pen, /obj/item/flashlight/pen{ pixel_x = 4; pixel_y = 3 }, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/lootdrop/maintenance/three, /turf/open/floor/plating{ icon_state = "platingdmg1" }, @@ -75164,6 +74223,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/maintenance/port/aft) +"pak" = ( +/obj/structure/chair/office/light, +/turf/open/floor/plasteel/white, +/area/science/misc_lab/range) "pay" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -75176,7 +74239,7 @@ /turf/open/floor/plating, /area/maintenance/solars/port/aft) "pcn" = ( -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/science/misc_lab/range) "pcL" = ( /obj/effect/spawner/structure/window/reinforced, @@ -75227,12 +74290,15 @@ /turf/open/floor/plating, /area/maintenance/port) "pmZ" = ( -/obj/structure/sign/poster/official/random{ - pixel_y = 32 +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow, +/obj/effect/turf_decal/stripes/line{ + dir = 4 }, -/obj/structure/cable, /turf/open/floor/plasteel, -/area/engine/storage_shared) +/area/engine/break_room) "ppz" = ( /obj/machinery/vending/boozeomat/all_access, /obj/effect/decal/cleanable/cobweb, @@ -75250,6 +74316,13 @@ }, /turf/open/floor/plating, /area/maintenance/port/aft) +"pvK" = ( +/obj/machinery/computer/security{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/plasteel/showroomfloor, +/area/security/warden) "pvL" = ( /obj/machinery/atmospherics/pipe/simple/general/visible, /obj/machinery/door/firedoor, @@ -75270,6 +74343,14 @@ }, /turf/open/floor/plating, /area/maintenance/port/fore) +"pzC" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple, +/turf/open/floor/plasteel/white, +/area/science/misc_lab/range) "pCp" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable, @@ -75306,10 +74387,10 @@ /turf/open/floor/plating, /area/maintenance/port) "pOm" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 }, -/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel, /area/engine/break_room) "pOP" = ( @@ -75355,18 +74436,78 @@ dir = 1; network = list("ss13","rd") }, -/turf/open/floor/plasteel/white, -/area/science/misc_lab/range) -"qdT" = ( -/obj/effect/turf_decal/tile/yellow{ +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ dir = 8 }, -/obj/machinery/computer/rdconsole/production{ +/obj/machinery/light_switch{ + pixel_y = -28 + }, +/turf/open/floor/plasteel/white, +/area/science/misc_lab/range) +"pZw" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/plasteel/cafeteria{ + dir = 5 + }, +/area/crew_quarters/heads/hor) +"qaj" = ( +/obj/machinery/airalarm{ + dir = 4; + pixel_x = -23 + }, +/obj/item/radio/intercom{ + dir = 4; + pixel_y = 24 + }, +/obj/effect/turf_decal/tile/red{ dir = 1 }, -/obj/effect/turf_decal/bot, -/turf/open/floor/plasteel/dark/corner, -/area/engine/storage_shared) +/obj/structure/table, +/obj/machinery/recharger{ + pixel_y = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/camera/autoname, +/turf/open/floor/plasteel, +/area/security/checkpoint/engineering) +"qdT" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/structure/sign/poster/official/random{ + pixel_x = 32 + }, +/obj/effect/turf_decal/tile/yellow, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/item/cigbutt, +/obj/structure/table/reinforced, +/obj/item/storage/firstaid/fire{ + pixel_y = -4 + }, +/obj/item/paper{ + pixel_x = -4; + pixel_y = 6 + }, +/turf/open/floor/plasteel, +/area/engine/break_room) +"qgQ" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/turf/open/floor/plating, +/area/engine/break_room) "qhe" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -75383,15 +74524,6 @@ /obj/structure/sign/poster/ripped, /turf/closed/wall, /area/medical/chemistry) -"qjB" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/science/misc_lab/range) "qkD" = ( /obj/effect/turf_decal/tile/green, /obj/effect/turf_decal/tile/green{ @@ -75430,6 +74562,30 @@ }, /turf/open/floor/plasteel, /area/maintenance/department/science) +"qte" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plasteel/white, +/area/science/research) +"qtp" = ( +/obj/structure/window/reinforced{ + dir = 1; + layer = 2.9 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/science/genetics) +"qxe" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/engine/break_room) "qyH" = ( /obj/machinery/vending/assist, /obj/effect/turf_decal/stripes/line{ @@ -75553,6 +74709,26 @@ dir = 5 }, /area/crew_quarters/kitchen) +"qRr" = ( +/obj/machinery/flasher/portable, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/item/radio/intercom{ + pixel_x = 30 + }, +/obj/machinery/camera{ + c_tag = "Security - Gear Room"; + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/security/warden) "qUR" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -75588,6 +74764,32 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/white, /area/medical/chemistry) +"qZU" = ( +/obj/structure/table, +/obj/item/paper_bin{ + pixel_x = -3; + pixel_y = 7 + }, +/turf/open/floor/plasteel, +/area/security/main) +"raN" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 9 + }, +/obj/structure/sign/warning/vacuum/external{ + pixel_y = -32 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/engine/break_room) "rbG" = ( /obj/structure/cable, /turf/open/floor/plasteel, @@ -75623,7 +74825,34 @@ req_access_txt = null }, /turf/open/floor/plasteel/dark, -/area/maintenance/port/aft) +/area/medical/chemistry) +"roZ" = ( +/obj/machinery/computer/secure_data{ + dir = 4 + }, +/obj/machinery/computer/security/telescreen{ + desc = "Used for watching Prison Wing holding areas."; + name = "Prison Monitor"; + network = list("prison"); + pixel_x = -30 + }, +/turf/open/floor/plasteel/showroomfloor, +/area/security/warden) +"rqO" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/machinery/door/airlock/security/glass{ + id_tag = "outerbrig"; + name = "Brig"; + req_access_txt = "63" + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/turf/open/floor/plasteel, +/area/security/brig) "rrB" = ( /turf/closed/wall, /area/vacant_room/commissary) @@ -75640,14 +74869,15 @@ /turf/open/floor/wood, /area/vacant_room/office) "rxn" = ( -/obj/machinery/power/apc/auto_name/south, /obj/structure/disposalpipe/segment{ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/structure/cable, +/obj/machinery/newscaster{ + pixel_y = -30 + }, /turf/open/floor/plasteel, /area/engine/break_room) "rzX" = ( @@ -75683,9 +74913,36 @@ }, /turf/open/floor/plasteel/kitchen_coldroom/freezerfloor, /area/crew_quarters/kitchen/coldroom) +"rGw" = ( +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/machinery/computer/secure_data{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/machinery/computer/security/telescreen/minisat{ + dir = 4; + pixel_x = -29 + }, +/obj/structure/cable, +/turf/open/floor/plasteel, +/area/security/checkpoint/engineering) "rJv" = ( /turf/open/floor/plating, /area/hallway/primary/port) +"rLg" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/structure/chair{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/starboard) "rLL" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ @@ -75738,6 +74995,14 @@ "rUK" = ( /turf/closed/wall, /area/crew_quarters/kitchen/coldroom) +"rUR" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/loading_area, +/turf/open/floor/plasteel/dark/corner, +/area/hallway/primary/starboard) "rVd" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 10 @@ -75746,17 +75011,13 @@ /turf/open/floor/plasteel, /area/security/checkpoint/medical) "rWg" = ( -/obj/item/twohanded/required/kirbyplants/random, -/obj/machinery/airalarm{ - dir = 8; - pixel_x = 24 - }, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 +/obj/effect/turf_decal/stripes/line{ + dir = 4 }, +/obj/structure/cable, /turf/open/floor/plasteel/dark/corner, /area/engine/storage_shared) "rYC" = ( @@ -75764,10 +75025,38 @@ icon_state = "platingdmg2" }, /area/maintenance/starboard/secondary) -"sao" = ( -/obj/structure/closet/toolcloset, -/obj/effect/turf_decal/bot, +"rYV" = ( +/obj/structure/chair/stool{ + pixel_y = 8 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 1 + }, /turf/open/floor/plasteel, +/area/engine/break_room) +"sao" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/structure/sign/poster/official/random{ + pixel_x = -32 + }, +/obj/effect/turf_decal/bot, +/obj/machinery/rnd/production/circuit_imprinter, +/obj/machinery/camera{ + c_tag = "Engineering - Foyer - Shared Storage"; + dir = 4 + }, +/turf/open/floor/plasteel/dark/corner{ + dir = 1 + }, /area/engine/storage_shared) "sdi" = ( /obj/structure/window/reinforced{ @@ -75779,6 +75068,9 @@ pixel_x = -2; pixel_y = -2 }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, /turf/open/floor/plasteel/white, /area/science/misc_lab/range) "sdA" = ( @@ -75792,11 +75084,35 @@ "sfQ" = ( /obj/structure/closet, /obj/item/extinguisher, -/obj/item/flashlight, -/obj/effect/spawner/lootdrop/maintenance, /obj/effect/decal/cleanable/cobweb, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating, /area/maintenance/port/aft) +"sfR" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/structure/table/reinforced, +/obj/item/book/manual/wiki/engineering_hacking{ + pixel_x = 2; + pixel_y = 3 + }, +/obj/item/book/manual/wiki/engineering_guide{ + pixel_x = -2 + }, +/obj/effect/turf_decal/tile/yellow, +/obj/machinery/camera{ + c_tag = "Engineering - Desk"; + dir = 1 + }, +/obj/item/trash/can{ + pixel_x = -14 + }, +/turf/open/floor/plasteel, +/area/engine/break_room) "sht" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -75812,6 +75128,11 @@ /obj/structure/sign/warning/biohazard, /turf/closed/wall, /area/medical/chemistry) +"snF" = ( +/obj/structure/chair, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/security/brig) "sof" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ @@ -75831,13 +75152,10 @@ /turf/closed/wall, /area/medical/medbay/aft) "szA" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, /obj/structure/window/reinforced{ - dir = 4 + dir = 8 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/white, /area/science/misc_lab/range) "sAd" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ @@ -75862,16 +75180,8 @@ /turf/open/floor/plasteel/white, /area/medical/chemistry) "sFv" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "47" - }, -/obj/machinery/door/firedoor, -/obj/structure/cable, -/turf/open/floor/plating, -/area/maintenance/starboard/secondary) +/turf/closed/wall/r_wall, +/area/science/explab) "sGh" = ( /obj/machinery/door/airlock/external{ name = "Solar Maintenance"; @@ -75906,12 +75216,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) -"sLd" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/turf/open/floor/plasteel, -/area/maintenance/department/science) "sPc" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ @@ -75923,9 +75227,47 @@ /obj/structure/cable, /turf/closed/wall/r_wall, /area/engine/engineering) +"sRB" = ( +/mob/living/carbon/monkey, +/turf/open/floor/grass, +/area/science/genetics) +"sUG" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/green/visible{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/meter, +/turf/open/floor/engine, +/area/engine/engineering) "tay" = ( /turf/closed/wall, /area/medical/medbay/central) +"tbp" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/engine/break_room) +"tbu" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/bot, +/obj/machinery/light/small, +/obj/machinery/power/apc/auto_name/south, +/obj/structure/cable, +/obj/structure/rack, +/obj/effect/spawner/lootdrop/maintenance, +/obj/item/lightreplacer{ + pixel_y = 7 + }, +/obj/item/storage/belt/utility, +/turf/open/floor/plasteel/dark/corner, +/area/engine/storage_shared) "tbC" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -75954,12 +75296,53 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/science/mixing/chamber) +"tmp" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/machinery/disposal/bin{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/structure/disposalpipe/trunk, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/engine/break_room) +"tpc" = ( +/obj/structure/fans/tiny/invisible, +/obj/docking_port/stationary{ + dir = 4; + dwidth = 1; + height = 4; + roundstart_template = /datum/map_template/shuttle/escape_pod/default; + width = 3 + }, +/turf/open/space/basic, +/area/space) +"tqI" = ( +/turf/closed/wall, +/area/engine/break_room) "tru" = ( /obj/machinery/computer/warrant{ dir = 1 }, /turf/open/floor/plasteel/dark, /area/security/courtroom) +"tsk" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/engine, +/area/science/misc_lab/range) "tsx" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 8 @@ -76010,16 +75393,16 @@ }, /turf/open/floor/engine, /area/engine/supermatter) -"tEg" = ( -/obj/item/relic, -/turf/open/floor/engine, -/area/science/explab) "tFJ" = ( /obj/structure/bodycontainer/morgue{ dir = 8 }, /turf/open/floor/plasteel/dark, /area/medical/morgue) +"tGe" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/turf/open/floor/plasteel, +/area/security/checkpoint/engineering) "tKc" = ( /obj/machinery/atmospherics/pipe/simple/general/visible, /obj/structure/cable, @@ -76086,16 +75469,9 @@ /turf/open/floor/plasteel/white, /area/medical/chemistry) "tVY" = ( -/obj/structure/closet/crate, -/obj/item/target/alien, -/obj/item/target/alien, -/obj/item/target/clown, -/obj/item/target/clown, -/obj/item/target/syndicate, -/obj/item/target/syndicate, -/obj/item/gun/energy/laser/practice, -/obj/item/gun/energy/laser/practice, -/turf/open/floor/plasteel/white, +/obj/structure/table, +/obj/item/storage/bag/money, +/turf/open/floor/circuit, /area/science/misc_lab/range) "tXK" = ( /obj/machinery/air_sensor/atmos/toxins_mixing_tank, @@ -76122,6 +75498,17 @@ }, /turf/open/floor/plasteel/white, /area/medical/chemistry) +"uow" = ( +/obj/machinery/vending/coffee, +/obj/effect/turf_decal/bot, +/obj/structure/sign/poster/official/random{ + pixel_x = 32 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 9 + }, +/turf/open/floor/plasteel/dark, +/area/engine/break_room) "uqB" = ( /obj/machinery/space_heater, /turf/open/floor/plating{ @@ -76132,32 +75519,39 @@ /turf/closed/wall/mineral/plastitanium, /area/security/prison) "usN" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 1 +/obj/machinery/door/airlock/engineering/glass{ + name = "Shared Engineering Storage"; + req_one_access_txt = "32;19" }, -/obj/effect/landmark/event_spawn, -/obj/structure/cable, /turf/open/floor/plasteel, /area/engine/storage_shared) "uun" = ( /obj/machinery/vending/assist, /turf/open/floor/plasteel, /area/maintenance/department/science) -"uuO" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +"uvH" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/secure_closet/brig{ + id = "Cell 1"; + name = "Cell 1 Locker" }, -/turf/closed/wall/r_wall, -/area/maintenance/starboard/secondary) -"uEH" = ( -/obj/machinery/door/airlock/engineering/glass{ - name = "Shared Engineering Storage"; - req_one_access_txt = "32;19" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/door/firedoor, /obj/structure/cable, /turf/open/floor/plasteel, +/area/security/brig) +"uyj" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/corner, +/turf/open/floor/plasteel, +/area/engine/break_room) +"uEH" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plating, /area/engine/storage_shared) "uFC" = ( /obj/machinery/airalarm, @@ -76191,11 +75585,40 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/secondary) +"uNe" = ( +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/machinery/door/airlock/security/glass{ + id_tag = "innerbrig"; + name = "Brig"; + req_access_txt = "63" + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 + }, +/obj/effect/turf_decal/trimline/red/filled/corner{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/security/brig) "uOc" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, /area/maintenance/port/aft) +"uPK" = ( +/obj/structure/table, +/obj/item/book/manual/wiki/experimentor, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple, +/turf/open/floor/plasteel/white, +/area/science/misc_lab/range) "uRM" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -76206,6 +75629,11 @@ }, /turf/open/floor/plasteel/white, /area/science/research) +"uYd" = ( +/obj/structure/rack, +/obj/effect/spawner/lootdrop/maintenance/two, +/turf/open/floor/plating, +/area/maintenance/port/aft) "uYk" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -76214,6 +75642,10 @@ dir = 1; pixel_y = -22 }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, /turf/open/floor/plasteel/white, /area/science/misc_lab/range) "uYL" = ( @@ -76228,6 +75660,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/structure/cable, /turf/open/floor/plasteel/kitchen_coldroom/freezerfloor, /area/crew_quarters/kitchen/coldroom) "vgd" = ( @@ -76250,6 +75683,39 @@ }, /turf/open/floor/plasteel, /area/maintenance/department/science) +"vml" = ( +/obj/machinery/door/window/westleft{ + name = "monkey pen"; + req_one_access_txt = "9" + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/science/genetics) +"vnm" = ( +/obj/structure/cable, +/turf/closed/wall/r_wall, +/area/ai_monitored/turret_protected/ai) +"voX" = ( +/obj/machinery/vending/tool, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plasteel/dark, +/area/engine/storage_shared) +"vqh" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/engineering{ + name = "Supermatter Engine"; + req_access_txt = "10" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/starboard) "vrW" = ( /obj/structure/grille, /turf/open/space/basic, @@ -76282,20 +75748,25 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, /area/maintenance/starboard/secondary) +"vyS" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plating, +/area/engine/storage_shared) "vzO" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/structure/chair/office{ + dir = 8 + }, /obj/effect/turf_decal/tile/yellow{ dir = 1 }, -/obj/effect/turf_decal/tile/yellow, -/obj/structure/table/reinforced, -/turf/open/floor/plasteel/dark/corner{ - dir = 8 - }, -/area/engine/storage_shared) +/turf/open/floor/plasteel, +/area/engine/break_room) "vAs" = ( -/obj/structure/rack, /obj/machinery/portable_atmospherics/canister/air, -/obj/item/wrench, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating{ icon_state = "platingdmg2" @@ -76313,6 +75784,28 @@ /obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/wood, /area/maintenance/port/aft) +"vFS" = ( +/obj/structure/table, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/item/screwdriver{ + pixel_y = 10 + }, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/item/geiger_counter{ + pixel_x = 7; + pixel_y = 3 + }, +/obj/structure/cable, +/obj/item/radio/off{ + pixel_x = -5; + pixel_y = 2 + }, +/turf/open/floor/plasteel, +/area/security/checkpoint/engineering) "vHP" = ( /obj/machinery/vending/cigarette, /obj/effect/turf_decal/stripes/line{ @@ -76384,6 +75877,15 @@ }, /turf/open/floor/plasteel/white, /area/medical/chemistry) +"vQP" = ( +/obj/structure/table, +/obj/item/storage/firstaid/regular, +/obj/structure/window/reinforced{ + dir = 1; + pixel_y = 1 + }, +/turf/open/floor/plasteel/white, +/area/science/misc_lab/range) "vRF" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -76403,8 +75905,15 @@ /area/hallway/secondary/entry) "vVq" = ( /obj/effect/turf_decal/stripes/line, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/science/misc_lab/range) +"vVP" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/effect/landmark/start/prisoner, +/turf/open/floor/plasteel, +/area/security/prison) "vWK" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/stripes/line{ @@ -76435,15 +75944,38 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) +"wdI" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/engine/break_room) "wen" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/grille, +/obj/structure/cable, /turf/open/floor/plating, /area/maintenance/port/aft) "wfq" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/carpet/green, /area/maintenance/port/aft) +"wgD" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/central) "wgP" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/door/firedoor, @@ -76473,11 +76005,10 @@ /area/security/prison) "wkM" = ( /obj/structure/rack, -/obj/item/clothing/mask/gas, -/obj/effect/spawner/lootdrop/maintenance, /obj/effect/decal/cleanable/dirt, /obj/item/reagent_containers/glass/bucket, /obj/item/mop, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating, /area/maintenance/port/aft) "wmt" = ( @@ -76542,6 +76073,12 @@ dir = 5 }, /area/crew_quarters/kitchen) +"wAb" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/central) "wAn" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, @@ -76557,7 +76094,7 @@ }, /obj/effect/turf_decal/tile/yellow, /turf/open/floor/plasteel/dark, -/area/maintenance/port/aft) +/area/medical/chemistry) "wBp" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/cable, @@ -76578,6 +76115,13 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood, /area/maintenance/port/aft) +"wHc" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/orange/visible, +/turf/closed/wall/r_wall, +/area/engine/engineering) "wIh" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/stripes/corner{ @@ -76611,9 +76155,6 @@ /obj/item/dice/d20, /obj/item/dice, /obj/structure/table/wood, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/structure/sign/poster/contraband/random{ pixel_y = -32 }, @@ -76663,6 +76204,12 @@ /obj/structure/cable, /turf/open/floor/plasteel, /area/maintenance/department/science) +"wVo" = ( +/obj/structure/cable, +/turf/open/floor/plating{ + icon_state = "platingdmg2" + }, +/area/maintenance/port) "wYq" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood, @@ -76682,6 +76229,14 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel, /area/janitor) +"xfP" = ( +/obj/structure/window/reinforced{ + dir = 1; + layer = 2.9 + }, +/obj/machinery/computer/rdconsole/experiment, +/turf/open/floor/plasteel/white, +/area/science/misc_lab/range) "xgQ" = ( /obj/machinery/chem_heater{ pixel_x = 4 @@ -76693,13 +76248,20 @@ /obj/machinery/light, /turf/open/floor/plasteel/white, /area/medical/pharmacy) +"xjc" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/security/brig) "xop" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ dir = 4 }, /obj/effect/decal/cleanable/dirt, /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/item/reagent_containers/glass/bucket, @@ -76783,6 +76345,13 @@ /obj/structure/cable, /turf/open/floor/plasteel, /area/maintenance/department/science) +"xDR" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/engine/atmos) "xEf" = ( /obj/structure/table, /obj/item/flashlight/lamp{ @@ -76795,6 +76364,13 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/white, /area/medical/chemistry) +"xIf" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/engine/break_room) "xTm" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -76816,12 +76392,36 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, /turf/open/floor/plasteel/white, /area/science/misc_lab/range) +"xWD" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/arrows/red{ + dir = 4 + }, +/obj/effect/turf_decal/box/red, +/turf/open/floor/plasteel, +/area/engine/break_room) "xXl" = ( /obj/structure/cable, /turf/open/floor/wood, /area/vacant_room/office) +"xXq" = ( +/obj/machinery/requests_console{ + department = "Medbay"; + departmentType = 1; + name = "Medbay RC" + }, +/turf/closed/wall, +/area/medical/storage) "xZy" = ( /obj/structure/table/glass, /obj/machinery/light{ @@ -76860,6 +76460,13 @@ /obj/effect/landmark/blobstart, /turf/open/floor/engine/cult, /area/library) +"ybC" = ( +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/science/misc_lab/range) "ycH" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -76877,6 +76484,22 @@ }, /turf/open/floor/plating, /area/maintenance/port/aft) +"yej" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + id = "briglockdown"; + name = "brig shutters" + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/security/warden) +"yeM" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 4 + }, +/obj/effect/spawner/lootdrop/maintenance, +/turf/open/floor/plating, +/area/maintenance/starboard) "yfM" = ( /obj/machinery/vending/engivend, /obj/effect/turf_decal/delivery, @@ -76892,7 +76515,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/turf/open/floor/plasteel, +/turf/open/floor/engine, /area/science/misc_lab/range) "yih" = ( /obj/machinery/door/airlock/medical/glass{ @@ -90411,7 +90034,7 @@ bbL bPL alK kPN -amU +wVo alC cga ibr @@ -90440,7 +90063,7 @@ qJB bYC lMJ aaa -gka +gZR aaa cue cda @@ -90624,7 +90247,7 @@ dne aip dne dst -aDc +awS dhE aRG aRG @@ -90657,7 +90280,7 @@ bzw jEJ bCI bEo -bvY +hiA bqi bJq bud @@ -90667,8 +90290,8 @@ vTD bxT wBp nfn -aob -aob +bbL +bbL auF cga mxt @@ -90697,7 +90320,7 @@ bXt bYC bYC bYC -gka +gZR aaa cue cda @@ -90954,7 +90577,7 @@ bXu bYD vhx pay -gka +gZR lMJ cue cda @@ -91205,7 +90828,7 @@ cga nPC uqB bTp -bUP +vhx ntG bXv bYC @@ -92985,7 +92608,7 @@ dux dux dux dux -oZg +bXF dux dux dux @@ -93244,7 +92867,7 @@ diy dux xuA reI -cbs +hxX wen jdp qit @@ -94014,7 +93637,7 @@ bXD bYI bZO cbt -hFE +oZg dux dux csT @@ -94244,7 +93867,7 @@ beV bgH biE bkh -dmH +lDf bnW bqn bsy @@ -94275,7 +93898,7 @@ cdd dux cfC fWc -oPU +snr ovU jkQ fJl @@ -94532,7 +94155,7 @@ cde dux dux cdc -dux +cga oSw jkQ lVu @@ -95573,8 +95196,8 @@ cia cuh cvm cvl -cxc -cxR +cdk +uYd dux aaa aaa @@ -96586,7 +96209,7 @@ dux dux dux dux -cfD +dyw dwb cic cia @@ -97351,7 +96974,7 @@ bSB bPR bue div -bXI +bLd dux dux cbD @@ -98139,11 +97762,11 @@ coI cqd crs css -dux -dux -dux -dux -dux +nMe +nMe +nMe +nMe +nMe cxU cyO czP @@ -99079,7 +98702,7 @@ aaI aaI acE adb -abE +fos abE aem aeN @@ -100096,7 +99719,7 @@ aaa aaa aaf aaf -agL +aay aaB aaH aaQ @@ -100107,7 +99730,7 @@ aca act acI add -acv +vVP adS aen aeM @@ -100197,13 +99820,13 @@ cmu csw cmu cmu -cvt -cvt +cxU +cxU cxl cxY -cvt -cvt -cvt +cxU +cxU +cxU cxU cCQ cDT @@ -100415,7 +100038,7 @@ bkz bmp bon bqC -bsN +acw buo bwj bol @@ -100441,7 +100064,7 @@ cad cbP cdv cez -bXK +xXq tay cio cjO @@ -100460,7 +100083,7 @@ cxm cxZ cyV czX -cvt +cxU cCb cCR cDU @@ -100695,7 +100318,7 @@ bWj bXL bXL cae -caj +bXL bXL bXL bXL @@ -100955,11 +100578,11 @@ rVd cbQ cdw ceA -cfQ +cbS cgX -cip -cjQ -clo +wAb +wgD +cri cmv cnE coQ @@ -100974,7 +100597,7 @@ cxo cyb cyX czZ -cvt +cxU cCd cCT cDW @@ -101135,7 +100758,7 @@ abE abE abE ade -abE +fos abE aeo aeQ @@ -101212,9 +100835,9 @@ cag caf caf ceB -cfR -cgY -cir +cbS +cgX +cbY cdx cfP cmv @@ -101223,15 +100846,15 @@ coR cqo crB csA -ctA -ctA -ctA -ctA +cCe +cCe +cCe +cCe cxp cyc -ctA -ctA -ctA +cCe +cCe +cCe cCe cCe cDX @@ -101471,7 +101094,7 @@ cbS cbS bXL dwy -cip +cbY cdy clp cmu @@ -101480,15 +101103,15 @@ coS cqn crC csB -ctA -cur -cvx -cwy +cCe +cCf +cCj +cCf cxq -cyd +cCj cyY -cAa -ctA +cCf +cCj cCf cCU cDY @@ -101664,8 +101287,8 @@ anh aor apE dCg -anh -anh +agT +agT auU awa awZ @@ -101673,7 +101296,7 @@ ayw azD aAY aCk -aDw +aDx aDC aGb aHx @@ -101729,7 +101352,7 @@ ceD cfT cgZ cit -cjQ +dJG clq cmu cmu @@ -101737,15 +101360,15 @@ cmu cqp cmu cmu -ctA +cCe cus -cvy -cwz +cCj +cCj cxr -cye -cyZ -cAb -ctA +cCj +cCj +cCj +cCj cCg cCV cDZ @@ -101910,11 +101533,11 @@ adz acf hyP aeQ -afG -agL +afL +aay ahz aiv -ajo +aiq aky akg ani @@ -101928,9 +101551,9 @@ awb axa ayx azE -azE +uvH aCk -aDx +aDw aEK aFZ aHx @@ -101994,15 +101617,15 @@ cbu cqq crD csC -ctA -cut -cvz -cwA +cCe +cCj +cCj +cCj cxs -cyf -cyZ -cAc -ctA +cCj +cCj +cCj +cCj cCj cCj cDY @@ -102175,19 +101798,19 @@ ajp akz ajQ anj -aot -apG -apG -apG +alS +alS +agR +alS atN alS awc axg -ayy -azF -aAZ -aCk -aDw +ahx +aiq +aiq +ajm +aDy aEL aGd aHx @@ -102251,16 +101874,16 @@ uGS uGS uGS csD -ctA +cCe cuu -cvA -cwB -cxt -cyg -cyZ -cAd -ctA -dbr +cCj +tFJ +acl +cCj +tFJ +tFJ +cCj +tFJ tFJ dDC tFJ @@ -102426,25 +102049,25 @@ adc afa afT agN -ahB -ahB -ahB -ahB +ahx +ahx +ahx +agL alR -ahB -adY -ajx -adY -ajx -atO +afX +afZ +agQ +aeq +aiq +aiq auW -awd +ara axc -ahx -ahx -ahx -ajm -aDy +ayw +xjc +cTY +aCk +aDx aEM aFZ aHx @@ -102508,15 +102131,15 @@ coT cqr uGS csE -ctA -cuv -cvB -cwC -cxu +cCe +cCf +cCj +cCf +cxq cyh -cza -cAe -ctA +cCf +cCf +cCj cCf cCf cDY @@ -102683,23 +102306,23 @@ aep aeQ afU agO -ahB +ahx aNA ajq aix akA -ank -ajx -apI -ara +aeq +aeq +anl +aeq asp -ajx -auW -awd +ahE +aiq +atO axd -ayw +dhv azG -aAY +eYX aCk aDw aEN @@ -102765,17 +102388,17 @@ coU cqs crE csF +cCe ctA -ctA -ctA -ctA +cCj +cCj cxv cyi -ctA -ctA -ctA -cCi -cCW +cvB +cCj +cCj +cCj +cCj cEb cEV cFV @@ -102940,11 +102563,11 @@ ael afd afV agP -ahB +ahx aiy dBZ ajr -alT +akK anl aou apJ @@ -102954,11 +102577,11 @@ ava axR awe axe -ayz -dCj -azE -aCk -aDx +ahx +aiq +aiq +ajm +aDy dCo aGg aHx @@ -103022,15 +102645,15 @@ coV xgQ uGS cKJ -ctB +cCe cuw -cvC -cwD +cCj +cCj cxw -cyj -czb -cAf -cBc +cCg +cxs +cCj +cCj cCj cCX cEc @@ -103197,25 +102820,25 @@ aax aay aay aax -adY +ajm aiz ajt akB -akA -anm -ajx -apK -arc +aff +aeq +aga +apJ +arb asr -ajx +ahF auY -awc -axg -ayy -azF +avb +aCq +ayw +xjc aBa aCk -aDw +aDx aEN aGh aHx @@ -103280,14 +102903,14 @@ cqu uGS csH ctC -cux -cvD -cwE -cxx -cyk -czc -cAg -ctB +cCj +cCj +cCj +cCj +cCj +cxs +cCj +cvE cCk cCY cEd @@ -103449,30 +103072,30 @@ aaa aaa aaf aaa +aaa aaf +aaa aaf -aaf -aaf -aaf -adY -adY -adY -adY -alV -adY -adY +aav +aeq +aeq +aeq +aeq +aeq +aeq +agb apL -dCh +aeq ass -adY -auW -awd +ahG +aiC +axi axf -ahx -ahx -ahx -ajm -aDz +dBX +hjl +nEv +aCk +aDw aEN aFZ aHy @@ -103536,18 +103159,18 @@ coX cnL uGS cbC -ctB -cuy +cCe +tFJ cvE -ctB -cxy -cyl -czd -cAg -ctB +tFJ +tFJ +cCj +acl +tFJ +cCe +cCe cCe cCe -cEe cEY cCe cCe @@ -103706,30 +103329,30 @@ aaf aaf aaf aaf -aaf -aaf -aeq -aeq -aeq -aeq +lMJ +lMJ +lMJ +lMJ +lMJ aeq +aer bgB akC alU ann -adY +agc apM -ans +aeq ast +ahH adY -auW -awd -axd -ayw -azH -aAY -aCk -aDw +ayz +ajx +adY +ajx +ajx +adY +aDz aEN aGg aHx @@ -103794,13 +103417,13 @@ coY uGS csI ctD -cuz +cCe cvF -ctB -ctB +cCe +cCe cym -cze -ctB +cxp +cCe cBd cCl cCZ @@ -103963,30 +103586,30 @@ aaa aaa aaf aaa -aaf +aaa +lMJ +aaa +lMJ +aaa aeq -aeq -afZ -agR -ahE aiA akD -akD -dCa ano -ajx +akD +ano +akD apN -are +cZk asu atQ auZ awf -axa +aDE ayA -azE -azE -aCk -aDx +roZ +pvK +aBc +aDw aEQ aGj aHz @@ -104079,7 +103702,7 @@ cPs cPU cQp cQN -cQY +lwx cQK eCT cYJ @@ -104220,29 +103843,29 @@ aaa aaa aaf aaa +aaa +lMJ +aaa +lMJ +aaa aeq aeq -aff -afY -afY -afY -ahP ajv akE alW -anp -aow -ans +akE +alW +akE arf asv atR azb -awc -axg +ayB +ayB ayy -azF +npx aBb -aCk +hql aDw aEN aGk @@ -104318,7 +103941,7 @@ cAi ctF car car -czg +car cFb car car @@ -104477,34 +104100,34 @@ aaa aaa aaf aaa +aaa +ank +aaa +lMJ +aaa +aaa aeq -aes -afh -agb -agT -ahG -aiC ajw akF alZ anq -ajx +agd aoy -arg +anl asw -ajx -auW +ahI +alV awg axh -ahx -ahx -ahx -ajm +dCh +mDQ +dmU +yej aDA aEN aGl aHB -aIK +adD aJV aIK aHB @@ -104733,30 +104356,30 @@ aaa aaa aaa aaf -adD -aeq -aer -afg -aga +aaf +lMJ agS -ahF +ajx +ajx +agS +adY aeq -ajx -ajx -ama +anl +anl +aeq +aeq +aeq +aeq +aeq +agU +ahH +adY +ayE ajx adY -adY -dhv +ajx ajx adY -avb -awh -axi -ayB -azI -aBc -aCn aDB aES aGm @@ -104991,30 +104614,30 @@ aaa aaa aaf aaa -aeq -aex -afg -agd -agU -ahH -aeq +adY +agS +aDG +eph +oVO +adY +aes ajy arj amb -ajz +afY amf dCf -ajz -ajz +alV +asu atS -auW +ama awi axj -aiq -azJ +uNe aBd -aCk -aDC +ece +rqO +aHF aET aGn aHD @@ -105248,25 +104871,25 @@ aaa aaa aaf aaa -aeq -aeq -afX -agc -dBX -agc -ajs -ajz -akI -amb -ant +ajx +axl +ame +ame +ame +ehi +ajs +akI +akI +afg +ame +ame ame -apJ ari asx aiB avc awj -axk +axc ayC azK aBe @@ -105505,33 +105128,33 @@ aaa aaa aaf aaa -aaf -aeq -aeq -agQ -ahC -ahI -aeq +adY +agS +aEW +ixj +qRr +adY +aex ajA akJ -amb +afh anu aoz apQ -arj +ajx asz -ahB -avd -awd -axl -ahx -ahx -ahx -ajm -aDE +ahP +anB +aCn +axa +azN +aBh +eoT +aGq +gPT aEV -aDE -aHE +ooY +aHD aIN aJY aLA @@ -105761,34 +105384,34 @@ aaa aaa aaa aaf -aaf -aaf -aaf -aeq -aeq -aeq -aeq -aeq +aav +lMJ +agS +ajx +ajx +agS adY -akK +adY +adY +ajx alX ahB ajx ahB ark -ajx -ahB +aiD +ajD ave awl axm -aiq -azL -aBf ajm -aDF -aEW -aGq -aHE +aiq +aiq +ajm +ajm +ajm +ajm +eZU aIO aJZ aIR @@ -106018,13 +105641,13 @@ aaa aaa aaa aaf -aaa -aaa -aaf -aaf +lMJ +lMJ aaf aaf aaf +lMJ +lMJ aiD ajB akL @@ -106036,16 +105659,16 @@ arl asy ajD avf -awd +aCn axn -ayw -azM -aBg -ayw -aDG -aEX +azQ +aBk +lJY aGr -aHE +ajm +aEX +aDH +eZU aIP aKa aLB @@ -106275,7 +105898,7 @@ aaa aaa aaa aaf -aaf +aav aaf adZ adZ @@ -106292,17 +105915,17 @@ rQK arm asC aiD -auY +ahC awh axo -ayE -azN -aBh -aCq +aiq +snF +eeh +aCr +ajm +avk aDH -aEY -aGs -aHE +eZU aIQ aKb dCq @@ -106552,14 +106175,14 @@ atU avg awn axp -aiq +mEn azO aBi -ajm -ajm -ajm -ajm -aHE +aBi +fCe +avk +avk +eZU aIR aKc aLC @@ -106813,10 +106436,10 @@ aiq azP aBj aCr +ajm +hdb avk -avk -avk -aHD +ofB aIS aKd aIR @@ -107063,17 +106686,17 @@ apU iOo asF aiD -auW +anm awp axr -ayF -ayF -ayF +aBf +aCs +aDF ayF ayJ ayJ -aGt -aHF +ayJ +aHD aIT aKe aIR @@ -107320,16 +106943,16 @@ apV arq asG ajD -auW +avd awp axs ayF -azQ -aBk -aCs +ayF +ayF +ayF aDI -ayJ -ayJ +aFa +kKH aHD aHD aHD @@ -107577,9 +107200,9 @@ apW iOo asH aiD -auW +avd awq -axq +aHE ayG azR aBl @@ -107648,9 +107271,9 @@ cpp cqF crL csW -ctO -cuJ -cvN +cAu +cFl +cAu dDy qom cyw @@ -107834,7 +107457,7 @@ bni arr asI aiD -auY +anB awr axt ayH @@ -107903,9 +107526,9 @@ cgo coc cpn cqG -crM +cCs csX -ctP +qte cuK cvO cwO @@ -108085,13 +107708,13 @@ adZ ajD akT amm -anB +qZU aoH apY iOo asJ ajD -auW +avd aws axu ayI @@ -108159,9 +107782,9 @@ clJ cmL ccd cdM -cqH -crN +cci crN +kCU crN crN cvP @@ -108675,7 +108298,7 @@ coe cpq cqJ crP -cuN +pZw ctR cuN cvR @@ -108916,7 +108539,7 @@ sKL bUb bVb bWG -dVQ +bSS bSS bSS bSS @@ -108929,8 +108552,8 @@ ckl diH cgo cof -cdL -dOB +cdM +hSZ crQ ctb ctS @@ -109687,7 +109310,7 @@ jZS bUd bVq bWJ -eza +bYc bZs aWf ccr @@ -110727,7 +110350,7 @@ cgq cgq cgq cmP -cmP +cvA cpx cqP crR @@ -110980,9 +110603,9 @@ bST dDr cgq chx -chx -chx -cgq +cuz +cur +cvz cmQ cok cpy @@ -111236,13 +110859,13 @@ ccw bST ceZ cgq -chx -ciS -chx +cur +sRB +cvx clS -cmR -col -cpz +htB +ckr +cpC cqR cgq ctj @@ -111493,17 +111116,17 @@ ccv bST csg cgq -chx -ciT -ckr +cut +abU +abU clT -cmS -com -cpA +qtp +ckr +cpC cqS cgq dwL -uuO +dwL dwL dwL dwL @@ -111751,23 +111374,23 @@ bST ceZ cgq chy -ciU -tEg -clU +edM +vml +edM cmT con cpB -cqT +cqU crU dwL ftu -kVo -kVo -kVo -gHh -sLd -nHj +pCp +pCp +pCp +czC wRy +nHj +gbA cBE cAJ cCE @@ -112007,14 +111630,14 @@ tYS bST ceZ cgq -chx -cLU -chx -clU -cmU -coo +cuv +ckr +cvy +cmS +ckr +ckr cpC -cqU +lMB crV dwL vKB @@ -112265,13 +111888,13 @@ bST ceZ cgq chA -ciV -cks -cgq -cmV -cop +acr +ckr +ckr +ckr +acr cpD -cqV +ckr crW dwL mHF @@ -112521,15 +112144,15 @@ dbE bST diB cgq -chx +cux ciW -ckt +aSy clV -cmW -coq +aSy +ciW cpE cqW -crX +lTA dwL mHF cuZ @@ -113044,13 +112667,13 @@ pCp cpG pCp dDu -clW +iSU cuc cuZ -dyp +eqG pcn vVq -cyM +xfP xVP ojg czF @@ -113302,12 +112925,12 @@ ovj ovj cuZ sFv +gtf cuZ -cuZ -eqG -pcn -vVq -cyM +tsk +lIw +kyI +vQP pZm ojg czG @@ -113563,7 +113186,7 @@ cud kxk szA hFV -qjB +szA dGH mzh ojg @@ -113817,10 +113440,10 @@ cqY cuZ jLY lzk -lzk +pzC cwd -kfu -cxP +krD +krD krD gnZ ojg @@ -114074,12 +113697,12 @@ cqZ cuZ cuZ obb -krD +fam kOt krD krD -krD -krD +pak +hMx ocT aaf aaf @@ -114332,11 +113955,11 @@ crZ cuZ tVY fUC -krD -krD -krD -krD -krD +hHS +nLi +ybC +mbL +uPK ocT aaf aaa @@ -115829,14 +115452,14 @@ bbs bcE bef aWw -bhO +gbb bjC blg bmV bpd -bmV +rLg btx -buZ +bkW bwZ byP bAx @@ -115851,7 +115474,7 @@ bNL bPh bKr bSd -bPm +yeM alq bVC bWY @@ -116355,7 +115978,7 @@ bxb byQ bAz bCf -bty +rUR bFE bHo bIH @@ -116606,9 +116229,9 @@ blj bmY bhT bhT +nde +kRO bhT -bhT -bxc bxc bAA bCg @@ -116621,7 +116244,7 @@ bKr bKr bKr bKr -apc +lVD apc alq alq @@ -116865,8 +116488,8 @@ hfn msD bep vzO +hYz bxd -byR bAB bCh bDO @@ -117116,18 +116739,18 @@ bek bfR bhV bjG -bll +xyt bna kCw -msD -hkq +kCw +kCw bve +ofT bxd -byS bAC -bAH +xDR dCY -bFH +lFr bHq bIJ aiN @@ -117363,7 +116986,7 @@ ifN aRp aSv aTH -aVa +aBI aWw aWw aWw @@ -117372,15 +116995,15 @@ aWw aWw aWw bhW -bjG -xyt +hKs +xIf bnb -owR -owR +jUn +lci pmZ qdT +sfR bxd -byT bAD bCj bDP @@ -117391,7 +117014,7 @@ bBt atm bLZ bPm -apc +lVD bSf apc bxc @@ -117628,19 +117251,19 @@ bby dgz aBI byK -bhX -hKs +wdI +tbp bln bnc -bph -iHl +owR +owR usN -bvg +owR +owR bxd -byU bAE bCk -bAH +bFH bFJ bHs bIL @@ -117889,12 +117512,12 @@ bhY bjI ecs rxn -bpi +owR sao hkq bvh +voX bxd -byV bAF bCl bDQ @@ -118143,19 +117766,19 @@ dgz aBI byK bhZ -fHj +rYV bnd pOm uEH brE mzU bvi -bxc +tbu bxc bxc bCm -bDR bza +bDR bxl bIN bxg @@ -118394,21 +118017,21 @@ aCZ aVe axY aYu +fMA +fMA aYu aYu -aYu -aYu -aYu +tqI bia fHj blo bne -owR -owR +vyS +mHR oJW rWg +oBU bxc -byW bAG bCn dBM @@ -118649,23 +118272,23 @@ dBB dBB aTM aVe -apc -aYu +qaj +rGw aZL bbB bcL -bem bfV +tmp bib bjJ blp bnf -bpg owR owR owR -bxd -byX +fdM +owR +bxc bAH bCo bDT @@ -118906,13 +118529,13 @@ dBA aSA dfT aVf -apc -aYu +vFS +tGe aZM bbC bcM -ben bfW +kIL bic bjK eLn @@ -118921,9 +118544,9 @@ bpk brI btB bvk +dql bxe -byY -bDU +gGf bCp bDU bFN @@ -119161,26 +118784,26 @@ dlI aQe aRv dfD -dfT -aVe -apc -aYu +jQh +dfZ +oJL +hMM aZN bbD bcN -beo bfX +bhX bid bjL -blr -bng -bpl +bjG +bjL +xyt btD bvn bvl bxf +bxc byZ -bAJ bCq bDV bFO @@ -119418,25 +119041,25 @@ dlI dfp dfp dfE -dfP -dfY -dgc +ocA +aVe +aYu aYu cXA cXA cXA cXA -cXA -bie -bjM -bls -bhT -bpm -bhT -bhT -bvm +uyj +qxe +nLx +noe +bng +xWD +kSe +uow +gjM bxg -bza +bxc bza bza bza @@ -119675,23 +119298,23 @@ dfj dlI deD dfF -dfT -aVe +dfP +wHc aWH dgi dgc aqq -aqr -aWu -bif -bif -bif +fvl +atm +bie +bjM +bls bhT bhT -brK +bpm bhT -bvo -bvr +bhT +bvm bxh bzb bAK @@ -119932,21 +119555,21 @@ dfk dfq djt dfD -dfQ -dfZ +dfT +vqh apc apc dgo +aqr apc -cXZ -atm -bfZ -bif -bfY +aWu +jnI +neo +qgQ +bhT +bhT +brK bhT -bqF -bpp -btF bvp bvv bxi @@ -120188,7 +119811,7 @@ aNv dfk daY djx -dfD +sUG cXz aVe atm @@ -120197,14 +119820,14 @@ dgp cXI cYj atm -wOY -adF -wOY -bhT -bpv -brL -btE +bfZ +bif +bfY bhT +bqF +bpp +btF +fEU bvs bxj bzd @@ -120454,14 +120077,14 @@ dgp alr atm atm -aaa -aaa -aaa +wOY +tpc +wOY +bhT +bpv +brL +btE bhT -brJ -brN -btG -bvq bxm bxk bze @@ -120714,12 +120337,12 @@ dgI aaa aaa aaa -sJW -aNC -brM -aNC bhT -bwl +brJ +brN +btG +bvq +raN bxl bzf bAO @@ -120971,12 +120594,12 @@ dgJ aaa aaa aaa -aaa -aaf -uGa -aaf -aaf -ack +sJW +aNC +brM +aNC +bhT +bwl bxc bzg bAP @@ -121226,14 +120849,14 @@ azd dgB dgK aaa -cUL +aav aaa aaf aaf bpw -aaa -aaf +lMJ aaf +ack bxc bzh bAQ @@ -121482,9 +121105,9 @@ dgt dgk dgv dgJ -anT -aaf -aaf +aav +cUL +aav aaf aaa bpw @@ -121740,8 +121363,8 @@ dgk dgB dgM dgN -dgO -dgO +nmA +nmA dgw dgO fcn @@ -132268,7 +131891,7 @@ aOV aaa aRy aRy -aTV +vnm aVq aWQ aYA diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm index 43757144b5e..cffdfbd732d 100644 --- a/_maps/map_files/Mining/Lavaland.dmm +++ b/_maps/map_files/Mining/Lavaland.dmm @@ -1462,7 +1462,7 @@ /area/mine/living_quarters) "ed" = ( /obj/machinery/camera{ - c_tag = "Crew Area Hallway West"; + c_tag = "Crew Area Hallway"; network = list("mine") }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3, @@ -2193,7 +2193,7 @@ /area/mine/living_quarters) "fL" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/effect/turf_decal/tile/bar, @@ -3637,6 +3637,12 @@ }, /turf/open/floor/plasteel/freezer, /area/mine/living_quarters) +"vh" = ( +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/mine/laborcamp/security) "vq" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3, /turf/open/floor/plasteel, @@ -3676,10 +3682,11 @@ dir = 1 }, /obj/machinery/power/apc{ - name = "Labor Camp Security APC"; dir = 1; + name = "Labor Camp Security APC"; pixel_y = 23 }, +/obj/structure/cable, /turf/open/floor/plasteel, /area/mine/laborcamp/security) "zn" = ( @@ -3799,7 +3806,7 @@ /area/mine/laborcamp/security) "Fe" = ( /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12 }, /obj/structure/mirror{ @@ -4236,7 +4243,7 @@ /area/mine/living_quarters) "YY" = ( /obj/machinery/camera{ - c_tag = "Crew Area"; + c_tag = "Crew Area Hallway West"; dir = 1; network = list("mine") }, @@ -10393,8 +10400,8 @@ bk az az yr -UH -ch +vh +bh GI Fd Hd @@ -10651,7 +10658,7 @@ yr yr yr za -ch +bh QN oW sM diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 6c1bd775415..dbe222442f5 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -225,6 +225,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable, /turf/open/floor/plasteel, /area/science/explab) "aaE" = ( @@ -272,8 +273,8 @@ /turf/open/floor/plasteel/white, /area/science/explab) "aaJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/white, /area/science/explab) "aaK" = ( @@ -339,6 +340,51 @@ /obj/structure/cable, /turf/open/floor/plasteel/dark, /area/science/explab) +"aaR" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/chair{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/medical/sleeper) +"aaS" = ( +/obj/effect/landmark/start/paramedic, +/turf/open/floor/plasteel/white, +/area/medical/medbay/central) +"aaT" = ( +/obj/effect/mapping_helpers/iannewyear, +/turf/open/floor/wood, +/area/crew_quarters/heads/hop) +"aaU" = ( +/obj/machinery/door/airlock{ + name = "Unisex Restroom" + }, +/turf/open/floor/plasteel/freezer, +/area/security/prison/toilet) +"aaV" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = -12; + pixel_y = 2 + }, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plasteel/freezer, +/area/security/prison/toilet) +"aaW" = ( +/obj/structure/toilet{ + dir = 8 + }, +/obj/effect/landmark/start/prisoner, +/turf/open/floor/plasteel/freezer, +/area/security/prison/toilet) "abf" = ( /obj/structure/bed, /turf/open/floor/plating, @@ -2027,12 +2073,6 @@ /obj/structure/cable, /turf/open/floor/plasteel/dark, /area/security/prison) -"agC" = ( -/obj/machinery/door/airlock{ - name = "Unisex Restroom" - }, -/turf/open/floor/plasteel/freezer, -/area/security/prison) "agD" = ( /obj/machinery/light/small{ dir = 8 @@ -2085,6 +2125,7 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/start/prisoner, /turf/open/floor/plasteel, /area/security/prison) "agK" = ( @@ -2130,6 +2171,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, +/obj/effect/landmark/start/prisoner, /turf/open/floor/plasteel, /area/security/prison) "agN" = ( @@ -2150,17 +2192,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/security/prison) -"agO" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = -12; - pixel_y = 2 - }, -/obj/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/plasteel/freezer, -/area/security/prison) "agP" = ( /turf/closed/wall, /area/security/main) @@ -2238,12 +2269,6 @@ /obj/structure/cable, /turf/open/floor/plasteel, /area/security/prison) -"ahb" = ( -/obj/structure/toilet{ - dir = 8 - }, -/turf/open/floor/plasteel/freezer, -/area/security/prison) "ahd" = ( /obj/structure/closet/secure_closet/security/sec, /obj/effect/turf_decal/delivery, @@ -2752,7 +2777,7 @@ /turf/open/floor/plasteel/showroomfloor, /area/security/main) "aio" = ( -/obj/structure/closet/l3closet, +/obj/structure/closet/l3closet/security, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel/showroomfloor, /area/security/main) @@ -2795,9 +2820,8 @@ /turf/open/floor/plasteel/white, /area/security/execution/transfer) "aiw" = ( -/obj/machinery/power/emitter/anchored{ - dir = 1; - state = 2 +/obj/machinery/power/emitter/welded{ + dir = 1 }, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -7482,6 +7506,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 }, +/obj/machinery/navbeacon/wayfinding/minisat_access_ai, /turf/open/floor/plasteel/dark, /area/bridge) "atN" = ( @@ -8050,6 +8075,7 @@ dir = 8 }, /obj/structure/cable, +/obj/machinery/navbeacon/wayfinding/vault, /turf/open/floor/plasteel/dark, /area/ai_monitored/nuke_storage) "auZ" = ( @@ -8064,6 +8090,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable, +/obj/machinery/navbeacon/wayfinding/gateway, /turf/open/floor/plasteel, /area/gateway) "avb" = ( @@ -8910,6 +8937,7 @@ /obj/effect/turf_decal/tile/red{ dir = 4 }, +/obj/machinery/navbeacon/wayfinding/sec, /turf/open/floor/plasteel, /area/security/brig) "awO" = ( @@ -10300,6 +10328,7 @@ dir = 8 }, /obj/structure/cable, +/obj/machinery/navbeacon/wayfinding/aiupload, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload) "aAD" = ( @@ -10463,6 +10492,7 @@ req_access_txt = "4" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/navbeacon/wayfinding/det, /turf/open/floor/plasteel/dark, /area/security/detectives_office) "aBg" = ( @@ -11047,8 +11077,6 @@ /obj/structure/table, /obj/item/assembly/signaler, /obj/item/assembly/signaler, -/obj/item/multitool, -/obj/item/multitool, /obj/machinery/airalarm{ pixel_y = 22 }, @@ -11296,6 +11324,7 @@ dir = 4 }, /obj/structure/cable, +/obj/machinery/navbeacon/wayfinding/hop, /turf/open/floor/wood, /area/crew_quarters/heads/hop) "aCW" = ( @@ -12181,7 +12210,7 @@ /area/hallway/primary/central) "aEZ" = ( /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, @@ -13033,6 +13062,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/navbeacon/wayfinding/bridge, /turf/open/floor/plasteel/dark, /area/bridge) "aHh" = ( @@ -14230,6 +14260,7 @@ req_access_txt = "18" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/navbeacon/wayfinding/eva, /turf/open/floor/plasteel, /area/storage/eva) "aLc" = ( @@ -14245,6 +14276,7 @@ req_access_txt = "17" }, /obj/structure/cable, +/obj/machinery/navbeacon/wayfinding/teleporter, /turf/open/floor/plasteel, /area/teleporter) "aLe" = ( @@ -14410,7 +14442,7 @@ /area/crew_quarters/cafeteria) "aLE" = ( /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, @@ -14500,10 +14532,24 @@ /turf/open/floor/plasteel, /area/storage/eva) "aLU" = ( -/obj/structure/closet/crate/rcd, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/structure/rack, +/obj/item/grenade/chem_grenade/smart_metal_foam{ + pixel_x = -4; + pixel_y = 6 + }, +/obj/item/grenade/chem_grenade/smart_metal_foam{ + pixel_x = 4; + pixel_y = 2 + }, +/obj/item/grenade/chem_grenade/smart_metal_foam{ + pixel_x = 8 + }, +/obj/item/grenade/chem_grenade/smart_metal_foam{ + pixel_y = 4 + }, /turf/open/floor/plasteel/dark, /area/storage/eva) "aLV" = ( @@ -16223,22 +16269,13 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) -"aQA" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "aQB" = ( -/obj/structure/disposalpipe/junction/flip{ - dir = 8 - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "aQC" = ( @@ -17434,6 +17471,7 @@ dir = 4 }, /obj/structure/cable, +/obj/machinery/navbeacon/wayfinding/disposals, /turf/open/floor/plating, /area/maintenance/disposal) "aTz" = ( @@ -17757,6 +17795,7 @@ dir = 4 }, /obj/machinery/door/firedoor, +/obj/machinery/navbeacon/wayfinding/cargo, /turf/open/floor/plasteel, /area/quartermaster/office) "aUp" = ( @@ -19331,7 +19370,7 @@ /area/janitor) "aXQ" = ( /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, @@ -19889,7 +19928,7 @@ /area/hydroponics) "aYQ" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /turf/open/floor/plasteel, @@ -21689,7 +21728,7 @@ /obj/item/reagent_containers/glass/bucket, /obj/item/mop, /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/machinery/light_switch{ @@ -22053,6 +22092,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/machinery/navbeacon/wayfinding/hydro, /turf/open/floor/plasteel, /area/hydroponics) "bel" = ( @@ -22108,6 +22148,7 @@ id = "kitchenwindowshutters"; name = "kitchen shutters" }, +/obj/machinery/navbeacon/wayfinding/kitchen, /turf/open/floor/plasteel, /area/crew_quarters/kitchen) "bep" = ( @@ -22444,6 +22485,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, +/obj/machinery/navbeacon/wayfinding/janitor, /turf/open/floor/plasteel, /area/janitor) "bfj" = ( @@ -22916,6 +22958,7 @@ /obj/machinery/door/airlock/public/glass{ name = "Bar" }, +/obj/machinery/navbeacon/wayfinding/bar, /turf/open/floor/plasteel, /area/crew_quarters/bar) "bgv" = ( @@ -24218,7 +24261,7 @@ "bkm" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12 }, /obj/effect/turf_decal/tile/green{ @@ -24335,6 +24378,10 @@ /turf/open/floor/engine, /area/science/explab) "bkA" = ( +/obj/machinery/light{ + dir = 1; + light_color = "#d1dfff" + }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 }, @@ -24421,7 +24468,7 @@ dir = 1 }, /obj/machinery/camera{ - c_tag = "Genetics Cloning Foyer"; + c_tag = "Ward Access"; network = list("ss13","medbay") }, /obj/machinery/atmospherics/components/unary/vent_pump/on, @@ -24853,27 +24900,21 @@ /area/science/server) "blP" = ( /obj/effect/landmark/event_spawn, -/obj/item/beacon, /obj/machinery/light{ dir = 8 }, -/turf/open/floor/engine, -/area/science/explab) -"blQ" = ( /obj/machinery/rnd/experimentor, /turf/open/floor/engine, /area/science/explab) "blR" = ( +/obj/item/beacon, /obj/effect/landmark/blobstart, /obj/effect/landmark/xeno_spawn, /turf/open/floor/engine, /area/science/explab) "blS" = ( -/obj/machinery/light{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/item/book/manual/wiki/experimentor, +/obj/machinery/rnd/bepis, /turf/open/floor/engine, /area/science/explab) "blX" = ( @@ -25292,12 +25333,12 @@ /area/maintenance/department/engine) "bnv" = ( /turf/closed/wall, -/area/medical/genetics) +/area/medical/medbay/zone2) "bnw" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical/glass{ - name = "Cloning"; - req_one_access_txt = "5;9" + name = "Ward"; + req_one_access_txt = "5" }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -25551,30 +25592,30 @@ /turf/open/floor/plasteel/dark, /area/science/server) "bnV" = ( -/obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ id = "testlab"; name = "test chamber blast door" }, /obj/machinery/atmospherics/pipe/simple/general/hidden, +/obj/effect/spawner/structure/window/reinforced, /turf/open/floor/engine, /area/science/explab) "bnW" = ( -/obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/poddoor/preopen{ id = "testlab"; name = "test chamber blast door" }, +/obj/effect/spawner/structure/window/reinforced, /turf/open/floor/engine, /area/science/explab) "bnX" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/door/firedoor/heavy, /obj/machinery/door/poddoor/preopen{ id = "telelab"; name = "test chamber blast door" }, -/obj/machinery/door/firedoor/heavy, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/engine, /area/science/explab) "bnY" = ( @@ -25649,20 +25690,20 @@ /obj/structure/flora/ausbushes/brflowers, /obj/structure/flora/ausbushes/ywflowers, /turf/open/floor/grass, -/area/medical/genetics) +/area/medical/medbay/zone2) "bos" = ( /obj/structure/flora/junglebush/large, /turf/open/floor/grass, -/area/medical/genetics) +/area/medical/medbay/zone2) "bot" = ( /obj/structure/flora/junglebush, /obj/structure/flora/ausbushes/brflowers, /turf/open/floor/grass, -/area/medical/genetics) +/area/medical/medbay/zone2) "bou" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/medical/genetics) +/area/medical/medbay/zone2) "bov" = ( /obj/structure/closet/secure_closet/personal/patient, /obj/effect/turf_decal/tile/blue{ @@ -25671,8 +25712,11 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "bow" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 @@ -25684,7 +25728,7 @@ dir = 4 }, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "box" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ @@ -25698,7 +25742,7 @@ }, /obj/structure/cable, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "boy" = ( /obj/structure/closet/wardrobe/mixed, /obj/effect/turf_decal/tile/blue{ @@ -25708,7 +25752,7 @@ dir = 4 }, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "boz" = ( /obj/machinery/vending/clothing, /obj/machinery/firealarm{ @@ -25721,8 +25765,9 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/effect/turf_decal/tile/blue, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "boA" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/chair{ @@ -26099,12 +26144,11 @@ /obj/structure/flora/junglebush, /obj/structure/flora/ausbushes/sparsegrass, /turf/open/floor/grass, -/area/medical/genetics) +/area/medical/medbay/zone2) "bpw" = ( /obj/structure/flora/grass/jungle, -/obj/item/reagent_containers/food/snacks/grown/banana, /turf/open/floor/grass, -/area/medical/genetics) +/area/medical/medbay/zone2) "bpx" = ( /obj/structure/flora/ausbushes/lavendergrass, /obj/structure/flora/ausbushes/sparsegrass, @@ -26115,9 +26159,8 @@ /obj/structure/flora/junglebush, /obj/structure/flora/junglebush/large, /turf/open/floor/grass, -/area/medical/genetics) +/area/medical/medbay/zone2) "bpy" = ( -/obj/machinery/clonepod, /obj/item/radio/intercom{ frequency = 1485; name = "Station Intercom (Medbay)"; @@ -26126,42 +26169,39 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/medical/genetics) -"bpz" = ( -/obj/effect/turf_decal/stripes/line{ dir = 8 }, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) +"bpz" = ( +/obj/structure/bed, +/obj/item/bedsheet/medical, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "bpA" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 8 }, /obj/structure/cable, +/obj/structure/bed, +/obj/item/bedsheet/medical, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "bpB" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "bpC" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/effect/spawner/structure/window, /turf/open/floor/plating, -/area/medical/genetics) +/area/medical/medbay/zone2) "bpD" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -26337,6 +26377,7 @@ }, /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/navbeacon/wayfinding/med, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "bpV" = ( @@ -26525,9 +26566,6 @@ /turf/open/floor/plasteel/dark, /area/science/server) "bqo" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 1 - }, /obj/structure/extinguisher_cabinet{ pixel_x = -24 }, @@ -26540,26 +26578,25 @@ /obj/effect/turf_decal/tile/purple{ dir = 8 }, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 1 + }, /turf/open/floor/plasteel/white, /area/science/explab) "bqp" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 - }, -/obj/structure/chair/stool, /obj/effect/turf_decal/tile/purple{ dir = 1 }, /obj/effect/turf_decal/tile/purple{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 8 + }, +/obj/structure/chair/stool, /turf/open/floor/plasteel/white, /area/science/explab) "bqq" = ( -/obj/effect/landmark/start/scientist, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/tile/purple{ dir = 1 @@ -26567,18 +26604,22 @@ /obj/effect/turf_decal/tile/purple{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/effect/landmark/start/scientist, /turf/open/floor/plasteel/white, /area/science/explab) "bqr" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 8 - }, /obj/effect/turf_decal/tile/purple{ dir = 1 }, /obj/effect/turf_decal/tile/purple{ dir = 4 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 + }, /turf/open/floor/plasteel/white, /area/science/explab) "bqs" = ( @@ -26777,7 +26818,6 @@ "bqT" = ( /obj/structure/flora/grass/jungle/b, /obj/structure/flora/ausbushes/ppflowers, -/obj/item/reagent_containers/food/snacks/grown/banana, /obj/machinery/camera{ c_tag = "Genetics Monkey Pen Fore"; dir = 4; @@ -26787,38 +26827,30 @@ dir = 8 }, /turf/open/floor/grass, -/area/medical/genetics) +/area/medical/medbay/zone2) "bqU" = ( /obj/structure/sink/puddle, /obj/structure/flora/ausbushes/reedbush{ pixel_y = 6 }, /turf/open/floor/grass, -/area/medical/genetics) +/area/medical/medbay/zone2) "bqV" = ( /obj/structure/flora/grass/jungle/b, /obj/machinery/light/small{ dir = 4 }, -/mob/living/carbon/monkey, /turf/open/floor/grass, -/area/medical/genetics) +/area/medical/medbay/zone2) "bqW" = ( -/obj/machinery/computer/cloning{ - dir = 4 - }, /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, -/turf/open/floor/plasteel, -/area/medical/genetics) +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "bqX" = ( /obj/machinery/holopad, /obj/structure/disposalpipe/segment{ @@ -26827,38 +26859,33 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "bqY" = ( -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 8; - sortType = 23 - }, /obj/structure/cable, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"bqZ" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/cable, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) +"bqZ" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/junction/flip{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "bra" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical/glass{ - id_tag = "GeneticsDoor"; - name = "Cloning"; - req_one_access_txt = "5;9" - }, -/obj/effect/mapping_helpers/airlock/unres{ - dir = 8 + name = "Ward"; + req_one_access_txt = "5" }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/structure/cable, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "brb" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -26928,7 +26955,7 @@ /obj/machinery/computer/crew, /turf/open/floor/plasteel/white, /area/medical/medbay/central) -"bri" = ( +"brh" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 }, @@ -27214,10 +27241,6 @@ /turf/open/floor/plasteel/dark, /area/science/server) "brG" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 1; - name = "Connector Port (Air Supply)" - }, /obj/machinery/light_switch{ pixel_x = -25 }, @@ -27227,6 +27250,10 @@ /obj/effect/turf_decal/tile/purple{ dir = 8 }, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 1; + name = "Connector Port (Air Supply)" + }, /turf/open/floor/plasteel/white, /area/science/explab) "brH" = ( @@ -27234,11 +27261,20 @@ /turf/open/floor/plasteel/white, /area/science/explab) "brJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ dir = 4 }, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, /turf/open/floor/plasteel/white, -/area/science/explab) +/area/science/genetics) "brO" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/white, @@ -27254,7 +27290,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/structure/closet/l3closet, +/obj/structure/closet/l3closet/scientist, /obj/machinery/light{ dir = 1 }, @@ -27270,7 +27306,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/structure/sign/departments/xenobio{ pixel_x = 32 }, @@ -27281,6 +27316,7 @@ /obj/effect/turf_decal/tile/purple{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/open/floor/plasteel/white, /area/science/xenobiology) "brV" = ( @@ -27428,20 +27464,29 @@ /obj/structure/flora/grass/jungle/b, /mob/living/simple_animal/butterfly, /turf/open/floor/grass, -/area/medical/genetics) +/area/medical/medbay/zone2) "bsp" = ( -/obj/item/toy/beach_ball, -/turf/open/floor/grass, -/area/medical/genetics) +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/landmark/start/geneticist, +/turf/open/floor/plasteel/white, +/area/science/genetics) "bsq" = ( /obj/structure/flora/grass/jungle/b, /obj/structure/flora/ausbushes/ppflowers, +/mob/living/simple_animal/pet/dog/corgi/puppy, /turf/open/floor/grass, -/area/medical/genetics) +/area/medical/medbay/zone2) "bsr" = ( -/obj/machinery/dna_scannernew, /obj/machinery/camera{ - c_tag = "Genetics Cloning"; + c_tag = "Ward Fore"; dir = 4; network = list("ss13","medbay") }, @@ -27452,53 +27497,55 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, -/turf/open/floor/plasteel, -/area/medical/genetics) +/obj/structure/closet/wardrobe/mixed, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "bss" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, +/obj/structure/bed, +/obj/item/bedsheet/medical, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "bst" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /obj/structure/cable, +/obj/structure/bed, +/obj/item/bedsheet/medical, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "bsu" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 1 }, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "bsv" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/structure/chair/stool, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "bsw" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /obj/effect/spawner/structure/window, /turf/open/floor/plating, -/area/medical/genetics) +/area/medical/medbay/zone2) "bsx" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 @@ -27606,7 +27653,10 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, -/obj/machinery/camera, +/obj/machinery/camera{ + c_tag = "Medbay Cryogenics"; + network = list("ss13","medbay") + }, /turf/open/floor/plasteel, /area/medical/sleeper) "bsF" = ( @@ -27643,7 +27693,6 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable, -/obj/structure/cable, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "bsI" = ( @@ -27858,29 +27907,38 @@ /turf/open/floor/plasteel/dark, /area/science/server) "btg" = ( -/obj/structure/rack, -/obj/item/crowbar, -/obj/item/wrench, /obj/machinery/firealarm{ dir = 4; pixel_x = -28 }, -/obj/item/multitool, -/obj/item/multitool, /obj/effect/turf_decal/tile/purple{ dir = 1 }, /obj/effect/turf_decal/tile/purple{ dir = 8 }, +/obj/structure/rack, +/obj/item/wrench, +/obj/item/crowbar, +/obj/item/book/manual/wiki/experimentor, +/obj/item/multitool, +/obj/item/multitool, /turf/open/floor/plasteel/white, /area/science/explab) "bti" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/power/apc/auto_name/east, +/obj/structure/cable, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple, +/obj/structure/sink{ + dir = 8; + pixel_x = 11 }, /turf/open/floor/plasteel/white, -/area/science/explab) +/area/science/genetics) "btl" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -27888,6 +27946,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/structure/cable, /turf/open/floor/plasteel, /area/science/explab) "btp" = ( @@ -27895,6 +27954,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/structure/cable, /turf/open/floor/plasteel/white, /area/science/explab) "bts" = ( @@ -27905,6 +27965,7 @@ /obj/effect/turf_decal/tile/purple{ dir = 4 }, +/obj/structure/cable, /turf/open/floor/plasteel/white, /area/science/explab) "btt" = ( @@ -27917,8 +27978,9 @@ }, /obj/machinery/door/airlock/research{ name = "Xenobiology Lab"; - req_access_txt = "55" + req_one_access_txt = "55, 9" }, +/obj/structure/cable, /turf/open/floor/plasteel/dark, /area/science/xenobiology) "btu" = ( @@ -28062,75 +28124,42 @@ /area/maintenance/department/engine) "btR" = ( /obj/structure/flora/ausbushes/brflowers, -/mob/living/carbon/monkey, /turf/open/floor/grass, -/area/medical/genetics) +/area/medical/medbay/zone2) "btS" = ( /turf/open/floor/grass, -/area/medical/genetics) +/area/medical/medbay/zone2) "btT" = ( /obj/structure/flora/junglebush, /obj/structure/flora/ausbushes/sunnybush, -/obj/item/reagent_containers/food/snacks/grown/banana, -/mob/living/carbon/monkey, /turf/open/floor/grass, -/area/medical/genetics) -"btU" = ( -/obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21" - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "btV" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 1 }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "btW" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, /obj/structure/cable, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "btX" = ( -/obj/structure/table, -/obj/item/book/manual/wiki/medical_cloning{ - pixel_y = 6 - }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "btY" = ( /obj/structure/table, -/obj/item/storage/box/rxglasses{ - pixel_x = 3; - pixel_y = 3 - }, /obj/item/storage/box/bodybags, /obj/item/pen, +/obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ - dir = 8 + dir = 4 }, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "btZ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/tile/blue{ @@ -28445,6 +28474,7 @@ /obj/effect/turf_decal/tile/purple{ dir = 8 }, +/obj/structure/cable, /turf/open/floor/plasteel/white, /area/science/xenobiology) "buL" = ( @@ -28511,33 +28541,26 @@ /turf/open/floor/plating, /area/maintenance/department/engine) "bvc" = ( -/turf/closed/wall/r_wall, -/area/medical/genetics) -"bvd" = ( -/obj/machinery/door/airlock/research/glass{ - name = "Genetics"; - req_access_txt = "9" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/turf_decal/tile/blue{ - dir = 1 +/obj/structure/table, +/obj/item/storage/box/rxglasses{ + pixel_x = 3; + pixel_y = 3 }, +/obj/item/clothing/gloves/color/latex, +/obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/structure/cable, /turf/open/floor/plasteel/white, -/area/medical/genetics) -"bve" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plating, -/area/medical/genetics) +/area/medical/medbay/zone2) +"bvd" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable, +/obj/structure/bed, +/obj/item/bedsheet/medical, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "bvf" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/camera{ @@ -29059,6 +29082,7 @@ }, /obj/machinery/atmospherics/pipe/simple/cyan/hidden, /obj/effect/turf_decal/tile/neutral, +/obj/machinery/navbeacon/wayfinding/minisat_access_chapel_library, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "bws" = ( @@ -29075,91 +29099,44 @@ }, /area/maintenance/department/engine) "bwu" = ( -/mob/living/carbon/monkey, +/mob/living/simple_animal/pet/dog/corgi, /turf/open/floor/grass, -/area/medical/genetics) +/area/medical/medbay/zone2) "bwv" = ( -/obj/structure/table, -/obj/item/folder/white, -/obj/item/pen, /obj/machinery/airalarm{ pixel_y = 22 }, /obj/structure/extinguisher_cabinet{ pixel_x = -26 }, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple{ +/obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/effect/turf_decal/tile/purple{ +/obj/effect/turf_decal/tile/blue{ dir = 8 }, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"bww" = ( -/obj/machinery/computer/scan_consolenew, -/obj/effect/turf_decal/tile/purple{ +/obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, +/obj/structure/closet/wardrobe/pjs, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "bwx" = ( -/obj/machinery/dna_scannernew, -/obj/effect/turf_decal/tile/purple{ +/obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, /turf/open/floor/plasteel/white, -/area/medical/genetics) -"bwy" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"bwz" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "bwA" = ( /obj/structure/table, -/obj/item/storage/box/rxglasses{ - pixel_x = 4; - pixel_y = 4 - }, /obj/item/storage/box/bodybags, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ +/obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/effect/turf_decal/tile/blue, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "bwB" = ( /obj/machinery/requests_console{ department = "Medbay"; @@ -29222,19 +29199,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/sleeper) -"bwI" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/structure/chair{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/medical/sleeper) "bwK" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 1 @@ -29334,7 +29298,7 @@ dir = 8 }, /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12 }, /obj/effect/turf_decal/tile/yellow{ @@ -29542,6 +29506,7 @@ dir = 4 }, /obj/structure/cable, +/obj/machinery/navbeacon/wayfinding/research, /turf/open/floor/plasteel/dark, /area/science/explab) "bxr" = ( @@ -29646,6 +29611,7 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 1 }, +/obj/structure/cable, /turf/open/floor/plasteel/white, /area/science/xenobiology) "bxG" = ( @@ -29680,7 +29646,7 @@ /area/science/explab) "bxL" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /turf/open/floor/plasteel/dark, @@ -29727,9 +29693,22 @@ /turf/open/floor/plasteel, /area/science/xenobiology) "bxP" = ( -/obj/effect/spawner/lootdrop/maintenance, -/turf/open/floor/plating, -/area/maintenance/department/science) +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/science/genetics) "bxQ" = ( /obj/machinery/door/window/northleft{ base_state = "right"; @@ -29827,9 +29806,8 @@ /area/maintenance/department/engine) "byd" = ( /obj/structure/flora/junglebush/c, -/mob/living/carbon/monkey, /turf/open/floor/grass, -/area/medical/genetics) +/area/medical/medbay/zone2) "bye" = ( /obj/structure/window/reinforced{ dir = 4; @@ -29839,53 +29817,41 @@ dir = 4 }, /turf/open/floor/grass, -/area/medical/genetics) +/area/medical/medbay/zone2) "byf" = ( -/obj/structure/table, -/obj/item/storage/box/disks, -/obj/item/flashlight/pen, -/obj/item/flashlight/pen, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple{ +/obj/effect/turf_decal/tile/blue{ dir = 8 }, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"byg" = ( -/obj/structure/chair/stool, -/obj/effect/landmark/start/geneticist, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 +/obj/effect/turf_decal/tile/blue{ + dir = 1 }, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) +"byg" = ( +/turf/closed/wall/r_wall, +/area/science/genetics) "byh" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 }, +/obj/structure/bed, +/obj/item/bedsheet/medical, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "byi" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 }, /obj/structure/cable, +/obj/structure/bed, +/obj/item/bedsheet/medical, /turf/open/floor/plasteel/white, -/area/medical/genetics) -"byj" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "byk" = ( -/obj/structure/table, -/obj/item/clothing/gloves/color/latex, -/obj/item/clothing/gloves/color/latex, -/obj/item/storage/box/monkeycubes, /obj/machinery/light{ dir = 4 }, @@ -29893,12 +29859,16 @@ dir = 8; pixel_x = 24 }, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ +/obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/effect/turf_decal/tile/blue, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "byl" = ( /obj/structure/extinguisher_cabinet{ pixel_x = -24 @@ -30196,7 +30166,7 @@ /area/science/explab) "byQ" = ( /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12 }, /obj/effect/turf_decal/stripes/line{ @@ -30542,60 +30512,57 @@ dir = 8 }, /turf/open/floor/grass, -/area/medical/genetics) +/area/medical/medbay/zone2) "bzF" = ( /obj/machinery/door/window/eastleft{ - name = "Monkey Pen"; - req_one_access_txt = "9" + name = "Petting Garden"; + req_one_access_txt = null }, -/obj/item/reagent_containers/food/snacks/grown/banana, +/mob/living/simple_animal/pet/dog/corgi/puppy, /turf/open/floor/grass, -/area/medical/genetics) +/area/medical/medbay/zone2) "bzG" = ( -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple{ +/obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, /turf/open/floor/plasteel/white, -/area/medical/genetics) -"bzH" = ( -/turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "bzI" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "bzJ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 }, /obj/structure/cable, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "bzK" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "bzL" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/structure/mirror{ pixel_x = 28 }, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ +/obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/effect/turf_decal/tile/blue, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "bzM" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-10" @@ -30642,6 +30609,7 @@ dir = 8 }, /obj/machinery/camera{ + c_tag = "Medbay Treatment"; dir = 4; network = list("ss13","medbay") }, @@ -30666,6 +30634,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/effect/landmark/start/paramedic, /turf/open/floor/plasteel/white, /area/medical/sleeper) "bzT" = ( @@ -31046,14 +31015,14 @@ "bAN" = ( /obj/structure/flora/ausbushes/sparsegrass, /turf/open/floor/grass, -/area/medical/genetics) +/area/medical/medbay/zone2) "bAO" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 }, /obj/machinery/light/small, /turf/open/floor/grass, -/area/medical/genetics) +/area/medical/medbay/zone2) "bAP" = ( /obj/structure/window/reinforced{ dir = 4; @@ -31064,50 +31033,49 @@ }, /obj/structure/flora/ausbushes/palebush, /turf/open/floor/grass, -/area/medical/genetics) +/area/medical/medbay/zone2) "bAQ" = ( -/obj/structure/table, -/obj/item/reagent_containers/glass/beaker, -/obj/item/reagent_containers/dropper, -/obj/item/storage/pill_bottle/mutadone, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/item/twohanded/required/kirbyplants/random, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) +"bAR" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, /obj/effect/turf_decal/tile/purple{ dir = 1 }, -/obj/effect/turf_decal/tile/purple{ - dir = 8 +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/stripes/line{ + dir = 10 }, -/turf/open/floor/plasteel/white, -/area/medical/genetics) -"bAR" = ( -/obj/structure/chair/stool, /obj/effect/landmark/start/geneticist, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/science/genetics) "bAS" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "bAT" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 9 }, /obj/structure/cable, +/obj/structure/bed, +/obj/item/bedsheet/medical, /turf/open/floor/plasteel/white, -/area/medical/genetics) -"bAU" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "bAV" = ( /obj/machinery/shower{ dir = 8 @@ -31117,12 +31085,12 @@ name = "Genetics Requests Console"; pixel_x = 32 }, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ +/obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/effect/turf_decal/tile/blue, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "bAW" = ( /turf/closed/wall, /area/medical/virology) @@ -31616,70 +31584,62 @@ /turf/open/floor/plating, /area/maintenance/department/engine) "bBZ" = ( -/obj/structure/table, -/obj/item/pen, /obj/item/radio/intercom{ pixel_x = -27 }, -/obj/item/paper_bin{ - layer = 2.9 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ +/obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/structure/closet/wardrobe/pjs, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "bCa" = ( -/obj/machinery/computer/scan_consolenew{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ +/obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/effect/turf_decal/tile/blue, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "bCb" = ( -/obj/machinery/dna_scannernew, /obj/machinery/camera{ - c_tag = "Genetics"; + c_tag = "Ward Aft"; dir = 1; network = list("ss13","medbay") }, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ +/obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/effect/turf_decal/tile/blue, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "bCc" = ( -/obj/effect/turf_decal/tile/purple{ +/obj/structure/cable, +/obj/effect/turf_decal/tile/blue{ dir = 8 }, -/obj/structure/cable, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "bCd" = ( /obj/structure/cable, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "bCe" = ( /obj/machinery/power/apc{ dir = 4; - name = "Genetics APC"; + name = "Ward APC"; pixel_x = 24 }, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ +/obj/structure/cable, +/obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/structure/cable, +/obj/effect/turf_decal/tile/blue, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "bCf" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 @@ -32244,16 +32204,16 @@ /turf/open/floor/plating, /area/maintenance/department/engine) "bDl" = ( -/obj/structure/closet/secure_closet/medical1, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ +/obj/structure/closet/secure_closet/personal/patient, +/obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "bDm" = ( /obj/structure/closet/secure_closet/personal/patient, /obj/machinery/light, @@ -32261,23 +32221,23 @@ dir = 1; pixel_y = -22 }, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ +/obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/effect/turf_decal/tile/blue, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "bDn" = ( -/obj/machinery/vending/wardrobe/gene_wardrobe, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ +/obj/structure/closet/secure_closet/personal/patient, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, /turf/open/floor/plasteel/white, -/area/medical/genetics) +/area/medical/medbay/zone2) "bDo" = ( /obj/machinery/shower{ dir = 4 @@ -32294,7 +32254,7 @@ /turf/open/floor/plasteel/white, /area/medical/virology) "bDq" = ( -/obj/structure/closet/l3closet, +/obj/structure/closet/l3closet/virology, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -32760,7 +32720,7 @@ /area/medical/virology) "bEs" = ( /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, @@ -32781,7 +32741,7 @@ /turf/open/floor/plasteel/white, /area/medical/virology) "bEu" = ( -/obj/structure/closet/l3closet, +/obj/structure/closet/l3closet/virology, /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 10 }, @@ -33395,35 +33355,29 @@ id = "toxinsdriver"; pixel_x = 28 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 9 - }, /obj/effect/turf_decal/tile/purple{ dir = 1 }, /obj/effect/turf_decal/tile/purple{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/open/floor/plasteel, /area/science/mixing) "bFx" = ( -/obj/structure/chair{ - dir = 1 +/obj/structure/flora/junglebush/large, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 }, -/turf/open/floor/plating{ - icon_state = "platingdmg3" - }, -/area/maintenance/department/science) +/turf/open/floor/grass, +/area/science/genetics) "bFy" = ( -/obj/structure/chair{ - dir = 1 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 8 }, -/turf/open/floor/plating, -/area/maintenance/department/science) -"bFz" = ( -/obj/item/cigbutt/cigarbutt, -/turf/open/floor/plating, -/area/maintenance/department/science) +/mob/living/carbon/monkey, +/turf/open/floor/grass, +/area/science/genetics) "bFB" = ( /obj/item/newspaper, /turf/open/floor/plating, @@ -33533,7 +33487,7 @@ /area/medical/medbay/central) "bFP" = ( /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, @@ -33972,19 +33926,14 @@ /turf/open/floor/plasteel, /area/science/mixing) "bGA" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Toxins Launch Maintenance"; - req_access_txt = "8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 - }, -/turf/open/floor/plating, +/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, +/turf/closed/wall, /area/science/mixing) "bGB" = ( -/obj/machinery/light/small, -/turf/open/floor/plating, -/area/maintenance/department/science) +/obj/structure/flora/ausbushes/brflowers, +/obj/machinery/light, +/turf/open/floor/grass, +/area/science/genetics) "bGD" = ( /obj/structure/window/reinforced{ dir = 4 @@ -34171,7 +34120,6 @@ /area/medical/medbay/central) "bHb" = ( /obj/structure/closet/crate/freezer/surplus_limbs, -/obj/item/reagent_containers/glass/beaker/instabitaluri, /obj/machinery/newscaster/security_unit{ pixel_y = 32 }, @@ -34631,7 +34579,7 @@ pixel_x = 28 }, /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/effect/turf_decal/tile/green{ @@ -38624,7 +38572,8 @@ name = "Atmospherics Monitoring"; req_access_txt = "24" }, -/turf/open/floor/plating, +/obj/machinery/navbeacon/wayfinding/atmos, +/turf/open/floor/plasteel, /area/engine/lobby) "bRs" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -38877,6 +38826,7 @@ }, /obj/machinery/door/firedoor, /obj/structure/cable, +/obj/machinery/navbeacon/wayfinding/techstorage, /turf/open/floor/plasteel/dark, /area/storage/tech) "bRV" = ( @@ -39580,6 +39530,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable, +/obj/machinery/navbeacon/wayfinding/engineering, /turf/open/floor/plasteel, /area/engine/break_room) "bTG" = ( @@ -41561,6 +41512,7 @@ req_access_txt = "24" }, /obj/structure/cable, +/obj/machinery/navbeacon/wayfinding/incinerator, /turf/open/floor/plasteel/dark, /area/maintenance/disposal/incinerator) "bYv" = ( @@ -42769,9 +42721,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/machinery/power/emitter/anchored{ - dir = 4; - state = 2 +/obj/machinery/power/emitter/welded{ + dir = 4 }, /obj/structure/cable, /turf/open/floor/plating, @@ -43174,7 +43125,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, -/obj/machinery/camera/emp_proof{ +/obj/machinery/camera{ c_tag = "Engineering Port Aft"; dir = 1 }, @@ -43365,6 +43316,7 @@ dir = 8 }, /obj/structure/cable, +/obj/machinery/navbeacon/wayfinding/minisat_access_tcomms, /turf/open/floor/plasteel/dark, /area/engine/engineering) "cet" = ( @@ -43539,9 +43491,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/power/emitter/anchored{ - dir = 4; - state = 2 +/obj/machinery/power/emitter/welded{ + dir = 4 }, /obj/structure/cable, /turf/open/floor/plating, @@ -44137,7 +44088,7 @@ /area/chapel/main/monastery) "chu" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /turf/open/floor/plasteel/showroomfloor, @@ -44248,7 +44199,7 @@ /area/chapel/main/monastery) "chU" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /turf/open/floor/plasteel, @@ -45784,6 +45735,7 @@ name = "Dormitories" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/navbeacon/wayfinding/dorms, /turf/open/floor/plasteel, /area/crew_quarters/dorms) "cor" = ( @@ -46537,7 +46489,6 @@ dir = 4 }, /obj/structure/cable, -/obj/structure/cable, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "cre" = ( @@ -49172,6 +49123,10 @@ /obj/structure/barricade/wooden, /turf/open/floor/plating, /area/maintenance/department/security/brig) +"dfm" = ( +/obj/structure/sink/puddle, +/turf/open/floor/grass, +/area/science/genetics) "dfr" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -49274,15 +49229,17 @@ /turf/open/floor/plasteel/dark, /area/chapel/office) "dqw" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12; 55" - }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/door/airlock/research/glass{ + name = "Genetics"; + req_access_txt = "9" + }, +/obj/structure/cable, /turf/open/floor/plating, -/area/maintenance/department/science) +/area/science/genetics) "dqG" = ( /obj/machinery/light/small{ dir = 1 @@ -49620,6 +49577,13 @@ icon_state = "wood-broken" }, /area/maintenance/department/crew_quarters/dorms) +"eqX" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/closed/wall, +/area/science/mixing) "eta" = ( /obj/machinery/door/airlock/engineering{ name = "Engineering Supplies"; @@ -49786,7 +49750,6 @@ /area/maintenance/department/security/brig) "eSL" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/item/beacon, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -49797,6 +49760,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/item/beacon, /turf/open/floor/plasteel/dark, /area/science/explab) "eVy" = ( @@ -49928,14 +49892,14 @@ /turf/open/floor/plasteel, /area/construction/mining/aux_base) "fhE" = ( -/obj/machinery/camera/emp_proof{ - c_tag = "Engine Containment Port Aft"; - dir = 1; - network = list("engine") - }, /obj/effect/turf_decal/stripes/line{ dir = 10 }, +/obj/machinery/camera{ + c_tag = "Engineering Supermatter Port Aft"; + dir = 1; + network = list("ss13","engine") + }, /turf/open/floor/engine, /area/engine/engineering) "fhM" = ( @@ -50080,13 +50044,13 @@ /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) "fwi" = ( -/obj/machinery/camera/emp_proof{ - c_tag = "Engine Containment Starboard Fore"; - network = list("engine") - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/machinery/camera{ + c_tag = "Engineering Supermatter Port Fore"; + network = list("ss13","engine") + }, /turf/open/floor/engine, /area/engine/engineering) "fwl" = ( @@ -50226,6 +50190,14 @@ }, /turf/open/floor/plating, /area/hallway/secondary/exit/departure_lounge) +"fTZ" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/machinery/door/airlock/external{ + name = "Port Docking Bay 1" + }, +/obj/machinery/navbeacon/wayfinding/dockarrival, +/turf/open/floor/plating, +/area/hallway/secondary/entry) "fUA" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/red{ @@ -50751,6 +50723,12 @@ /obj/structure/cable, /turf/open/floor/plating, /area/maintenance/department/chapel/monastery) +"gOV" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 + }, +/turf/open/floor/grass, +/area/science/genetics) "gPV" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 @@ -50777,12 +50755,17 @@ }, /area/maintenance/department/engine) "gXg" = ( -/obj/item/extinguisher, -/obj/structure/closet/crate{ - icon_state = "crateopen" +/obj/machinery/computer/scan_consolenew{ + dir = 1 }, -/turf/open/floor/plating, -/area/maintenance/department/science) +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/science/genetics) "gXQ" = ( /obj/effect/turf_decal/tile/yellow, /obj/structure/cable, @@ -50826,7 +50809,7 @@ "hgD" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall, -/area/maintenance/department/science) +/area/science/genetics) "hiw" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -50945,10 +50928,12 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "hxn" = ( -/obj/structure/chair, -/obj/item/clothing/glasses/regular, -/turf/open/floor/plating, -/area/maintenance/department/science) +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/flora/junglebush, +/turf/open/floor/grass, +/area/science/genetics) "hzc" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -50973,6 +50958,13 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/engine, /area/engine/engineering) +"hDD" = ( +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "hDG" = ( /obj/machinery/door/airlock/engineering{ name = "Auxillary Base Construction"; @@ -51103,7 +51095,7 @@ /area/maintenance/department/science) "hTl" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 12 }, /obj/structure/mirror{ @@ -51239,6 +51231,16 @@ /obj/effect/turf_decal/tile/yellow, /turf/open/floor/plasteel/dark, /area/maintenance/disposal/incinerator) +"igu" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/camera{ + c_tag = "Engineering Supermatter Starboard Fore"; + network = list("ss13","engine") + }, +/turf/open/floor/engine, +/area/engine/engineering) "igE" = ( /obj/structure/table/reinforced, /obj/machinery/button/door{ @@ -51392,6 +51394,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/machinery/navbeacon/wayfinding/dockescpod, /turf/open/floor/plating, /area/crew_quarters/dorms) "izF" = ( @@ -51495,10 +51498,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/camera/emp_proof{ - c_tag = "Engine Containment Starboard Fore"; +/obj/machinery/camera{ + c_tag = "Engineering Supermatter Starboard Mid"; dir = 8; - network = list("engine") + network = list("ss13","engine") }, /turf/open/floor/engine, /area/engine/engineering) @@ -51649,7 +51652,7 @@ /area/space/nearstation) "jhD" = ( /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, @@ -51657,6 +51660,9 @@ icon_state = "platingdmg3" }, /area/maintenance/department/crew_quarters/dorms) +"jiD" = ( +/turf/closed/wall, +/area/science/genetics) "jjC" = ( /obj/structure/rack, /obj/item/storage/briefcase{ @@ -52060,9 +52066,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/power/emitter/anchored{ - dir = 8; - state = 2 +/obj/machinery/power/emitter/welded{ + dir = 8 }, /obj/structure/cable, /turf/open/floor/plating, @@ -52100,11 +52105,16 @@ }, /area/maintenance/department/crew_quarters/dorms) "kkQ" = ( -/obj/machinery/vending/cola/pwr_game, -/turf/open/floor/plating{ - icon_state = "platingdmg3" +/obj/machinery/vending/wardrobe/gene_wardrobe, +/obj/effect/turf_decal/tile/purple{ + dir = 4 }, -/area/maintenance/department/science) +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/science/genetics) "klo" = ( /obj/structure/dresser, /obj/structure/mirror{ @@ -52338,7 +52348,7 @@ /turf/open/floor/plating, /area/maintenance/department/security/brig) "kFD" = ( -/obj/structure/closet/l3closet, +/obj/structure/closet/l3closet/scientist, /obj/machinery/light{ dir = 8 }, @@ -52429,18 +52439,21 @@ /turf/open/floor/carpet, /area/crew_quarters/heads/hos) "kPi" = ( -/obj/structure/table, -/obj/machinery/microwave, -/obj/machinery/light/small{ +/obj/effect/turf_decal/tile/purple{ dir = 1 }, -/obj/structure/noticeboard{ - pixel_y = 32 +/obj/effect/turf_decal/tile/purple{ + dir = 4 }, -/turf/open/floor/plating{ - icon_state = "platingdmg3" +/obj/machinery/firealarm{ + dir = 1; + pixel_y = 27 }, -/area/maintenance/department/science) +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/science/genetics) "kQy" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -52546,9 +52559,13 @@ /turf/open/floor/plating, /area/gateway) "ldQ" = ( -/obj/structure/floodlight_frame, -/turf/open/floor/plating, -/area/maintenance/department/science) +/obj/machinery/dna_scannernew, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/science/genetics) "lem" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -52562,6 +52579,12 @@ }, /turf/open/floor/plating, /area/security/execution/transfer) +"lfI" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/grass, +/area/science/genetics) "lhu" = ( /obj/machinery/shieldgen, /obj/machinery/light{ @@ -52587,6 +52610,9 @@ /obj/machinery/atmospherics/pipe/simple/general/hidden, /turf/open/floor/plating, /area/maintenance/department/cargo) +"lku" = ( +/turf/closed/wall/r_wall, +/area/medical/medbay/zone2) "lms" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 9 @@ -52637,6 +52663,13 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /turf/closed/wall/r_wall, /area/maintenance/disposal/incinerator) +"luM" = ( +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "lzJ" = ( /obj/structure/closet/crate/bin, /turf/open/floor/carpet, @@ -52694,6 +52727,10 @@ }, /turf/open/floor/plating, /area/maintenance/department/engine) +"lDw" = ( +/obj/structure/flora/grass/jungle, +/turf/open/floor/grass, +/area/science/genetics) "lEn" = ( /obj/structure/window/reinforced{ dir = 1 @@ -52774,9 +52811,15 @@ /turf/open/floor/plating, /area/maintenance/department/security/brig) "lNW" = ( -/obj/structure/grille, -/turf/open/floor/plating, -/area/maintenance/department/science) +/obj/machinery/computer/scan_consolenew{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/science/genetics) "lQn" = ( /obj/machinery/light/small{ dir = 1; @@ -53221,9 +53264,15 @@ /turf/open/floor/plasteel/white, /area/science/xenobiology) "mSc" = ( -/obj/machinery/space_heater, -/turf/open/floor/plating, -/area/maintenance/department/science) +/obj/structure/table/glass, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/item/storage/box/rxglasses, +/obj/item/reagent_containers/dropper, +/turf/open/floor/plasteel/dark, +/area/science/genetics) "mTS" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -53287,8 +53336,19 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 10 }, -/turf/open/floor/plating, -/area/maintenance/department/science) +/obj/structure/table/glass, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/item/storage/box/bodybags, +/obj/item/storage/box/disks, +/obj/item/storage/pill_bottle/mutadone, +/obj/item/storage/pill_bottle/mannitol, +/turf/open/floor/plasteel/dark, +/area/science/genetics) "new" = ( /obj/structure/chair/wood{ dir = 4 @@ -53781,13 +53841,9 @@ /turf/open/floor/plating, /area/maintenance/department/cargo) "obP" = ( -/obj/structure/table, -/obj/item/paper_bin, -/obj/item/pen, -/turf/open/floor/plating{ - luminosity = 2 - }, -/area/maintenance/department/science) +/obj/structure/flora/grass/jungle/b, +/turf/open/floor/grass, +/area/science/genetics) "oep" = ( /obj/structure/table/glass, /obj/item/paper_bin, @@ -53804,6 +53860,16 @@ /obj/structure/lattice, /turf/open/space/basic, /area/space) +"ofo" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/structure/closet/wardrobe/mixed, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "ofN" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/blue, @@ -53829,7 +53895,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, -/obj/machinery/camera/emp_proof{ +/obj/machinery/camera{ c_tag = "Engineering Starboard Aft"; dir = 1 }, @@ -53859,6 +53925,7 @@ id = "assistantshutters"; name = "storage shutters" }, +/obj/machinery/navbeacon/wayfinding/tools, /turf/open/floor/plasteel, /area/storage/primary) "ooh" = ( @@ -53995,7 +54062,7 @@ dir = 4 }, /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /turf/open/floor/plasteel, @@ -54138,6 +54205,14 @@ icon_state = "platingdmg3" }, /area/maintenance/department/science) +"oKI" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/flora/ausbushes/grassybush, +/mob/living/simple_animal/butterfly, +/turf/open/floor/grass, +/area/science/genetics) "oLR" = ( /obj/effect/turf_decal/tile/red{ dir = 4 @@ -54320,15 +54395,19 @@ /turf/open/floor/plating, /area/maintenance/department/security/brig) "pdW" = ( -/obj/structure/disposalpipe/segment{ - dir = 5 +/obj/effect/turf_decal/tile/purple{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 4 }, -/obj/structure/cable, -/turf/open/floor/plating, -/area/science/explab) +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/science/genetics) "pfP" = ( /obj/structure/table, /obj/item/storage/box/syringes, @@ -54486,20 +54565,19 @@ /turf/open/floor/plating, /area/maintenance/department/cargo) "pKg" = ( -/obj/machinery/camera/emp_proof{ - c_tag = "Engine Containment Starboard Aft"; - dir = 1; - network = list("engine"); - pixel_x = 22 - }, /obj/effect/turf_decal/stripes/line{ dir = 6 }, +/obj/machinery/camera{ + c_tag = "Engineering Supermatter Starboard Aft"; + dir = 1; + network = list("ss13","engine") + }, /turf/open/floor/engine, /area/engine/engineering) "pMG" = ( /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, @@ -54877,6 +54955,10 @@ /obj/structure/sign/warning/fire, /turf/closed/wall/r_wall, /area/maintenance/disposal/incinerator) +"qHc" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/closed/wall, +/area/science/genetics) "qHu" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -55012,6 +55094,31 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) +"qXV" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/machinery/airalarm{ + pixel_y = 22 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/camera{ + c_tag = "Genetics Lab"; + network = list("ss13","rd") + }, +/turf/open/floor/plasteel/white, +/area/science/genetics) "qYq" = ( /obj/item/wrench, /obj/effect/turf_decal/tile/green{ @@ -55104,6 +55211,13 @@ /obj/structure/cable, /turf/open/floor/plasteel/dark, /area/science/xenobiology) +"rlj" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/mob/living/carbon/monkey, +/turf/open/floor/grass, +/area/science/genetics) "rlV" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/sign/directions/evac{ @@ -55125,12 +55239,13 @@ /turf/open/space/basic, /area/space/nearstation) "roa" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 5 }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 1 + }, /turf/open/floor/plasteel/white, /area/science/xenobiology) "ros" = ( @@ -55275,12 +55390,13 @@ /turf/open/floor/plating, /area/maintenance/department/science) "rFq" = ( -/obj/structure/chair, -/obj/item/reagent_containers/food/snacks/donkpocket, -/turf/open/floor/plating{ - icon_state = "platingdmg3" +/obj/machinery/door/window/eastleft{ + dir = 1; + name = "Monkey Pen"; + req_one_access_txt = "9" }, -/area/maintenance/department/science) +/turf/open/floor/grass, +/area/science/genetics) "rHA" = ( /turf/open/floor/plasteel, /area/construction/mining/aux_base) @@ -55325,11 +55441,19 @@ /turf/open/floor/plasteel, /area/security/main) "rKL" = ( -/obj/item/trash/cheesie, -/turf/open/floor/plating{ - icon_state = "platingdmg3" +/obj/effect/turf_decal/tile/purple{ + dir = 8 }, -/area/maintenance/department/science) +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line, +/obj/structure/extinguisher_cabinet{ + pixel_x = 27 + }, +/turf/open/floor/plasteel/white, +/area/science/genetics) "rLi" = ( /obj/machinery/button/door{ id = "shootshut"; @@ -55431,9 +55555,14 @@ /turf/open/floor/wood, /area/lawoffice) "sci" = ( -/obj/structure/reagent_dispensers/watertank, -/turf/open/floor/plating, -/area/maintenance/department/science) +/obj/structure/table/glass, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/item/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, +/turf/open/floor/plasteel/dark, +/area/science/genetics) "scp" = ( /obj/machinery/door/airlock/maintenance{ name = "Auxillary Base Maintenance"; @@ -55479,6 +55608,10 @@ /obj/item/reagent_containers/food/snacks/meat/slab/monkey, /turf/open/floor/plating, /area/maintenance/department/engine) +"skj" = ( +/mob/living/carbon/monkey, +/turf/open/floor/grass, +/area/science/genetics) "skw" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden, /turf/closed/wall, @@ -55505,10 +55638,37 @@ }, /turf/open/floor/engine, /area/engine/supermatter) +"spo" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/item/twohanded/required/kirbyplants/random, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "spz" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plating, -/area/maintenance/department/science) +/obj/structure/cable, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/requests_console{ + department = "Genetics"; + name = "Genetics Requests Console"; + pixel_x = 32 + }, +/turf/open/floor/plasteel/white, +/area/science/genetics) "sqh" = ( /obj/structure/chair{ dir = 8 @@ -55597,14 +55757,15 @@ }, /area/maintenance/department/security/brig) "syQ" = ( -/obj/machinery/vending/games, -/obj/structure/sign/plaques/deempisi{ - pixel_y = 28 +/obj/effect/turf_decal/tile/purple{ + dir = 1 }, -/turf/open/floor/plating{ - icon_state = "platingdmg3" +/obj/effect/turf_decal/tile/purple{ + dir = 4 }, -/area/maintenance/department/science) +/obj/effect/landmark/start/geneticist, +/turf/open/floor/plasteel/white, +/area/science/genetics) "szG" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -55644,6 +55805,10 @@ }, /turf/open/floor/plasteel, /area/engine/lobby) +"sEz" = ( +/obj/machinery/pinpointer_dispenser, +/turf/closed/wall/r_wall, +/area/security/checkpoint/customs) "sEB" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/disposalpipe/segment, @@ -55746,15 +55911,6 @@ /obj/machinery/meter, /turf/open/floor/engine, /area/engine/engineering) -"sXb" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/chair/office{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/medical/genetics) "sXi" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ @@ -56207,7 +56363,7 @@ /area/engine/engineering) "tXn" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/effect/turf_decal/stripes/corner{ @@ -56322,10 +56478,10 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/camera/emp_proof{ - c_tag = "Engine Containment Starboard Fore"; +/obj/machinery/camera{ + c_tag = "Engineering Supermatter Port Mid"; dir = 4; - network = list("engine") + network = list("ss13","engine") }, /turf/open/floor/engine, /area/engine/engineering) @@ -56404,12 +56560,38 @@ /obj/structure/cable, /turf/open/floor/plating, /area/security/execution/transfer) +"urk" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/science/genetics) "urG" = ( /obj/machinery/atmospherics/pipe/simple/orange/visible/layer3{ dir = 4 }, /turf/open/floor/plasteel, /area/engine/atmos) +"urO" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/bed, +/obj/item/bedsheet/medical, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "urP" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -56458,10 +56640,8 @@ /turf/open/floor/plating, /area/science/xenobiology) "uvq" = ( -/obj/structure/table, -/obj/item/dice/d20, -/turf/open/floor/plating, -/area/maintenance/department/science) +/turf/open/floor/grass, +/area/science/genetics) "uwb" = ( /obj/machinery/atmospherics/pipe/manifold/general/visible{ dir = 1 @@ -56488,6 +56668,13 @@ /obj/structure/cable, /turf/open/floor/plasteel, /area/tcommsat/computer) +"uzx" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Genetics maintenance"; + req_one_access_txt = "9" + }, +/turf/open/floor/plating, +/area/science/genetics) "uAU" = ( /obj/structure/table/wood, /obj/item/folder/blue, @@ -57279,6 +57466,17 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, /area/maintenance/department/security/brig) +"wDs" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/machinery/door/airlock/external{ + name = "Escape Airlock"; + safety_mode = 1 + }, +/obj/machinery/navbeacon/wayfinding/dockesc, +/turf/open/floor/plating, +/area/hallway/secondary/exit/departure_lounge) "wDA" = ( /obj/structure/cable, /turf/open/floor/plasteel, @@ -57306,8 +57504,16 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 5 }, -/turf/open/floor/plating, -/area/maintenance/department/science) +/obj/machinery/dna_scannernew, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/light, +/turf/open/floor/plasteel/dark, +/area/science/genetics) "wGm" = ( /obj/machinery/atmospherics/pipe/manifold/general/hidden{ dir = 8 @@ -57485,6 +57691,13 @@ icon_state = "panelscorched" }, /area/maintenance/department/cargo) +"xan" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/mob/living/carbon/monkey, +/turf/open/floor/grass, +/area/science/genetics) "xau" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -57532,6 +57745,14 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/wood, /area/lawoffice) +"xgt" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel/white, +/area/science/genetics) "xgG" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -57539,6 +57760,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/structure/cable, /turf/open/floor/plasteel, /area/science/explab) "xhj" = ( @@ -57587,10 +57809,19 @@ /turf/open/floor/plasteel/grimy, /area/security/detectives_office) "xlA" = ( -/obj/machinery/door/airlock/maintenance, -/obj/effect/mapping_helpers/airlock/abandoned, -/turf/open/floor/plating, -/area/maintenance/department/science) +/obj/structure/table/glass, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/item/paper_bin, +/obj/item/folder/white, +/obj/item/pen, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/dark, +/area/science/genetics) "xlB" = ( /obj/structure/cable, /turf/open/floor/plasteel/dark/telecomms, @@ -57771,6 +58002,19 @@ }, /turf/closed/wall/r_wall, /area/science/mixing/chamber) +"xIU" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/plasteel/white, +/area/science/genetics) "xJy" = ( /obj/structure/chair/comfy/black, /obj/structure/sign/plaques/kiddie{ @@ -57805,6 +58049,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/disposalpipe/segment, +/obj/machinery/navbeacon/wayfinding/lawyer, /turf/open/floor/plasteel/dark, /area/lawoffice) "xNx" = ( @@ -76070,7 +76315,7 @@ aHA aHA aHA xee -aKB +wDs nYn fTY xee @@ -78390,7 +78635,7 @@ aWK aYG aZA baN -bbQ +fTZ bcX bdV aaa @@ -79879,9 +80124,9 @@ afs agy agd agp -agC -agO -ahb +aaU +aaV +aaW agy ahK aih @@ -79932,7 +80177,7 @@ aXK aXH aXH aXH -aXH +sEz bdc bdX bfa @@ -81233,12 +81478,12 @@ bnv bos bpw bqU -bsp -btS btS bwu -btS bwu +btS +btS +btS bAO bnv bDk @@ -81716,11 +81961,11 @@ aHE aAL aAL rlV -aDZ -aGV +aAL +luM aAL aAL -aQA +aHE aAL aAL aTO @@ -81749,13 +81994,13 @@ bnv bou bnv bou -bvc +bnv bwv byf bzG bAQ bBZ -bvc +bnv bDi bEn bDi @@ -81974,7 +82219,7 @@ aIL aDZ aDZ aDZ -aGV +hDD aDZ aDZ aQB @@ -82005,14 +82250,14 @@ bov bpy bqW bsr -btU -bou -bww -byg -bzH -bAR +bqW +ofo +bwx +bpB +bjQ +bAS bCa -bvc +bnv bEr bFH bEr @@ -82260,17 +82505,17 @@ bmi bjN bow bpz -sXb +bjQ bss btV -bou -bwx +bpz +bjQ byh bzI -bAS +urO bCb -bvc -bvc +bnv +lku bFI bGO bHU @@ -82521,13 +82766,13 @@ bqX bst btW bvd -bwy +btW byi bzJ bAT bCc bDl -bvc +lku bFJ bGP bHV @@ -82777,14 +83022,14 @@ bpB bqY bsu btX -bve -bwz -byj +btX +btX +btX bzK -bAU +btV bCd bDm -bvc +lku bFK bGQ bHX @@ -83030,7 +83275,7 @@ kSO bjL bjL boz -bpB +spo bqZ bsv btY @@ -83041,7 +83286,7 @@ bzL bAV bCe bDn -bvc +lku bFL bGR bHX @@ -83291,16 +83536,16 @@ bpC bra bsw bnv -bvc -bvc -bvc -bvc -bvc -bvc -bvc -bvc -bAW -bAW +bnv +bnv +bnv +bnv +bnv +bnv +bnv +lku +bEr +bEr bHY bGW bKn @@ -84335,7 +84580,7 @@ bKt qar bGW bNR -bAW +bEr bva bva pwj @@ -85098,7 +85343,7 @@ bzR bBb bDr bEx -bkh +aaS bGX bIe bjc @@ -85348,7 +85593,7 @@ biY bsD buc kQy -bwI +aaR byo bzS eFj @@ -87143,7 +87388,7 @@ boH boH boH bsG -bri +brh gfo cqm bvl @@ -87400,7 +87645,7 @@ bmw bkh boH bpR -bri +brh jWH nYu oSa @@ -90781,7 +91026,7 @@ cci cam ogX cbj -fwi +igu vPX jBn mUa @@ -91729,7 +91974,7 @@ aaa aaa aAH aBD -aCS +aaT aDV aEO aAH @@ -97675,7 +97920,7 @@ aEj aTx bjw bkz -blQ +bky bmW bnW bpe @@ -98701,8 +98946,8 @@ bgL bht bbI biC -pdW -bjw +biz +aaj aak aam aaq @@ -99994,7 +100239,7 @@ aap aap bqv bqs -brJ +aaM buD bvZ bxJ @@ -100508,7 +100753,7 @@ bky bpo lAR bqs -bti +aaL buF bwb bxK @@ -100765,7 +101010,7 @@ boh boh bqx bqs -brJ +aaM buG bwc bxL @@ -101286,7 +101531,7 @@ ldQ lNW mSc sci -bwm +jiD glf bFr qtA @@ -101539,11 +101784,11 @@ brT bxF wkZ bnj -bwm -bwm -lWy +brJ +bsp +bAR gXg -bwm +jiD pNy bFs bGx @@ -101797,10 +102042,10 @@ roa buK dqw spz -spz -spz +bti +pdW wFT -bwm +jiD veM bFt bGy @@ -102054,7 +102299,7 @@ ume bkF bkF bkF -bkF +byg bxP nev hgD @@ -102311,12 +102556,12 @@ vMx xzp gdL iLl -bkF -bwm +byg +urk xlA -bwm -bAF -bAF +qHc +bAG +eqX bGA bAG fwr @@ -102568,14 +102813,14 @@ csu ofN ugC gdJ -bkF -lWy -cDB -lWy -tSL -lWy -cDB -bwm +byg +qXV +xIU +oKI +skj +lfI +rlj +jiD rBh bwm aht @@ -102825,14 +103070,14 @@ btu xpr uLi pXg -bkF +byg kPi -cDB +xgt hxn uvq bFx -tSL -bwm +gOV +jiD bIP bwm aht @@ -103082,14 +103327,14 @@ btv nuv ihk cPT -bkF +byg syQ -cDB +xgt rFq obP bFy bGB -bwm +jiD bIQ bwm aht @@ -103339,14 +103584,14 @@ dgz jxl tXn hfZ -bkF +byg kkQ rKL -lWy -lWy -bFz -lWy -xlA +xan +dfm +uvq +lDw +uzx bIR bwm aht diff --git a/_maps/map_files/debug/multiz.dmm b/_maps/map_files/debug/multiz.dmm index 87f45a4ce4e..eb8d233d0e8 100644 --- a/_maps/map_files/debug/multiz.dmm +++ b/_maps/map_files/debug/multiz.dmm @@ -106,9 +106,7 @@ /turf/open/openspace, /area/space) "av" = ( -/obj/structure/stairs{ - dir = 1 - }, +/obj/structure/stairs/north, /turf/open/floor/plating, /area/hallway/secondary/service) "aw" = ( @@ -1344,7 +1342,7 @@ }, /area/hallway/secondary/service) "sm" = ( -/obj/structure/stairs, +/obj/structure/stairs/south, /turf/open/floor/plating, /area/construction) "su" = ( diff --git a/_maps/map_files/debug/runtimestation.dmm b/_maps/map_files/debug/runtimestation.dmm index af4fd9c60f9..b2b404f7289 100644 --- a/_maps/map_files/debug/runtimestation.dmm +++ b/_maps/map_files/debug/runtimestation.dmm @@ -826,7 +826,6 @@ /turf/open/floor/plasteel/cafeteria, /area/medical/medbay) "cK" = ( -/obj/machinery/dna_scannernew, /obj/effect/turf_decal/tile/blue{ dir = 8 }, @@ -1278,7 +1277,6 @@ /area/hallway/secondary/entry) "es" = ( /obj/machinery/light, -/obj/machinery/clonepod, /obj/effect/turf_decal/tile/blue{ dir = 4 }, @@ -1934,9 +1932,7 @@ pixel_x = 32 }, /obj/structure/cable, -/obj/machinery/computer/shuttle/mining{ - dir = 2 - }, +/obj/machinery/computer/shuttle/mining, /turf/open/floor/plasteel, /area/quartermaster/miningoffice) "gk" = ( @@ -2356,15 +2352,6 @@ }, /turf/open/floor/plasteel, /area/science) -"BB" = ( -/obj/machinery/computer/cloning{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel/white/corner, -/area/medical/medbay) "BD" = ( /obj/structure/closet/secure_closet/CMO{ locked = 0 @@ -2471,8 +2458,8 @@ height = 5; id = "mining_home"; name = "mining shuttle bay"; - width = 7; - roundstart_template = /datum/map_template/shuttle/mining/box + roundstart_template = /datum/map_template/shuttle/mining/box; + width = 7 }, /turf/open/floor/engine, /area/quartermaster/miningoffice) @@ -8404,7 +8391,7 @@ by Qt by cm -BB +cK by cS cS diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 2ce7c67f566..8fcc1bb129b 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -4696,7 +4696,7 @@ /area/abductor_ship) "lG" = ( /obj/structure/table/abductor, -/obj/item/storage/box/alienhandcuffs, +/obj/machinery/recharger, /turf/open/floor/plating/abductor, /area/abductor_ship) "lH" = ( @@ -5620,7 +5620,7 @@ /area/centcom/ferry) "nC" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/structure/mirror{ @@ -7671,7 +7671,7 @@ pixel_x = 28 }, /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /turf/open/floor/plasteel/freezer, @@ -7883,11 +7883,12 @@ "rB" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, +/obj/structure/reagent_dispensers/fueltank, +/obj/item/weldingtool/experimental, /obj/machinery/power/terminal{ dir = 8 }, -/obj/structure/reagent_dispensers/fueltank, -/obj/item/weldingtool/experimental, +/obj/structure/cable, /turf/open/floor/plasteel, /area/centcom/ferry) "rC" = ( @@ -14697,7 +14698,7 @@ /area/centcom/ferry) "Hb" = ( /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12 }, /obj/structure/mirror{ @@ -14751,7 +14752,7 @@ /area/tdome/tdomeobserve) "Hh" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/structure/mirror{ @@ -14774,7 +14775,7 @@ /area/centcom/holding) "Hn" = ( /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12 }, /obj/structure/mirror{ @@ -14905,7 +14906,7 @@ /area/tdome/tdomeobserve) "Hx" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/structure/mirror{ @@ -14915,7 +14916,7 @@ /area/tdome/tdomeobserve) "HA" = ( /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12 }, /obj/structure/mirror{ @@ -14946,7 +14947,7 @@ /area/tdome/tdomeobserve) "HC" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/effect/turf_decal/tile/red{ @@ -14963,7 +14964,7 @@ /area/tdome/tdomeobserve) "HD" = ( /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12 }, /obj/effect/turf_decal/tile/bar, @@ -14974,7 +14975,7 @@ /area/tdome/tdomeobserve) "HF" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/structure/mirror{ @@ -14996,7 +14997,7 @@ /area/centcom/holding) "HI" = ( /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12 }, /obj/structure/mirror{ @@ -15120,7 +15121,7 @@ /area/centcom/holding) "HR" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/structure/mirror{ @@ -17217,7 +17218,7 @@ /area/centcom/control) "Op" = ( /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, @@ -17614,6 +17615,11 @@ }, /turf/open/floor/carpet/black, /area/centcom/holding) +"RQ" = ( +/obj/structure/closet/abductor, +/obj/item/storage/box/alienhandcuffs, +/turf/open/floor/plating/abductor, +/area/abductor_ship) "RS" = ( /obj/machinery/light{ dir = 8 @@ -20355,7 +20361,7 @@ aa aa ks kP -lj +RQ lG lj mw @@ -20382,7 +20388,7 @@ aa aa ks kP -lj +RQ lG lj mw @@ -20412,7 +20418,7 @@ aa aa ks kP -lj +RQ lG lj mw @@ -20439,7 +20445,7 @@ aa aa ks kP -lj +RQ lG lj mw diff --git a/_maps/shuttles/emergency_asteroid.dmm b/_maps/shuttles/emergency_asteroid.dmm index d14c924cf37..2bd663f3e57 100644 --- a/_maps/shuttles/emergency_asteroid.dmm +++ b/_maps/shuttles/emergency_asteroid.dmm @@ -323,7 +323,7 @@ /area/shuttle/escape) "bt" = ( /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, diff --git a/_maps/shuttles/emergency_cere.dmm b/_maps/shuttles/emergency_cere.dmm index c8b8e57c910..80446cfc965 100644 --- a/_maps/shuttles/emergency_cere.dmm +++ b/_maps/shuttles/emergency_cere.dmm @@ -1499,7 +1499,7 @@ /area/shuttle/escape) "cX" = ( /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, diff --git a/_maps/shuttles/emergency_delta.dmm b/_maps/shuttles/emergency_delta.dmm index d0b66ee2330..72e290b0987 100644 --- a/_maps/shuttles/emergency_delta.dmm +++ b/_maps/shuttles/emergency_delta.dmm @@ -299,7 +299,7 @@ /area/shuttle/escape) "au" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/effect/turf_decal/tile/blue{ diff --git a/_maps/shuttles/emergency_donut.dmm b/_maps/shuttles/emergency_donut.dmm index 5cf8b4869df..b42dec9707c 100644 --- a/_maps/shuttles/emergency_donut.dmm +++ b/_maps/shuttles/emergency_donut.dmm @@ -364,7 +364,7 @@ /area/shuttle/escape) "bj" = ( /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12 }, /turf/open/floor/mineral/titanium/white, diff --git a/_maps/shuttles/emergency_kilo.dmm b/_maps/shuttles/emergency_kilo.dmm index dd25eec25c3..4ca99a04e16 100644 --- a/_maps/shuttles/emergency_kilo.dmm +++ b/_maps/shuttles/emergency_kilo.dmm @@ -1441,7 +1441,7 @@ dir = 9 }, /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, @@ -1483,7 +1483,7 @@ dir = 5 }, /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /turf/open/floor/mineral/titanium/white, diff --git a/_maps/shuttles/emergency_luxury.dmm b/_maps/shuttles/emergency_luxury.dmm index 093f6d7b353..0b891ef9c17 100644 --- a/_maps/shuttles/emergency_luxury.dmm +++ b/_maps/shuttles/emergency_luxury.dmm @@ -3,94 +3,93 @@ /turf/template_noop, /area/template_noop) "ab" = ( -/turf/closed/indestructible/riveted/uranium, +/turf/closed/wall/mineral/titanium, /area/shuttle/escape/luxury) "ac" = ( -/obj/machinery/door/airlock/external, -/turf/open/floor/wood{ - icon_state = "wood-broken2" +/obj/machinery/door/airlock/external{ + name = "Economy-Class" }, +/turf/open/floor/plasteel, /area/shuttle/escape/luxury) "ad" = ( -/obj/machinery/door/airlock/gold, -/obj/effect/forcefield/luxury_shuttle{ - name = "Ticket Booth" +/obj/machinery/scanner_gate/luxury_shuttle{ + layer = 2.6 }, -/turf/open/floor/mineral/gold, +/obj/machinery/door/airlock/silver{ + name = "First Class" + }, +/turf/open/floor/carpet/orange, /area/shuttle/escape/luxury) "ae" = ( /obj/docking_port/mobile/emergency{ dir = 2; dwidth = 5; height = 14; - name = "Luxury emergency shuttle"; + name = "Luxurious Emergency Shuttle"; width = 25 }, -/obj/machinery/door/airlock/gold, -/obj/effect/forcefield/luxury_shuttle{ - name = "Ticket Booth" +/obj/machinery/scanner_gate/luxury_shuttle{ + layer = 2.6 }, -/turf/open/floor/mineral/gold, +/obj/machinery/door/airlock/silver{ + name = "First Class" + }, +/turf/open/floor/carpet/orange, /area/shuttle/escape/luxury) "af" = ( -/turf/open/floor/wood{ - icon_state = "wood-broken3" +/obj/machinery/door/airlock/security/glass{ + name = "Escape Shuttle Cell"; + req_access_txt = "2" }, +/turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape/luxury) "ag" = ( -/turf/open/floor/wood, +/turf/closed/indestructible/riveted/plastinum, /area/shuttle/escape/luxury) "ah" = ( -/turf/open/floor/wood{ - icon_state = "wood-broken" +/obj/effect/turf_decal/delivery, +/obj/structure/ore_box, +/obj/effect/decal/cleanable/cobweb, +/obj/machinery/light/small{ + dir = 1 }, +/turf/open/floor/plasteel, /area/shuttle/escape/luxury) "ai" = ( -/turf/open/floor/wood{ - icon_state = "wood-broken5" - }, -/area/shuttle/escape/luxury) +/turf/closed/indestructible/riveted/plastinum, +/area/shuttle/escape) "aj" = ( -/turf/open/floor/mineral/gold, +/obj/effect/turf_decal/delivery, +/obj/structure/closet/crate/large, +/obj/effect/spawner/lootdrop/maintenance/eight, +/turf/open/floor/plasteel, /area/shuttle/escape/luxury) "ak" = ( -/obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-10" - }, -/turf/open/floor/mineral/gold, +/turf/open/floor/plasteel, /area/shuttle/escape/luxury) "al" = ( -/obj/structure/mirror{ - pixel_y = 32 - }, -/turf/open/floor/mineral/gold, +/turf/closed/wall/mineral/plastitanium/nodiagonal, /area/shuttle/escape/luxury) "am" = ( -/turf/open/floor/wood{ - icon_state = "wood-broken7" - }, -/area/shuttle/escape/luxury) -"an" = ( -/obj/machinery/light/small, -/turf/open/floor/wood{ - icon_state = "wood-broken2" - }, +/turf/open/floor/carpet/orange, /area/shuttle/escape/luxury) "ao" = ( -/obj/machinery/light/small, -/turf/open/floor/wood{ - icon_state = "wood-broken6" - }, +/turf/open/floor/carpet/blue, /area/shuttle/escape/luxury) "ap" = ( -/obj/structure/toilet{ +/obj/structure/chair/comfy/teal{ + icon_state = "comfychair"; dir = 4 }, -/turf/open/floor/mineral/gold, -/area/shuttle/escape/luxury) +/turf/open/floor/mineral/diamond, +/area/shuttle/escape) "aq" = ( -/obj/machinery/door/airlock/gold, -/turf/open/floor/mineral/gold, +/obj/effect/turf_decal/delivery, +/obj/structure/reagent_dispensers/fueltank, +/obj/structure/window{ + dir = 4 + }, +/turf/open/floor/plasteel, /area/shuttle/escape/luxury) "ar" = ( /obj/structure/shuttle/engine/propulsion{ @@ -108,664 +107,1287 @@ /turf/open/floor/plating/airless, /area/shuttle/escape/luxury) "at" = ( -/turf/open/floor/carpet, +/turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape/luxury) "au" = ( -/obj/structure/chair/comfy, -/turf/open/floor/carpet, +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, /area/shuttle/escape/luxury) "av" = ( -/obj/structure/chair/comfy{ - dir = 4 +/obj/machinery/door/poddoor/shutters/indestructible{ + id = "ohnopoors" + }, +/turf/closed/indestructible/opsglass{ + desc = "A durable looking window made of an alloy of of plasma and titanium."; + name = "plastitanium window" }, -/turf/open/floor/mineral/gold, /area/shuttle/escape/luxury) "aw" = ( +/turf/open/floor/mineral/titanium/blue, +/area/shuttle/escape/luxury) +"ax" = ( +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/shuttle/escape/luxury) +"ay" = ( +/turf/closed/indestructible/syndicate, +/area/shuttle/escape/luxury) +"az" = ( /obj/machinery/computer/communications{ dir = 8 }, -/turf/open/floor/mineral/gold, -/area/shuttle/escape/luxury) -"ax" = ( -/obj/structure/table/wood/fancy, -/obj/item/reagent_containers/food/snacks/spaghetti/meatballspaghetti, -/turf/open/floor/carpet, -/area/shuttle/escape/luxury) -"ay" = ( -/obj/structure/table/wood/fancy, -/obj/item/reagent_containers/food/snacks/notasandwich, -/turf/open/floor/carpet, -/area/shuttle/escape/luxury) -"az" = ( -/obj/structure/table/wood/fancy, -/obj/item/reagent_containers/food/snacks/spaghetti/pastatomato, -/turf/open/floor/carpet, +/turf/open/floor/mineral/diamond, /area/shuttle/escape/luxury) "aA" = ( -/obj/structure/table/wood/fancy, -/obj/item/reagent_containers/food/snacks/kebab/tofu, -/turf/open/floor/carpet, +/obj/machinery/button/door{ + id = "ohnopoors"; + name = "window shutters"; + pixel_x = -5; + pixel_y = 26; + req_access_txt = "0" + }, +/turf/open/floor/carpet/blue, /area/shuttle/escape/luxury) "aB" = ( -/obj/structure/table/wood/fancy, -/obj/item/reagent_containers/food/snacks/honkdae, -/turf/open/floor/carpet, +/turf/open/floor/carpet/cyan, /area/shuttle/escape/luxury) "aC" = ( -/obj/structure/table/wood/fancy, -/obj/item/reagent_containers/food/snacks/enchiladas, -/turf/open/floor/carpet, +/obj/item/reagent_containers/food/snacks/enchiladas{ + pixel_y = 3 + }, +/obj/structure/table/wood/fancy/black, +/turf/open/floor/carpet/red, /area/shuttle/escape/luxury) "aD" = ( -/obj/structure/table/wood/fancy, -/obj/item/reagent_containers/food/snacks/candiedapple, -/turf/open/floor/carpet, +/obj/item/reagent_containers/food/snacks/candiedapple{ + pixel_y = 6 + }, +/obj/structure/table/wood/fancy/black, +/turf/open/floor/carpet/red, /area/shuttle/escape/luxury) "aE" = ( -/obj/structure/table/wood/fancy, -/obj/item/reagent_containers/food/snacks/burger/baconburger, -/turf/open/floor/carpet, +/obj/item/reagent_containers/food/snacks/benedict{ + pixel_y = 1 + }, +/obj/structure/table/wood/fancy/black, +/turf/open/floor/carpet/red, /area/shuttle/escape/luxury) "aF" = ( -/obj/structure/table/wood/fancy, -/obj/item/reagent_containers/food/snacks/benedict, -/turf/open/floor/carpet, +/obj/item/reagent_containers/food/snacks/cakeslice/chocolate{ + pixel_y = 1 + }, +/obj/structure/table/wood/fancy/black, +/turf/open/floor/carpet/red, /area/shuttle/escape/luxury) "aG" = ( -/obj/structure/table/wood/fancy, -/obj/item/reagent_containers/food/snacks/cakeslice/chocolate, -/turf/open/floor/carpet, +/obj/item/reagent_containers/food/snacks/eggplantparm{ + pixel_y = 3 + }, +/obj/structure/table/wood/fancy/black, +/turf/open/floor/carpet/red, /area/shuttle/escape/luxury) "aH" = ( -/obj/structure/table/wood/fancy, -/obj/item/reagent_containers/food/snacks/spaghetti/chowmein, -/turf/open/floor/carpet, +/obj/item/reagent_containers/food/snacks/spaghetti/copypasta{ + pixel_y = 5 + }, +/obj/structure/table/wood/fancy/black, +/turf/open/floor/carpet/red, /area/shuttle/escape/luxury) "aI" = ( -/obj/structure/table/wood/fancy, -/obj/item/reagent_containers/food/snacks/dulcedebatataslice, -/turf/open/floor/carpet, +/obj/item/reagent_containers/food/snacks/spaghetti/boiledspaghetti{ + pixel_y = 5 + }, +/obj/structure/table/wood/fancy/black, +/turf/open/floor/carpet/red, /area/shuttle/escape/luxury) "aJ" = ( -/obj/structure/table/wood/fancy, -/obj/item/reagent_containers/food/snacks/salad/validsalad, -/turf/open/floor/carpet, +/obj/item/reagent_containers/food/snacks/cherrycupcake{ + pixel_y = 2 + }, +/obj/structure/table/wood/fancy/black, +/turf/open/floor/carpet/red, /area/shuttle/escape/luxury) "aK" = ( -/obj/structure/table/wood/fancy, -/obj/item/reagent_containers/food/snacks/carneburrito, -/turf/open/floor/carpet, +/obj/item/reagent_containers/food/snacks/spaghetti/meatballspaghetti{ + pixel_y = 5 + }, +/obj/structure/table/wood/fancy/black, +/turf/open/floor/carpet/red, /area/shuttle/escape/luxury) "aL" = ( -/obj/structure/table/wood/fancy, -/obj/item/reagent_containers/food/snacks/chawanmushi, -/turf/open/floor/carpet, +/obj/item/reagent_containers/food/snacks/notasandwich{ + pixel_y = 11 + }, +/obj/structure/table/wood/fancy/black, +/turf/open/floor/carpet/red, /area/shuttle/escape/luxury) "aM" = ( +/obj/structure/chair/comfy/teal{ + icon_state = "comfychair"; + dir = 4 + }, +/turf/open/floor/mineral/diamond, +/area/shuttle/escape/luxury) +"aN" = ( +/obj/item/reagent_containers/food/snacks/burger/baconburger{ + pixel_y = 2 + }, +/obj/structure/table/wood/fancy/black, +/turf/open/floor/carpet/red, +/area/shuttle/escape/luxury) +"aO" = ( +/obj/item/reagent_containers/food/snacks/melonfruitbowl{ + pixel_y = 4 + }, +/obj/structure/table/wood/fancy/black, +/turf/open/floor/carpet/red, +/area/shuttle/escape/luxury) +"aP" = ( +/obj/item/reagent_containers/food/snacks/khachapuri{ + pixel_y = 6 + }, +/obj/structure/table/wood/fancy/black, +/turf/open/floor/carpet/red, +/area/shuttle/escape/luxury) +"aQ" = ( +/obj/item/reagent_containers/food/snacks/bearsteak{ + pixel_y = 6 + }, +/obj/structure/table/wood/fancy/black, +/turf/open/floor/carpet/red, +/area/shuttle/escape/luxury) +"aR" = ( +/obj/structure/mirror{ + pixel_x = -23; + pixel_y = -4; + pixel_z = 2 + }, +/obj/structure/sink/greyscale{ + dir = 4; + pixel_x = -12 + }, +/turf/open/floor/mineral/titanium/white, +/area/shuttle/escape/luxury) +"aS" = ( +/turf/open/floor/mineral/titanium/white, +/area/shuttle/escape/luxury) +"aT" = ( +/obj/item/reagent_containers/food/snacks/spaghetti/pastatomato{ + pixel_y = 5 + }, +/obj/structure/table/wood/fancy/black, +/turf/open/floor/carpet/red, +/area/shuttle/escape/luxury) +"aU" = ( +/obj/item/reagent_containers/food/snacks/kebab/tofu{ + pixel_y = 6 + }, +/obj/structure/table/wood/fancy/black, +/turf/open/floor/carpet/red, +/area/shuttle/escape/luxury) +"aV" = ( +/obj/item/reagent_containers/food/snacks/honkdae{ + pixel_y = 8 + }, +/obj/structure/table/wood/fancy/black, +/turf/open/floor/carpet/red, +/area/shuttle/escape/luxury) +"aW" = ( +/obj/item/reagent_containers/food/snacks/spaghetti/chowmein{ + pixel_y = 5 + }, +/obj/structure/table/wood/fancy/black, +/turf/open/floor/carpet/red, +/area/shuttle/escape/luxury) +"aX" = ( +/obj/item/reagent_containers/food/snacks/grilledcheese{ + pixel_y = 11 + }, +/obj/structure/table/wood/fancy/black, +/turf/open/floor/carpet/red, +/area/shuttle/escape/luxury) +"aY" = ( +/obj/item/reagent_containers/food/snacks/jelliedtoast/cherry{ + pixel_y = 6 + }, +/obj/structure/table/wood/fancy/black, +/turf/open/floor/carpet/red, +/area/shuttle/escape/luxury) +"aZ" = ( +/obj/item/reagent_containers/food/snacks/honeybun{ + pixel_y = 1 + }, +/obj/structure/table/wood/fancy/black, +/turf/open/floor/carpet/red, +/area/shuttle/escape/luxury) +"ba" = ( +/obj/item/reagent_containers/food/snacks/customizable/pizza{ + pixel_y = 5 + }, +/obj/structure/table/wood/fancy/black, +/turf/open/floor/carpet/red, +/area/shuttle/escape/luxury) +"bb" = ( +/obj/machinery/door/airlock/silver{ + name = "Restroom" + }, +/turf/open/floor/mineral/titanium/white, +/area/shuttle/escape/luxury) +"bc" = ( +/turf/closed/indestructible/opsglass{ + desc = "A durable looking window made of an alloy of of plasma and titanium."; + name = "plastitanium window" + }, +/area/shuttle/escape/luxury) +"be" = ( +/obj/structure/girder, +/turf/open/floor/plasteel, +/area/shuttle/escape/luxury) +"bf" = ( +/obj/structure/closet/crate/trashcart, +/obj/effect/turf_decal/loading_area, +/obj/effect/spawner/lootdrop/maintenance/six, +/turf/open/floor/plasteel, +/area/shuttle/escape/luxury) +"bg" = ( +/obj/structure/closet/crate/trashcart, +/obj/effect/turf_decal/loading_area, +/obj/effect/spawner/lootdrop/maintenance/three, +/turf/open/floor/plasteel, +/area/shuttle/escape/luxury) +"bi" = ( /obj/machinery/computer/emergency_shuttle{ dir = 8 }, -/turf/open/floor/mineral/gold, -/area/shuttle/escape/luxury) -"aN" = ( -/obj/structure/table/wood/fancy, -/obj/item/reagent_containers/food/snacks/melonfruitbowl, -/turf/open/floor/carpet, -/area/shuttle/escape/luxury) -"aO" = ( -/obj/structure/table/wood/fancy, -/obj/item/reagent_containers/food/snacks/khachapuri, -/turf/open/floor/carpet, -/area/shuttle/escape/luxury) -"aP" = ( -/obj/structure/table/wood/fancy, -/obj/item/reagent_containers/food/snacks/grilledcheese, -/turf/open/floor/carpet, -/area/shuttle/escape/luxury) -"aQ" = ( -/obj/structure/table/wood/fancy, -/obj/item/reagent_containers/food/snacks/jelliedtoast/cherry, -/turf/open/floor/carpet, -/area/shuttle/escape/luxury) -"aR" = ( -/obj/structure/table/wood/fancy, -/obj/item/reagent_containers/food/snacks/honeybun, -/turf/open/floor/carpet, -/area/shuttle/escape/luxury) -"aS" = ( -/obj/structure/table/wood/fancy, -/obj/item/reagent_containers/food/snacks/eggplantparm, -/turf/open/floor/carpet, -/area/shuttle/escape/luxury) -"aT" = ( -/obj/structure/table/wood/fancy, -/obj/item/reagent_containers/food/snacks/spaghetti/copypasta, -/turf/open/floor/carpet, -/area/shuttle/escape/luxury) -"aU" = ( -/obj/structure/table/wood/fancy, -/obj/item/reagent_containers/food/snacks/bearsteak, -/turf/open/floor/carpet, -/area/shuttle/escape/luxury) -"aV" = ( -/obj/structure/table/wood/fancy, -/obj/item/reagent_containers/food/snacks/spaghetti/boiledspaghetti, -/turf/open/floor/carpet, -/area/shuttle/escape/luxury) -"aW" = ( -/obj/structure/table/wood/fancy, -/obj/item/reagent_containers/food/snacks/cherrycupcake, -/turf/open/floor/carpet, -/area/shuttle/escape/luxury) -"aX" = ( -/obj/structure/table/wood/fancy, -/obj/item/reagent_containers/food/snacks/customizable/pizza, -/turf/open/floor/carpet, -/area/shuttle/escape/luxury) -"aY" = ( -/obj/structure/table/wood/fancy, -/obj/item/reagent_containers/food/snacks/hotdog, -/turf/open/floor/carpet, -/area/shuttle/escape/luxury) -"aZ" = ( -/obj/structure/table/wood/fancy, -/obj/item/reagent_containers/food/snacks/pie/grapetart, -/turf/open/floor/carpet, -/area/shuttle/escape/luxury) -"ba" = ( -/obj/structure/table/wood/fancy, -/obj/item/reagent_containers/food/snacks/burger/superbite, -/turf/open/floor/carpet, -/area/shuttle/escape/luxury) -"bb" = ( -/obj/structure/table/wood/fancy, -/obj/item/reagent_containers/food/snacks/cakeslice/slimecake, -/turf/open/floor/carpet, -/area/shuttle/escape/luxury) -"bc" = ( -/obj/machinery/computer/station_alert{ - dir = 8 - }, -/turf/open/floor/mineral/gold, -/area/shuttle/escape/luxury) -"bd" = ( -/obj/structure/chair/comfy{ - dir = 1 - }, -/turf/open/floor/carpet, -/area/shuttle/escape/luxury) -"be" = ( -/obj/machinery/computer/crew{ - dir = 8 - }, -/turf/open/floor/mineral/gold, -/area/shuttle/escape/luxury) -"bf" = ( -/obj/machinery/stasis, -/turf/open/floor/mineral/gold, -/area/shuttle/escape/luxury) -"bg" = ( -/obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - pixel_x = -3; - pixel_y = 3 - }, -/turf/open/floor/mineral/gold, -/area/shuttle/escape/luxury) -"bh" = ( -/turf/open/floor/plating/beach/coastline_b, -/area/shuttle/escape/luxury) -"bi" = ( -/obj/machinery/light, -/turf/open/floor/mineral/gold, +/turf/open/floor/mineral/diamond, /area/shuttle/escape/luxury) "bj" = ( +/obj/structure/chair/comfy/shuttle, /obj/machinery/light{ - dir = 8 + dir = 1 }, -/turf/open/floor/mineral/gold, +/turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape/luxury) "bk" = ( /obj/machinery/light{ - dir = 4 + dir = 1 }, -/turf/open/floor/mineral/gold, +/turf/open/floor/carpet/blue, /area/shuttle/escape/luxury) "bl" = ( -/obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-10" +/obj/machinery/computer/station_alert{ + dir = 8 + }, +/turf/open/floor/mineral/diamond, +/area/shuttle/escape/luxury) +"bm" = ( +/obj/structure/table/wood/fancy/black, +/obj/item/storage/fancy/cigarettes/cigars/havana{ + pixel_y = 7 + }, +/turf/open/floor/mineral/titanium/blue, +/area/shuttle/escape) +"bn" = ( +/obj/effect/turf_decal/delivery, +/obj/structure/closet/crate/engineering/electrical, +/obj/effect/decal/cleanable/robot_debris, +/obj/effect/spawner/lootdrop/maintenance/eight, +/turf/open/floor/plasteel, +/area/shuttle/escape/luxury) +"bo" = ( +/obj/effect/turf_decal/delivery, +/obj/structure/closet/crate/engineering, +/obj/effect/spawner/lootdrop/maintenance/eight, +/turf/open/floor/plasteel, +/area/shuttle/escape/luxury) +"bp" = ( +/obj/effect/turf_decal/delivery, +/obj/structure/window{ + dir = 4 + }, +/obj/structure/closet/crate{ + icon_state = "crateopen" + }, +/turf/open/floor/plasteel, +/area/shuttle/escape/luxury) +"bq" = ( +/obj/item/stack/rods/ten, +/turf/open/floor/plating, +/area/shuttle/escape/luxury) +"br" = ( +/obj/effect/decal/cleanable/robot_debris, +/turf/open/floor/plating, +/area/shuttle/escape/luxury) +"bs" = ( +/turf/open/floor/plating, +/area/shuttle/escape/luxury) +"bt" = ( +/obj/structure/window/reinforced{ + dir = 1; + pixel_y = 2 + }, +/obj/item/clothing/head/collectable/paper, +/turf/open/floor/holofloor/beach/water, +/area/shuttle/escape/luxury) +"bu" = ( +/obj/structure/window/reinforced{ + dir = 1; + pixel_y = 2 + }, +/turf/open/floor/holofloor/beach/water, +/area/shuttle/escape/luxury) +"bv" = ( +/obj/machinery/computer/crew{ + dir = 8 + }, +/turf/open/floor/mineral/diamond, +/area/shuttle/escape/luxury) +"bw" = ( +/obj/structure/window/reinforced{ + dir = 1; + pixel_y = 2 + }, +/obj/structure/window/reinforced{ + dir = 4; + layer = 2.9 + }, +/turf/open/floor/holofloor/beach/coast_t{ + icon_state = "sandwater_t"; + dir = 8 + }, +/area/shuttle/escape/luxury) +"bx" = ( +/obj/machinery/door/airlock/silver{ + name = "Flight Control" + }, +/turf/open/floor/mineral/titanium/blue, +/area/shuttle/escape/luxury) +"by" = ( +/obj/structure/closet/crate/large, +/obj/effect/turf_decal/delivery, +/obj/effect/decal/cleanable/robot_debris, +/obj/effect/spawner/lootdrop/maintenance/eight, +/turf/open/floor/plasteel, +/area/shuttle/escape/luxury) +"bz" = ( +/obj/effect/turf_decal/delivery, +/obj/structure/closet/crate{ + icon_state = "crateopen" + }, +/turf/open/floor/plasteel, +/area/shuttle/escape/luxury) +"bA" = ( +/obj/effect/turf_decal/delivery, +/obj/structure/window{ + dir = 4 + }, +/obj/structure/closet/crate{ + icon_state = "crateopen" + }, +/obj/effect/decal/cleanable/oil, +/obj/effect/spawner/lootdrop/maintenance/two, +/turf/open/floor/plasteel, +/area/shuttle/escape/luxury) +"bB" = ( +/obj/item/stack/ore/glass, +/turf/open/floor/plating, +/area/shuttle/escape/luxury) +"bC" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/structure/window, +/turf/open/floor/plasteel, +/area/shuttle/escape/luxury) +"bD" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/turf/open/floor/mineral/plastitanium/red/brig, +/area/shuttle/escape/luxury) +"bE" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/mineral/titanium/blue, +/area/shuttle/escape) +"bF" = ( +/obj/item/bikehorn/rubberducky, +/obj/item/bikehorn/rubberducky, +/turf/open/floor/holofloor/beach/water, +/area/shuttle/escape/luxury) +"bG" = ( +/obj/machinery/door/window/eastleft, +/turf/open/floor/holofloor/beach/coast_t{ + icon_state = "sandwater_t"; + dir = 8 + }, +/area/shuttle/escape/luxury) +"bH" = ( +/obj/structure/door_assembly, +/turf/open/floor/plating, +/area/shuttle/escape/luxury) +"bI" = ( +/obj/item/stack/tile/plasteel, +/turf/open/floor/plasteel, +/area/shuttle/escape/luxury) +"bJ" = ( +/obj/structure/chair/comfy/shuttle, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/window{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/shuttle/escape/luxury) +"bK" = ( +/obj/structure/chair/comfy/shuttle, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/window{ + dir = 1 + }, +/turf/open/floor/plating, +/area/shuttle/escape/luxury) +"bL" = ( +/obj/structure/window/reinforced, +/turf/open/floor/holofloor/beach/water, +/area/shuttle/escape/luxury) +"bM" = ( +/obj/structure/window/reinforced, +/obj/machinery/door/window/eastright, +/turf/open/floor/holofloor/beach/coast_t{ + icon_state = "sandwater_t"; + dir = 8 + }, +/area/shuttle/escape/luxury) +"bN" = ( +/obj/machinery/chem_dispenser/drinks/beer{ + name = "aperitif fountain"; + pixel_y = 8 + }, +/obj/structure/table/wood/fancy/black, +/turf/open/floor/carpet/green, +/area/shuttle/escape/luxury) +"bO" = ( +/obj/machinery/chem_dispenser/drinks{ + name = "soda fountain"; + pixel_y = 8 + }, +/obj/structure/table/wood/fancy/black, +/turf/open/floor/carpet/green, +/area/shuttle/escape/luxury) +"bP" = ( +/obj/structure/table/wood/fancy/black, +/obj/machinery/recharger, +/turf/open/floor/mineral/titanium/blue, +/area/shuttle/escape/luxury) +"bQ" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/holofloor/beach/water, +/area/shuttle/escape/luxury) +"bR" = ( +/obj/effect/decal/cleanable/glass, +/turf/open/floor/plating, +/area/shuttle/escape/luxury) +"bS" = ( +/obj/item/stack/tile/plasteel, +/turf/open/floor/plating, +/area/shuttle/escape/luxury) +"bT" = ( +/obj/effect/decal/cleanable/oil, +/turf/open/floor/plasteel, +/area/shuttle/escape/luxury) +"bU" = ( +/obj/effect/decal/cleanable/generic, +/turf/open/floor/plasteel, +/area/shuttle/escape/luxury) +"bV" = ( +/obj/structure/chair/comfy/brown, +/turf/open/floor/carpet/orange, +/area/shuttle/escape/luxury) +"bW" = ( +/turf/open/floor/carpet/green, +/area/shuttle/escape/luxury) +"bX" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/structure/window, +/turf/open/floor/plating, +/area/shuttle/escape/luxury) +"bY" = ( +/obj/structure/table/wood/fancy/black, +/obj/item/reagent_containers/food/drinks/bottle/champagne{ + pixel_x = 7; + pixel_y = 11 + }, +/obj/item/reagent_containers/food/drinks/shaker{ + pixel_x = -7; + pixel_y = 11 + }, +/obj/item/reagent_containers/glass/rag{ + pixel_x = -6; + pixel_y = 4 + }, +/turf/open/floor/carpet/green, +/area/shuttle/escape/luxury) +"bZ" = ( +/obj/machinery/vending/boozeomat, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/carpet/green, +/area/shuttle/escape/luxury) +"ca" = ( +/obj/machinery/iv_drip, +/mob/living/simple_animal/bot/medbot{ + name = "\improper emergency medibot"; + pixel_x = -3; + pixel_y = 2 + }, +/turf/open/floor/carpet/cyan, +/area/shuttle/escape/luxury) +"cb" = ( +/obj/machinery/stasis, +/turf/open/floor/carpet/cyan, +/area/shuttle/escape/luxury) +"cc" = ( +/obj/effect/turf_decal/delivery, +/obj/structure/closet/crate/large, +/obj/effect/decal/cleanable/robot_debris, +/obj/effect/spawner/lootdrop/maintenance/eight, +/turf/open/floor/plasteel, +/area/shuttle/escape/luxury) +"cd" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Emergency Shuttle Infirmary" + }, +/turf/open/floor/carpet/cyan, +/area/shuttle/escape/luxury) +"ce" = ( +/obj/machinery/vending/wallmed{ + name = "Emergency NanoMed"; + pixel_x = 26; + use_power = 0 + }, +/turf/open/floor/carpet/cyan, +/area/shuttle/escape/luxury) +"cf" = ( +/obj/effect/decal/cleanable/vomit/old, +/obj/item/stack/ore/glass, +/turf/open/floor/plasteel, +/area/shuttle/escape/luxury) +"cg" = ( +/obj/effect/decal/cleanable/glass, +/turf/open/floor/plasteel, +/area/shuttle/escape/luxury) +"ch" = ( +/obj/structure/chair/comfy/brown{ + dir = 1 + }, +/turf/open/floor/carpet/orange, +/area/shuttle/escape/luxury) +"ci" = ( +/obj/structure/piano{ + icon_state = "piano" + }, +/turf/open/floor/carpet/green, +/area/shuttle/escape/luxury) +"cj" = ( +/obj/structure/closet/crate/freezer, +/obj/item/reagent_containers/blood, +/obj/item/reagent_containers/blood, +/obj/item/reagent_containers/blood/AMinus, +/obj/item/reagent_containers/blood/BMinus{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/reagent_containers/blood/BPlus{ + pixel_x = 1; + pixel_y = 2 + }, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OPlus{ + pixel_x = -2; + pixel_y = -1 + }, +/obj/item/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/APlus, +/obj/item/reagent_containers/blood/random, +/turf/open/floor/carpet/cyan, +/area/shuttle/escape/luxury) +"ck" = ( +/obj/item/stack/tile/plasteel, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/shuttle/escape/luxury) +"cl" = ( +/obj/structure/table/optable, +/obj/item/surgical_drapes, +/turf/open/floor/carpet/cyan, +/area/shuttle/escape/luxury) +"cm" = ( +/obj/structure/table, +/obj/item/scalpel{ + pixel_y = 12 + }, +/obj/item/circular_saw, +/obj/item/retractor{ + pixel_x = 4 + }, +/obj/item/hemostat{ + pixel_x = -4 + }, +/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/mask/surgical, +/obj/item/surgicaldrill, +/obj/item/cautery, +/turf/open/floor/carpet/cyan, +/area/shuttle/escape/luxury) +"cn" = ( +/obj/machinery/door/airlock{ + name = "Economy Medical" + }, +/turf/open/floor/plasteel, +/area/shuttle/escape/luxury) +"co" = ( +/obj/item/shard, +/turf/open/floor/plating, +/area/shuttle/escape/luxury) +"cp" = ( +/obj/structure/closet/crate/freezer, +/obj/effect/decal/cleanable/blood/old, +/obj/item/bot_assembly/medbot, +/obj/item/stack/medical/gauze, +/obj/item/reagent_containers/food/drinks/bottle/whiskey, +/obj/item/reagent_containers/glass/bottle/ethanol, +/obj/item/organ/stomach, +/obj/item/clothing/mask/surgical, +/turf/open/floor/plasteel, +/area/shuttle/escape/luxury) +"cq" = ( +/obj/effect/decal/cleanable/chem_pile, +/turf/open/floor/plating, +/area/shuttle/escape/luxury) +"cr" = ( +/obj/structure/frame/machine, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/turf/open/floor/plasteel, +/area/shuttle/escape/luxury) +"cs" = ( +/obj/effect/decal/cleanable/robot_debris, +/turf/open/floor/plasteel, +/area/shuttle/escape/luxury) +"ct" = ( +/obj/machinery/shower{ + dir = 8 + }, +/turf/open/floor/mineral/titanium/white, +/area/shuttle/escape/luxury) +"cu" = ( +/obj/structure/toilet{ + pixel_y = 8 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/mineral/titanium/white, +/area/shuttle/escape/luxury) +"cv" = ( +/obj/structure/table, +/obj/item/reagent_containers/pill/floorpill{ + pixel_x = -6; + pixel_y = -3 + }, +/obj/item/reagent_containers/pill/floorpill{ + pixel_x = 8; + pixel_y = -3 + }, +/obj/item/reagent_containers/pill/floorpill, +/obj/item/healthanalyzer{ + pixel_y = 9 + }, +/turf/open/floor/plating, +/area/shuttle/escape/luxury) +"cw" = ( +/obj/structure/bed, +/turf/open/floor/plasteel, +/area/shuttle/escape/luxury) +"cx" = ( +/obj/effect/decal/cleanable/vomit/old, +/turf/open/floor/plasteel, +/area/shuttle/escape/luxury) +"cy" = ( +/obj/item/shard, +/turf/open/floor/plasteel, +/area/shuttle/escape/luxury) +"cz" = ( +/obj/machinery/light, +/turf/open/floor/mineral/titanium/blue, +/area/shuttle/escape/luxury) +"cA" = ( +/obj/effect/decal/cleanable/oil, +/turf/open/floor/plating, +/area/shuttle/escape/luxury) +"cB" = ( +/obj/structure/bed, +/obj/effect/decal/cleanable/blood/old, +/turf/open/floor/plasteel, +/area/shuttle/escape/luxury) +"cC" = ( +/obj/structure/grille/broken, +/obj/effect/spawner/lootdrop/maintenance/two, +/turf/open/floor/plasteel, +/area/shuttle/escape/luxury) +"cD" = ( +/obj/structure/frame/machine, +/obj/effect/turf_decal/delivery, +/obj/effect/decal/cleanable/cobweb, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/shuttle/escape/luxury) +"cE" = ( +/obj/structure/chair/comfy/brown, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/carpet/orange, +/area/shuttle/escape/luxury) +"cF" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/carpet/green, +/area/shuttle/escape/luxury) +"cG" = ( +/obj/machinery/stasis, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/carpet/cyan, +/area/shuttle/escape/luxury) +"cH" = ( +/obj/structure/table, +/obj/item/storage/firstaid/advanced, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/fire, +/obj/item/reagent_containers/glass/bottle/epinephrine{ + pixel_x = 6 + }, +/obj/item/reagent_containers/glass/bottle/multiver{ + pixel_x = -3 + }, +/obj/item/reagent_containers/glass/bottle/epinephrine{ + pixel_x = -3; + pixel_y = 8 + }, +/obj/item/reagent_containers/glass/bottle/multiver{ + pixel_x = 6; + pixel_y = 8 + }, +/obj/item/reagent_containers/syringe/epinephrine{ + pixel_x = 3; + pixel_y = -2 + }, +/obj/item/reagent_containers/syringe/epinephrine{ + pixel_x = 3; + pixel_y = -2 + }, +/obj/item/reagent_containers/syringe/epinephrine{ + pixel_x = 3; + pixel_y = -2 + }, +/obj/machinery/light, +/turf/open/floor/carpet/cyan, +/area/shuttle/escape/luxury) +"cI" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/carpet/blue, +/area/shuttle/escape/luxury) +"cJ" = ( +/obj/item/stack/tile/plasteel, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/plating, +/area/shuttle/escape/luxury) +"cK" = ( +/obj/structure/table, +/obj/item/wirecutters{ + pixel_y = 6 + }, +/obj/item/hatchet, +/obj/item/kitchen/knife, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/plating, +/area/shuttle/escape/luxury) +"cL" = ( +/obj/structure/chair/comfy/brown{ + dir = 1 + }, +/obj/machinery/light, +/turf/open/floor/carpet/orange, +/area/shuttle/escape/luxury) +"cM" = ( +/obj/machinery/light, +/turf/open/floor/mineral/titanium/white, +/area/shuttle/escape/luxury) +"cN" = ( +/obj/structure/chair/wood{ + dir = 8 + }, +/turf/open/floor/carpet/green, +/area/shuttle/escape/luxury) +"qa" = ( +/obj/structure/toilet{ + pixel_y = 8 }, /obj/machinery/light{ dir = 8 }, -/turf/open/floor/mineral/gold, +/turf/open/floor/mineral/titanium/white, /area/shuttle/escape/luxury) -"bp" = ( -/obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-21"; - pixel_x = -3; - pixel_y = 3 +"Lt" = ( +/obj/machinery/door/airlock/security/glass{ + name = "Escape Shuttle Cell"; + req_access_txt = "2" }, -/obj/machinery/light, -/turf/open/floor/mineral/gold, -/area/shuttle/escape/luxury) -"hA" = ( -/obj/structure/table/optable, -/obj/item/surgical_drapes, -/turf/open/floor/mineral/gold, -/area/shuttle/escape/luxury) -"zg" = ( -/obj/machinery/vending/wallmed, -/turf/closed/indestructible/riveted/uranium, -/area/shuttle/escape/luxury) -"OL" = ( -/obj/item/surgicaldrill, -/obj/item/scalpel, -/obj/item/retractor, -/obj/item/cautery, -/obj/item/hemostat, -/obj/item/circular_saw, -/obj/structure/table/wood/fancy, -/turf/open/floor/mineral/gold, +/obj/machinery/scanner_gate/luxury_shuttle, +/turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape/luxury) (1,1,1) = {" aa -ab -ab -ab -ab +al +ar +ar +al ar ar ar ar -ab -ab -ab -ab +al +ar +ar +al aa "} (2,1,1) = {" ab -ab -am -ab -ab +al +as +as +al as as as as -ab -bf -hA -ab +al +as +as +al ab "} (3,1,1) = {" ab -af -ag +ah +bn +by ab -ab -ab -ab -ab -ab -zg +cD aj +cc aj -zg +ab +cp +cv +cK ab "} (4,1,1) = {" ab -ag -an -ab -bl aj -aj -aj -aj -bj -aj -aj -OL +bo +bz +bH +bR +bC +bJ +ak +cn +cq +bs +cA ab "} (5,1,1) = {" ab -ag -ag +aq +bp +bA ab -aj -at -at -at -at -aj -aj -aj -aj +bS +bC +bJ +cf +ab +cr +cw +cB ab "} (6,1,1) = {" ab -ag -ag +be +bq +bB +ck +bT +ak +bU +cg +ab +ab +ab ab -aj -au -ax -aN -bd -aj -aj -bg -bp ab "} (7,1,1) = {" ab -ah -ag -ab -aj -au -ay -aO -bd -aj -aj -bh -bh +bf +br +bC +bJ +bI +bC +bK +bs +co +cs +cJ +cC ab "} (8,1,1) = {" ab -ag -ag -ab -aj -au -az -aP -bd -aj -aj -bh -bh +bg +ak +bC +bJ +bU +bC +bJ +bS +bC +bJ +cx +bC ab "} (9,1,1) = {" -ab -ag -ag -ab -aj -au -aA -aQ -bd -aj -aj -bh -bh +ac +ax +bs +bC +bK +bS +bX +bJ +ak +bC +bJ +cy +bC ab "} (10,1,1) = {" -ab -ai -ao -ab -aj -au -aB -aR -bd -aj -aj -bh -bh -ab -"} -(11,1,1) = {" -ab ag ag -ab -aj -au -aC -aS -bd -aj -aj -bh -bh -ab -"} -(12,1,1) = {" -ac -ag af -ab -aj -au -aD +ag +ag +ay +av +av +av +ay +av +av +av +ay +"} +(11,1,1) = {" +af +at +at +bD +ag +aA +ao +ao +ao +ao +ao +ao +ao +ag +"} +(12,1,1) = {" +ag +bj +at +bD +ag +cE +aG +aK +ch +bV +aO aT -bd -aj -aj -bh -bh -ab +cL +ag "} (13,1,1) = {" -ab -ab -ab -ab -aj -au -aE +ag +at +at +bD +ag +bV +aH +aL +ch +bV +aP aU -bd -aj -aj -bh -bh -ab +ch +ag "} (14,1,1) = {" -ad -aj -aj -bj -aj -au -aF -aV -bd -aj -aj -bh -bh -ab +ag +Lt +ag +ag +ag +bV +aC +aE +ch +bV +aX +aZ +ch +ag "} (15,1,1) = {" -ab -aj -aj -aj -aj -au -aG -aW -bd -aj -aj -bh -bh -ab +ag +ao +bt +bQ +bL +bV +aD +aF +ch +bV +aY +ba +ch +ag "} (16,1,1) = {" -ab -aj -aj -aj -aj -au +ag +ao +bu +bF +bL +bV +aI +aD +ch +bV aH -aX -bd -aj -aj -bh -bh -ab +aV +ch +ag "} (17,1,1) = {" -ab -aj -aj -aj -aj -au -aI -aY -bd -aj -aj -bh -bh -ab +ae +ao +bw +bG +bM +bV +aJ +aN +ch +bV +aQ +aW +cL +ag "} (18,1,1) = {" -ab -aj -aj -aj -aj -au -aJ -aZ -bd -aj -aj -bh -bh -ab +ag +bk +ao +ao +ao +ao +ao +ao +ao +ao +cI +ao +ao +ag "} (19,1,1) = {" -ab -aj -aj -aj -aj -au -aK -ba -bd -aj -aj -bh -bh -ab +ad +ao +ao +ao +bN +bW +bY +ao +ci +ag +ag +ag +bb +ag "} (20,1,1) = {" -ae -aj -aj -bk -aj -au -aL -bb -bd -aj -aj -bg -bp -ab +ag +am +ao +ao +bO +cF +bZ +ao +cN +ag +aR +aR +aS +ag "} (21,1,1) = {" -ab -ab -ab -ab -aj -at -at -at -at -aj -aj -aj -aj -ab +ag +au +bx +bx +au +ag +au +cd +au +ag +ct +ct +cM +ag "} (22,1,1) = {" -ab -ak -ap -ab -aj -aj -aj -aj -aj -aj -aj -aj -aj -ab +ai +bm +aw +aw +bP +ag +ca +aB +cj +ag +ag +ag +aS +ag "} (23,1,1) = {" -ab -aj -bi -ab -aj -av -av -av -av -aj -aj -aj -aj -ab +ai +bE +aw +aw +cz +ag +cG +aB +cH +ag +cu +bb +aS +ag "} (24,1,1) = {" -ab -al -aj -aq -bk -aw +ai +ap aM -bc -be -bk -aj -aj -ak -ab +aM +aM +ag +cb +aB +cl +ag +ag +ag +cM +ag "} (25,1,1) = {" -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab +ag +az +bi +bl +bv +ag +cb +ce +cm +ag +qa +bb +aS +ag +"} +(26,1,1) = {" +ag +bc +bc +bc +bc +ag +ag +ag +ag +ag +ag +ag +ag +ag "} diff --git a/_maps/shuttles/emergency_zeta.dmm b/_maps/shuttles/emergency_zeta.dmm index f2fa6efcda3..b07d3e0c16a 100644 --- a/_maps/shuttles/emergency_zeta.dmm +++ b/_maps/shuttles/emergency_zeta.dmm @@ -221,18 +221,6 @@ /obj/machinery/sleeper/survival_pod, /turf/open/floor/plating/abductor, /area/shuttle/escape) -"K" = ( -/obj/machinery/dna_scannernew, -/turf/open/floor/plating/abductor, -/area/shuttle/escape) -"L" = ( -/obj/machinery/computer/prototype_cloning, -/turf/open/floor/plating/abductor, -/area/shuttle/escape) -"M" = ( -/obj/machinery/clonepod/experimental, -/turf/open/floor/plating/abductor, -/area/shuttle/escape) "N" = ( /obj/machinery/abductor/pad{ desc = "A funky looking disc, built into the floor." @@ -591,7 +579,7 @@ l l l c -K +l l l Y @@ -614,7 +602,7 @@ l l l c -L +l l l l @@ -637,7 +625,7 @@ l q s b -M +l O S Z diff --git a/_maps/shuttles/infiltrator_basic.dmm b/_maps/shuttles/infiltrator_basic.dmm index 2d9c1e12acb..00904d387e6 100644 --- a/_maps/shuttles/infiltrator_basic.dmm +++ b/_maps/shuttles/infiltrator_basic.dmm @@ -1011,7 +1011,7 @@ /area/shuttle/syndicate/medical) "ck" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/structure/mirror{ diff --git a/_maps/shuttles/ruin_caravan_victim.dmm b/_maps/shuttles/ruin_caravan_victim.dmm index a660f579aeb..c35642727f7 100644 --- a/_maps/shuttles/ruin_caravan_victim.dmm +++ b/_maps/shuttles/ruin_caravan_victim.dmm @@ -230,6 +230,7 @@ dir = 5 }, /obj/effect/decal/cleanable/dirt, +/obj/structure/cable, /turf/open/floor/plating/airless, /area/shuttle/caravan/freighter1) "lM" = ( diff --git a/_maps/shuttles/whiteship_box.dmm b/_maps/shuttles/whiteship_box.dmm index ecb26682a17..4122bdd4a00 100644 --- a/_maps/shuttles/whiteship_box.dmm +++ b/_maps/shuttles/whiteship_box.dmm @@ -87,7 +87,6 @@ "am" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/closet/crate/freezer/surplus_limbs, -/obj/item/reagent_containers/glass/beaker/instabitaluri, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/shuttle/abandoned/medbay) @@ -1555,7 +1554,7 @@ pixel_y = 16 }, /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, diff --git a/_maps/shuttles/whiteship_delta.dmm b/_maps/shuttles/whiteship_delta.dmm index 8af1f8e4568..f5d70f14db5 100644 --- a/_maps/shuttles/whiteship_delta.dmm +++ b/_maps/shuttles/whiteship_delta.dmm @@ -69,7 +69,7 @@ pixel_y = 16 }, /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/structure/mirror{ diff --git a/_maps/shuttles/whiteship_donut.dmm b/_maps/shuttles/whiteship_donut.dmm index b695fea84fd..bdfd28b984f 100644 --- a/_maps/shuttles/whiteship_donut.dmm +++ b/_maps/shuttles/whiteship_donut.dmm @@ -252,7 +252,7 @@ "aQ" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12 }, /obj/item/soap, diff --git a/_maps/shuttles/whiteship_meta.dmm b/_maps/shuttles/whiteship_meta.dmm index caada2a63a0..b641313e3c9 100644 --- a/_maps/shuttles/whiteship_meta.dmm +++ b/_maps/shuttles/whiteship_meta.dmm @@ -1002,7 +1002,7 @@ "bG" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/structure/toilet{ @@ -2549,7 +2549,7 @@ "dR" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/effect/decal/cleanable/food/flour, @@ -2562,7 +2562,7 @@ "dT" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, diff --git a/_maps/templates/hilbertshotel.dmm b/_maps/templates/hilbertshotel.dmm index 87fff9e42d9..df277f2d90a 100644 --- a/_maps/templates/hilbertshotel.dmm +++ b/_maps/templates/hilbertshotel.dmm @@ -137,7 +137,7 @@ pixel_x = -32 }, /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, diff --git a/_maps/templates/hilbertshotellore.dmm b/_maps/templates/hilbertshotellore.dmm index f6be66bd067..8f98ec39965 100644 --- a/_maps/templates/hilbertshotellore.dmm +++ b/_maps/templates/hilbertshotellore.dmm @@ -174,7 +174,7 @@ pixel_x = -32 }, /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, @@ -295,7 +295,7 @@ pixel_x = -32 }, /obj/structure/sink{ - dir = 8; + dir = 4; pixel_x = -12; pixel_y = 2 }, diff --git a/_maps/templates/shelter_3.dmm b/_maps/templates/shelter_3.dmm index 6da0647ac38..f2a3de030ca 100644 --- a/_maps/templates/shelter_3.dmm +++ b/_maps/templates/shelter_3.dmm @@ -212,7 +212,7 @@ /area/survivalpod) "I" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/machinery/light/small{ diff --git a/code/__DEFINES/DNA.dm b/code/__DEFINES/DNA.dm index 79e1e72edc5..3719ec84df2 100644 --- a/code/__DEFINES/DNA.dm +++ b/code/__DEFINES/DNA.dm @@ -35,7 +35,10 @@ #define TELEPATHY /datum/mutation/human/telepathy #define FIREBREATH /datum/mutation/human/firebreath #define VOID /datum/mutation/human/void +#define TONGUESPIKE /datum/mutation/human/tonguespike +#define TONGUESPIKECHEM /datum/mutation/human/tongue_spike/chem #define STRONG /datum/mutation/human/strong +#define STIMMED /datum/mutation/human/stimmed #define FIRESWEAT /datum/mutation/human/fire #define THERMAL /datum/mutation/human/thermal #define ANTENNA /datum/mutation/human/antenna @@ -50,6 +53,7 @@ #define EXTRASTUN /datum/mutation/human/extrastun #define GELADIKINESIS /datum/mutation/human/geladikinesis #define CRYOKINESIS /datum/mutation/human/cryokinesis +#define SPIDER_WEB /datum/mutation/human/webbing #define UI_CHANGED "ui changed" #define UE_CHANGED "ue changed" @@ -99,10 +103,6 @@ #define TR_KEEPSTUNS (1<<9) #define TR_KEEPREAGENTS (1<<10) - -#define CLONER_FRESH_CLONE "fresh" -#define CLONER_MATURE_CLONE "mature" - //species traits for mutantraces #define MUTCOLORS 1 #define HAIR 2 diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index f84bee5a5af..4d73369a318 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -26,7 +26,7 @@ #define ACCESS_AI_UPLOAD 16 #define ACCESS_TELEPORTER 17 #define ACCESS_EVA 18 -/// Bridge, EVA storage windoors, gateway shutters, AI integrity restorer, clone record deletion, comms console +/// Bridge, EVA storage windoors, gateway shutters, AI integrity restorer, comms console #define ACCESS_HEADS 19 #define ACCESS_CAPTAIN 20 #define ACCESS_ALL_PERSONAL_LOCKERS 21 @@ -77,8 +77,6 @@ #define ACCESS_WEAPONS 66 /// NTnet diagnostics/monitoring software #define ACCESS_NETWORK 67 -/// Cloning room and clone pod ejection -#define ACCESS_CLONING 68 /// Pharmacy access (Chemistry room in Medbay) #define ACCESS_PHARMACY 69 ///Nice. diff --git a/code/__DEFINES/achievements.dm b/code/__DEFINES/achievements.dm index b610eb50cc1..acf77ed73e1 100644 --- a/code/__DEFINES/achievements.dm +++ b/code/__DEFINES/achievements.dm @@ -19,6 +19,11 @@ #define MEDAL_SELFOUCH "Hands???" #define MEDAL_SANDMAN "Mister Sandman" #define MEDAL_CLEANBOSS "Cleanboss" +#define MEDAL_RULE8 "Rule 8" +#define MEDAL_LONGSHIFT "longshift" + +//Skill medal hub IDs +#define MEDAL_LEGENDARY_MINER "Legendary Miner" //Boss medals diff --git a/code/__DEFINES/atmospherics.dm b/code/__DEFINES/atmospherics.dm index 61198aa0ae8..1a2ed41c69e 100644 --- a/code/__DEFINES/atmospherics.dm +++ b/code/__DEFINES/atmospherics.dm @@ -131,12 +131,14 @@ #define BODYTEMP_COOLING_MAX -100 /// The maximum number of degrees that your body can heat up in 1 tick, due to the environment, when in a hot area. #define BODYTEMP_HEATING_MAX 30 - -/// The limit the human body can take before it starts taking damage from heat. -#define BODYTEMP_HEAT_DAMAGE_LIMIT (BODYTEMP_NORMAL + 50) -/// The limit the human body can take before it starts taking damage from coldness. -#define BODYTEMP_COLD_DAMAGE_LIMIT (BODYTEMP_NORMAL - 50) - +/// The body temperature limit the human body can take before it starts taking damage from heat. +/// This also affects how fast the body normalises it's temperature when hot. +/// 340k is about 66c, and rather high for a human. +#define BODYTEMP_HEAT_DAMAGE_LIMIT (BODYTEMP_NORMAL + 30) +/// The body temperature limit the human body can take before it starts taking damage from cold. +/// This also affects how fast the body normalises it's temperature when cold. +/// 270k is about -3c, that is below freezing and would hurt over time. +#define BODYTEMP_COLD_DAMAGE_LIMIT (BODYTEMP_NORMAL - 40) /// what min_cold_protection_temperature is set to for space-helmet quality headwear. MUST NOT BE 0. #define SPACE_HELM_MIN_TEMP_PROTECT 2.0 diff --git a/code/__DEFINES/blackmarket.dm b/code/__DEFINES/blackmarket.dm new file mode 100644 index 00000000000..569759f5437 --- /dev/null +++ b/code/__DEFINES/blackmarket.dm @@ -0,0 +1,10 @@ + +// Shipping methods + +// The BEST way of shipping items: accurate, "undetectable" +#define SHIPPING_METHOD_LTSRBT "LTSRBT" +// Picks a random area to teleport the item to and gives you a minute to get there before it is sent. +#define SHIPPING_METHOD_TELEPORT "Teleport" +// Throws the item from somewhere at the station. +#define SHIPPING_METHOD_LAUNCH "Launch" + diff --git a/code/__DEFINES/cinematics.dm b/code/__DEFINES/cinematics.dm index 6d85c45f1bc..f994dc82a4b 100644 --- a/code/__DEFINES/cinematics.dm +++ b/code/__DEFINES/cinematics.dm @@ -11,3 +11,4 @@ #define CINEMATIC_NUKE_FAR 11 #define CINEMATIC_NUKE_CLOWNOP 12 #define CINEMATIC_CULT_NUKE 13 +#define CINEMATIC_CULT_FAIL 14 diff --git a/code/__DEFINES/cleaning.dm b/code/__DEFINES/cleaning.dm index 8b66484ead5..1c0f65cbdc8 100644 --- a/code/__DEFINES/cleaning.dm +++ b/code/__DEFINES/cleaning.dm @@ -9,6 +9,8 @@ #define CLEAN_IMPRESSIVE 5 /// Cleans things spotless down to the atomic structure #define CLEAN_GOD 6 +/// Never cleaned +#define CLEAN_NEVER 7 //How strong things have to be to wipe forensic evidence... #define CLEAN_STRENGTH_FINGERPRINTS CLEAN_IMPRESSIVE diff --git a/code/__DEFINES/components.dm b/code/__DEFINES/components.dm index 6d9cbf639d3..eed6589f7f2 100644 --- a/code/__DEFINES/components.dm +++ b/code/__DEFINES/components.dm @@ -34,6 +34,8 @@ #define COMPONENT_DUPE_UNIQUE 2 /// old component is given the initialization args of the new #define COMPONENT_DUPE_UNIQUE_PASSARGS 4 +/// each component of the same type is consulted as to whether the duplicate should be allowed +#define COMPONENT_DUPE_SELECTIVE 5 // All signals. Format: // When the signal is called: (signal arguments) @@ -82,6 +84,7 @@ #define COMSIG_PARENT_ATTACKBY "atom_attackby" //from base of atom/attackby(): (/obj/item, /mob/living, params) #define COMPONENT_NO_AFTERATTACK 1 //Return this in response if you don't want afterattack to be called #define COMSIG_ATOM_HULK_ATTACK "hulk_attack" //from base of atom/attack_hulk(): (/mob/living/carbon/human) +#define COMSIG_ATOM_ATTACK_ANIMAL "attack_animal" //from base of atom/animal_attack(): (/mob/user) #define COMSIG_PARENT_EXAMINE "atom_examine" //from base of atom/examine(): (/mob) #define COMSIG_ATOM_GET_EXAMINE_NAME "atom_examine_name" //from base of atom/get_examine_name(): (/mob, list/overrides) //Positions for overrides list @@ -93,6 +96,7 @@ #define COMSIG_ATOM_NO_UPDATE_ICON_STATE 1 #define COMSIG_ATOM_NO_UPDATE_OVERLAYS 2 #define COMSIG_ATOM_UPDATE_OVERLAYS "atom_update_overlays" //from base of atom/update_overlays(): (list/new_overlays) +#define COMSIG_ATOM_UPDATED_ICON "atom_updated_icon" //from base of atom/update_icon(): (signalOut, did_anything) #define COMSIG_ATOM_ENTERED "atom_entered" //from base of atom/Entered(): (atom/movable/entering, /atom) #define COMSIG_ATOM_EXIT "atom_exit" //from base of atom/Exit(): (/atom/movable/exiting, /atom/newloc) #define COMPONENT_ATOM_BLOCK_EXIT 1 @@ -133,6 +137,7 @@ #define COMPONENT_BLOCK_TOOL_ATTACK 1 #define COMSIG_ATOM_INTERCEPT_TELEPORT "intercept_teleport" //called when teleporting into a protected turf: (channel, turf/origin) #define COMPONENT_BLOCK_TELEPORT 1 +#define COMSIG_ATOM_HEARER_IN_VIEW "atom_hearer_in_view" //called when an atom is added to the hearers on get_hearers_in_view(): (list/processing_list, list/hearers) #define COMSIG_ATOM_ORBIT_BEGIN "atom_orbit_begin" //called when an atom starts orbiting another atom: (atom) #define COMSIG_ATOM_ORBIT_STOP "atom_orbit_stop" //called when an atom stops orbiting another atom: (atom) ///////////////// @@ -152,6 +157,7 @@ #define COMSIG_CLICK "atom_click" //from base of atom/Click(): (location, control, params, mob/user) #define COMSIG_CLICK_SHIFT "shift_click" //from base of atom/ShiftClick(): (/mob) + #define COMPONENT_ALLOW_EXAMINATE 1 //Allows the user to examinate regardless of client.eye. #define COMSIG_CLICK_CTRL "ctrl_click" //from base of atom/CtrlClickOn(): (/mob) #define COMSIG_CLICK_ALT "alt_click" //from base of atom/AltClick(): (/mob) #define COMSIG_CLICK_CTRL_SHIFT "ctrl_shift_click" //from base of atom/CtrlShiftClick(/mob) @@ -196,11 +202,10 @@ #define HEARING_SPANS 6 #define HEARING_MESSAGE_MODE 7 */ #define COMSIG_MOVABLE_DISPOSING "movable_disposing" //called when the movable is added to a disposal holder object for disposal movement: (obj/structure/disposalholder/holder, obj/machinery/disposal/source) -#define COMSIG_MOVABLE_UPDATE_GLIDE_SIZE "movable_glide_size" //Called when the movable's glide size is updated: (new_glide_size) // /mob signals #define COMSIG_MOB_DEATH "mob_death" //from base of mob/death(): (gibbed) - +#define COMSIG_MOB_STATCHANGE "mob_statchange" //from base of mob/set_stat(): (new_stat) #define COMSIG_MOB_CLICKON "mob_clickon" //from base of mob/clickon(): (atom/A, params) #define COMSIG_MOB_MIDDLECLICKON "mob_middleclickon" //from base of mob/MiddleClickOn(): (atom/A) #define COMSIG_MOB_ALTCLICKON "mob_altclickon" //from base of mob/AltClickOn(): (atom/A) @@ -241,6 +246,7 @@ #define COMSIG_LIVING_ELECTROCUTE_ACT "living_electrocute_act" //from base of mob/living/electrocute_act(): (shock_damage, source, siemens_coeff, flags) #define COMSIG_LIVING_MINOR_SHOCK "living_minor_shock" //sent by stuff like stunbatons and tasers: () #define COMSIG_LIVING_REVIVE "living_revive" //from base of mob/living/revive() (full_heal, admin_revive) +#define COMSIG_LIVING_REGENERATE_LIMBS "living_regen_limbs" //from base of /mob/living/regenerate_limbs(): (noheal, excluded_limbs) #define COMSIG_PROCESS_BORGCHARGER_OCCUPANT "living_charge" //sent from borg recharge stations: (amount, repairs) #define COMSIG_MOB_CLIENT_LOGIN "comsig_mob_client_login" //sent when a mob/login() finishes: (client) #define COMSIG_BORG_SAFE_DECONSTRUCT "borg_safe_decon" //sent from borg mobs to itself, for tools to catch an upcoming destroy() due to safe decon (rather than detonation) @@ -294,6 +300,8 @@ #define COMPONENT_BLOCK_MARK_RETRIEVAL 1 #define COMSIG_ITEM_HIT_REACT "item_hit_react" //from base of obj/item/hit_reaction(): (list/args) #define COMSIG_ITEM_WEARERCROSSED "wearer_crossed" //called on item when crossed by something (): (/atom/movable, mob/living/crossed) +#define COMSIG_ITEM_MICROWAVE_ACT "microwave_act" //called on item when microwaved (): (obj/machinery/microwave/M) + // /obj/item/clothing signals #define COMSIG_SHOES_STEP_ACTION "shoes_step_action" //from base of obj/item/clothing/shoes/proc/step_action(): () diff --git a/code/__DEFINES/construction.dm b/code/__DEFINES/construction.dm index 6711c52b0ae..aeae88a328c 100644 --- a/code/__DEFINES/construction.dm +++ b/code/__DEFINES/construction.dm @@ -57,7 +57,6 @@ #define FLOODLIGHT_NEEDS_WIRES 0 #define FLOODLIGHT_NEEDS_LIGHTS 1 #define FLOODLIGHT_NEEDS_SECURING 2 -#define FLOODLIGHT_NEEDS_WRENCHING 3 //other construction-related things diff --git a/code/__DEFINES/flags.dm b/code/__DEFINES/flags.dm index ba3d015b3b8..835114b2c6c 100644 --- a/code/__DEFINES/flags.dm +++ b/code/__DEFINES/flags.dm @@ -4,16 +4,6 @@ #define ALL (~0) //For convenience. #define NONE 0 -//for convenience -#define ENABLE_BITFIELD(variable, flag) (variable |= (flag)) -#define DISABLE_BITFIELD(variable, flag) (variable &= ~(flag)) -#define CHECK_BITFIELD(variable, flag) (variable & (flag)) -#define TOGGLE_BITFIELD(variable, flag) (variable ^= (flag)) - - -//check if all bitflags specified are present -#define CHECK_MULTIPLE_BITFIELDS(flagvar, flags) (((flagvar) & (flags)) == (flags)) - GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)) // for /datum/var/datum_flags @@ -38,8 +28,8 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204 /// Prevent clicking things below it on the same turf eg. doors/ fulltile windows #define PREVENT_CLICK_UNDER_1 (1<<11) #define HOLOGRAM_1 (1<<12) -/// TESLA_IGNORE grants immunity from being targeted by tesla-style electricity -#define TESLA_IGNORE_1 (1<<13) +/// Prevents mobs from getting chainshocked by teslas and the supermatter +#define SHOCKED_1 (1<<13) ///Whether /atom/Initialize() has already run for the object #define INITIALIZED_1 (1<<14) /// was this spawned by an admin? used for stat tracking stuff. @@ -47,6 +37,7 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204 /// should not get harmed if this gets caught by an explosion? #define PREVENT_CONTENTS_EXPLOSION_1 (1<<16) + //turf-only flags #define NOJAUNT_1 (1<<0) #define UNUSED_RESERVATION_TURF_1 (1<<1) @@ -96,14 +87,16 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204 #define FREEZE_PROOF (1<<7) //tesla_zap -#define TESLA_MACHINE_EXPLOSIVE (1<<0) -#define TESLA_ALLOW_DUPLICATES (1<<1) -#define TESLA_OBJ_DAMAGE (1<<2) -#define TESLA_MOB_DAMAGE (1<<3) -#define TESLA_MOB_STUN (1<<4) +#define ZAP_MACHINE_EXPLOSIVE (1<<0) +#define ZAP_ALLOW_DUPLICATES (1<<1) +#define ZAP_OBJ_DAMAGE (1<<2) +#define ZAP_MOB_DAMAGE (1<<3) +#define ZAP_MOB_STUN (1<<4) +#define ZAP_IS_TESLA (1<<5) -#define TESLA_DEFAULT_FLAGS ALL -#define TESLA_FUSION_FLAGS TESLA_OBJ_DAMAGE | TESLA_MOB_DAMAGE | TESLA_MOB_STUN +#define ZAP_DEFAULT_FLAGS ALL +#define ZAP_FUSION_FLAGS ZAP_OBJ_DAMAGE | ZAP_MOB_DAMAGE | ZAP_MOB_STUN | ZAP_IS_TESLA +#define ZAP_SUPERMATTER_FLAGS NONE //EMP protection #define EMP_PROTECT_SELF (1<<0) diff --git a/code/__DEFINES/food.dm b/code/__DEFINES/food.dm index 60f99c4c750..62bdd1d8c38 100644 --- a/code/__DEFINES/food.dm +++ b/code/__DEFINES/food.dm @@ -19,3 +19,7 @@ #define DRINK_VERYGOOD 3 #define DRINK_FANTASTIC 4 #define FOOD_AMAZING 5 + +#define FOOD_IN_CONTAINER (1<<0) + +#define STOP_SERVING_BREAKFAST (15 MINUTES) diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm index 1827032d94e..f7430cfe273 100644 --- a/code/__DEFINES/is_helpers.dm +++ b/code/__DEFINES/is_helpers.dm @@ -78,6 +78,7 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list( #define isfelinid(A) (is_species(A, /datum/species/human/felinid)) #define isethereal(A) (is_species(A, /datum/species/ethereal)) #define isvampire(A) (is_species(A,/datum/species/vampire)) +#define isdullahan(A) (is_species(A, /datum/species/dullahan)) //more carbon mobs #define ismonkey(A) (istype(A, /mob/living/carbon/monkey)) diff --git a/code/__DEFINES/jobs.dm b/code/__DEFINES/jobs.dm index e6b1d77f8aa..55a3da0bc35 100644 --- a/code/__DEFINES/jobs.dm +++ b/code/__DEFINES/jobs.dm @@ -23,6 +23,7 @@ #define DOCTOR (1<<4) #define GENETICIST (1<<5) #define VIROLOGIST (1<<6) +#define PARAMEDIC (1<<7) #define CIVILIAN (1<<2) @@ -41,6 +42,7 @@ #define CLOWN (1<<11) #define MIME (1<<12) #define ASSISTANT (1<<13) +#define PRISONER (1<<14) #define JOB_AVAILABLE 0 #define JOB_UNAVAILABLE_GENERIC 1 @@ -69,20 +71,22 @@ #define JOB_DISPLAY_ORDER_CURATOR 13 #define JOB_DISPLAY_ORDER_LAWYER 14 #define JOB_DISPLAY_ORDER_CHAPLAIN 15 -#define JOB_DISPLAY_ORDER_CHIEF_ENGINEER 16 -#define JOB_DISPLAY_ORDER_STATION_ENGINEER 17 -#define JOB_DISPLAY_ORDER_ATMOSPHERIC_TECHNICIAN 18 -#define JOB_DISPLAY_ORDER_CHIEF_MEDICAL_OFFICER 19 -#define JOB_DISPLAY_ORDER_MEDICAL_DOCTOR 20 -#define JOB_DISPLAY_ORDER_CHEMIST 21 -#define JOB_DISPLAY_ORDER_GENETICIST 22 -#define JOB_DISPLAY_ORDER_VIROLOGIST 23 -#define JOB_DISPLAY_ORDER_RESEARCH_DIRECTOR 24 -#define JOB_DISPLAY_ORDER_SCIENTIST 25 -#define JOB_DISPLAY_ORDER_ROBOTICIST 26 -#define JOB_DISPLAY_ORDER_HEAD_OF_SECURITY 27 -#define JOB_DISPLAY_ORDER_WARDEN 28 -#define JOB_DISPLAY_ORDER_DETECTIVE 29 -#define JOB_DISPLAY_ORDER_SECURITY_OFFICER 30 -#define JOB_DISPLAY_ORDER_AI 31 -#define JOB_DISPLAY_ORDER_CYBORG 32 +#define JOB_DISPLAY_ORDER_AI 16 +#define JOB_DISPLAY_ORDER_CYBORG 17 +#define JOB_DISPLAY_ORDER_CHIEF_ENGINEER 18 +#define JOB_DISPLAY_ORDER_STATION_ENGINEER 19 +#define JOB_DISPLAY_ORDER_ATMOSPHERIC_TECHNICIAN 20 +#define JOB_DISPLAY_ORDER_CHIEF_MEDICAL_OFFICER 21 +#define JOB_DISPLAY_ORDER_MEDICAL_DOCTOR 22 +#define JOB_DISPLAY_ORDER_PARAMEDIC 23 +#define JOB_DISPLAY_ORDER_CHEMIST 24 +#define JOB_DISPLAY_ORDER_VIROLOGIST 25 +#define JOB_DISPLAY_ORDER_RESEARCH_DIRECTOR 26 +#define JOB_DISPLAY_ORDER_SCIENTIST 27 +#define JOB_DISPLAY_ORDER_ROBOTICIST 28 +#define JOB_DISPLAY_ORDER_GENETICIST 29 +#define JOB_DISPLAY_ORDER_HEAD_OF_SECURITY 30 +#define JOB_DISPLAY_ORDER_WARDEN 31 +#define JOB_DISPLAY_ORDER_DETECTIVE 32 +#define JOB_DISPLAY_ORDER_SECURITY_OFFICER 33 +#define JOB_DISPLAY_ORDER_PRISONER 34 diff --git a/code/__DEFINES/logging.dm b/code/__DEFINES/logging.dm index 4b1db3937c8..7decaa9df70 100644 --- a/code/__DEFINES/logging.dm +++ b/code/__DEFINES/logging.dm @@ -36,6 +36,7 @@ #define LOG_MECHA (1 << 15) #define LOG_VIRUS (1 << 16) #define LOG_CLONING (1 << 17) +#define LOG_SHUTTLE (1 << 18) //Individual logging panel pages #define INDIVIDUAL_ATTACK_LOG (LOG_ATTACK) @@ -44,7 +45,7 @@ #define INDIVIDUAL_COMMS_LOG (LOG_PDA | LOG_CHAT | LOG_COMMENT | LOG_TELECOMMS) #define INDIVIDUAL_OOC_LOG (LOG_OOC | LOG_ADMIN) #define INDIVIDUAL_OWNERSHIP_LOG (LOG_OWNERSHIP) -#define INDIVIDUAL_SHOW_ALL_LOG (LOG_ATTACK | LOG_SAY | LOG_WHISPER | LOG_EMOTE | LOG_DSAY | LOG_PDA | LOG_CHAT | LOG_COMMENT | LOG_TELECOMMS | LOG_OOC | LOG_ADMIN | LOG_OWNERSHIP | LOG_GAME) +#define INDIVIDUAL_SHOW_ALL_LOG (LOG_ATTACK | LOG_SAY | LOG_WHISPER | LOG_EMOTE | LOG_DSAY | LOG_PDA | LOG_CHAT | LOG_COMMENT | LOG_TELECOMMS | LOG_OOC | LOG_ADMIN | LOG_OWNERSHIP | LOG_GAME | LOG_ADMIN_PRIVATE | LOG_ASAY | LOG_MECHA | LOG_VIRUS | LOG_CLONING | LOG_SHUTTLE) #define LOGSRC_CLIENT "Client" #define LOGSRC_MOB "Mob" diff --git a/code/__DEFINES/machines.dm b/code/__DEFINES/machines.dm index 7781efc5eee..71ea98f9f0d 100644 --- a/code/__DEFINES/machines.dm +++ b/code/__DEFINES/machines.dm @@ -110,10 +110,6 @@ #define MACHINE_ELECTRIFIED_PERMANENT -1 #define MACHINE_DEFAULT_ELECTRIFY_TIME 30 -//cloning defines. These are flags. -#define CLONING_SUCCESS (1<<0) -#define CLONING_DELETE_RECORD (1<<1) - //these flags are used to tell the DNA modifier if a plant gene cannot be extracted or modified. #define PLANT_GENE_REMOVABLE (1<<0) #define PLANT_GENE_EXTRACTABLE (1<<1) diff --git a/code/__DEFINES/materials.dm b/code/__DEFINES/materials.dm index 0e5234792af..601df51d77f 100644 --- a/code/__DEFINES/materials.dm +++ b/code/__DEFINES/materials.dm @@ -4,11 +4,8 @@ /// Hard materials, such as iron or metal #define MAT_CATEGORY_RIGID "rigid material" - -/// Gets the reference for the material type that was given -#define getmaterialref(A) (SSmaterials.materials[A] || A) - /// Flag for atoms, this flag ensures it isn't re-colored by materials. Useful for snowflake icons such as default toolboxes. #define MATERIAL_COLOR (1<<0) #define MATERIAL_ADD_PREFIX (1<<1) #define MATERIAL_NO_EFFECTS (1<<2) +#define MATERIAL_AFFECT_STATISTICS (1<<3) diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index 00c81bdd07e..89097b48e3f 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -262,16 +262,13 @@ GLOBAL_LIST_INIT(pda_styles, sortList(list(MONO, VT, ORBITRON, SHARE))) #define MAP_MAXY 5 #define MAP_MAXZ 6 -// Defib stats -#define DEFIB_TIME_LIMIT 900 -#define DEFIB_TIME_LOSS 60 - // Diagonal movement #define FIRST_DIAG_STEP 1 #define SECOND_DIAG_STEP 2 #define DEADCHAT_ARRIVALRATTLE "arrivalrattle" #define DEADCHAT_DEATHRATTLE "deathrattle" +#define DEADCHAT_LAWCHANGE "lawchange" #define DEADCHAT_REGULAR "regular-deadchat" // Bluespace shelter deploy checks @@ -395,6 +392,10 @@ GLOBAL_LIST_INIT(pda_styles, sortList(list(MONO, VT, ORBITRON, SHARE))) #define PIRATE_NAMES_FILE "pirates.json" #define REDPILL_FILE "redpill.json" #define ARCADE_FILE "arcade.json" +#define BOOMER_FILE "boomer.json" +#define LOCATIONS_FILE "locations.json" +#define WANTED_FILE "wanted_message.json" +#define VISTA_FILE "steve.json" //Fullscreen overlay resolution in tiles. #define FULLSCREEN_OVERLAY_RESOLUTION_X 15 diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm index b0eb91c4d56..c5e6c1fc2ae 100644 --- a/code/__DEFINES/mobs.dm +++ b/code/__DEFINES/mobs.dm @@ -183,6 +183,8 @@ #define ETHEREAL_CHARGE_NORMAL 50 #define ETHEREAL_CHARGE_ALMOSTFULL 75 #define ETHEREAL_CHARGE_FULL 100 +#define ETHEREAL_CHARGE_OVERLOAD 125 +#define ETHEREAL_CHARGE_DANGEROUS 150 //Slime evolution threshold. Controls how fast slimes can split/grow #define SLIME_EVOLUTION_THRESHOLD 10 diff --git a/code/__DEFINES/movement.dm b/code/__DEFINES/movement.dm deleted file mode 100644 index 5d5605d0fa1..00000000000 --- a/code/__DEFINES/movement.dm +++ /dev/null @@ -1,18 +0,0 @@ -//The minimum for glide_size to be clamped to. -//Clamped to 5 because byond's glide size scaling is actually just completely broken and "step" -//movement is better than dealing with the awful camera juddering -#define MIN_GLIDE_SIZE 5 -//The maximum for glide_size to be clamped to. -//This shouldn't be higher than the icon size, and generally you shouldn't be changing this, but it's here just in case. -#define MAX_GLIDE_SIZE 32 - -//This is a global so it can be changed in game, if you want to make this a bit faster you can make it a constant/define directly in the code -GLOBAL_VAR_INIT(glide_size_multiplier, 1.25) - -///Broken down, here's what this does: -/// divides the world icon_size (32) by delay divided by ticklag to get the number of pixels something should be moving each tick. -/// The division result is given a min value of 1 to prevent obscenely slow glide sizes from being set -/// Then that's multiplied by the global glide size multiplier. 1.25 by default feels pretty close to spot on. This is just to try to get byond to behave. -/// The whole result is then clamped to within the range above. -/// Not very readable but it works -#define DELAY_TO_GLIDE_SIZE(delay) (CLAMP(((32 / max(delay / world.tick_lag, 1)) * GLOB.glide_size_multiplier), MIN_GLIDE_SIZE, MAX_GLIDE_SIZE)) diff --git a/code/__DEFINES/nanites.dm b/code/__DEFINES/nanites.dm index 75b6766d45e..40611465f44 100644 --- a/code/__DEFINES/nanites.dm +++ b/code/__DEFINES/nanites.dm @@ -12,6 +12,10 @@ #define NANITE_CLOUD_DISABLE 2 #define NANITE_CLOUD_ENABLE 3 +///Nanite Protocol types +#define NANITE_PROTOCOL_REPLICATION "nanite_replication" +#define NANITE_PROTOCOL_STORAGE "nanite_storage" + ///Nanite extra settings types: used to help uis know what type an extra setting is #define NESTYPE_TEXT "text" #define NESTYPE_NUMBER "number" diff --git a/code/__DEFINES/obj_flags.dm b/code/__DEFINES/obj_flags.dm index ecdc2f7a766..6ef4d0ca692 100644 --- a/code/__DEFINES/obj_flags.dm +++ b/code/__DEFINES/obj_flags.dm @@ -51,3 +51,5 @@ #define ORGAN_FAILING (1<<2) //Failing organs perform damaging effects until replaced or fixed #define ORGAN_EXTERNAL (1<<3) //Was this organ implanted/inserted/etc, if true will not be removed during species change. #define ORGAN_VITAL (1<<4) //Currently only the brain +#define ORGAN_EDIBLE (1<<5) //is a snack? :D +#define ORGAN_SYNTHETIC_EMP (1<<6) //Synthetic organ affected by an EMP. Deteriorates over time. diff --git a/code/__DEFINES/preferences.dm b/code/__DEFINES/preferences.dm index a9a1955ad2d..25ca2739782 100644 --- a/code/__DEFINES/preferences.dm +++ b/code/__DEFINES/preferences.dm @@ -36,8 +36,9 @@ #define CHAT_GHOSTPDA (1<<8) #define CHAT_GHOSTRADIO (1<<9) #define CHAT_BANKCARD (1<<10) +#define CHAT_GHOSTLAWS (1<<11) -#define TOGGLES_DEFAULT_CHAT (CHAT_OOC|CHAT_DEAD|CHAT_GHOSTEARS|CHAT_GHOSTSIGHT|CHAT_PRAYER|CHAT_RADIO|CHAT_PULLR|CHAT_GHOSTWHISPER|CHAT_GHOSTPDA|CHAT_GHOSTRADIO|CHAT_BANKCARD) +#define TOGGLES_DEFAULT_CHAT (CHAT_OOC|CHAT_DEAD|CHAT_GHOSTEARS|CHAT_GHOSTSIGHT|CHAT_PRAYER|CHAT_RADIO|CHAT_PULLR|CHAT_GHOSTWHISPER|CHAT_GHOSTPDA|CHAT_GHOSTRADIO|CHAT_BANKCARD|CHAT_GHOSTLAWS) #define PARALLAX_INSANE -1 //for show offs #define PARALLAX_HIGH 0 //default. diff --git a/code/__DEFINES/profile.dm b/code/__DEFINES/profile.dm index 3c9650876e2..5fc84789014 100644 --- a/code/__DEFINES/profile.dm +++ b/code/__DEFINES/profile.dm @@ -1,5 +1,5 @@ -#define PROFILE_START ;PROFILE_STORE = list();PROFILE_SET; -#define PROFILE_STOP ;PROFILE_STORE = null; +#define LINE_PROFILE_START ;PROFILE_STORE = list();PROFILE_SET; +#define LINE_PROFILE_STOP ;PROFILE_STORE = null; #define PROFILE_SET ;PROFILE_TIME = TICK_USAGE_REAL; PROFILE_LINE = __LINE__; PROFILE_FILE = __FILE__; PROFILE_SLEEPCHECK = world.time; diff --git a/code/__DEFINES/reactions.dm b/code/__DEFINES/reactions.dm index 5973eab8b82..eb151dd0475 100644 --- a/code/__DEFINES/reactions.dm +++ b/code/__DEFINES/reactions.dm @@ -33,7 +33,6 @@ #define NOBLIUM_RESEARCH_AMOUNT 1000 #define BZ_RESEARCH_SCALE 4 #define BZ_RESEARCH_MAX_AMOUNT 400 -#define MIASMA_RESEARCH_AMOUNT 40 #define STIMULUM_RESEARCH_AMOUNT 50 //Plasma fusion properties #define FUSION_ENERGY_THRESHOLD 3e9 //Amount of energy it takes to start a fusion reaction diff --git a/code/__DEFINES/reagents.dm b/code/__DEFINES/reagents.dm index 18b41f0a058..1255eccf19e 100644 --- a/code/__DEFINES/reagents.dm +++ b/code/__DEFINES/reagents.dm @@ -31,6 +31,8 @@ #define REACT_REAGENTS 5 // a reaction occured #define MIMEDRINK_SILENCE_DURATION 30 //ends up being 60 seconds given 1 tick every 2 seconds +#define TRESHOLD_UNHUSK 50 //Health treshold for instabitaluri and rezadone to unhusk someone + //used by chem masters and pill presses #define PILL_STYLE_COUNT 22 //Update this if you add more pill icons or you die #define RANDOM_PILL_STYLE 22 //Dont change this one though diff --git a/code/__DEFINES/research.dm b/code/__DEFINES/research.dm index e06aa3ab576..85314155c58 100644 --- a/code/__DEFINES/research.dm +++ b/code/__DEFINES/research.dm @@ -75,3 +75,13 @@ ) #define TECHWEB_BOMB_POINTCAP 50000 //Adjust as needed; Stops toxins from nullifying RND progression mechanics. Current Value Cap Radius: 100 + +//research point values for slime extracts + +#define SLIME_RESEARCH_TIER_0 100 +#define SLIME_RESEARCH_TIER_1 500 +#define SLIME_RESEARCH_TIER_2 1000 +#define SLIME_RESEARCH_TIER_3 1500 +#define SLIME_RESEARCH_TIER_4 2000 +#define SLIME_RESEARCH_TIER_5 2500 +#define SLIME_RESEARCH_TIER_RAINBOW 5000 diff --git a/code/__DEFINES/robots.dm b/code/__DEFINES/robots.dm index 0820d632473..e45ba3d2bb2 100644 --- a/code/__DEFINES/robots.dm +++ b/code/__DEFINES/robots.dm @@ -50,3 +50,5 @@ #define ASSEMBLY_THIRD_STEP 2 #define ASSEMBLY_FOURTH_STEP 3 #define ASSEMBLY_FIFTH_STEP 4 + +#define BORG_LAMP_CD_RESET -1 //special value to reset cyborg's lamp_cooldown diff --git a/code/__DEFINES/say.dm b/code/__DEFINES/say.dm index b301fd79147..0994e37686c 100644 --- a/code/__DEFINES/say.dm +++ b/code/__DEFINES/say.dm @@ -15,6 +15,7 @@ #define MODE_INTERCOM "intercom" #define MODE_KEY_INTERCOM "i" +#define MODE_TOKEN_INTERCOM ":i" #define MODE_BINARY "binary" #define MODE_KEY_BINARY "b" @@ -45,6 +46,8 @@ #define MODE_MONKEY "monkeyhive" +#define MODE_SING "%" + //Spans. Robot speech, italics, etc. Applied in compose_message(). #define SPAN_ROBOT "robot" #define SPAN_YELL "yell" @@ -54,6 +57,7 @@ #define SPAN_REALLYBIG "reallybig" #define SPAN_COMMAND "command_headset" #define SPAN_CLOWN "clown" +#define SPAN_SINGING "singing" //bitflag #defines for return value of the radio() proc. #define ITALICS 1 @@ -63,6 +67,9 @@ //Eavesdropping #define EAVESDROP_EXTRA_RANGE 1 //how much past the specified message_range does the message get starred, whispering only +/// How close intercoms can be for radio code use +#define MODE_RANGE_INTERCOM 1 + // A link given to ghost alice to follow bob #define FOLLOW_LINK(alice, bob) "(F)" #define TURF_LINK(alice, turfy) "(T)" diff --git a/code/__DEFINES/skills.dm b/code/__DEFINES/skills.dm index 3a16b4cf811..ab6268c2a8a 100644 --- a/code/__DEFINES/skills.dm +++ b/code/__DEFINES/skills.dm @@ -1,5 +1,5 @@ -// Skills +// Skill levels #define SKILL_LEVEL_NONE 0 #define SKILL_LEVEL_NOVICE 1 #define SKILL_LEVEL_APPRENTICE 2 @@ -8,6 +8,7 @@ #define SKILL_LEVEL_MASTER 5 #define SKILL_LEVEL_LEGENDARY 6 +//Skill experience thresholds #define SKILL_EXP_NOVICE 100 #define SKILL_EXP_APPRENTICE 250 #define SKILL_EXP_JOURNEYMAN 500 @@ -15,5 +16,13 @@ #define SKILL_EXP_MASTER 1500 #define SKILL_EXP_LEGENDARY 2500 +//Skill modifier types +#define SKILL_SPEED_MODIFIER "skill_speed_modifier" + + // Gets the reference for the skill type that was given #define GetSkillRef(A) (SSskills.all_skills[A]) + +//number defines +#define CLEAN_SKILL_BEAUTY_ADJUSTMENT 15//It's a denominator so no 0. Higher number = less cleaning xp per cleanable +#define CLEAN_SKILL_GENERIC_WASH_XP 1.5//Value. Higher number = more XP when cleaning non-cleanables (walls/floors/lips) diff --git a/code/__DEFINES/spaceman_dmm.dm b/code/__DEFINES/spaceman_dmm.dm index e590a30ff99..b9c0544bc10 100644 --- a/code/__DEFINES/spaceman_dmm.dm +++ b/code/__DEFINES/spaceman_dmm.dm @@ -11,3 +11,8 @@ #define SHOULD_CALL_PARENT(X) #define UNLINT(X) X #endif + +/world/proc/enable_debugger() + var/dll = world.GetConfig("env", "EXTOOLS_DLL") + if (dll) + call(dll, "debug_initialize")() diff --git a/code/__DEFINES/subsystems.dm b/code/__DEFINES/subsystems.dm index 6907a153bd6..f4246e19b3c 100644 --- a/code/__DEFINES/subsystems.dm +++ b/code/__DEFINES/subsystems.dm @@ -20,7 +20,7 @@ * * make sure you add an update to the schema_version stable in the db changelog */ -#define DB_MINOR_VERSION 6 +#define DB_MINOR_VERSION 7 //! ## Timing subsystem @@ -98,6 +98,7 @@ // Subsystems shutdown in the reverse of the order they initialize in // The numbers just define the ordering, they are meaningless otherwise. +#define INIT_ORDER_PROFILER 101 #define INIT_ORDER_TITLE 100 #define INIT_ORDER_GARBAGE 99 #define INIT_ORDER_DBCORE 95 @@ -106,7 +107,6 @@ #define INIT_ORDER_INPUT 85 #define INIT_ORDER_VIS 80 #define INIT_ORDER_ACHIEVEMENTS 77 -#define INIT_ORDER_MATERIALS 76 #define INIT_ORDER_RESEARCH 75 #define INIT_ORDER_EVENTS 70 #define INIT_ORDER_JOBS 65 @@ -206,3 +206,12 @@ }\ A.flags_1 &= ~OVERLAY_QUEUED_1;\ } + +// Air subsystem subtasks +#define SSAIR_PIPENETS 1 +#define SSAIR_ATMOSMACHINERY 2 +#define SSAIR_ACTIVETURFS 3 +#define SSAIR_EXCITEDGROUPS 4 +#define SSAIR_HIGHPRESSURE 5 +#define SSAIR_HOTSPOTS 6 +#define SSAIR_SUPERCONDUCTIVITY 7 diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm index 8a89e5c1392..586282bcc6b 100644 --- a/code/__DEFINES/traits.dm +++ b/code/__DEFINES/traits.dm @@ -85,6 +85,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai #define TRAIT_SLEEPIMMUNE "sleep_immunity" #define TRAIT_PUSHIMMUNE "push_immunity" #define TRAIT_SHOCKIMMUNE "shock_immunity" +#define TRAIT_TESLA_SHOCKIMMUNE "tesla_shock_immunity" #define TRAIT_STABLEHEART "stable_heart" #define TRAIT_STABLELIVER "stable_liver" #define TRAIT_RESISTHEAT "resist_heat" @@ -144,6 +145,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai #define TRAIT_BOOZE_SLIDER "booze-slider" #define TRAIT_QUICK_CARRY "quick-carry" #define TRAIT_QUICKER_CARRY "quicker-carry" +#define TRAIT_QUICK_BUILD "quick-build" #define TRAIT_UNINTELLIGIBLE_SPEECH "unintelligible-speech" #define TRAIT_UNSTABLE "unstable" #define TRAIT_OIL_FRIED "oil_fried" @@ -153,13 +155,15 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai #define TRAIT_PASSTABLE "passtable" #define TRAIT_NOFLASH "noflash" //Makes you immune to flashes #define TRAIT_XENO_IMMUNE "xeno_immune"//prevents xeno huggies implanting skeletons +#define TRAIT_NAIVE "naive" //non-mob traits #define TRAIT_PARALYSIS "paralysis" //Used for limb-based paralysis, where replacing the limb will fix it // item traits -#define TRAIT_NODROP "nodrop" -#define TRAIT_T_RAY_VISIBLE "t-ray-visible" // Visible on t-ray scanners if the atom/var/level == 1 +#define TRAIT_NODROP "nodrop" +#define TRAIT_NO_STORAGE_INSERT "no_storage_insert" //cannot be inserted in a storage. +#define TRAIT_T_RAY_VISIBLE "t-ray-visible" // Visible on t-ray scanners if the atom/var/level == 1 #define TRAIT_NO_TELEPORT "no-teleport" //you just can't //quirk traits @@ -189,6 +193,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai // common trait sources #define TRAIT_GENERIC "generic" +#define GENERIC_ITEM_TRAIT "generic_item" #define UNCONSCIOUS_BLIND "unconscious_blind" #define EYE_DAMAGE "eye_damage" #define GENETIC_MUTATION "genetic" diff --git a/code/__DEFINES/typeids.dm b/code/__DEFINES/typeids.dm index 8bfe6216e26..275f7719f07 100644 --- a/code/__DEFINES/typeids.dm +++ b/code/__DEFINES/typeids.dm @@ -2,7 +2,7 @@ #define TYPEID_NULL "0" #define TYPEID_NORMAL_LIST "f" //helper macros -#define GET_TYPEID(ref) ( ( (length(ref) <= 10) ? "TYPEID_NULL" : copytext(ref, 4, length(ref)-6) ) ) +#define GET_TYPEID(ref) ( ( (length(ref) <= 10) ? "TYPEID_NULL" : copytext(ref, 4, -7) ) ) #define IS_NORMAL_LIST(L) (GET_TYPEID("\ref[L]") == TYPEID_NORMAL_LIST) diff --git a/code/__DEFINES/vv.dm b/code/__DEFINES/vv.dm index aec3dbccc69..4d740a7ba20 100644 --- a/code/__DEFINES/vv.dm +++ b/code/__DEFINES/vv.dm @@ -99,6 +99,7 @@ #define VV_HK_PLAYER_PANEL "player_panel" #define VV_HK_BUILDMODE "buildmode" #define VV_HK_DIRECT_CONTROL "direct_control" +#define VV_HK_GIVE_DIRECT_CONTROL "give_direct_control" #define VV_HK_OFFER_GHOSTS "offer_ghosts" // /mob/living/carbon diff --git a/code/__HELPERS/_lists.dm b/code/__HELPERS/_lists.dm index 0216797fbe3..cf16c75e9db 100644 --- a/code/__HELPERS/_lists.dm +++ b/code/__HELPERS/_lists.dm @@ -22,33 +22,44 @@ #define SANITIZE_LIST(L) ( islist(L) ? L : list() ) #define reverseList(L) reverseRange(L.Copy()) -// binary search sorted insert -// IN: Object to be inserted -// LIST: List to insert object into -// TYPECONT: The typepath of the contents of the list -// COMPARE: The variable on the objects to compare -#define BINARY_INSERT(IN, LIST, TYPECONT, COMPARE) \ - var/__BIN_CTTL = length(LIST);\ - if(!__BIN_CTTL) {\ - LIST += IN;\ - } else {\ - var/__BIN_LEFT = 1;\ - var/__BIN_RIGHT = __BIN_CTTL;\ - var/__BIN_MID = (__BIN_LEFT + __BIN_RIGHT) >> 1;\ - var/##TYPECONT/__BIN_ITEM;\ - while(__BIN_LEFT < __BIN_RIGHT) {\ - __BIN_ITEM = LIST[__BIN_MID];\ - if(__BIN_ITEM.##COMPARE <= IN.##COMPARE) {\ - __BIN_LEFT = __BIN_MID + 1;\ - } else {\ - __BIN_RIGHT = __BIN_MID;\ +/// Passed into BINARY_INSERT to compare keys +#define COMPARE_KEY __BIN_LIST[__BIN_MID] +/// Passed into BINARY_INSERT to compare values +#define COMPARE_VALUE __BIN_LIST[__BIN_LIST[__BIN_MID]] + +/**** + * Binary search sorted insert + * INPUT: Object to be inserted + * LIST: List to insert object into + * TYPECONT: The typepath of the contents of the list + * COMPARE: The object to compare against, usualy the same as INPUT + * COMPARISON: The variable on the objects to compare + */ +#define BINARY_INSERT(INPUT, LIST, TYPECONT, COMPARE, COMPARISON, COMPTYPE) \ + do {\ + var/list/__BIN_LIST = LIST;\ + var/__BIN_CTTL = length(__BIN_LIST);\ + if(!__BIN_CTTL) {\ + __BIN_LIST += INPUT;\ + } else {\ + var/__BIN_LEFT = 1;\ + var/__BIN_RIGHT = __BIN_CTTL;\ + var/__BIN_MID = (__BIN_LEFT + __BIN_RIGHT) >> 1;\ + var/##TYPECONT/__BIN_ITEM;\ + while(__BIN_LEFT < __BIN_RIGHT) {\ + __BIN_ITEM = COMPTYPE;\ + if(__BIN_ITEM.##COMPARISON <= COMPARE.##COMPARISON) {\ + __BIN_LEFT = __BIN_MID + 1;\ + } else {\ + __BIN_RIGHT = __BIN_MID;\ + };\ + __BIN_MID = (__BIN_LEFT + __BIN_RIGHT) >> 1;\ };\ - __BIN_MID = (__BIN_LEFT + __BIN_RIGHT) >> 1;\ + __BIN_ITEM = COMPTYPE;\ + __BIN_MID = __BIN_ITEM.##COMPARISON > COMPARE.##COMPARISON ? __BIN_MID : __BIN_MID + 1;\ + __BIN_LIST.Insert(__BIN_MID, INPUT);\ };\ - __BIN_ITEM = LIST[__BIN_MID];\ - __BIN_MID = __BIN_ITEM.##COMPARE > IN.##COMPARE ? __BIN_MID : __BIN_MID + 1;\ - LIST.Insert(__BIN_MID, IN);\ - } + } while(FALSE) //Returns a list in plain english as a string /proc/english_list(list/input, nothing_text = "nothing", and_text = " and ", comma_text = ", ", final_comma_text = "" ) @@ -72,27 +83,6 @@ return "[output][and_text][input[index]]" -//Returns list element or null. Should prevent "index out of bounds" error. -/proc/listgetindex(list/L, index) - if(LAZYLEN(L)) - if(isnum(index) && ISINTEGER(index)) - if(ISINRANGE(index,1,L.len)) - return L[index] - else if(index in L) - return L[index] - return - -//Return either pick(list) or null if list is not of type /list or is empty -/proc/safepick(list/L) - if(LAZYLEN(L)) - return pick(L) - -//Checks if the list is empty -/proc/isemptylist(list/L) - if(!L.len) - return TRUE - return FALSE - //Checks for specific types in a list /proc/is_type_in_list(atom/A, list/L) if(!LAZYLEN(L) || !A) @@ -105,24 +95,6 @@ //Checks for specific types in specifically structured (Assoc "type" = TRUE) lists ('typecaches') #define is_type_in_typecache(A, L) (A && length(L) && L[(ispath(A) ? A : A:type)]) -//Checks for a string in a list -/proc/is_string_in_list(string, list/L) - if(!LAZYLEN(L) || !string) - return - for(var/V in L) - if(string == V) - return TRUE - return - -//Removes a string from a list -/proc/remove_strings_from_list(string, list/L) - if(!LAZYLEN(L) || !string) - return - for(var/V in L) - if(V == string) - L -= V //No return here so that it removes all strings of that type - return - //returns a new list with only atoms that are in typecache L /proc/typecache_filter_list(list/atoms, list/typecache) RETURN_TYPE(/list) @@ -175,12 +147,6 @@ L[T] = TRUE return L -//Empties the list by setting the length to 0. Hopefully the elements get garbage collected -/proc/clearlist(list/list) - if(istype(list)) - list.len = 0 - return - //Removes any null entries from the list //Returns TRUE if the list had nulls, FALSE otherwise /proc/listclearnulls(list/L) diff --git a/code/__HELPERS/_logging.dm b/code/__HELPERS/_logging.dm index 68f1d8dc605..363a36295a0 100644 --- a/code/__HELPERS/_logging.dm +++ b/code/__HELPERS/_logging.dm @@ -148,6 +148,9 @@ if (CONFIG_GET(flag/log_vote)) WRITE_LOG(GLOB.world_game_log, "VOTE: [text]") +/proc/log_shuttle(text) + if (CONFIG_GET(flag/log_shuttle)) + WRITE_LOG(GLOB.world_shuttle_log, "SHUTTLE: [text]") /proc/log_topic(text) WRITE_LOG(GLOB.world_game_log, "TOPIC: [text]") diff --git a/code/__HELPERS/_string_lists.dm b/code/__HELPERS/_string_lists.dm index f2f57bb15db..32c2dc213ec 100644 --- a/code/__HELPERS/_string_lists.dm +++ b/code/__HELPERS/_string_lists.dm @@ -1,4 +1,5 @@ #define pick_list(FILE, KEY) (pick(strings(FILE, KEY))) +#define pick_list_weighted(FILE, KEY) (pickweight(strings(FILE, KEY))) #define pick_list_replacements(FILE, KEY) (strings_replacement(FILE, KEY)) #define json_load(FILE) (json_decode(file2text(FILE))) diff --git a/code/__HELPERS/cmp.dm b/code/__HELPERS/cmp.dm index b0d606ea951..03ba8790530 100644 --- a/code/__HELPERS/cmp.dm +++ b/code/__HELPERS/cmp.dm @@ -35,7 +35,7 @@ GLOBAL_VAR_INIT(cmp_field, "name") /proc/cmp_datum_text_dsc(datum/a, datum/b, variable) return sorttext(a.vars[variable], b.vars[variable]) - + /proc/cmp_ckey_asc(client/a, client/b) return sorttext(b.ckey, a.ckey) @@ -51,6 +51,9 @@ GLOBAL_VAR_INIT(cmp_field, "name") /proc/cmp_subsystem_priority(datum/controller/subsystem/a, datum/controller/subsystem/b) return a.priority - b.priority +/proc/cmp_filter_data_priority(list/A, list/B) + return A["priority"] - B["priority"] + /proc/cmp_timer(datum/timedevent/a, datum/timedevent/b) return a.timeToRun - b.timeToRun diff --git a/code/__HELPERS/files.dm b/code/__HELPERS/files.dm index 84d36f9db4b..ba53368ae9c 100644 --- a/code/__HELPERS/files.dm +++ b/code/__HELPERS/files.dm @@ -20,7 +20,7 @@ continue path += choice - if(copytext(path,-1,0) != "/") //didn't choose a directory, no need to iterate again + if(copytext_char(path, -1) != "/") //didn't choose a directory, no need to iterate again break var/extensions for(var/i in valid_extensions) diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm index 2a9ffa8a310..f3ff9dcf1ae 100644 --- a/code/__HELPERS/game.dm +++ b/code/__HELPERS/game.dm @@ -152,11 +152,11 @@ /proc/recursive_hear_check(O) var/list/processing_list = list(O) . = list() - while(processing_list.len) - var/atom/A = processing_list[1] + var/i = 0 + while(i < length(processing_list)) + var/atom/A = processing_list[++i] if(A.flags_1 & HEAR_1) . += A - processing_list.Cut(1, 2) processing_list += A.contents /** recursive_organ_check @@ -196,56 +196,12 @@ return -// Better recursive loop, technically sort of not actually recursive cause that shit is retarded, enjoy. -//No need for a recursive limit either -/proc/recursive_mob_check(atom/O,client_check=1,sight_check=1,include_radio=1) - - var/list/processing_list = list(O) - var/list/processed_list = list() - var/list/found_mobs = list() - - while(processing_list.len) - - var/atom/A = processing_list[1] - var/passed = 0 - - if(ismob(A)) - var/mob/A_tmp = A - passed=1 - - if(client_check && !A_tmp.client) - passed=0 - - if(sight_check && !isInSight(A_tmp, O)) - passed=0 - - else if(include_radio && istype(A, /obj/item/radio)) - passed=1 - - if(sight_check && !isInSight(A, O)) - passed=0 - - if(passed) - found_mobs |= A - - for(var/atom/B in A) - if(!processed_list[B]) - processing_list |= B - - processing_list.Cut(1, 2) - processed_list[A] = A - - return found_mobs - - /proc/get_hearers_in_view(R, atom/source) // Returns a list of hearers in view(R) from source (ignoring luminosity). Used in saycode. var/turf/T = get_turf(source) . = list() - if(!T) return - var/list/processing_list = list() if (R == 0) // if the range is zero, we know exactly where to look for, we can skip view processing_list += T.contents // We can shave off one iteration by assuming turfs cannot hear @@ -258,11 +214,12 @@ processing_list += O T.luminosity = lum - while(processing_list.len) // recursive_hear_check inlined here - var/atom/A = processing_list[1] + var/i = 0 + while(i < length(processing_list)) // recursive_hear_check inlined here + var/atom/A = processing_list[++i] if(A.flags_1 & HEAR_1) . += A - processing_list.Cut(1, 2) + SEND_SIGNAL(A, COMSIG_ATOM_HEARER_IN_VIEW, processing_list, .) processing_list += A.contents /proc/get_mobs_in_radio_ranges(list/obj/item/radio/radios) @@ -272,7 +229,6 @@ if(R) . |= get_hearers_in_view(R.canhear_range, R) - #define SIGNV(X) ((X<0)?-1:1) /proc/inLineOfSight(X1,Y1,X2,Y2,Z=1,PX1=16.5,PY1=16.5,PX2=16.5,PY2=16.5) @@ -452,7 +408,7 @@ var/list/result = list() for(var/m in group) var/mob/M = m - if(!M.key || !M.client || (ignore_category && GLOB.poll_ignore[ignore_category] && M.ckey in GLOB.poll_ignore[ignore_category])) + if(!M.key || !M.client || (ignore_category && GLOB.poll_ignore[ignore_category] && (M.ckey in GLOB.poll_ignore[ignore_category]))) continue if(be_special_flag) if(!(M.client.prefs) || !(be_special_flag in M.client.prefs.be_special)) diff --git a/code/__HELPERS/global_lists.dm b/code/__HELPERS/global_lists.dm index 07a0bdb0df3..834ecbe88b7 100644 --- a/code/__HELPERS/global_lists.dm +++ b/code/__HELPERS/global_lists.dm @@ -31,7 +31,7 @@ init_sprite_accessory_subtypes(/datum/sprite_accessory/wings, GLOB.r_wings_list,roundstart = TRUE) init_sprite_accessory_subtypes(/datum/sprite_accessory/caps, GLOB.caps_list) init_sprite_accessory_subtypes(/datum/sprite_accessory/moth_wings, GLOB.moth_wings_list) - + init_sprite_accessory_subtypes(/datum/sprite_accessory/moth_markings, GLOB.moth_markings_list) //Species for(var/spath in subtypesof(/datum/species)) @@ -52,7 +52,7 @@ // Keybindings init_keybindings() - + GLOB.emote_list = init_emote_list() init_subtypes(/datum/crafting_recipe, GLOB.crafting_recipes) diff --git a/code/__HELPERS/icons.dm b/code/__HELPERS/icons.dm index 1944cff9c61..53eec1504d6 100644 --- a/code/__HELPERS/icons.dm +++ b/code/__HELPERS/icons.dm @@ -981,7 +981,7 @@ world var/icon/atom_icon = new(A.icon, A.icon_state) if(!letter) - letter = copytext(A.name, 1, 2) + letter = A.name[1] if(uppercase == 1) letter = uppertext(letter) else if(uppercase == -1) @@ -1109,7 +1109,7 @@ GLOBAL_LIST_INIT(freon_color_matrix, list("#2E5E69", "#60A2A8", "#A1AFB1", rgb(0 WRITE_FILE(GLOB.iconCache[iconKey], icon) var/iconData = GLOB.iconCache.ExportText(iconKey) var/list/partial = splittext(iconData, "{") - return replacetext(copytext(partial[2], 3, -5), "\n", "") + return replacetext(copytext_char(partial[2], 3, -5), "\n", "") /proc/icon2html(thing, target, icon_state, dir, frame = 1, moving = FALSE) if (!thing) diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm index 6291085b314..b0e42aff3fc 100644 --- a/code/__HELPERS/mobs.dm +++ b/code/__HELPERS/mobs.dm @@ -341,7 +341,7 @@ GLOBAL_LIST_EMPTY(species_list) drifting = 0 user_loc = user.loc - if(L && !CHECK_MULTIPLE_BITFIELDS(L.mobility_flags, required_mobility_flags)) + if(L && !((L.mobility_flags & required_mobility_flags) == required_mobility_flags)) . = 0 break @@ -431,7 +431,7 @@ GLOBAL_LIST_EMPTY(species_list) continue if(M.stat != DEAD && !override) continue - if(speaker_key && speaker_key in ignoring) + if(speaker_key && (speaker_key in ignoring)) continue switch(message_type) @@ -441,6 +441,9 @@ GLOBAL_LIST_EMPTY(species_list) if(DEADCHAT_ARRIVALRATTLE) if(toggles & DISABLE_ARRIVALRATTLE) continue + if(DEADCHAT_LAWCHANGE) + if(!(chat_toggles & CHAT_GHOSTLAWS)) + continue if(isobserver(M)) var/rendered_message = message diff --git a/code/__HELPERS/names.dm b/code/__HELPERS/names.dm index e56e5bae113..b204803c652 100644 --- a/code/__HELPERS/names.dm +++ b/code/__HELPERS/names.dm @@ -67,10 +67,11 @@ GLOBAL_VAR(command_name) name = "" // Prefix - for(var/holiday_name in SSevents.holidays) - if(holiday_name == "Friday the 13th") - random = 13 + var/holiday_name = pick(SSevents.holidays) + if(holiday_name) var/datum/holiday/holiday = SSevents.holidays[holiday_name] + if(istype(holiday, /datum/holiday/friday_thirteenth)) + random = 13 name = holiday.getStationPrefix() //get normal name if(!name) @@ -167,7 +168,7 @@ GLOBAL_DATUM(syndicate_code_response_regex, /regex) var/threats = strings(ION_FILE, "ionthreats") var/foods = strings(ION_FILE, "ionfood") var/drinks = strings(ION_FILE, "iondrinks") - var/list/locations = GLOB.teleportlocs.len ? GLOB.teleportlocs : drinks //if null, defaults to drinks instead. + var/locations = strings(LOCATIONS_FILE, "locations") var/list/names = list() for(var/datum/data/record/t in GLOB.data_core.general)//Picks from crew manifest. @@ -200,7 +201,7 @@ GLOBAL_DATUM(syndicate_code_response_regex, /regex) . += pick(get_all_jobs())//Returns a job. safety -= 1 if(2) - switch(rand(1,3))//Food, drinks, or things. Only selectable once. + switch(rand(1,3))//Food, drinks, or places. Only selectable once. if(1) . += lowertext(pick(drinks)) if(2) diff --git a/code/__HELPERS/pronouns.dm b/code/__HELPERS/pronouns.dm index ae803b8c8f1..bfe09ba370c 100644 --- a/code/__HELPERS/pronouns.dm +++ b/code/__HELPERS/pronouns.dm @@ -28,10 +28,10 @@ . = "does" /datum/proc/p_theyve(capitalized, temp_gender) - . = p_they(capitalized, temp_gender) + "'" + copytext(p_have(temp_gender), 3) + . = p_they(capitalized, temp_gender) + "'" + copytext_char(p_have(temp_gender), 3) /datum/proc/p_theyre(capitalized, temp_gender) - . = p_they(capitalized, temp_gender) + "'" + copytext(p_are(temp_gender), 2) + . = p_they(capitalized, temp_gender) + "'" + copytext_char(p_are(temp_gender), 2) /datum/proc/p_s(temp_gender) //is this a descriptive proc name, or what? . = "s" diff --git a/code/__HELPERS/radio.dm b/code/__HELPERS/radio.dm index c55fb8095de..1d3c9bf3441 100644 --- a/code/__HELPERS/radio.dm +++ b/code/__HELPERS/radio.dm @@ -1,6 +1,6 @@ // Ensure the frequency is within bounds of what it should be sending/receiving at /proc/sanitize_frequency(frequency, free = FALSE) - . = round(frequency) + frequency = round(frequency) if(free) . = CLAMP(frequency, MIN_FREE_FREQ, MAX_FREE_FREQ) else diff --git a/code/__HELPERS/roundend.dm b/code/__HELPERS/roundend.dm index 9132a378d32..e173231ffdf 100644 --- a/code/__HELPERS/roundend.dm +++ b/code/__HELPERS/roundend.dm @@ -188,10 +188,16 @@ cb.InvokeAsync() LAZYCLEARLIST(round_end_events) + var/speed_round = FALSE + if(world.time - SSticker.round_start_time <= 300 SECONDS) + speed_round = TRUE + for(var/client/C in GLOB.clients) if(!C.credits) C.RollCredits() C.playtitlemusic(40) + if(speed_round) + C.give_award(/datum/award/achievement/misc/speed_round, C.mob) var/popcount = gather_roundend_feedback() display_report(popcount) diff --git a/code/__HELPERS/sanitize_values.dm b/code/__HELPERS/sanitize_values.dm index 467deee6e37..9a2e18f3156 100644 --- a/code/__HELPERS/sanitize_values.dm +++ b/code/__HELPERS/sanitize_values.dm @@ -16,7 +16,7 @@ return value if(default) return default - + /proc/sanitize_inlist(value, list/List, default) if(value in List) return value @@ -49,24 +49,30 @@ if(!istext(color)) color = "" - var/start = 1 + (text2ascii(color,1)==35) + var/start = 1 + (text2ascii(color, 1) == 35) var/len = length(color) - var/step_size = 1 + ((len+1)-start != desired_format) + var/char = "" + // RRGGBB -> RGB but awful + var/convert_to_shorthand = desired_format == 3 && length_char(color) > 3 . = "" - for(var/i=start, i<=len, i+=step_size) - var/ascii = text2ascii(color,i) - switch(ascii) - if(48 to 57) - . += ascii2text(ascii) //numbers 0 to 9 - if(97 to 102) - . += ascii2text(ascii) //letters a to f - if(65 to 70) - . += ascii2text(ascii+32) //letters A to F - translates to lowercase + var/i = start + while(i <= len) + char = color[i] + switch(text2ascii(char)) + if(48 to 57) //numbers 0 to 9 + . += char + if(97 to 102) //letters a to f + . += char + if(65 to 70) //letters A to F + . += lowertext(char) else break + i += length(char) + if(convert_to_shorthand && i <= len) //skip next one + i += length(color[i]) - if(length(.) != desired_format) + if(length_char(.) != desired_format) if(default) return default return crunch + repeat_string(desired_format, "0") @@ -74,7 +80,9 @@ return crunch + . /proc/sanitize_ooccolor(color) - var/list/HSL = rgb2hsl(hex2num(copytext(color,2,4)),hex2num(copytext(color,4,6)),hex2num(copytext(color,6,8))) + if(length(color) != length_char(color)) + CRASH("Invalid characters in color '[color]'") + var/list/HSL = rgb2hsl(hex2num(copytext(color, 2, 4)), hex2num(copytext(color, 4, 6)), hex2num(copytext(color, 6, 8))) HSL[3] = min(HSL[3],0.4) var/list/RGB = hsl2rgb(arglist(HSL)) return "#[num2hex(RGB[1],2)][num2hex(RGB[2],2)][num2hex(RGB[3],2)]" diff --git a/code/__HELPERS/shell.dm b/code/__HELPERS/shell.dm index eed86a3bd10..35a8e4635b4 100644 --- a/code/__HELPERS/shell.dm +++ b/code/__HELPERS/shell.dm @@ -55,6 +55,6 @@ if(bad_chars) bad_match = url_encode(bad_chars_regex.match) scrubbed_url += bad_match - last_good = bad_chars + length(bad_match) + last_good = bad_chars + length(bad_chars_regex.match) while(bad_chars) . = scrubbed_url diff --git a/code/__HELPERS/text.dm b/code/__HELPERS/text.dm index 79a722c7b57..5249e37453e 100644 --- a/code/__HELPERS/text.dm +++ b/code/__HELPERS/text.dm @@ -40,8 +40,8 @@ for(var/char in repl_chars) var/index = findtext(t, char) while(index) - t = copytext(t, 1, index) + repl_chars[char] + copytext(t, index+1) - index = findtext(t, char, index+1) + t = copytext(t, 1, index) + repl_chars[char] + copytext(t, index + length(char)) + index = findtext(t, char, index + length(char)) return t /proc/sanitize_filename(t) @@ -73,22 +73,28 @@ //Returns null if there is any bad text in the string -/proc/reject_bad_text(text, max_length=512) - if(length(text) > max_length) - return //message too long - var/non_whitespace = 0 - for(var/i=1, i<=length(text), i++) - switch(text2ascii(text,i)) - if(62,60,92,47) - return //rejects the text if it contains these bad characters: <, >, \ or / - if(127 to 255) - return //rejects weird letters like � +/proc/reject_bad_text(text, max_length = 512, ascii_only = TRUE) + var/char_count = 0 + var/non_whitespace = FALSE + var/lenbytes = length(text) + var/char = "" + for(var/i = 1, i <= lenbytes, i += length(char)) + char = text[i] + char_count++ + if(char_count > max_length) + return + switch(text2ascii(char)) + if(62, 60, 92, 47) // <, >, \, / + return if(0 to 31) - return //more weird stuff + return if(32) - continue //whitespace + continue + if(127 to INFINITY) + if(ascii_only) + return else - non_whitespace = 1 + non_whitespace = TRUE if(non_whitespace) return text //only accepts the text if it has some non-spaces @@ -109,73 +115,84 @@ else return trim(html_encode(name), max_length) +#define NO_CHARS_DETECTED 0 +#define SPACES_DETECTED 1 +#define SYMBOLS_DETECTED 2 +#define NUMBERS_DETECTED 3 +#define LETTERS_DETECTED 4 + //Filters out undesirable characters from names -/proc/reject_bad_name(t_in, allow_numbers=0, max_length=MAX_NAME_LEN) - if(!t_in || length(t_in) > max_length) - return //Rejects the input if it is null or if it is longer then the max length allowed +/proc/reject_bad_name(t_in, allow_numbers = FALSE, max_length = MAX_NAME_LEN, ascii_only = TRUE) + if(!t_in) + return //Rejects the input if it is null - var/number_of_alphanumeric = 0 - var/last_char_group = 0 + var/number_of_alphanumeric = 0 + var/last_char_group = NO_CHARS_DETECTED var/t_out = "" + var/t_len = length(t_in) + var/charcount = 0 + var/char = "" - for(var/i=1, i<=length(t_in), i++) - var/ascii_char = text2ascii(t_in,i) - switch(ascii_char) + + for(var/i = 1, i <= t_len, i += length(char)) + char = t_in[i] + + switch(text2ascii(char)) // A .. Z if(65 to 90) //Uppercase Letters - t_out += ascii2text(ascii_char) number_of_alphanumeric++ - last_char_group = 4 + last_char_group = LETTERS_DETECTED // a .. z if(97 to 122) //Lowercase Letters - if(last_char_group<2) - t_out += ascii2text(ascii_char-32) //Force uppercase first character - else - t_out += ascii2text(ascii_char) + if(last_char_group == NO_CHARS_DETECTED || last_char_group == SPACES_DETECTED || last_char_group == SYMBOLS_DETECTED) //start of a word + char = uppertext(char) number_of_alphanumeric++ - last_char_group = 4 + last_char_group = LETTERS_DETECTED // 0 .. 9 if(48 to 57) //Numbers - if(!last_char_group) - continue //suppress at start of string - if(!allow_numbers) + if(last_char_group == NO_CHARS_DETECTED || !allow_numbers) //suppress at start of string continue - t_out += ascii2text(ascii_char) number_of_alphanumeric++ - last_char_group = 3 + last_char_group = NUMBERS_DETECTED // ' - . if(39,45,46) //Common name punctuation - if(!last_char_group) + if(last_char_group == NO_CHARS_DETECTED) continue - t_out += ascii2text(ascii_char) - last_char_group = 2 + last_char_group = SYMBOLS_DETECTED // ~ | @ : # $ % & * + if(126,124,64,58,35,36,37,38,42,43) //Other symbols that we'll allow (mainly for AI) - if(!last_char_group) - continue //suppress at start of string - if(!allow_numbers) + if(last_char_group == NO_CHARS_DETECTED || !allow_numbers) //suppress at start of string continue - t_out += ascii2text(ascii_char) - last_char_group = 2 + last_char_group = SYMBOLS_DETECTED //Space if(32) - if(last_char_group <= 1) - continue //suppress double-spaces and spaces at start of string - t_out += ascii2text(ascii_char) - last_char_group = 1 + if(last_char_group == NO_CHARS_DETECTED || last_char_group == SPACES_DETECTED) //suppress double-spaces and spaces at start of string + continue + last_char_group = SPACES_DETECTED + + if(127 to INFINITY) + if(ascii_only) + continue + last_char_group = SYMBOLS_DETECTED //for now, we'll treat all non-ascii characters like symbols even though most are letters + else - return + continue + + t_out += char + charcount++ + if(charcount >= max_length) + break if(number_of_alphanumeric < 2) return //protects against tiny names like "A" and also names like "' ' ' ' ' ' ' '" - if(last_char_group == 1) - t_out = copytext(t_out,1,length(t_out)) //removes the last character (in this case a space) + if(last_char_group == SPACES_DETECTED) + t_out = copytext_char(t_out, 1, -1) //removes the last character (in this case a space) for(var/bad_name in list("space","floor","wall","r-wall","monkey","unknown","inactive ai")) //prevents these common metagamey names if(cmptext(t_out,bad_name)) @@ -183,6 +200,13 @@ return t_out +#undef NO_CHARS_DETECTED +#undef SPACES_DETECTED +#undef NUMBERS_DETECTED +#undef LETTERS_DETECTED + + + //html_encode helper proc that returns the smallest non null of two numbers //or 0 if they're both null (needed because of findtext returning 0 when a value is not present) /proc/non_zero_min(a, b) @@ -192,39 +216,6 @@ return a return (a < b ? a : b) -/* - * Text searches - */ - -//Checks the beginning of a string for a specified sub-string -//Returns the position of the substring or 0 if it was not found -/proc/dd_hasprefix(text, prefix) - var/start = 1 - var/end = length(prefix) + 1 - return findtext(text, prefix, start, end) - -//Checks the beginning of a string for a specified sub-string. This proc is case sensitive -//Returns the position of the substring or 0 if it was not found -/proc/dd_hasprefix_case(text, prefix) - var/start = 1 - var/end = length(prefix) + 1 - return findtextEx(text, prefix, start, end) - -//Checks the end of a string for a specified substring. -//Returns the position of the substring or 0 if it was not found -/proc/dd_hassuffix(text, suffix) - var/start = length(text) - length(suffix) - if(start) - return findtext(text, suffix, start, null) - return - -//Checks the end of a string for a specified substring. This proc is case sensitive -//Returns the position of the substring or 0 if it was not found -/proc/dd_hassuffix_case(text, suffix) - var/start = length(text) - length(suffix) - if(start) - return findtextEx(text, suffix, start, null) - //Checks if any of a given list of needles is in the haystack /proc/text_in_list(haystack, list/needle_list, start=1, end=0) for(var/needle in needle_list) @@ -239,23 +230,19 @@ return 1 return 0 -//Adds 'u' number of zeros ahead of the text 't' -/proc/add_zero(t, u) - while (length(t) < u) - t = "0[t]" - return t +//Adds 'char' ahead of 'text' until there are 'count' characters total +/proc/add_leading(text, count, char = " ") + text = "[text]" + var/charcount = count - length_char(text) + var/list/chars_to_add[max(charcount + 1, 0)] + return jointext(chars_to_add, char) + text -//Adds 'u' number of spaces ahead of the text 't' -/proc/add_lspace(t, u) - while(length(t) < u) - t = " [t]" - return t - -//Adds 'u' number of spaces behind the text 't' -/proc/add_tspace(t, u) - while(length(t) < u) - t = "[t] " - return t +//Adds 'char' behind 'text' until there are 'count' characters total +/proc/add_trailing(text, count, char = " ") + text = "[text]" + var/charcount = count - length_char(text) + var/list/chars_to_add[max(charcount + 1, 0)] + return text + jointext(chars_to_add, char) //Returns a string with reserved characters and spaces before the first letter removed /proc/trim_left(text) @@ -269,63 +256,47 @@ for (var/i = length(text), i > 0, i--) if (text2ascii(text, i) > 32) return copytext(text, 1, i + 1) - return "" //Returns a string with reserved characters and spaces before the first word and after the last word removed. /proc/trim(text, max_length) if(max_length) - text = copytext(text, 1, max_length) + text = copytext_char(text, 1, max_length) return trim_left(trim_right(text)) //Returns a string with the first element of the string capitalized. -/proc/capitalize(t as text) - return uppertext(copytext(t, 1, 2)) + copytext(t, 2) - -//Centers text by adding spaces to either side of the string. -/proc/dd_centertext(message, length) - var/new_message = message - var/size = length(message) - var/delta = length - size - if(size == length) - return new_message - if(size > length) - return copytext(new_message, 1, length + 1) - if(delta == 1) - return new_message + " " - if(delta % 2) - new_message = " " + new_message - delta-- - var/spaces = add_lspace("",delta/2-1) - return spaces + new_message + spaces - -//Limits the length of the text. Note: MAX_MESSAGE_LEN and MAX_NAME_LEN are widely used for this purpose -/proc/dd_limittext(message, length) - var/size = length(message) - if(size <= length) - return message - return copytext(message, 1, length + 1) - +/proc/capitalize(t) + . = t + if(t) + . = t[1] + return uppertext(.) + copytext(t, 1 + length(.)) /proc/stringmerge(text,compare,replace = "*") //This proc fills in all spaces with the "replace" var (* by default) with whatever //is in the other string at the same spot (assuming it is not a replace char). //This is used for fingerprints var/newtext = text - if(length(text) != length(compare)) - return 0 - for(var/i = 1, i < length(text), i++) - var/a = copytext(text,i,i+1) - var/b = copytext(compare,i,i+1) + var/text_it = 1 //iterators + var/comp_it = 1 + var/newtext_it = 1 + var/text_length = length(text) + var/comp_length = length(compare) + while(comp_it <= comp_length && text_it <= text_length) + var/a = text[text_it] + var/b = compare[comp_it] //if it isn't both the same letter, or if they are both the replacement character //(no way to know what it was supposed to be) if(a != b) if(a == replace) //if A is the replacement char - newtext = copytext(newtext,1,i) + b + copytext(newtext, i+1) + newtext = copytext(newtext, 1, newtext_it) + b + copytext(newtext, newtext_it + length(newtext[newtext_it])) else if(b == replace) //if B is the replacement char - newtext = copytext(newtext,1,i) + a + copytext(newtext, i+1) + newtext = copytext(newtext, 1, newtext_it) + a + copytext(newtext, newtext_it + length(newtext[newtext_it])) else //The lists disagree, Uh-oh! return 0 + text_it += length(a) + comp_it += length(b) + newtext_it += length(newtext[newtext_it]) + return newtext /proc/stringpercent(text,character = "*") @@ -334,16 +305,21 @@ if(!text || !character) return 0 var/count = 0 - for(var/i = 1, i <= length(text), i++) - var/a = copytext(text,i,i+1) + var/lentext = length(text) + var/a = "" + for(var/i = 1, i <= lentext, i += length(a)) + a = text[i] if(a == character) count++ return count /proc/reverse_text(text = "") var/new_text = "" - for(var/i = length(text); i > 0; i--) - new_text += copytext(text, i, i+1) + var/lentext = length(text) + var/letter = "" + for(var/i = 1, i <= lentext, i += length(letter)) + letter = text[i] + new_text = letter + new_text return new_text GLOBAL_LIST_INIT(zero_character_only, list("0")) @@ -366,15 +342,6 @@ GLOBAL_LIST_INIT(binary, list("0","1")) /proc/random_color() return random_string(6, GLOB.hex_characters) -/proc/add_zero2(t, u) - var/temp1 - while (length(t) < u) - t = "0[t]" - temp1 = t - if (length(t) > u) - temp1 = copytext(t,2,u+1) - return temp1 - //merges non-null characters (3rd argument) from "from" into "into". Returns result //e.g. into = "Hello World" // from = "Seeya______" @@ -387,41 +354,48 @@ GLOBAL_LIST_INIT(binary, list("0","1")) into = "" if(!istext(from)) from = "" - var/null_ascii = istext(null_char) ? text2ascii(null_char,1) : null_char - - var/previous = 0 + var/null_ascii = istext(null_char) ? text2ascii(null_char, 1) : null_char + var/copying_into = FALSE + var/char = "" var/start = 1 - var/end = length(into) + 1 - - for(var/i=1, i= text2ascii("a") && ca <= text2ascii("m")) - ca += 13 - else if(ca >= text2ascii("n") && ca <= text2ascii("z")) - ca -= 13 - else if(ca >= text2ascii("A") && ca <= text2ascii("M")) - ca += 13 - else if(ca >= text2ascii("N") && ca <= text2ascii("Z")) - ca -= 13 - result += ascii2text(ca) - return jointext(result, "") + var/lentext = length(text) + var/char = "" + var/ascii = 0 + . = "" + for(var/i = 1, i <= lentext, i += length(char)) + char = text[i] + ascii = text2ascii(char) + switch(ascii) + if(65 to 77, 97 to 109) //A to M, a to m + ascii += 13 + if(78 to 90, 110 to 122) //N to Z, n to z + ascii -= 13 + . += ascii2text(ascii) //Takes a list of values, sanitizes it down for readability and character count, //then exports it as a json file at data/npc_saves/[filename].json. @@ -607,7 +586,8 @@ GLOBAL_LIST_INIT(binary, list("0","1")) return //Regular expressions are, as usual, absolute magic - var/regex/all_invalid_symbols = new("\[^ -~]+") + //Any characters outside of 32 (space) to 126 (~) because treating things you don't understand as "magic" is really stupid + var/regex/all_invalid_symbols = new(@"[^ -~]{1}") var/list/accepted = list() for(var/string in proposed) @@ -615,34 +595,44 @@ GLOBAL_LIST_INIT(binary, list("0","1")) continue var/buffer = "" var/early_culling = TRUE - for(var/pos = 1, pos <= length(string), pos++) - var/let = copytext(string, pos, (pos + 1) % length(string)) - if(early_culling && !findtext(let,GLOB.is_alphanumeric)) + var/lentext = length(string) + var/let = "" + + for(var/pos = 1, pos <= lentext, pos += length(let)) + let = string[pos] + if(!findtext(let, GLOB.is_alphanumeric)) continue early_culling = FALSE - buffer += let - if(!findtext(buffer,GLOB.is_alphanumeric)) + buffer = copytext(string, pos) + break + if(early_culling) //Never found any letters! Bail! continue + var/punctbuffer = "" - var/cutoff = length(buffer) - for(var/pos = length(buffer), pos >= 0, pos--) - var/let = copytext(buffer, pos, (pos + 1) % length(buffer)) - if(findtext(let,GLOB.is_alphanumeric)) + var/cutoff = 0 + lentext = length_char(buffer) + for(var/pos = 1, pos <= lentext, pos++) + let = copytext_char(buffer, -pos, -pos + 1) + if(!findtext(let, GLOB.is_punctuation)) //This won't handle things like Nyaaaa!~ but that's fine break - if(findtext(let,GLOB.is_punctuation)) - punctbuffer = let + punctbuffer //Note this isn't the same thing as using += - cutoff = pos + punctbuffer += let + cutoff += length(let) if(punctbuffer) //We clip down excessive punctuation to get the letter count lower and reduce repeats. It's not perfect but it helps. var/exclaim = FALSE var/question = FALSE var/periods = 0 - for(var/pos = length(punctbuffer), pos >= 0, pos--) - var/punct = copytext(punctbuffer, pos, (pos + 1) % length(punctbuffer)) - if(!exclaim && findtext(punct,"!")) + lentext = length(punctbuffer) + for(var/pos = 1, pos <= lentext, pos += length(let)) + let = punctbuffer[pos] + if(!exclaim && findtext(let, "!")) exclaim = TRUE - if(!question && findtext(punct,"?")) + if(question) + break + if(!question && findtext(let, "?")) question = TRUE - if(!exclaim && !question && findtext(punct,".")) + if(exclaim) + break + if(!exclaim && !question && findtext(let, ".")) //? and ! take priority over periods periods += 1 if(exclaim) if(question) @@ -651,15 +641,13 @@ GLOBAL_LIST_INIT(binary, list("0","1")) punctbuffer = "!" else if(question) punctbuffer = "?" - else if(periods) - if(periods > 1) - punctbuffer = "..." - else - punctbuffer = "" //Grammer nazis be damned - buffer = copytext(buffer, 1, cutoff) + punctbuffer - if(!findtext(buffer,GLOB.is_alphanumeric)) - continue - if(!buffer || length(buffer) > 280 || length(buffer) <= cullshort || buffer in accepted) + else if(periods > 1) + punctbuffer = "..." + else + punctbuffer = "" //Grammer nazis be damned + buffer = copytext(buffer, 1, -cutoff) + punctbuffer + lentext = length_char(buffer) + if(!buffer || lentext > 280 || lentext <= cullshort || (buffer in accepted)) continue accepted += buffer @@ -670,7 +658,7 @@ GLOBAL_LIST_INIT(binary, list("0","1")) if(fexists(log)) oldjson = json_decode(file2text(log)) oldentries = oldjson["data"] - if(!isemptylist(oldentries)) + if(length(oldentries)) for(var/string in accepted) for(var/old in oldentries) if(string == old) @@ -680,7 +668,7 @@ GLOBAL_LIST_INIT(binary, list("0","1")) var/list/finalized = list() finalized = accepted.Copy() + oldentries.Copy() //we keep old and unreferenced phrases near the bottom for culling listclearnulls(finalized) - if(!isemptylist(finalized) && length(finalized) > storemax) + if(length(finalized) > storemax) finalized.Cut(storemax + 1) fdel(log) @@ -696,7 +684,7 @@ GLOBAL_LIST_INIT(binary, list("0","1")) var/leng = length(string) - var/next_space = findtext(string, " ", next_backslash + 1) + var/next_space = findtext(string, " ", next_backslash + length(string[next_backslash])) if(!next_space) next_space = leng - next_backslash @@ -704,8 +692,8 @@ GLOBAL_LIST_INIT(binary, list("0","1")) return string var/base = next_backslash == 1 ? "" : copytext(string, 1, next_backslash) - var/macro = lowertext(copytext(string, next_backslash + 1, next_space)) - var/rest = next_backslash > leng ? "" : copytext(string, next_space + 1) + var/macro = lowertext(copytext(string, next_backslash + length(string[next_backslash]), next_space)) + var/rest = next_backslash > leng ? "" : copytext(string, next_space + length(string[next_space])) //See https://secure.byond.com/docs/ref/info.html#/DM/text/macros switch(macro) @@ -781,38 +769,35 @@ GLOBAL_LIST_INIT(binary, list("0","1")) return uppertext(pick(GLOB.alphabet)) /proc/unintelligize(message) - var/prefix=copytext(message,1,2) + var/regex/word_boundaries = regex(@"\b[\S]+\b", "g") + var/prefix = message[1] if(prefix == ";") - message = copytext(message,2) - else if(prefix in list(":","#")) - prefix += copytext(message,2,3) - message = copytext(message,3) + message = copytext(message, 1 + length(prefix)) + else if(prefix in list(":", "#")) + prefix += message[1 + length(prefix)] + message = copytext(message, length(prefix)) else - prefix="" + prefix = "" - var/list/words = splittext(message," ") var/list/rearranged = list() - for(var/i=1;i<=words.len;i++) - var/cword = pick(words) - words.Remove(cword) - var/suffix = copytext(cword,length(cword)-1,length(cword)) - while(length(cword)>0 && suffix in list(".",",",";","!",":","?")) - cword = copytext(cword,1 ,length(cword)-1) - suffix = copytext(cword,length(cword)-1,length(cword) ) + while(word_boundaries.Find(message)) + var/cword = word_boundaries.match if(length(cword)) rearranged += cword - message = "[prefix][jointext(rearranged," ")]" - . = message + shuffle_inplace(rearranged) + return "[prefix][jointext(rearranged, " ")]" /proc/readable_corrupted_text(text) var/list/corruption_options = list("..", "£%", "~~\"", "!!", "*", "^", "$!", "-", "}", "?") var/corrupted_text = "" + var/lentext = length(text) + var/letter = "" // Have every letter have a chance of creating corruption on either side // Small chance of letters being removed in place of corruption - still overall readable - for(var/letter_index = 1; letter_index <= length(text); letter_index++) - var/letter = text[letter_index] + for(var/letter_index = 1, letter_index <= lentext, letter_index += length(letter)) + letter = text[letter_index] if (prob(15)) corrupted_text += pick(corruption_options) diff --git a/code/__HELPERS/type2type.dm b/code/__HELPERS/type2type.dm index 9cd1dd50af7..2026397a047 100644 --- a/code/__HELPERS/type2type.dm +++ b/code/__HELPERS/type2type.dm @@ -485,17 +485,17 @@ //assumes format #RRGGBB #rrggbb /proc/color_hex2num(A) - if(!A) + if(!A || length(A) != length_char(A)) return 0 - var/R = hex2num(copytext(A,2,4)) - var/G = hex2num(copytext(A,4,6)) - var/B = hex2num(copytext(A,6,0)) + var/R = hex2num(copytext(A, 2, 4)) + var/G = hex2num(copytext(A, 4, 6)) + var/B = hex2num(copytext(A, 6, 8)) return R+G+B //word of warning: using a matrix like this as a color value will simplify it back to a string after being set /proc/color_hex2color_matrix(string) var/length = length(string) - if(length != 7 && length != 9) + if((length != 7 && length != 9) || length != length_char(string)) return color_matrix_identity() var/r = hex2num(copytext(string, 2, 4))/255 var/g = hex2num(copytext(string, 4, 6))/255 @@ -549,26 +549,3 @@ else //regex everything else (works for /proc too) return lowertext(replacetext("[the_type]", "[type2parent(the_type)]/", "")) -/proc/strtohex(str) - if(!istext(str)||!str) - return - var/r - var/c - for(var/i = 1 to length(str)) - c= text2ascii(str,i) - r+= num2hex(c) - return r - -// Decodes hex to raw byte string. -// If safe=TRUE, returns null on incorrect input strings instead of CRASHing -/proc/hextostr(str, safe=FALSE) - if(!istext(str)||!str) - return - var/r - var/c - for(var/i = 1 to length(str)/2) - c = hex2num(copytext(str,i*2-1,i*2+1), safe) - if(isnull(c)) - return null - r += ascii2text(c) - return r diff --git a/code/__HELPERS/type_processing.dm b/code/__HELPERS/type_processing.dm index 50684c79532..05a0dd28552 100644 --- a/code/__HELPERS/type_processing.dm +++ b/code/__HELPERS/type_processing.dm @@ -31,8 +31,8 @@ /mob = "M" ) for (var/tn in TYPES_SHORTCUTS) - if (copytext(typename,1, length("[tn]/")+1)=="[tn]/" /*findtextEx(typename,"[tn]/",1,2)*/ ) - typename = TYPES_SHORTCUTS[tn]+copytext(typename,length("[tn]/")) + if(copytext(typename, 1, length("[tn]/") + 1) == "[tn]/" /*findtextEx(typename,"[tn]/",1,2)*/ ) + typename = TYPES_SHORTCUTS[tn] + copytext(typename, length("[tn]/")) break .[typename] = type diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index 76c2ad78b6e..bb3a7136815 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -6,22 +6,16 @@ //Inverts the colour of an HTML string /proc/invertHTML(HTMLstring) - - if (!( istext(HTMLstring) )) + if(!istext(HTMLstring)) CRASH("Given non-text argument!") - else - if (length(HTMLstring) != 7) - CRASH("Given non-HTML argument!") + else if(length(HTMLstring) != 7) + CRASH("Given non-HTML argument!") + else if(length_char(HTMLstring) != 7) + CRASH("Given non-hex symbols in argument!") var/textr = copytext(HTMLstring, 2, 4) var/textg = copytext(HTMLstring, 4, 6) var/textb = copytext(HTMLstring, 6, 8) - var/r = hex2num(textr) - var/g = hex2num(textg) - var/b = hex2num(textb) - textr = num2hex(255 - r, 2) - textg = num2hex(255 - g, 2) - textb = num2hex(255 - b, 2) - return text("#[][][]", textr, textg, textb) + return rgb(255 - hex2num(textr), 255 - hex2num(textg), 255 - hex2num(textb)) /proc/Get_Angle(atom/movable/start,atom/movable/end)//For beams. if(!start || !end) @@ -181,15 +175,15 @@ Turf and target are separate in case you want to teleport some distance from a t //Returns whether or not a player is a guest using their ckey as an input /proc/IsGuestKey(key) if (findtext(key, "Guest-", 1, 7) != 1) //was findtextEx - return 0 + return FALSE var/i, ch, len = length(key) - for (i = 7, i <= len, ++i) + for (i = 7, i <= len, ++i) //we know the first 6 chars are Guest- ch = text2ascii(key, i) - if (ch < 48 || ch > 57) - return 0 - return 1 + if (ch < 48 || ch > 57) //0-9 + return FALSE + return TRUE //Generalised helper proc for letting mobs rename themselves. Used to be clname() and ainame() /mob/proc/apply_pref_name(role, client/C) @@ -466,36 +460,34 @@ Turf and target are separate in case you want to teleport some distance from a t /atom/proc/GetAllContents(var/T) var/list/processing_list = list(src) - var/list/assembled = list() if(T) - while(processing_list.len) - var/atom/A = processing_list[1] - processing_list.Cut(1, 2) + . = list() + var/i = 0 + while(i < length(processing_list)) + var/atom/A = processing_list[++i] //Byond does not allow things to be in multiple contents, or double parent-child hierarchies, so only += is needed //This is also why we don't need to check against assembled as we go along processing_list += A.contents if(istype(A,T)) - assembled += A + . += A else - while(processing_list.len) - var/atom/A = processing_list[1] - processing_list.Cut(1, 2) + var/i = 0 + while(i < length(processing_list)) + var/atom/A = processing_list[++i] processing_list += A.contents - assembled += A - return assembled + return processing_list /atom/proc/GetAllContentsIgnoring(list/ignore_typecache) if(!length(ignore_typecache)) return GetAllContents() var/list/processing = list(src) - var/list/assembled = list() - while(processing.len) - var/atom/A = processing[1] - processing.Cut(1,2) + . = list() + var/i = 0 + while(i < length(processing)) + var/atom/A = processing[++i] if(!ignore_typecache[A.type]) processing += A.contents - assembled += A - return assembled + . += A //Step-towards method of determining whether one atom can see another. Similar to viewers() /proc/can_see(atom/source, atom/target, length=5) // I couldnt be arsed to do actual raycasting :I This is horribly inaccurate. @@ -1112,7 +1104,9 @@ B --><-- A A.cut_overlay(O) /proc/get_random_station_turf() - return safepick(get_area_turfs(pick(GLOB.the_station_areas))) + var/list/turfs = get_area_turfs(pick(GLOB.the_station_areas)) + if (length(turfs)) + return pick(turfs) /proc/get_safe_random_station_turf() //excludes dense turfs (like walls) and areas that have valid_territory set to FALSE for (var/i in 1 to 5) @@ -1400,7 +1394,7 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new) /proc/GUID() var/const/GUID_VERSION = "b" var/const/GUID_VARIANT = "d" - var/node_id = copytext(md5("[rand()*rand(1,9999999)][world.name][world.hub][world.hub_password][world.internet_address][world.address][world.contents.len][world.status][world.port][rand()*rand(1,9999999)]"), 1, 13) + var/node_id = copytext_char(md5("[rand()*rand(1,9999999)][world.name][world.hub][world.hub_password][world.internet_address][world.address][world.contents.len][world.status][world.port][rand()*rand(1,9999999)]"), 1, 13) var/time_high = "[num2hex(text2num(time2text(world.realtime,"YYYY")), 2)][num2hex(world.realtime, 6)]" diff --git a/code/_compile_options.dm b/code/_compile_options.dm index 3ec2510cc78..15aa07c7b9d 100644 --- a/code/_compile_options.dm +++ b/code/_compile_options.dm @@ -39,6 +39,26 @@ #error You need version 512 or higher #endif +//Compatability -- These procs were added in 513.1493, not 513.1490 +//Which really shoulda bumped us up to 514 right then and there but instead Lummox is a dumb dumb +#if DM_BUILD < 1493 +#define length_char(args...) length(args) +#define text2ascii_char(args...) text2ascii(args) +#define copytext_char(args...) copytext(args) +#define splittext_char(args...) splittext(args) +#define spantext_char(args...) spantext(args) +#define nonspantext_char(args...) nonspantext(args) +#define findtext_char(args...) findtext(args) +#define findtextEx_char(args...) findtextEx(args) +#define findlasttext_char(args...) findlasttext(args) +#define findlasttextEx_char(args...) findlasttextEx(args) +#define replacetext_char(args...) replacetext(args) +#define replacetextEx_char(args...) replacetextEx(args) +// /regex procs +#define Find_char(args...) Find(args) +#define Replace_char(args...) Replace(args) +#endif + //Additional code for the above flags. #ifdef TESTING #warn compiling in TESTING mode. testing() debug messages will be visible. diff --git a/code/_globalvars/bitfields.dm b/code/_globalvars/bitfields.dm index a4a80bb06f0..14ed32967c6 100644 --- a/code/_globalvars/bitfields.dm +++ b/code/_globalvars/bitfields.dm @@ -131,9 +131,9 @@ GLOBAL_LIST_INIT(bitfields, list( "NO_RUINS_1" = NO_RUINS_1, "PREVENT_CLICK_UNDER_1" = PREVENT_CLICK_UNDER_1, "HOLOGRAM_1" = HOLOGRAM_1, - "TESLA_IGNORE_1" = TESLA_IGNORE_1, + "SHOCKED_1" = SHOCKED_1, "INITIALIZED_1" = INITIALIZED_1, - "ADMIN_SPAWNED_1" = ADMIN_SPAWNED_1, + "ADMIN_SPAWNED_1" = ADMIN_SPAWNED_1 ), "clothing_flags" = list( "LAVAPROTECT" = LAVAPROTECT, @@ -149,12 +149,13 @@ GLOBAL_LIST_INIT(bitfields, list( "SNUG_FIT" = SNUG_FIT, "ANTI_TINFOIL_MANEUVER" = ANTI_TINFOIL_MANEUVER, ), - "tesla_flags" = list( - "TESLA_MOB_DAMAGE" = TESLA_MOB_DAMAGE, - "TESLA_OBJ_DAMAGE" = TESLA_OBJ_DAMAGE, - "TESLA_MOB_STUN" = TESLA_MOB_STUN, - "TESLA_ALLOW_DUPLICATES" = TESLA_ALLOW_DUPLICATES, - "TESLA_MACHINE_EXPLOSIVE" = TESLA_MACHINE_EXPLOSIVE, + "zap_flags" = list( + "ZAP_MOB_DAMAGE" = ZAP_MOB_DAMAGE, + "ZAP_OBJ_DAMAGE" = ZAP_OBJ_DAMAGE, + "ZAP_MOB_STUN" = ZAP_MOB_STUN, + "ZAP_ALLOW_DUPLICATES" = ZAP_ALLOW_DUPLICATES, + "ZAP_MACHINE_EXPLOSIVE" = ZAP_MACHINE_EXPLOSIVE, + "ZAP_IS_TESLA" = ZAP_IS_TESLA, ), "smooth" = list( "SMOOTH_TRUE" = SMOOTH_TRUE, @@ -195,5 +196,11 @@ GLOBAL_LIST_INIT(bitfields, list( "MOB_EPIC" = MOB_EPIC, "MOB_REPTILE" = MOB_REPTILE, "MOB_SPIRIT" = MOB_SPIRIT + ), + "machine_stat" = list ( + "BROKEN" = BROKEN, + "NOPOWER" = NOPOWER, + "MAINT" = MAINT, + "EMPED" = EMPED ) )) diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm index 1f7b93f6382..c388a8a5713 100644 --- a/code/_globalvars/lists/flavor_misc.dm +++ b/code/_globalvars/lists/flavor_misc.dm @@ -89,6 +89,7 @@ GLOBAL_LIST_INIT(ai_core_display_screens, sortList(list( "Gondola", "Goon", "Hades", + "HAL 9000", "Heartline", "Helios", "House", @@ -180,7 +181,7 @@ GLOBAL_LIST_INIT(scarySounds, list('sound/weapons/thudswoosh.ogg','sound/weapons 21 Hydroponics 22 Janitor 23 Genetics -24 Testing Range +24 Experimentor Lab 25 Toxins 26 Dormitories 27 Virology @@ -201,7 +202,7 @@ GLOBAL_LIST_INIT(TAGGERLOCATIONS, list("Disposals", "CMO Office", "Chemistry", "Research", "RD Office", "Robotics", "HoP Office", "Library", "Chapel", "Theatre", "Bar", "Kitchen", "Hydroponics", "Janitor Closet","Genetics", - "Testing Range", "Toxins", "Dormitories", "Virology", + "Experimentor Lab", "Toxins", "Dormitories", "Virology", "Xenobiology", "Law Office","Detective's Office")) GLOBAL_LIST_INIT(station_prefixes, world.file2list("strings/station_prefixes.txt") + "") diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm index 73b4208d252..a9a1db0b37b 100644 --- a/code/_globalvars/lists/maintenance_loot.dm +++ b/code/_globalvars/lists/maintenance_loot.dm @@ -16,7 +16,6 @@ GLOBAL_LIST_INIT(trash_loot, list(//junk: useless, very easy to get, or ghetto chemistry items list(//trash - /obj/item/trash = 1, /obj/item/trash/can = 1, /obj/item/trash/raisins = 1, /obj/item/trash/candy = 1, @@ -50,7 +49,6 @@ GLOBAL_LIST_INIT(trash_loot, list(//junk: useless, very easy to get, or ghetto c /obj/item/reagent_containers/food/snacks/urinalcake = 1, /obj/item/airlock_painter = 1, - /obj/item/pipe = 1, /obj/item/rack_parts = 1, /obj/item/clothing/mask/breath = 1, /obj/item/shard = 1, @@ -84,10 +82,6 @@ GLOBAL_LIST_INIT(common_loot, list( //common: basic items /obj/item/toy/crayon/spraycan = 1, ) = 1, - list(//strange objects - /obj/item/relic = 5, - ) = 1, - list(//equipment /obj/item/clothing/mask/gas = 1, /obj/item/radio/headset = 1, @@ -169,7 +163,7 @@ GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items /obj/item/grenade/iedcasing = 1, /obj/item/melee/baton/cattleprod = 1, /obj/item/throwing_star = 1, - ) = 1, + ) = 8, list(//equipment /obj/item/clothing/head/welding = 1, @@ -184,14 +178,18 @@ GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items /obj/item/clothing/mask/muzzle = 1, /obj/item/clothing/ears/earmuffs = 1, /obj/item/clothing/gloves/color/black = 1, - ) = 1, + ) = 8, + + list(//strange objects + /obj/item/relic = 5, + ) = 8, list(//construction and crafting /obj/item/stock_parts/cell/high = 1, /obj/item/stack/sheet/mineral/wood/fifty = 1, /obj/item/beacon = 1, /obj/item/weaponcrafting/receiver = 1, - ) = 1, + ) = 8, list(//medical and chemicals list(//basic healing items @@ -212,7 +210,7 @@ GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items /obj/item/watertank = 1, /obj/item/watertank/janitor = 1, ) = 1, - ) = 1, + ) = 8, list(//food /obj/item/reagent_containers/food/snacks/canned/peaches/maint = 1, @@ -223,15 +221,27 @@ GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items /obj/item/storage/box/donkpockets/donkpocketpizza = 1, /obj/item/storage/box/donkpockets/donkpocketberry = 1, /obj/item/storage/box/donkpockets/donkpockethonk = 1, - ) = 1, + ) = 1, /obj/item/reagent_containers/food/snacks/monkeycube = 1, + ) = 8, + + list(//fakeout items, keep this list at low relative weight + /obj/item/dice/d20 = 1, //To balance out the stealth die of fates in oddities + /obj/item/clothing/shoes/jackboots = 1, ) = 1, )) GLOBAL_LIST_INIT(oddity_loot, list(//oddity: strange or crazy items - //keeping commented out until there are more, otherwise the same ones may appear too often - // /obj/effect/rune/teleport = 1, - "" = 1 //nothing, so loot spawner doesn't break while nothing else is here + /obj/effect/rune/teleport = 1, + /obj/item/clothing/gloves/color/yellow = 1, + /obj/item/clothing/head/helmet/abductor = 1, + /obj/item/clothing/head/helmet/justice =1, + /obj/item/clothing/suit/space/hardsuit/carp = 1, + /obj/item/dice/d20/fate/stealth/one_use = 1, //Looks like a d20, keep the d20 in the uncommon pool. + /obj/item/dice/d20/fate/stealth/cursed = 1, //Only rolls 1 + /obj/item/clothing/shoes/jackboots/fast = 1, + /obj/item/clothing/suit/armor/reactive/table = 1, + /obj/item/storage/box/donkpockets/donkpocketgondola = 1 )) //Maintenance loot spawner pools diff --git a/code/_globalvars/lists/mobs.dm b/code/_globalvars/lists/mobs.dm index 5635cd7b3e7..6b675d78400 100644 --- a/code/_globalvars/lists/mobs.dm +++ b/code/_globalvars/lists/mobs.dm @@ -64,12 +64,16 @@ GLOBAL_LIST_EMPTY(emote_list) . = list() for(var/path in subtypesof(/datum/emote)) var/datum/emote/E = new path() - if(!.[E.key]) - .[E.key] = list(E) - else - .[E.key] += E - - if(!.[E.key_third_person]) - .[E.key_third_person] = list(E) - else - .[E.key_third_person] |= E + if(E.key) + if(!.[E.key]) + .[E.key] = list(E) + else + .[E.key] += E + else if(E.message) //Assuming all non-base emotes have this + stack_trace("Keyless emote: [E.type]") + + if(E.key_third_person) //This one is optional + if(!.[E.key_third_person]) + .[E.key_third_person] = list(E) + else + .[E.key_third_person] |= E diff --git a/code/_globalvars/lists/objects.dm b/code/_globalvars/lists/objects.dm index 14c752613bf..6dcc6225799 100644 --- a/code/_globalvars/lists/objects.dm +++ b/code/_globalvars/lists/objects.dm @@ -10,6 +10,7 @@ GLOBAL_LIST_EMPTY(navbeacons) //list of all bot nagivation beacons, used GLOBAL_LIST_EMPTY(teleportbeacons) //list of all tracking beacons used by teleporters GLOBAL_LIST_EMPTY(deliverybeacons) //list of all MULEbot delivery beacons. GLOBAL_LIST_EMPTY(deliverybeacontags) //list of all tags associated with delivery beacons. +GLOBAL_LIST_EMPTY(wayfindingbeacons) //list of all navigation beacons used by wayfinding pinpointers GLOBAL_LIST_EMPTY(nuke_list) GLOBAL_LIST_EMPTY(alarmdisplay) //list of all machines or programs that can display station alerts GLOBAL_LIST_EMPTY(singularities) //list of all singularities on the station (actually technically all engines) diff --git a/code/_globalvars/lists/poll_ignore.dm b/code/_globalvars/lists/poll_ignore.dm index 580caa1ad49..98c801c1ff0 100644 --- a/code/_globalvars/lists/poll_ignore.dm +++ b/code/_globalvars/lists/poll_ignore.dm @@ -14,7 +14,6 @@ #define POLL_IGNORE_SWARMER "swarmer" #define POLL_IGNORE_DRONE "drone" #define POLL_IGNORE_FUGITIVE "fugitive" -#define POLL_IGNORE_DEFECTIVECLONE "defective_clone" #define POLL_IGNORE_PYROSLIME "slime" #define POLL_IGNORE_SHADE "shade" #define POLL_IGNORE_IMAGINARYFRIEND "imaginary_friend" @@ -38,7 +37,6 @@ GLOBAL_LIST_INIT(poll_ignore_desc, list( POLL_IGNORE_SWARMER = "Swarmer shells", POLL_IGNORE_DRONE = "Drone shells", POLL_IGNORE_FUGITIVE = "Fugitive Hunter", - POLL_IGNORE_DEFECTIVECLONE = "Defective clone", POLL_IGNORE_PYROSLIME = "Slime", POLL_IGNORE_SHADE = "Shade", POLL_IGNORE_IMAGINARYFRIEND = "Imaginary Friend", diff --git a/code/_globalvars/logging.dm b/code/_globalvars/logging.dm index 0693158a653..2e0a70dcdcf 100644 --- a/code/_globalvars/logging.dm +++ b/code/_globalvars/logging.dm @@ -40,6 +40,8 @@ GLOBAL_VAR(world_paper_log) GLOBAL_PROTECT(world_paper_log) GLOBAL_VAR(tgui_log) GLOBAL_PROTECT(tgui_log) +GLOBAL_VAR(world_shuttle_log) +GLOBAL_PROTECT(world_shuttle_log) GLOBAL_LIST_EMPTY(bombers) GLOBAL_PROTECT(bombers) diff --git a/code/_globalvars/traits.dm b/code/_globalvars/traits.dm index 2ef042b9680..83ea9fefb6c 100644 --- a/code/_globalvars/traits.dm +++ b/code/_globalvars/traits.dm @@ -14,6 +14,7 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_HUSK" = TRAIT_HUSK, "TRAIT_BADDNA" = TRAIT_BADDNA, "TRAIT_CLUMSY" = TRAIT_CLUMSY, + "TRAIT_CHUNKYFINGERS" = TRAIT_CHUNKYFINGERS, "TRAIT_DUMB" = TRAIT_DUMB, "TRAIT_MONKEYLIKE" = TRAIT_MONKEYLIKE, "TRAIT_PACIFISM" = TRAIT_PACIFISM, @@ -23,10 +24,12 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_FAKEDEATH" = TRAIT_FAKEDEATH, "TRAIT_DISFIGURED" = TRAIT_DISFIGURED, "TRAIT_XENO_HOST" = TRAIT_XENO_HOST, + "TRAIT_STUNRESISTANCE" = TRAIT_STUNRESISTANCE, "TRAIT_STUNIMMUNE" = TRAIT_STUNIMMUNE, "TRAIT_SLEEPIMMUNE" = TRAIT_SLEEPIMMUNE, "TRAIT_PUSHIMMUNE" = TRAIT_PUSHIMMUNE, "TRAIT_SHOCKIMMUNE" = TRAIT_SHOCKIMMUNE, + "TRAIT_TESLA_SHOCKIMMUNE" = TRAIT_TESLA_SHOCKIMMUNE, "TRAIT_STABLEHEART" = TRAIT_STABLEHEART, "TRAIT_STABLELIVER" = TRAIT_STABLELIVER, "TRAIT_RESISTHEAT" = TRAIT_RESISTHEAT, @@ -84,10 +87,17 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_LAW_ENFORCEMENT_METABOLISM" = TRAIT_LAW_ENFORCEMENT_METABOLISM, "TRAIT_ALWAYS_CLEAN" = TRAIT_ALWAYS_CLEAN, "TRAIT_BOOZE_SLIDER" = TRAIT_BOOZE_SLIDER, + "TRAIT_QUICK_CARRY" = TRAIT_QUICK_CARRY, + "TRAIT_QUICKER_CARRY" = TRAIT_QUICKER_CARRY, "TRAIT_UNINTELLIGIBLE_SPEECH" = TRAIT_UNINTELLIGIBLE_SPEECH, "TRAIT_UNSTABLE" = TRAIT_UNSTABLE, "TRAIT_OIL_FRIED" = TRAIT_OIL_FRIED, - "TRAIT_XENO_IMMUNE" = TRAIT_XENO_IMMUNE + "TRAIT_MEDICAL_HUD" = TRAIT_MEDICAL_HUD, + "TRAIT_SECURITY_HUD" = TRAIT_SECURITY_HUD, + "TRAIT_PASSTABLE" = TRAIT_PASSTABLE, + "TRAIT_NOFLASH" = TRAIT_NOFLASH, + "TRAIT_XENO_IMMUNE" = TRAIT_XENO_IMMUNE, + "TRAIT_NAIVE" = TRAIT_NAIVE ), /obj/item/bodypart = list( "TRAIT_PARALYSIS" = TRAIT_PARALYSIS diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index f8d9ebbbab9..5fe96c168ac 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -300,9 +300,10 @@ /mob/proc/ShiftClickOn(atom/A) A.ShiftClick(src) return + /atom/proc/ShiftClick(mob/user) - SEND_SIGNAL(src, COMSIG_CLICK_SHIFT, user) - if(user.client && user.client.eye == user || user.client.eye == user.loc) + var/flags = SEND_SIGNAL(src, COMSIG_CLICK_SHIFT, user) + if(user.client && (user.client.eye == user || user.client.eye == user.loc || flags & COMPONENT_ALLOW_EXAMINATE)) user.examinate(src) return diff --git a/code/_onclick/hud/_defines.dm b/code/_onclick/hud/_defines.dm index 1e9a9173022..0233a4e0274 100644 --- a/code/_onclick/hud/_defines.dm +++ b/code/_onclick/hud/_defines.dm @@ -108,8 +108,9 @@ #define ui_mood "EAST-1:28,CENTER-3:10" //living -#define ui_living_pull "EAST-1:28,CENTER-2:15" +#define ui_living_pull "EAST-1:28,CENTER-3:15" #define ui_living_health "EAST-1:28,CENTER:15" +#define ui_living_healthdoll "EAST-1:28,CENTER-2:13" //borgs #define ui_borg_health "EAST-1:28,CENTER-1:15" //borgs have the health display where humans have the pressure damage indicator. diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm index 0374a855652..61bc30a8352 100644 --- a/code/_onclick/hud/alert.dm +++ b/code/_onclick/hud/alert.dm @@ -42,7 +42,7 @@ thealert.override_alerts = override if(override) thealert.timeout = null - thealert.mob_viewer = src + thealert.owner = src if(new_master) var/old_layer = new_master.layer @@ -97,7 +97,7 @@ var/severity = 0 var/alerttooltipstyle = "" var/override_alerts = FALSE //If it is overriding other alerts of the same type - var/mob/mob_viewer //the mob viewing this alert + var/mob/owner //Alert owner /obj/screen/alert/MouseEntered(location,control,params) @@ -227,6 +227,8 @@ or something covering your eyes." /obj/screen/alert/mind_control/Click() var/mob/living/L = usr + if(L != owner) + return to_chat(L, "[command]") /obj/screen/alert/drunk //Not implemented @@ -241,7 +243,7 @@ If you're feeling frisky, examine yourself and click the underlined item to pull icon_state = "embeddedobject" /obj/screen/alert/embeddedobject/Click() - if(isliving(usr)) + if(isliving(usr) && usr == owner) var/mob/living/carbon/human/M = usr return M.help_shake_act(M) @@ -270,7 +272,7 @@ or shoot a gun to move around via Newton's 3rd Law of Motion." /obj/screen/alert/fire/Click() var/mob/living/L = usr - if(!istype(L) || !L.can_resist()) + if(!istype(L) || !L.can_resist() || L != owner) return L.changeNext_move(CLICK_CD_RESIST) if(L.mobility_flags & MOBILITY_MOVE) @@ -330,10 +332,10 @@ or shoot a gun to move around via Newton's 3rd Law of Motion." /obj/screen/alert/bloodsense/process() var/atom/blood_target - if(!mob_viewer.mind) + if(!owner.mind) return - var/datum/antagonist/cult/antag = mob_viewer.mind.has_antag_datum(/datum/antagonist/cult,TRUE) + var/datum/antagonist/cult/antag = owner.mind.has_antag_datum(/datum/antagonist/cult,TRUE) if(!antag) return var/datum/objective/sacrifice/sac_objective = locate() in antag.cult_team.objectives @@ -370,7 +372,7 @@ or shoot a gun to move around via Newton's 3rd Law of Motion." add_overlay(narnar) return var/turf/P = get_turf(blood_target) - var/turf/Q = get_turf(mob_viewer) + var/turf/Q = get_turf(owner) if(!P || !Q || (P.z != Q.z)) //The target is on a different Z level, we cannot sense that far. icon_state = "runed_sense2" desc = "You can no longer sense your target's presence." @@ -460,6 +462,11 @@ Recharging stations are available in robotics, the dormitory bathrooms, and the desc = "Your blood's electric charge is running low, find a source of charge for your blood. Use a recharging station found in robotics or the dormitory bathrooms, or eat some Ethereal-friendly food." icon_state = "etherealcharge" +/obj/screen/alert/ethereal_overcharge + name = "Blood Overcharge" + desc = "Your blood's electric charge is becoming dangerously high, find an outlet for your energy. Use Grab Intent on an APC to channel your energy into it." + icon_state = "ethereal_overcharge" + //Need to cover all use cases - emag, illegal upgrade module, malf AI hack, traitor cyborg /obj/screen/alert/hacked name = "Hacked" @@ -489,7 +496,7 @@ so as to remain in compliance with the most up-to-date laws." var/atom/target = null /obj/screen/alert/hackingapc/Click() - if(!usr || !usr.client) + if(!usr || !usr.client || usr != owner) return if(!target) return @@ -515,7 +522,7 @@ so as to remain in compliance with the most up-to-date laws." timeout = 300 /obj/screen/alert/notify_cloning/Click() - if(!usr || !usr.client) + if(!usr || !usr.client || usr != owner) return var/mob/dead/observer/G = usr G.reenter_corpse() @@ -529,7 +536,7 @@ so as to remain in compliance with the most up-to-date laws." var/action = NOTIFY_JUMP /obj/screen/alert/notify_action/Click() - if(!usr || !usr.client) + if(!usr || !usr.client || usr != owner) return if(!target) return @@ -563,7 +570,7 @@ so as to remain in compliance with the most up-to-date laws." /obj/screen/alert/restrained/Click() var/mob/living/L = usr - if(!istype(L) || !L.can_resist()) + if(!istype(L) || !L.can_resist() || L != owner) return L.changeNext_move(CLICK_CD_RESIST) if((L.mobility_flags & MOBILITY_MOVE) && (L.last_special <= world.time)) @@ -571,7 +578,7 @@ so as to remain in compliance with the most up-to-date laws." /obj/screen/alert/restrained/buckled/Click() var/mob/living/L = usr - if(!istype(L) || !L.can_resist()) + if(!istype(L) || !L.can_resist() || L != owner) return L.changeNext_move(CLICK_CD_RESIST) if(L.last_special <= world.time) @@ -580,11 +587,14 @@ so as to remain in compliance with the most up-to-date laws." // PRIVATE = only edit, use, or override these if you're editing the system as a whole // Re-render all alerts - also called in /datum/hud/show_hud() because it's needed there -/datum/hud/proc/reorganize_alerts() +/datum/hud/proc/reorganize_alerts(mob/viewmob) + var/mob/screenmob = viewmob || mymob + if(!screenmob.client) + return var/list/alerts = mymob.alerts if(!hud_shown) for(var/i = 1, i <= alerts.len, i++) - mymob.client.screen -= alerts[alerts[i]] + screenmob.client.screen -= alerts[alerts[i]] return 1 for(var/i = 1, i <= alerts.len, i++) var/obj/screen/alert/alert = alerts[alerts[i]] @@ -604,7 +614,10 @@ so as to remain in compliance with the most up-to-date laws." else . = "" alert.screen_loc = . - mymob.client.screen |= alert + screenmob.client.screen |= alert + if(!viewmob) + for(var/M in mymob.observers) + reorganize_alerts(M) return 1 /obj/screen/alert/Click(location, control, params) @@ -614,6 +627,8 @@ so as to remain in compliance with the most up-to-date laws." if(paramslist["shift"]) // screen objects don't do the normal Click() stuff so we'll cheat to_chat(usr, "[name] - [desc]") return + if(usr != owner) + return if(master) return usr.client.Click(master, location, control, params) @@ -621,5 +636,5 @@ so as to remain in compliance with the most up-to-date laws." . = ..() severity = 0 master = null - mob_viewer = null + owner = null screen_loc = "" diff --git a/code/_onclick/hud/ghost.dm b/code/_onclick/hud/ghost.dm index 549b6346ce2..b301173d38a 100644 --- a/code/_onclick/hud/ghost.dm +++ b/code/_onclick/hud/ghost.dm @@ -93,3 +93,11 @@ screenmob.client.screen -= static_inventory else screenmob.client.screen += static_inventory + +//We should only see observed mob alerts. +/datum/hud/ghost/reorganize_alerts(mob/viewmob) + var/mob/dead/observer/O = mymob + if (istype(O) && O.observetarget) + return + . = ..() + diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm index cde48e31ca3..abcf107d202 100644 --- a/code/_onclick/hud/hud.dm +++ b/code/_onclick/hud/hud.dm @@ -189,7 +189,7 @@ GLOBAL_LIST_INIT(available_ui_styles, list( hud_version = display_hud_version persistent_inventory_update(screenmob) screenmob.update_action_buttons(1) - reorganize_alerts() + reorganize_alerts(screenmob) screenmob.reload_fullscreen() update_parallax_pref(screenmob) diff --git a/code/_onclick/hud/living.dm b/code/_onclick/hud/living.dm index 7f9e1ffc493..557aec9555e 100644 --- a/code/_onclick/hud/living.dm +++ b/code/_onclick/hud/living.dm @@ -11,6 +11,7 @@ pull_icon.hud = src static_inventory += pull_icon - healths = new /obj/screen/healths/living() - healths.hud = src - infodisplay += healths + //mob health doll! assumes whatever sprite the mob is + healthdoll = new /obj/screen/healthdoll/living() + healthdoll.hud = src + infodisplay += healthdoll diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index b70d0ac3e96..d605995f489 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -59,7 +59,7 @@ var/mob/M = usr M.swap_hand() return 1 - + /obj/screen/skills name = "skills" icon = 'icons/mob/screen_midnight.dmi' @@ -406,7 +406,7 @@ var/mob/living/user = hud?.mymob if(!istype(user)) return - + if(!user.resting) icon_state = "act_rest" else @@ -549,7 +549,7 @@ if(choice != hud.mymob.zone_selected) hud.mymob.zone_selected = choice update_icon() - + return TRUE /obj/screen/zone_sel/update_overlays() @@ -588,10 +588,6 @@ icon_state = "health0" screen_loc = ui_health -/obj/screen/healths/living - screen_loc = ui_living_health - mouse_opacity = MOUSE_OPACITY_TRANSPARENT - /obj/screen/healths/alien icon = 'icons/mob/screen_alien.dmi' screen_loc = ui_alien_health @@ -641,7 +637,7 @@ icon_state = "slime_health0" screen_loc = ui_slime_health mouse_opacity = MOUSE_OPACITY_TRANSPARENT - + /obj/screen/healths/lavaland_elite icon = 'icons/mob/screen_elite.dmi' icon_state = "elite_health0" @@ -657,6 +653,11 @@ var/mob/living/carbon/human/H = usr H.check_self_for_injuries() +/obj/screen/healthdoll/living + icon_state = "fullhealth0" + screen_loc = ui_living_healthdoll + var/filtered = FALSE //so we don't repeatedly create the mask of the mob every update + /obj/screen/mood name = "mood" icon_state = "mood5" diff --git a/code/_onclick/observer.dm b/code/_onclick/observer.dm index 589109d45e6..4dc647b8cea 100644 --- a/code/_onclick/observer.dm +++ b/code/_onclick/observer.dm @@ -4,7 +4,7 @@ if(can_reenter_corpse && mind && mind.current) if(A == mind.current || (mind.current in A)) // double click your corpse or whatever holds it - reenter_corpse() // (cloning scanner, body bag, closet, mech, etc) + reenter_corpse() // (body bag, closet, mech, etc) return // seems legit. // Things you might plausibly want to follow diff --git a/code/_onclick/other_mobs.dm b/code/_onclick/other_mobs.dm index f6668eef33e..1d6c4d82852 100644 --- a/code/_onclick/other_mobs.dm +++ b/code/_onclick/other_mobs.dm @@ -97,7 +97,7 @@ A.attack_animal(src) /atom/proc/attack_animal(mob/user) - return + SEND_SIGNAL(src, COMSIG_ATOM_ATTACK_ANIMAL, user) /mob/living/RestrainedClickOn(atom/A) return diff --git a/code/controllers/configuration/config_entry.dm b/code/controllers/configuration/config_entry.dm index 49ff1c8d498..0115d5cb975 100644 --- a/code/controllers/configuration/config_entry.dm +++ b/code/controllers/configuration/config_entry.dm @@ -163,7 +163,8 @@ if(key_pos || value_mode == VALUE_MODE_FLAG) key_name = lowertext(copytext(str_val, 1, key_pos)) - key_value = copytext(str_val, key_pos + 1) + if(key_pos) + key_value = copytext(str_val, key_pos + length(str_val[key_pos])) var/new_key var/new_value var/continue_check_value diff --git a/code/controllers/configuration/configuration.dm b/code/controllers/configuration/configuration.dm index 5f874a8dd9c..e93c804ac25 100644 --- a/code/controllers/configuration/configuration.dm +++ b/code/controllers/configuration/configuration.dm @@ -111,13 +111,13 @@ if(!L) continue - var/firstchar = copytext(L, 1, 2) + var/firstchar = L[1] if(firstchar == "#") continue var/lockthis = firstchar == "@" if(lockthis) - L = copytext(L, 2) + L = copytext(L, length(firstchar) + 1) var/pos = findtext(L, " ") var/entry = null @@ -125,7 +125,7 @@ if(pos) entry = lowertext(copytext(L, 1, pos)) - value = copytext(L, pos + 1) + value = copytext(L, pos + length(L[pos])) else entry = lowertext(L) @@ -291,7 +291,7 @@ Example config: t = trim(t) if(length(t) == 0) continue - else if(copytext(t, 1, 2) == "#") + else if(t[1] == "#") continue var/pos = findtext(t, " ") @@ -300,7 +300,7 @@ Example config: if(pos) command = lowertext(copytext(t, 1, pos)) - data = copytext(t, pos + 1) + data = copytext(t, pos + length(t[pos])) else command = lowertext(t) diff --git a/code/controllers/configuration/entries/game_options.dm b/code/controllers/configuration/entries/game_options.dm index f3db9bb3159..ac6ab78afb3 100644 --- a/code/controllers/configuration/entries/game_options.dm +++ b/code/controllers/configuration/entries/game_options.dm @@ -379,4 +379,8 @@ config_entry_value = 64 min_val = 0 +/datum/config_entry/number/ratcap + config_entry_value = 64 + min_val = 0 + /datum/config_entry/flag/dynamic_config_enabled diff --git a/code/controllers/configuration/entries/general.dm b/code/controllers/configuration/entries/general.dm index 999b5738b40..811937deb13 100644 --- a/code/controllers/configuration/entries/general.dm +++ b/code/controllers/configuration/entries/general.dm @@ -83,6 +83,8 @@ /datum/config_entry/flag/log_job_debug // log roundstart divide occupations debug information to a file +/datum/config_entry/flag/log_shuttle // log shuttle related actions, ie shuttle computers, shuttle manipulator, emergency console + /datum/config_entry/flag/allow_admin_ooccolor // Allows admins with relevant permissions to have their own ooc colour /datum/config_entry/flag/allow_admin_asaycolor //Allows admins with relevant permissions to have a personalized asay color @@ -487,3 +489,4 @@ /datum/config_entry/flag/reopen_roundstart_suicide_roles_command_report +/datum/config_entry/flag/auto_profile diff --git a/code/controllers/subsystem/air.dm b/code/controllers/subsystem/air.dm index 095369020e0..c9cb4a62b6c 100644 --- a/code/controllers/subsystem/air.dm +++ b/code/controllers/subsystem/air.dm @@ -1,11 +1,3 @@ -#define SSAIR_PIPENETS 1 -#define SSAIR_ATMOSMACHINERY 2 -#define SSAIR_ACTIVETURFS 3 -#define SSAIR_EXCITEDGROUPS 4 -#define SSAIR_HIGHPRESSURE 5 -#define SSAIR_HOTSPOTS 6 -#define SSAIR_SUPERCONDUCTIVITY 7 - SUBSYSTEM_DEF(air) name = "Atmospherics" init_order = INIT_ORDER_AIR @@ -405,11 +397,3 @@ SUBSYSTEM_DEF(air) return gas_string var/datum/atmosphere/mix = atmos_gen[gas_string] return mix.gas_string - -#undef SSAIR_PIPENETS -#undef SSAIR_ATMOSMACHINERY -#undef SSAIR_ACTIVETURFS -#undef SSAIR_EXCITEDGROUPS -#undef SSAIR_HIGHPRESSURE -#undef SSAIR_HOTSPOTS -#undef SSAIR_SUPERCONDUCTIVITY diff --git a/code/controllers/subsystem/blackbox.dm b/code/controllers/subsystem/blackbox.dm index b1f4de116d2..c97ffa7021b 100644 --- a/code/controllers/subsystem/blackbox.dm +++ b/code/controllers/subsystem/blackbox.dm @@ -270,6 +270,25 @@ Versioning key = new_key key_type = new_key_type +/datum/controller/subsystem/blackbox/proc/LogAhelp(ticket, action, message, recipient, sender) + + if(!SSdbcore.Connect()) + return + + ticket = sanitizeSQL(ticket) + action = sanitizeSQL(action) + message = sanitizeSQL(message) + recipient = recipient ? "'[sanitizeSQL(recipient)]'" : "NULL" + sender = sender ? "'[sanitizeSQL(sender)]'" : "NULL" + var/server_ip = sanitizeSQL(world.internet_address) + var/server_port = sanitizeSQL(world.port) + var/round_id = sanitizeSQL(GLOB.round_id) + + var/datum/DBQuery/query_log_ahelp = SSdbcore.NewQuery("INSERT INTO [format_table_name("ticket")] (ticket, action, message, recipient, sender, server_ip, server_port, round_id, timestamp) VALUES ('[ticket]', '[action]', '[message]', [recipient], [sender], INET_ATON(IF('[server_ip]' LIKE '', '0', '[server_ip]')), '[server_port]','[round_id]', '[SQLtime()]')") + query_log_ahelp.Execute() + qdel(query_log_ahelp) + + /datum/controller/subsystem/blackbox/proc/ReportDeath(mob/living/L) set waitfor = FALSE if(sealed) diff --git a/code/controllers/subsystem/blackmarket.dm b/code/controllers/subsystem/blackmarket.dm new file mode 100644 index 00000000000..58fad562d7a --- /dev/null +++ b/code/controllers/subsystem/blackmarket.dm @@ -0,0 +1,115 @@ +SUBSYSTEM_DEF(blackmarket) + name = "Blackmarket" + flags = SS_BACKGROUND + init_order = INIT_ORDER_DEFAULT + + /// Descriptions for each shipping methods. + var/shipping_method_descriptions = list( + SHIPPING_METHOD_LAUNCH="Launches the item at the station from space, cheap but you might not recieve your item at all.", + SHIPPING_METHOD_LTSRBT="Long-To-Short-Range-Bluespace-Transceiver, a machine that recieves items outside the station and then teleports them to the location of the uplink.", + SHIPPING_METHOD_TELEPORT="Teleports the item in a random area in the station, you get 60 seconds to get there first though." + ) + + /// List of all existing markets. + var/list/datum/blackmarket_market/markets = list() + /// List of existing ltsrbts. + var/list/obj/machinery/ltsrbt/telepads = list() + /// Currently queued purchases. + var/list/queued_purchases = list() + +/datum/controller/subsystem/blackmarket/Initialize(timeofday) + for(var/market in subtypesof(/datum/blackmarket_market)) + markets[market] += new market + + for(var/item in subtypesof(/datum/blackmarket_item)) + var/datum/blackmarket_item/I = new item() + if(!I.item) + continue + + for(var/M in I.markets) + if(!markets[M]) + stack_trace("SSblackmarket: Item [I] available in market that does not exist.") + continue + markets[M].add_item(item) + qdel(I) + . = ..() + +/datum/controller/subsystem/blackmarket/fire(resumed) + while(length(queued_purchases)) + var/datum/blackmarket_purchase/purchase = queued_purchases[1] + queued_purchases.Cut(1,2) + + // Uh oh, uplink is gone. We will just keep the money and you will not get your order. + if(!purchase.uplink || QDELETED(purchase.uplink)) + queued_purchases -= purchase + qdel(purchase) + continue + + switch(purchase.method) + // Find a ltsrbt pad and make it handle the shipping. + if(SHIPPING_METHOD_LTSRBT) + if(!telepads.len) + continue + // Prioritize pads that don't have a cooldown active. + var/free_pad_found = FALSE + for(var/obj/machinery/ltsrbt/pad in telepads) + if(pad.recharge_cooldown) + continue + pad.add_to_queue(purchase) + queued_purchases -= purchase + free_pad_found = TRUE + break + + if(free_pad_found) + continue + + var/obj/machinery/ltsrbt/pad = pick(telepads) + + to_chat(recursive_loc_check(purchase.uplink.loc, /mob), "[purchase.uplink] flashes a message noting that the order is being processed by [pad].") + + queued_purchases -= purchase + pad.add_to_queue(purchase) + // Get random area, throw it somewhere there. + if(SHIPPING_METHOD_TELEPORT) + var/turf/targetturf = get_safe_random_station_turf() + // This shouldn't happen. + if (!targetturf) + continue + + to_chat(recursive_loc_check(purchase.uplink.loc, /mob), "[purchase.uplink] flashes a message noting that the order is being teleported to [get_area(targetturf)] in 60 seconds.") + + // do_teleport does not want to teleport items from nullspace, so it just forceMoves and does sparks. + addtimer(CALLBACK(src, /datum/controller/subsystem/blackmarket/proc/fake_teleport, purchase.entry.spawn_item(), targetturf), 60 SECONDS) + queued_purchases -= purchase + qdel(purchase) + // Get the current location of the uplink if it exists, then throws the item from space at the station from a random direction. + if(SHIPPING_METHOD_LAUNCH) + var/startSide = pick(GLOB.cardinals) + var/turf/T = get_turf(purchase.uplink) + var/pickedloc = spaceDebrisStartLoc(startSide, T.z) + + var/atom/movable/item = purchase.entry.spawn_item(pickedloc) + item.throw_at(purchase.uplink, 3, 3, spin = FALSE) + + to_chat(recursive_loc_check(purchase.uplink.loc, /mob), "[purchase.uplink] flashes a message noting the order is being launched at the station from [dir2text(startSide)].") + + queued_purchases -= purchase + qdel(purchase) + + if(MC_TICK_CHECK) + break + +/// Used to make a teleportation effect as do_teleport does not like moving items from nullspace. +/datum/controller/subsystem/blackmarket/proc/fake_teleport(atom/movable/item, turf/target) + item.forceMove(target) + var/datum/effect_system/spark_spread/sparks = new + sparks.set_up(5, 1, target) + sparks.attach(item) + sparks.start() + +/// Used to add /datum/blackmarket_purchase to queued_purchases var. Returns TRUE when queued. +/datum/controller/subsystem/blackmarket/proc/queue_item(datum/blackmarket_purchase/P) + if(P.method == SHIPPING_METHOD_LTSRBT && !telepads.len) + return FALSE + queued_purchases += P + return TRUE diff --git a/code/controllers/subsystem/chat.dm b/code/controllers/subsystem/chat.dm index f59e2e69223..27f6d7c7fe8 100644 --- a/code/controllers/subsystem/chat.dm +++ b/code/controllers/subsystem/chat.dm @@ -18,7 +18,7 @@ SUBSYSTEM_DEF(chat) return -/datum/controller/subsystem/chat/proc/queue(target, message, handle_whitespace = TRUE) +/datum/controller/subsystem/chat/proc/queue(target, message, handle_whitespace = TRUE, trailing_newline = TRUE) if(!target || !message) return @@ -36,7 +36,8 @@ SUBSYSTEM_DEF(chat) if(handle_whitespace) message = replacetext(message, "\n", "
") message = replacetext(message, "\t", "[FOURSPACES][FOURSPACES]") - message += "
" + if (trailing_newline) + message += "
" //url_encode it TWICE, this way any UTF-8 characters are able to be decoded by the Javascript. diff --git a/code/controllers/subsystem/communications.dm b/code/controllers/subsystem/communications.dm index 718357b8bb9..e5bda7148a0 100644 --- a/code/controllers/subsystem/communications.dm +++ b/code/controllers/subsystem/communications.dm @@ -30,7 +30,7 @@ SUBSYSTEM_DEF(communications) /datum/controller/subsystem/communications/proc/send_message(datum/comm_message/sending,print = TRUE,unique = FALSE) for(var/obj/machinery/computer/communications/C in GLOB.machines) - if(!(C.stat & (BROKEN|NOPOWER)) && is_station_level(C.z)) + if(!(C.machine_stat & (BROKEN|NOPOWER)) && is_station_level(C.z)) if(unique) C.add_message(sending) else //We copy the message for each console, answers and deletions won't be shared diff --git a/code/controllers/subsystem/economy.dm b/code/controllers/subsystem/economy.dm index 0fdf902c963..078d122aa65 100644 --- a/code/controllers/subsystem/economy.dm +++ b/code/controllers/subsystem/economy.dm @@ -113,7 +113,7 @@ SUBSYSTEM_DEF(economy) D.adjust_money(medical_cash) if(ishostile(m)) var/mob/living/simple_animal/hostile/H = m - if(H.stat == DEAD && H.z in SSmapping.levels_by_trait(ZTRAIT_STATION)) + if(H.stat == DEAD && (H.z in SSmapping.levels_by_trait(ZTRAIT_STATION))) dead_monsters++ CHECK_TICK var/living_ratio = alive_crew / crew diff --git a/code/controllers/subsystem/events.dm b/code/controllers/subsystem/events.dm index f17c5c5e55c..cf7d9c460e0 100644 --- a/code/controllers/subsystem/events.dm +++ b/code/controllers/subsystem/events.dm @@ -97,9 +97,10 @@ SUBSYSTEM_DEF(events) //aka Badmin Central // > Not in modules/admin // REEEEEEEEE +// Why the heck is this here! Took me so damn long to find! /client/proc/forceEvent() set name = "Trigger Event" - set category = "Fun" + set category = "Admin - Events" if(!holder ||!check_rights(R_FUN)) return diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm index e0a26570f74..a52a33ad353 100644 --- a/code/controllers/subsystem/job.dm +++ b/code/controllers/subsystem/job.dm @@ -115,7 +115,7 @@ SUBSYSTEM_DEF(job) if(flag && (!(flag in player.client.prefs.be_special))) JobDebug("FOC flag failed, Player: [player], Flag: [flag], ") continue - if(player.mind && job.title in player.mind.restricted_roles) + if(player.mind && (job.title in player.mind.restricted_roles)) JobDebug("FOC incompatible with antagonist role, Player: [player]") continue if(player.client.prefs.job_preferences[job.title] == level) @@ -151,7 +151,7 @@ SUBSYSTEM_DEF(job) JobDebug("GRJ player not enough xp, Player: [player]") continue - if(player.mind && job.title in player.mind.restricted_roles) + if(player.mind && (job.title in player.mind.restricted_roles)) JobDebug("GRJ incompatible with antagonist role, Player: [player], Job: [job.title]") continue @@ -331,7 +331,7 @@ SUBSYSTEM_DEF(job) JobDebug("DO player not enough xp, Player: [player], Job:[job.title]") continue - if(player.mind && job.title in player.mind.restricted_roles) + if(player.mind && (job.title in player.mind.restricted_roles)) JobDebug("DO incompatible with antagonist role, Player: [player], Job:[job.title]") continue @@ -421,22 +421,24 @@ SUBSYSTEM_DEF(job) //If we joined at roundstart we should be positioned at our workstation if(!joined_late) var/obj/S = null - for(var/obj/effect/landmark/start/sloc in GLOB.start_landmarks_list) - if(sloc.name != rank) - S = sloc //so we can revert to spawning them on top of eachother if something goes wrong - continue - if(locate(/mob/living) in sloc.loc) - continue - S = sloc - sloc.used = TRUE - break if(length(GLOB.jobspawn_overrides[rank])) S = pick(GLOB.jobspawn_overrides[rank]) + else + for(var/_sloc in GLOB.start_landmarks_list) + var/obj/effect/landmark/start/sloc = _sloc + if(sloc.name != rank) + continue + S = sloc + if(locate(/mob/living) in sloc.loc) //so we can revert to spawning them on top of eachother if something goes wrong + continue + sloc.used = TRUE + break if(S) S.JoinPlayerHere(living_mob, FALSE) if(!S) //if there isn't a spawnpoint send them to latejoin, if there's no latejoin go yell at your mapper log_world("Couldn't find a round start spawn point for [rank]") - SendToLateJoin(living_mob) + if(!SendToLateJoin(living_mob)) + living_mob.move_to_error_room() if(living_mob.mind) @@ -612,12 +614,12 @@ SUBSYSTEM_DEF(job) if(M.mind && M.mind.assigned_role && length(GLOB.jobspawn_overrides[M.mind.assigned_role])) //We're doing something special today. destination = pick(GLOB.jobspawn_overrides[M.mind.assigned_role]) destination.JoinPlayerHere(M, FALSE) - return + return TRUE if(latejoin_trackers.len) destination = pick(latejoin_trackers) destination.JoinPlayerHere(M, buckle) - return + return TRUE //bad mojo var/area/shuttle/arrival/A = GLOB.areas_by_type[/area/shuttle/arrival] @@ -626,7 +628,7 @@ SUBSYSTEM_DEF(job) var/obj/structure/chair/C = locate() in A if(C) C.JoinPlayerHere(M, buckle) - return + return TRUE //last hurrah var/list/avail = list() @@ -636,7 +638,7 @@ SUBSYSTEM_DEF(job) if(avail.len) destination = pick(avail) destination.JoinPlayerHere(M, FALSE) - return + return TRUE //pick an open spot on arrivals and dump em var/list/arrivals_turfs = shuffle(get_area_turfs(/area/shuttle/arrival)) @@ -644,10 +646,11 @@ SUBSYSTEM_DEF(job) for(var/turf/T in arrivals_turfs) if(!is_blocked_turf(T, TRUE)) T.JoinPlayerHere(M, FALSE) - return + return TRUE //last chance, pick ANY spot on arrivals and dump em destination = arrivals_turfs[1] destination.JoinPlayerHere(M, FALSE) + return TRUE else var/msg = "Unable to send mob [M] to late join!" message_admins(msg) diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm index 2eb9710b5d0..271e9e5a20b 100644 --- a/code/controllers/subsystem/mapping.dm +++ b/code/controllers/subsystem/mapping.dm @@ -233,7 +233,7 @@ SUBSYSTEM_DEF(mapping) station_start = world.maxz + 1 INIT_ANNOUNCE("Loading [config.map_name]...") LoadGroup(FailedZs, "Station", config.map_path, config.map_file, config.traits, ZTRAITS_STATION) - + if(SSdbcore.Connect()) var/datum/DBQuery/query_round_map_name = SSdbcore.NewQuery("UPDATE [format_table_name("round")] SET map_name = '[config.map_name]' WHERE id = [GLOB.round_id]") query_round_map_name.Execute() @@ -266,7 +266,7 @@ SUBSYSTEM_DEF(mapping) fdel("_maps/custom/[config.map_file]") // And as the file is now removed set the next map to default. next_map_config = load_map_config(default_to_box = TRUE) - + GLOBAL_LIST_EMPTY(the_station_areas) /datum/controller/subsystem/mapping/proc/generate_station_area_list() @@ -284,10 +284,9 @@ GLOBAL_LIST_EMPTY(the_station_areas) log_world("ERROR: Station areas list failed to generate!") /datum/controller/subsystem/mapping/proc/maprotate() - if(map_voted) - map_voted = FALSE + if(map_voted || SSmapping.next_map_config) //If voted or set by other means. return - + var/players = GLOB.clients.len var/list/mapvotes = list() //count votes @@ -308,9 +307,13 @@ GLOBAL_LIST_EMPTY(the_station_areas) for (var/map in mapvotes) if (!map) mapvotes.Remove(map) + continue if (!(map in global.config.maplist)) mapvotes.Remove(map) continue + if(map in SSpersistence.blocked_maps) + mapvotes.Remove(map) + continue var/datum/map_config/VM = global.config.maplist[map] if (!VM) mapvotes.Remove(map) @@ -337,6 +340,13 @@ GLOBAL_LIST_EMPTY(the_station_areas) if (. && VM.map_name != config.map_name) to_chat(world, "Map rotation has chosen [VM.map_name] for next round!") +/datum/controller/subsystem/mapping/proc/mapvote() + if(map_voted || SSmapping.next_map_config) //If voted or set by other means. + return + if(SSvote.mode) //Theres already a vote running, default to rotation. + maprotate() + SSvote.initiate_vote("map", "automatic map rotation") + /datum/controller/subsystem/mapping/proc/changemap(var/datum/map_config/VM) if(!VM.MakeNextMap()) next_map_config = load_map_config(default_to_box = TRUE) @@ -407,7 +417,7 @@ GLOBAL_LIST_EMPTY(the_station_areas) //Manual loading of away missions. /client/proc/admin_away() set name = "Load Away Mission" - set category = "Fun" + set category = "Admin - Events" if(!holder ||!check_rights(R_FUN)) return diff --git a/code/controllers/subsystem/materials.dm b/code/controllers/subsystem/materials.dm index 0dcc5e96997..9813df6e747 100644 --- a/code/controllers/subsystem/materials.dm +++ b/code/controllers/subsystem/materials.dm @@ -7,12 +7,11 @@ These materials call on_applied() on whatever item they are applied to, common e SUBSYSTEM_DEF(materials) name = "Materials" - flags = SS_NO_FIRE - init_order = INIT_ORDER_MATERIALS + flags = SS_NO_FIRE | SS_NO_INIT ///Dictionary of material.type || material ref - var/list/materials = list() + var/list/materials ///Dictionary of category || list of material refs - var/list/materials_by_category = list() + var/list/materials_by_category ///List of stackcrafting recipes for materials using rigid materials var/list/rigid_stack_recipes = list( new /datum/stack_recipe("chair", /obj/structure/chair/greyscale, one_per_turf = TRUE, on_floor = TRUE, applies_mats = TRUE), @@ -20,14 +19,17 @@ SUBSYSTEM_DEF(materials) new /datum/stack_recipe("sink", /obj/structure/sink/greyscale, one_per_turf = TRUE, on_floor = TRUE, applies_mats = TRUE), ) -/datum/controller/subsystem/materials/Initialize(timeofday) - InitializeMaterials() - return ..() - ///Ran on initialize, populated the materials and materials_by_category dictionaries with their appropiate vars (See these variables for more info) -/datum/controller/subsystem/materials/proc/InitializeMaterials(timeofday) +/datum/controller/subsystem/materials/proc/InitializeMaterials() + materials = list() + materials_by_category = list() for(var/type in subtypesof(/datum/material)) var/datum/material/ref = new type materials[type] = ref for(var/c in ref.categories) materials_by_category[c] += list(ref) + +/datum/controller/subsystem/materials/proc/GetMaterialRef(datum/material/fakemat) + if(!materials) + InitializeMaterials() + return materials[fakemat] || fakemat diff --git a/code/controllers/subsystem/minor_mapping.dm b/code/controllers/subsystem/minor_mapping.dm index 72938e65b1b..8f471e40dce 100644 --- a/code/controllers/subsystem/minor_mapping.dm +++ b/code/controllers/subsystem/minor_mapping.dm @@ -20,7 +20,7 @@ SUBSYSTEM_DEF(minor_mapping) M = new(proposed_turf) else M.forceMove(proposed_turf) - if(M.environment_is_safe()) + if(M.environment_air_is_safe()) num_mice -= 1 M = null diff --git a/code/controllers/subsystem/mobs.dm b/code/controllers/subsystem/mobs.dm index 8caf2a4623c..885587ff554 100644 --- a/code/controllers/subsystem/mobs.dm +++ b/code/controllers/subsystem/mobs.dm @@ -8,6 +8,7 @@ SUBSYSTEM_DEF(mobs) var/static/list/clients_by_zlevel[][] var/static/list/dead_players_by_zlevel[][] = list(list()) // Needs to support zlevel 1 here, MaxZChanged only happens when z2 is created and new_players can login before that. var/static/list/cubemonkeys = list() + var/static/list/cheeserats = list() /datum/controller/subsystem/mobs/stat_entry() ..("P:[GLOB.mob_living_list.len]") diff --git a/code/controllers/subsystem/pai.dm b/code/controllers/subsystem/pai.dm index b802c6868f7..2583ae99c87 100644 --- a/code/controllers/subsystem/pai.dm +++ b/code/controllers/subsystem/pai.dm @@ -37,34 +37,34 @@ SUBSYSTEM_DEF(pai) switch(option) if("name") - t = input("Enter a name for your pAI", "pAI Name", candidate.name) as text|null + t = sanitize_name(stripped_input(usr, "Enter a name for your pAI", "pAI Name", candidate.name, MAX_NAME_LEN)) if(t) - candidate.name = copytext(sanitize_name(t),1,MAX_NAME_LEN) + candidate.name = t if("desc") - t = input("Enter a description for your pAI", "pAI Description", candidate.description) as message|null + t = stripped_multiline_input(usr, "Enter a description for your pAI", "pAI Description", candidate.description, MAX_MESSAGE_LEN) if(t) - candidate.description = copytext(sanitize(t),1,MAX_MESSAGE_LEN) + candidate.description = t if("role") - t = input("Enter a role for your pAI", "pAI Role", candidate.role) as text|null + t = stripped_input(usr, "Enter a role for your pAI", "pAI Role", candidate.role, MAX_MESSAGE_LEN) if(t) - candidate.role = copytext(sanitize(t),1,MAX_MESSAGE_LEN) + candidate.role = t if("ooc") - t = input("Enter any OOC comments", "pAI OOC Comments", candidate.comments) as message|null + t = stripped_multiline_input(usr, "Enter any OOC comments", "pAI OOC Comments", candidate.comments, MAX_MESSAGE_LEN) if(t) - candidate.comments = copytext(sanitize(t),1,MAX_MESSAGE_LEN) + candidate.comments = t if("save") candidate.savefile_save(usr) if("load") candidate.savefile_load(usr) //In case people have saved unsanitized stuff. if(candidate.name) - candidate.name = copytext(sanitize(candidate.name),1,MAX_NAME_LEN) + candidate.name = copytext_char(sanitize(candidate.name),1,MAX_NAME_LEN) if(candidate.description) - candidate.description = copytext(sanitize(candidate.description),1,MAX_MESSAGE_LEN) + candidate.description = copytext_char(sanitize(candidate.description),1,MAX_MESSAGE_LEN) if(candidate.role) - candidate.role = copytext(sanitize(candidate.role),1,MAX_MESSAGE_LEN) + candidate.role = copytext_char(sanitize(candidate.role),1,MAX_MESSAGE_LEN) if(candidate.comments) - candidate.comments = copytext(sanitize(candidate.comments),1,MAX_MESSAGE_LEN) + candidate.comments = copytext_char(sanitize(candidate.comments),1,MAX_MESSAGE_LEN) if("submit") if(candidate) diff --git a/code/controllers/subsystem/persistence.dm b/code/controllers/subsystem/persistence.dm index 3b80b54ad78..54bbabdb005 100644 --- a/code/controllers/subsystem/persistence.dm +++ b/code/controllers/subsystem/persistence.dm @@ -1,4 +1,7 @@ #define FILE_ANTAG_REP "data/AntagReputation.json" +#define FILE_RECENT_MAPS "data/RecentMaps.json" + +#define KEEP_ROUNDS_MAP 3 SUBSYSTEM_DEF(persistence) name = "Persistence" @@ -8,6 +11,8 @@ SUBSYSTEM_DEF(persistence) var/list/obj/structure/chisel_message/chisel_messages = list() var/list/saved_messages = list() var/list/saved_modes = list(1,2,3) + var/list/saved_maps = list() + var/list/blocked_maps = list() var/list/saved_trophies = list() var/list/antag_rep = list() var/list/antag_rep_change = list() @@ -20,6 +25,7 @@ SUBSYSTEM_DEF(persistence) LoadChiselMessages() LoadTrophies() LoadRecentModes() + LoadRecentMaps() LoadPhotoPersistence() if(CONFIG_GET(flag/use_antag_rep)) LoadAntagReputation() @@ -104,6 +110,27 @@ SUBSYSTEM_DEF(persistence) return saved_modes = json["data"] +/datum/controller/subsystem/persistence/proc/LoadRecentMaps() + var/map_sav = FILE_RECENT_MAPS + if(!fexists(FILE_RECENT_MAPS)) + return + var/list/json = json_decode(file2text(map_sav)) + if(!json) + return + saved_maps = json["data"] + + //Convert the mapping data to a shared blocking list, saves us doing this in several places later. + for(var/map in config.maplist) + var/datum/map_config/VM = config.maplist[map] + var/run = 0 + if(VM.map_name == SSmapping.config.map_name) + run++ + for(var/name in SSpersistence.saved_maps) + if(VM.map_name == name) + run++ + if(run >= 2) //If run twice in the last KEEP_ROUNDS_MAP + 1 (including current) rounds, disable map for voting and rotation. + blocked_maps += VM.map_name + /datum/controller/subsystem/persistence/proc/LoadAntagReputation() var/json = file2text(FILE_ANTAG_REP) if(!json) @@ -128,7 +155,7 @@ SUBSYSTEM_DEF(persistence) var/list/chosen_trophy = trophy_data - if(!chosen_trophy || isemptylist(chosen_trophy)) //Malformed + if(!length(chosen_trophy)) //Malformed continue var/path = text2path(chosen_trophy["path"]) //If the item no longer exist, this returns null @@ -144,6 +171,7 @@ SUBSYSTEM_DEF(persistence) CollectChiselMessages() CollectTrophies() CollectRoundtype() + CollectMaps() SavePhotoPersistence() //THIS IS PERSISTENCE, NOT THE LOGGING PORTION. if(CONFIG_GET(flag/use_antag_rep)) CollectAntagReputation() @@ -270,6 +298,21 @@ SUBSYSTEM_DEF(persistence) fdel(json_file) WRITE_FILE(json_file, json_encode(file_data)) +/datum/controller/subsystem/persistence/proc/CollectMaps() + if(length(saved_maps) > KEEP_ROUNDS_MAP) //Get rid of extras from old configs. + saved_maps.Cut(KEEP_ROUNDS_MAP+1) + var/mapstosave = min(length(saved_maps)+1, KEEP_ROUNDS_MAP) + if(length(saved_maps) < mapstosave) //Add extras if too short, one per round. + saved_maps += mapstosave + for(var/i = mapstosave; i > 1; i--) + saved_maps[i] = saved_maps[i-1] + saved_maps[1] = SSmapping.config.map_name + var/json_file = file(FILE_RECENT_MAPS) + var/list/file_data = list() + file_data["data"] = saved_maps + fdel(json_file) + WRITE_FILE(json_file, json_encode(file_data)) + /datum/controller/subsystem/persistence/proc/CollectAntagReputation() var/ANTAG_REP_MAXIMUM = CONFIG_GET(number/antag_rep_maximum) @@ -301,7 +344,7 @@ SUBSYSTEM_DEF(persistence) loaded = TRUE if(!loaded) //We do not have information for whatever reason, just generate new one R.GenerateRecipe() - + if(!R.HasConflicts()) //Might want to try again if conflicts happened in the future. add_chemical_reaction(R) @@ -323,6 +366,6 @@ SUBSYSTEM_DEF(persistence) recipe_data["results"] = R.results recipe_data["required_container"] = "[R.required_container]" file_data["[R.id]"] = recipe_data - + fdel(json_file) WRITE_FILE(json_file, json_encode(file_data)) diff --git a/code/controllers/subsystem/processing/nanites.dm b/code/controllers/subsystem/processing/nanites.dm index c34e7f78066..e138832b6b1 100644 --- a/code/controllers/subsystem/processing/nanites.dm +++ b/code/controllers/subsystem/processing/nanites.dm @@ -9,7 +9,7 @@ PROCESSING_SUBSYSTEM_DEF(nanites) var/neural_network_count = 0 /datum/controller/subsystem/processing/nanites/proc/check_hardware(datum/nanite_cloud_backup/backup) - if(QDELETED(backup.storage) || (backup.storage.stat & (NOPOWER|BROKEN))) + if(QDELETED(backup.storage) || (backup.storage.machine_stat & (NOPOWER|BROKEN))) return FALSE return TRUE diff --git a/code/controllers/subsystem/processing/networks.dm b/code/controllers/subsystem/processing/networks.dm index 0ca5472a6a2..719e97d1eed 100644 --- a/code/controllers/subsystem/processing/networks.dm +++ b/code/controllers/subsystem/processing/networks.dm @@ -46,6 +46,6 @@ PROCESSING_SUBSYSTEM_DEF(networks) var/hex = md5(string) if(!hex) return //errored - . = "[copytext(hex, 1, 9)]" //16 ^ 8 possibilities I think. + . = "[copytext_char(hex, 1, 9)]" //16 ^ 8 possibilities I think. if(interfaces_by_id[.]) return resolve_collisions? make_address("[num2text(rand(HID_RESTRICTED_END, 999999999), 12)]"):null diff --git a/code/controllers/subsystem/processing/quirks.dm b/code/controllers/subsystem/processing/quirks.dm index b4d29ef7594..365b2320d7e 100644 --- a/code/controllers/subsystem/processing/quirks.dm +++ b/code/controllers/subsystem/processing/quirks.dm @@ -1,3 +1,4 @@ +#define EXP_ASSIGN_WAYFINDER 1200 //Used to process and handle roundstart quirks // - Quirk strings are used for faster checking in code // - Quirk datums are stored and hold different effects, as well as being a vector for applying trait string @@ -41,3 +42,7 @@ PROCESSING_SUBSYSTEM_DEF(quirks) badquirk = TRUE if(badquirk) cli.prefs.save_character() + + // Assign wayfinding pinpointer granting quirk if they're new + if(cli.get_exp_living(TRUE) < EXP_ASSIGN_WAYFINDER && !user.has_quirk(/datum/quirk/needswayfinder)) + user.add_quirk(/datum/quirk/needswayfinder, TRUE) diff --git a/code/controllers/subsystem/profiler.dm b/code/controllers/subsystem/profiler.dm new file mode 100644 index 00000000000..ec8b243073e --- /dev/null +++ b/code/controllers/subsystem/profiler.dm @@ -0,0 +1,63 @@ +#define PROFILER_FILENAME "profiler.json" + +SUBSYSTEM_DEF(profiler) + name = "Profiler" + init_order = INIT_ORDER_PROFILER + runlevels = RUNLEVELS_DEFAULT | RUNLEVEL_LOBBY + wait = 3000 + flags = SS_NO_TICK_CHECK + var/fetch_cost = 0 + var/write_cost = 0 + +/datum/controller/subsystem/profiler/stat_entry(msg) + msg += "F:[round(fetch_cost,1)]ms" + msg += "|W:[round(write_cost,1)]ms" + ..(msg) + +/datum/controller/subsystem/profiler/Initialize() + if(CONFIG_GET(flag/auto_profile)) + StartProfiling() + else + StopProfiling() //Stop the early start from world/New + return ..() + +/datum/controller/subsystem/profiler/fire() + if(CONFIG_GET(flag/auto_profile)) + DumpFile() + +/datum/controller/subsystem/profiler/Shutdown() + if(CONFIG_GET(flag/auto_profile)) + DumpFile() + return ..() + +/datum/controller/subsystem/profiler/proc/StartProfiling() +#if DM_BUILD < 1506 || DM_VERSION < 513 + stack_trace("Auto profiling unsupported on this byond version") + CONFIG_SET(flag/auto_profile, FALSE) +#else + world.Profile(PROFILE_START) +#endif + +/datum/controller/subsystem/profiler/proc/StopProfiling() +#if DM_BUILD >= 1506 && DM_VERSION >= 513 + world.Profile(PROFILE_STOP) +#endif + +/datum/controller/subsystem/profiler/proc/DumpFile() +#if DM_BUILD < 1506 || DM_VERSION < 513 + stack_trace("Auto profiling unsupported on this byond version") + CONFIG_SET(flag/auto_profile, FALSE) +#else + var/timer = TICK_USAGE_REAL + var/current_profile_data = world.Profile(PROFILE_REFRESH,format="json") + fetch_cost = MC_AVERAGE(fetch_cost, TICK_DELTA_TO_MS(TICK_USAGE_REAL - timer)) + CHECK_TICK + if(!length(current_profile_data)) //Would be nice to have explicit proc to check this + stack_trace("Warning, profiling stopped manually before dump.") + var/json_file = file("[GLOB.log_directory]/[PROFILER_FILENAME]") + if(fexists(json_file)) + fdel(json_file) + timer = TICK_USAGE_REAL + WRITE_FILE(json_file, current_profile_data) + write_cost = MC_AVERAGE(write_cost, TICK_DELTA_TO_MS(TICK_USAGE_REAL - timer)) +#endif diff --git a/code/controllers/subsystem/research.dm b/code/controllers/subsystem/research.dm index 6a181ec5f02..c7688e01686 100644 --- a/code/controllers/subsystem/research.dm +++ b/code/controllers/subsystem/research.dm @@ -24,11 +24,13 @@ SUBSYSTEM_DEF(research) var/list/techweb_categories = list() //category name = list(node.id = TRUE) var/list/techweb_boost_items = list() //associative double-layer path = list(id = list(point_type = point_discount)) var/list/techweb_nodes_hidden = list() //Node ids that should be hidden by default. + var/list/techweb_nodes_experimental = list() //Node ids that are exclusive to the BEPIS. var/list/techweb_point_items = list( //path = list(point type = value) /obj/item/assembly/signaler/anomaly = list(TECHWEB_POINT_TYPE_GENERIC = 10000) ) var/list/errored_datums = list() var/list/point_types = list() //typecache style type = TRUE list + var/list/slime_already_researched = list() //Slime cores that have already been researched //---------------------------------------------- var/list/single_server_income = list(TECHWEB_POINT_TYPE_GENERIC = 52.3) var/multiserver_calculation = FALSE @@ -248,6 +250,8 @@ SUBSYSTEM_DEF(research) D.unlocked_by += node.id if(node.hidden) techweb_nodes_hidden[node.id] = TRUE + if(node.experimental) + techweb_nodes_experimental[node.id] = TRUE CHECK_TICK generate_techweb_unlock_linking() diff --git a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm index 3bee27b174a..8966f85d2f9 100644 --- a/code/controllers/subsystem/shuttle.dm +++ b/code/controllers/subsystem/shuttle.dm @@ -144,9 +144,9 @@ SUBSYSTEM_DEF(shuttle) return //no players no autoevac if(alive / total <= threshold) - var/msg = "Automatically dispatching shuttle due to crew death." + var/msg = "Automatically dispatching emergency shuttle due to crew death." message_admins(msg) - log_game("[msg] Alive: [alive], Roundstart: [total], Threshold: [threshold]") + log_shuttle("[msg] Alive: [alive], Roundstart: [total], Threshold: [threshold]") emergencyNoRecall = TRUE priority_announce("Catastrophic casualties detected: crisis shuttle protocols activated - jamming recall signals across all frequencies.") if(emergency.timeLeft(1) > emergencyCallTime * 0.4) @@ -234,11 +234,11 @@ SUBSYSTEM_DEF(shuttle) var/area/A = get_area(user) - log_game("[key_name(user)] has called the shuttle.") + log_shuttle("[key_name(user)] has called the emergency shuttle.") deadchat_broadcast(" has called the shuttle at [A.name].", "[user.real_name]", user) if(call_reason) SSblackbox.record_feedback("text", "shuttle_reason", 1, "[call_reason]") - log_game("Shuttle call reason: [call_reason]") + log_shuttle("Shuttle call reason: [call_reason]") message_admins("[ADMIN_LOOKUPFLW(user)] has called the shuttle. (TRIGGER CENTCOM RECALL)") /datum/controller/subsystem/shuttle/proc/centcom_recall(old_timer, admiral_message) @@ -271,7 +271,7 @@ SUBSYSTEM_DEF(shuttle) /datum/controller/subsystem/shuttle/proc/cancelEvac(mob/user) if(canRecall()) emergency.cancel(get_area(user)) - log_game("[key_name(user)] has recalled the shuttle.") + log_shuttle("[key_name(user)] has recalled the shuttle.") message_admins("[ADMIN_LOOKUPFLW(user)] has recalled the shuttle.") deadchat_broadcast(" has recalled the shuttle from [get_area_name(user, TRUE)].", "[user.real_name]", user) return 1 @@ -307,7 +307,7 @@ SUBSYSTEM_DEF(shuttle) continue else if(istype(thing, /obj/machinery/computer/communications)) var/obj/machinery/computer/communications/C = thing - if(C.stat & BROKEN) + if(C.machine_stat & BROKEN) continue var/turf/T = get_turf(thing) @@ -318,7 +318,7 @@ SUBSYSTEM_DEF(shuttle) if(callShuttle) if(EMERGENCY_IDLE_OR_RECALLED) emergency.request(null, set_coefficient = 2.5) - log_game("There is no means of calling the shuttle anymore. Shuttle automatically called.") + log_shuttle("There is no means of calling the emergency shuttle anymore. Shuttle automatically called.") message_admins("All the communications consoles were destroyed and all AIs are inactive. Shuttle called.") /datum/controller/subsystem/shuttle/proc/registerHostileEnvironment(datum/bad) diff --git a/code/controllers/subsystem/throwing.dm b/code/controllers/subsystem/throwing.dm index 76a4f332fda..82a5d49c094 100644 --- a/code/controllers/subsystem/throwing.dm +++ b/code/controllers/subsystem/throwing.dm @@ -56,6 +56,7 @@ SUBSYSTEM_DEF(throwing) var/dx var/dy var/force = MOVE_FORCE_DEFAULT + var/gentle = FALSE var/pure_diagonal var/diagonal_error var/datum/callback/callback @@ -147,7 +148,7 @@ SUBSYSTEM_DEF(throwing) if (callback) callback.Invoke() - + if(!thrownthing.zfalling) // I don't think you can zfall while thrown but hey, just in case. var/turf/T = get_turf(thrownthing) if(T && thrownthing.has_gravity(T)) diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index da9bcbc84fd..4afb3203326 100755 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -43,8 +43,6 @@ SUBSYSTEM_DEF(ticker) var/queue_delay = 0 var/list/queued_players = list() //used for join queues when the server exceeds the hard population cap - var/maprotatechecked = 0 - var/news_report var/late_join_disabled @@ -109,7 +107,7 @@ SUBSYSTEM_DEF(ticker) continue music -= S - if(isemptylist(music)) + if(!length(music)) music = world.file2list(ROUND_START_MUSIC_LIST, "\n") login_music = pick(music) else @@ -156,10 +154,10 @@ SUBSYSTEM_DEF(ticker) //lobby stats for statpanels if(isnull(timeLeft)) timeLeft = max(0,start_at - world.time) - totalPlayers = LAZYLEN(GLOB.new_player_list) + totalPlayers = LAZYLEN(GLOB.new_player_list) totalPlayersReady = 0 - for(var/i in GLOB.new_player_list) - var/mob/dead/new_player/player = i + for(var/i in GLOB.new_player_list) + var/mob/dead/new_player/player = i if(player.ready == PLAYER_READY_TO_PLAY) ++totalPlayersReady @@ -192,13 +190,13 @@ SUBSYSTEM_DEF(ticker) if(GAME_STATE_PLAYING) mode.process(wait * 0.1) check_queue() - check_maprotate() if(!roundend_check_paused && mode.check_finished(force_ending) || force_ending) current_state = GAME_STATE_FINISHED toggle_ooc(TRUE) // Turn it on toggle_dooc(TRUE) declare_completion(force_ending) + check_maprotate() Master.SetRunLevel(RUNLEVEL_POSTGAME) @@ -343,8 +341,8 @@ SUBSYSTEM_DEF(ticker) explosion(epi, 0, 256, 512, 0, TRUE, TRUE, 0, TRUE) /datum/controller/subsystem/ticker/proc/create_characters() - for(var/i in GLOB.new_player_list) - var/mob/dead/new_player/player = i + for(var/i in GLOB.new_player_list) + var/mob/dead/new_player/player = i if(player.ready == PLAYER_READY_TO_PLAY && player.mind) GLOB.joined_player_list += player.ckey player.create_character(FALSE) @@ -353,8 +351,8 @@ SUBSYSTEM_DEF(ticker) CHECK_TICK /datum/controller/subsystem/ticker/proc/collect_minds() - for(var/i in GLOB.new_player_list) - var/mob/dead/new_player/P = i + for(var/i in GLOB.new_player_list) + var/mob/dead/new_player/P = i if(P.new_character && P.new_character.mind) SSticker.minds += P.new_character.mind CHECK_TICK @@ -362,8 +360,8 @@ SUBSYSTEM_DEF(ticker) /datum/controller/subsystem/ticker/proc/equip_characters() var/captainless=1 - for(var/i in GLOB.new_player_list) - var/mob/dead/new_player/N = i + for(var/i in GLOB.new_player_list) + var/mob/dead/new_player/N = i var/mob/living/carbon/human/player = N.new_character if(istype(player) && player.mind && player.mind.assigned_role) if(player.mind.assigned_role == "Captain") @@ -374,16 +372,16 @@ SUBSYSTEM_DEF(ticker) SSquirks.AssignQuirks(N.new_character, N.client, TRUE) CHECK_TICK if(captainless) - for(var/i in GLOB.new_player_list) - var/mob/dead/new_player/N = i + for(var/i in GLOB.new_player_list) + var/mob/dead/new_player/N = i if(N.new_character) to_chat(N, "Captainship not forced on anyone.") CHECK_TICK /datum/controller/subsystem/ticker/proc/transfer_characters() var/list/livings = list() - for(var/i in GLOB.new_player_list) - var/mob/dead/new_player/player = i + for(var/i in GLOB.new_player_list) + var/mob/dead/new_player/player = i var/mob/living = player.transfer_character() if(living) qdel(player) @@ -449,17 +447,9 @@ SUBSYSTEM_DEF(ticker) queue_delay = 0 /datum/controller/subsystem/ticker/proc/check_maprotate() - if (!CONFIG_GET(flag/maprotation)) + if(!CONFIG_GET(flag/maprotation)) return - if (SSshuttle.emergency && SSshuttle.emergency.mode != SHUTTLE_ESCAPE || SSshuttle.canRecall()) - return - if (maprotatechecked) - return - - maprotatechecked = 1 - - //map rotate chance defaults to 75% of the length of the round (in minutes) - if (!prob((world.time/600)*CONFIG_GET(number/maprotatechancedelta))) + if(world.time - SSticker.round_start_time < 10 MINUTES) //Not forcing map rotation for very short rounds. return INVOKE_ASYNC(SSmapping, /datum/controller/subsystem/mapping/.proc/maprotate) @@ -493,12 +483,10 @@ SUBSYSTEM_DEF(ticker) queue_delay = SSticker.queue_delay queued_players = SSticker.queued_players - maprotatechecked = SSticker.maprotatechecked round_start_time = SSticker.round_start_time queue_delay = SSticker.queue_delay queued_players = SSticker.queued_players - maprotatechecked = SSticker.maprotatechecked switch (current_state) if(GAME_STATE_SETTING_UP) @@ -569,8 +557,8 @@ SUBSYSTEM_DEF(ticker) //Everyone who wanted to be an observer gets made one now /datum/controller/subsystem/ticker/proc/create_observers() - for(var/i in GLOB.new_player_list) - var/mob/dead/new_player/player = i + for(var/i in GLOB.new_player_list) + var/mob/dead/new_player/player = i if(player.ready == PLAYER_READY_TO_OBSERVE && player.mind) //Break chain since this has a sleep input in it addtimer(CALLBACK(player, /mob/dead/new_player.proc/make_me_an_observer), 1) diff --git a/code/controllers/subsystem/timer.dm b/code/controllers/subsystem/timer.dm index bd2fb854afc..36bf992cfb9 100644 --- a/code/controllers/subsystem/timer.dm +++ b/code/controllers/subsystem/timer.dm @@ -94,7 +94,7 @@ SUBSYSTEM_DEF(timer) if(ctime_timer.flags & TIMER_LOOP) ctime_timer.spent = 0 ctime_timer.timeToRun = REALTIMEOFDAY + ctime_timer.wait - BINARY_INSERT(ctime_timer, clienttime_timers, datum/timedevent, timeToRun) + BINARY_INSERT(ctime_timer, clienttime_timers, datum/timedevent, ctime_timer, timeToRun, COMPARE_KEY) else qdel(ctime_timer) @@ -423,7 +423,7 @@ SUBSYSTEM_DEF(timer) L = SStimer.second_queue if(L) - BINARY_INSERT(src, L, datum/timedevent, timeToRun) + BINARY_INSERT(src, L, datum/timedevent, src, timeToRun, COMPARE_KEY) return //get the list of buckets diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm index 64a8e723020..2942ef64ecd 100644 --- a/code/controllers/subsystem/vote.dm +++ b/code/controllers/subsystem/vote.dm @@ -75,13 +75,15 @@ SUBSYSTEM_DEF(vote) for (var/non_voter_ckey in non_voters) var/client/C = non_voters[non_voter_ckey] if(C.prefs.preferred_map) - var/preferred_map = C.prefs.preferred_map - choices[preferred_map] += 1 - greatest_votes = max(greatest_votes, choices[preferred_map]) - else if(global.config.defaultmap) - var/default_map = global.config.defaultmap.map_name - choices[default_map] += 1 - greatest_votes = max(greatest_votes, choices[default_map]) + if(choices[C.prefs.preferred_map]) //No votes if the map isnt in the vote. + var/preferred_map = C.prefs.preferred_map + choices[preferred_map] += 1 + greatest_votes = max(greatest_votes, choices[preferred_map]) + else if(config.defaultmap) + if(choices[config.defaultmap]) //No votes if the map isnt in the vote. + var/default_map = config.defaultmap.map_name + choices[default_map] += 1 + greatest_votes = max(greatest_votes, choices[default_map]) //get all options with that many votes and return them in a list . = list() if(greatest_votes) @@ -121,27 +123,27 @@ SUBSYSTEM_DEF(vote) /datum/controller/subsystem/vote/proc/result() . = announce_result() - var/restart = 0 + var/restart = FALSE if(.) switch(mode) if("restart") if(. == "Restart Round") - restart = 1 + restart = TRUE if("gamemode") if(GLOB.master_mode != .) SSticker.save_mode(.) if(SSticker.HasRoundStarted()) - restart = 1 + restart = TRUE else GLOB.master_mode = . if("map") SSmapping.changemap(global.config.maplist[.]) SSmapping.map_voted = TRUE if(restart) - var/active_admins = 0 + var/active_admins = FALSE for(var/client/C in GLOB.admins) if(!C.is_afk() && check_rights_for(C, R_SERVER)) - active_admins = 1 + active_admins = TRUE break if(!active_admins) SSticker.Reboot("Restart vote successful.", "restart vote") @@ -154,30 +156,34 @@ SUBSYSTEM_DEF(vote) /datum/controller/subsystem/vote/proc/submit_vote(vote) if(mode) if(CONFIG_GET(flag/no_dead_vote) && usr.stat == DEAD && !usr.client.holder) - return 0 + return FALSE if(!(usr.ckey in voted)) if(vote && 1<=vote && vote<=choices.len) voted += usr.ckey choices[choices[vote]]++ //check this return vote - return 0 + return FALSE /datum/controller/subsystem/vote/proc/initiate_vote(vote_type, initiator_key) + if(!Master.current_runlevel) //Server is still intializing. + to_chat(usr, "Cannot start vote, server is not done initializing.") + return FALSE + var/admin = FALSE + var/ckey = ckey(initiator_key) + if(GLOB.admin_datums[ckey]) + admin = TRUE + if(!mode) if(started_time) var/next_allowed_time = (started_time + CONFIG_GET(number/vote_delay)) if(mode) to_chat(usr, "There is already a vote in progress! please wait for it to finish.") - return 0 + return FALSE - var/admin = FALSE - var/ckey = ckey(initiator_key) - if(GLOB.admin_datums[ckey]) - admin = TRUE if(next_allowed_time > world.time && !admin) to_chat(usr, "A vote was initiated recently, you must wait [DisplayTimeText(next_allowed_time-world.time)] before a new vote can be started!") - return 0 + return FALSE reset() switch(vote_type) @@ -186,22 +192,25 @@ SUBSYSTEM_DEF(vote) if("gamemode") choices.Add(config.votable_modes) if("map") - for(var/map in global.config.maplist) + if(!admin && SSmapping.map_voted) + to_chat(usr, "The next map has already been selected.") + return FALSE + for(var/map in config.maplist) var/datum/map_config/VM = config.maplist[map] - if(!VM.votable) + if(!VM.votable || (VM.map_name in SSpersistence.blocked_maps)) continue choices.Add(VM.map_name) if("custom") question = stripped_input(usr,"What is the vote for?") if(!question) - return 0 + return FALSE for(var/i=1,i<=10,i++) var/option = capitalize(stripped_input(usr,"Please enter an option or hit cancel to finish")) if(!option || mode || !usr.client) break choices.Add(option) else - return 0 + return FALSE mode = vote_type initiator = initiator_key started_time = world.time @@ -220,18 +229,18 @@ SUBSYSTEM_DEF(vote) C.player_details.player_actions += V V.Grant(C.mob) generated_actions += V - return 1 - return 0 + return TRUE + return FALSE /datum/controller/subsystem/vote/proc/interface(client/C) if(!C) return - var/admin = 0 - var/trialmin = 0 + var/admin = FALSE + var/trialmin = FALSE if(C.holder) - admin = 1 + admin = TRUE if(check_rights_for(C, R_ADMIN)) - trialmin = 1 + trialmin = TRUE voting |= C if(mode) @@ -291,11 +300,11 @@ SUBSYSTEM_DEF(vote) if(!usr || !usr.client) return //not necessary but meh...just in-case somebody does something stupid - var/trialmin = 0 + var/trialmin = FALSE if(usr.client.holder) if(check_rights_for(usr.client, R_ADMIN)) - trialmin = 1 - + trialmin = TRUE + switch(href_list["vote"]) if("close") voting -= usr.client @@ -357,7 +366,7 @@ SUBSYSTEM_DEF(vote) Remove(owner) /datum/action/vote/IsAvailable() - return 1 + return TRUE /datum/action/vote/proc/remove_from_client() if(!owner) diff --git a/code/datums/achievements/_achievement_data.dm b/code/datums/achievements/_achievement_data.dm index 2a000c15557..b6e2cf3f7a9 100644 --- a/code/datums/achievements/_achievement_data.dm +++ b/code/datums/achievements/_achievement_data.dm @@ -30,7 +30,7 @@ /datum/achievement_data/proc/load_all_achievements() set waitfor = FALSE - + var/list/kv = list() var/datum/DBQuery/Query = SSdbcore.NewQuery("SELECT achievement_key,value FROM [format_table_name("achievements")] WHERE ckey = '[sanitizeSQL(owner_ckey)]'") if(!Query.Execute()) @@ -61,6 +61,8 @@ ///Unlocks an achievement of a specific type. /datum/achievement_data/proc/unlock(achievement_type, mob/user) + if(!SSachievements.achievements_enabled) + return var/datum/award/A = SSachievements.awards[achievement_type] get_data(achievement_type) //Get the current status first if necessary if(istype(A, /datum/award/achievement)) @@ -75,6 +77,8 @@ ///Resets an achievement to default values. /datum/achievement_data/proc/reset(achievement_type) + if(!SSachievements.achievements_enabled) + return var/datum/award/A = SSachievements.awards[achievement_type] get_data(achievement_type) if(istype(A, /datum/award/achievement)) diff --git a/code/datums/achievements/boss_achievements.dm b/code/datums/achievements/boss_achievements.dm index d50c6a37203..1c0cc0ad9ee 100644 --- a/code/datums/achievements/boss_achievements.dm +++ b/code/datums/achievements/boss_achievements.dm @@ -1,75 +1,90 @@ /datum/award/achievement/boss category = "Bosses" + icon = "baseboss" /datum/award/achievement/boss/tendril_exterminator name = "Tendril Exterminator" desc = "Watch your step" database_id = BOSS_MEDAL_TENDRIL + icon = "tendril" /datum/award/achievement/boss/boss_killer name = "Boss Killer" desc = "You've come a long ways from asking how to switch hands." database_id = "Boss Killer" + icon = "firstboss" /datum/award/achievement/boss/blood_miner_kill name = "Blood-drunk Miner Killer" desc = "I guess he couldn't handle his drink that well." database_id = BOSS_MEDAL_MINER + icon = "miner" /datum/award/achievement/boss/bubblegum_kill name = "Bubblegum Killer" desc = "I guess he wasn't made of candy after all" database_id = BOSS_MEDAL_BUBBLEGUM + icon = "bbgum" -/datum/award/achievement/boss/colussus_kill - name = "Colussus Killer" +/datum/award/achievement/boss/colossus_kill + name = "Colossus Killer" desc = "The bigger they are... the better the loot" database_id = BOSS_MEDAL_COLOSSUS + icon = "colossus" /datum/award/achievement/boss/drake_kill name = "Drake Killer" desc = "Now I can wear Rune Platebodies!" database_id = BOSS_MEDAL_DRAKE + icon = "drake" /datum/award/achievement/boss/hierophant_kill name = "Hierophant Killer" desc = "Hierophant, but not triumphant." database_id = BOSS_MEDAL_HIEROPHANT + icon = "hierophant" /datum/award/achievement/boss/legion_kill name = "Legion Killer" desc = "We were many..now we are none." database_id = BOSS_MEDAL_LEGION + icon = "legion" /datum/award/achievement/boss/swarmer_beacon_kill name = "Swarm Beacon Killer" desc = "GET THEM OFF OF ME!" database_id = BOSS_MEDAL_SWARMERS + icon = "swarmer" /datum/award/achievement/boss/blood_miner_crusher name = "Blood-drunk Miner Crusher" desc = "I guess he couldn't handle his drink that well." database_id = BOSS_MEDAL_MINER_CRUSHER + icon = "miner" /datum/award/achievement/boss/bubblegum_crusher name = "Bubblegum Crusher" desc = "I guess he wasn't made of candy after all" database_id = BOSS_MEDAL_BUBBLEGUM_CRUSHER + icon = "bbgum" -/datum/award/achievement/boss/colussus_crusher - name = "Colussus Crusher" +/datum/award/achievement/boss/colossus_crusher + name = "Colossus Crusher" desc = "The bigger they are... the better the loot" database_id = BOSS_MEDAL_COLOSSUS_CRUSHER + icon = "colossus" /datum/award/achievement/boss/drake_crusher name = "Drake Crusher" desc = "Now I can wear Rune Platebodies!" database_id = BOSS_MEDAL_DRAKE_CRUSHER + icon = "drake" /datum/award/achievement/boss/hierophant_crusher name = "Hierophant Crusher" desc = "Hierophant, but not triumphant." database_id = BOSS_MEDAL_HIEROPHANT_CRUSHER + icon = "hierophant" /datum/award/achievement/boss/legion_crusher name = "Legion Crusher" diff --git a/code/datums/achievements/misc_achievements.dm b/code/datums/achievements/misc_achievements.dm index a4f65925d27..3d3fe61a9f0 100644 --- a/code/datums/achievements/misc_achievements.dm +++ b/code/datums/achievements/misc_achievements.dm @@ -1,41 +1,49 @@ /datum/award/achievement/misc category = "Misc" + icon = "basemisc" /datum/award/achievement/misc/meteor_examine name = "Your Life Before Your Eyes" desc = "Take a close look at hurtling space debris" database_id = MEDAL_METEOR + icon = "meteors" /datum/award/achievement/misc/pulse name = "Jackpot" desc = "Win a pulse rifle from an arcade machine" database_id = MEDAL_PULSE + icon = "jackpot" /datum/award/achievement/misc/time_waste name = "Time waster" desc = "Speak no evil, hear no evil, see just errors" database_id = MEDAL_TIMEWASTE + icon = "timewaste" /datum/award/achievement/misc/feat_of_strength name = "Feat of Strength" desc = "If the rod is immovable, is it passing you or are you passing it?" database_id = MEDAL_RODSUPLEX + icon = "featofstrength" /datum/award/achievement/misc/round_and_full name = "Round and Full" desc = "Well at least you aren't down the river, I hear they eat people there." database_id = MEDAL_CLOWNCARKING + icon = "clownking" /datum/award/achievement/misc/the_best_driver name = "The Best Driver" desc = "100 honks later" database_id = MEDAL_THANKSALOT + icon = "clownthanks" /datum/award/achievement/misc/helbitaljanken name = "Helbitaljanken" desc = "You janked hard" database_id = MEDAL_HELBITALJANKEN - + icon = "helbital" + /datum/award/achievement/misc/getting_an_upgrade name = "Getting an upgrade" desc = "Make your first unique material item!" @@ -75,3 +83,15 @@ name = "One Lean, Mean, Cleaning Machine" desc = "How does it feel to know that your workplace values a mop bucket on wheels more than you?" // i can do better than this give me time database_id = MEDAL_CLEANBOSS + +/datum/award/achievement/misc/rule8 + name = "Rule 8" + desc = "Call an admin this is ILLEGAL!!" + database_id = MEDAL_RULE8 + icon = "rule8" + +/datum/award/achievement/misc/speed_round + name = "Long shift" + desc = "Well, that didn't take long." + database_id = MEDAL_LONGSHIFT + icon = "longshift" diff --git a/code/datums/achievements/skill_achievements.dm b/code/datums/achievements/skill_achievements.dm new file mode 100644 index 00000000000..7da936c61f4 --- /dev/null +++ b/code/datums/achievements/skill_achievements.dm @@ -0,0 +1,10 @@ +/datum/award/achievement/skill + category = "Skills" + icon = "baseskill" + +/datum/award/achievement/skill/legendary_miner + name = "Legendary miner" + desc = "No mere rock can stop me!" + database_id = MEDAL_LEGENDARY_MINER + icon = "mining" + diff --git a/code/datums/action.dm b/code/datums/action.dm index 2fdcd693e26..7d9f5a5e593 100644 --- a/code/datums/action.dm +++ b/code/datums/action.dm @@ -31,6 +31,7 @@ /datum/action/proc/link_to(Target) target = Target + RegisterSignal(Target, COMSIG_ATOM_UPDATED_ICON, .proc/OnUpdatedIcon) /datum/action/Destroy() if(owner) @@ -142,6 +143,8 @@ current_button.add_overlay(mutable_appearance(icon_icon, button_icon_state)) current_button.button_icon_state = button_icon_state +/datum/action/proc/OnUpdatedIcon() + UpdateButtonIcon() //Presets for item actions /datum/action/item_action @@ -190,6 +193,13 @@ /datum/action/item_action/toggle_light name = "Toggle Light" +/datum/action/item_action/toggle_light/Trigger() + if(istype(target, /obj/item/pda)) + var/obj/item/pda/P = target + P.toggle_light(owner) + return + ..() + /datum/action/item_action/toggle_hood name = "Toggle Hood" diff --git a/code/datums/brain_damage/brain_trauma.dm b/code/datums/brain_damage/brain_trauma.dm index 1aa1341c9cf..ca63c5b3d66 100644 --- a/code/datums/brain_damage/brain_trauma.dm +++ b/code/datums/brain_damage/brain_trauma.dm @@ -14,7 +14,6 @@ var/can_gain = TRUE var/random_gain = TRUE //can this be gained through random traumas? var/resilience = TRAUMA_RESILIENCE_BASIC //how hard is this to cure? - var/clonable = TRUE // will this transfer if the brain is cloned? /datum/brain_trauma/Destroy() if(brain && brain.traumas) @@ -25,10 +24,6 @@ owner = null return ..() -/datum/brain_trauma/proc/on_clone() - if(clonable) - return new type - //Called on life ticks /datum/brain_trauma/proc/on_life() return diff --git a/code/datums/brain_damage/hypnosis.dm b/code/datums/brain_damage/hypnosis.dm index e717d438591..8c21179b03a 100644 --- a/code/datums/brain_damage/hypnosis.dm +++ b/code/datums/brain_damage/hypnosis.dm @@ -14,7 +14,7 @@ qdel(src) hypnotic_phrase = phrase try - target_phrase = new("(\\b[hypnotic_phrase]\\b)","ig") + target_phrase = new("(\\b[REGEX_QUOTE(hypnotic_phrase)]\\b)","ig") catch(var/exception/e) stack_trace("[e] on [e.file]:[e.line]") qdel(src) @@ -52,4 +52,4 @@ new /datum/hallucination/chat(owner, TRUE, FALSE, "[hypnotic_phrase]") /datum/brain_trauma/hypnosis/handle_hearing(datum/source, list/hearing_args) - hearing_args[HEARING_MESSAGE] = target_phrase.Replace(hearing_args[HEARING_MESSAGE], "$1") + hearing_args[HEARING_RAW_MESSAGE] = target_phrase.Replace(hearing_args[HEARING_RAW_MESSAGE], "$1") diff --git a/code/datums/brain_damage/imaginary_friend.dm b/code/datums/brain_damage/imaginary_friend.dm index 17c26854b76..6b4766aba3a 100644 --- a/code/datums/brain_damage/imaginary_friend.dm +++ b/code/datums/brain_damage/imaginary_friend.dm @@ -152,7 +152,7 @@ to_chat(src, compose_message(speaker, message_language, raw_message, radio_freq, spans, message_mode)) /mob/camera/imaginary_friend/proc/friend_talk(message) - message = capitalize(trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN))) + message = capitalize(trim(copytext_char(sanitize(message), 1, MAX_MESSAGE_LEN))) if(!message) return diff --git a/code/datums/brain_damage/mild.dm b/code/datums/brain_damage/mild.dm index 7d25fe56b95..a890aef3139 100644 --- a/code/datums/brain_damage/mild.dm +++ b/code/datums/brain_damage/mild.dm @@ -199,14 +199,16 @@ var/list/new_message = list() for(var/word in message_split) - var/suffix = copytext(word,-1) - - // Check if we have a suffix and break it out of the word - if(suffix in list("." , "," , ";" , "!" , ":" , "?")) - word = copytext(word,1,-1) - else - suffix = "" + var/suffix = "" + var/suffix_foundon = 0 + for(var/potential_suffix in list("." , "," , ";" , "!" , ":" , "?")) + suffix_foundon = findtext(word, potential_suffix, -length(potential_suffix)) + if(suffix_foundon) + suffix = potential_suffix + break + if(suffix_foundon) + word = copytext(word, 1, suffix_foundon) word = html_decode(word) if(lowertext(word) in common_words) @@ -216,10 +218,10 @@ new_message += pick("uh","erm") break else - var/list/charlist = string2charlist(word) // Stupid shit code + var/list/charlist = text2charlist(word) + charlist.len = round(charlist.len * 0.5, 1) shuffle_inplace(charlist) - charlist.len = round(charlist.len * 0.5,1) - new_message += html_encode(jointext(charlist,"")) + suffix + new_message += jointext(charlist, "") + suffix message = jointext(new_message, " ") @@ -241,7 +243,7 @@ if(prob(25)) var/deja_vu = pick_n_take(hear_dejavu) var/static/regex/quoted_spoken_message = regex("\".+\"", "gi") - hearing_args[HEARING_MESSAGE] = quoted_spoken_message.Replace(hearing_args[HEARING_MESSAGE], "\"[deja_vu]\"") //Quotes included to avoid cases where someone says part of their name + hearing_args[HEARING_RAW_MESSAGE] = quoted_spoken_message.Replace(hearing_args[HEARING_RAW_MESSAGE], "\"[deja_vu]\"") //Quotes included to avoid cases where someone says part of their name return if(hear_dejavu.len >= 15) if(prob(50)) diff --git a/code/datums/brain_damage/phobia.dm b/code/datums/brain_damage/phobia.dm index 034f2baaaf0..12faa9ba365 100644 --- a/code/datums/brain_damage/phobia.dm +++ b/code/datums/brain_damage/phobia.dm @@ -31,11 +31,6 @@ trigger_species = SStraumas.phobia_species[phobia_type] ..() - -/datum/brain_trauma/mild/phobia/on_clone() - if(clonable) - return new type(phobia_type) - /datum/brain_trauma/mild/phobia/on_life() ..() if(HAS_TRAIT(owner, TRAIT_FEARLESS)) @@ -88,7 +83,7 @@ if(findtext(hearing_args[HEARING_RAW_MESSAGE], reg)) addtimer(CALLBACK(src, .proc/freak_out, null, word), 10) //to react AFTER the chat message - hearing_args[HEARING_MESSAGE] = reg.Replace(hearing_args[HEARING_MESSAGE], "$1") + hearing_args[HEARING_RAW_MESSAGE] = reg.Replace(hearing_args[HEARING_RAW_MESSAGE], "$1") break /datum/brain_trauma/mild/phobia/handle_speech(datum/source, list/speech_args) diff --git a/code/datums/brain_damage/special.dm b/code/datums/brain_damage/special.dm index 9444795108d..c743bf200da 100644 --- a/code/datums/brain_damage/special.dm +++ b/code/datums/brain_damage/special.dm @@ -142,7 +142,6 @@ /datum/brain_trauma/special/psychotic_brawling/bath_salts name = "Chemical Violent Psychosis" - clonable = FALSE /datum/brain_trauma/special/tenacity name = "Tenacity" @@ -244,7 +243,6 @@ scan_desc = "criminal mind" gain_text = "Justice is coming for you." lose_text = "You were absolved for your crimes." - clonable = FALSE random_gain = FALSE var/obj/effect/hallucination/simple/securitron/beepsky diff --git a/code/datums/brain_damage/split_personality.dm b/code/datums/brain_damage/split_personality.dm index 8c90b146ac2..c033327c91b 100644 --- a/code/datums/brain_damage/split_personality.dm +++ b/code/datums/brain_damage/split_personality.dm @@ -204,9 +204,9 @@ /datum/brain_trauma/severe/split_personality/brainwashing/handle_hearing(datum/source, list/hearing_args) if(HAS_TRAIT(owner, TRAIT_DEAF) || owner == hearing_args[HEARING_SPEAKER]) return - var/message = hearing_args[HEARING_MESSAGE] + var/message = hearing_args[HEARING_RAW_MESSAGE] if(findtext(message, codeword)) - hearing_args[HEARING_MESSAGE] = replacetext(message, codeword, "[codeword]") + hearing_args[HEARING_RAW_MESSAGE] = replacetext(message, codeword, "[codeword]") addtimer(CALLBACK(src, /datum/brain_trauma/severe/split_personality.proc/switch_personalities), 10) /datum/brain_trauma/severe/split_personality/brainwashing/handle_speech(datum/source, list/speech_args) diff --git a/code/datums/browser.dm b/code/datums/browser.dm index cbddbf3c82e..61953c23c8b 100644 --- a/code/datums/browser.dm +++ b/code/datums/browser.dm @@ -74,9 +74,9 @@ return {" - - + + [head_content] diff --git a/code/datums/cinematic.dm b/code/datums/cinematic.dm index ed1b7d670ff..e26f8fba2cf 100644 --- a/code/datums/cinematic.dm +++ b/code/datums/cinematic.dm @@ -203,6 +203,20 @@ special() screen.icon_state = "summary_cult" +/datum/cinematic/cult_fail + id = CINEMATIC_CULT_FAIL + +/datum/cinematic/cult_fail/content() + screen.icon_state = "station_intact" + sleep(20) + cinematic_sound(sound('sound/creatures/narsie_rises.ogg')) + sleep(60) + cinematic_sound(sound('sound/effects/explosion_distant.ogg')) + sleep(10) + cinematic_sound(sound('sound/magic/demon_dies.ogg')) + sleep(30) + special() + /datum/cinematic/nuke_annihilation id = CINEMATIC_ANNIHILATION diff --git a/code/datums/components/README.md b/code/datums/components/README.md index 509630bb0a0..d86d06b947a 100644 --- a/code/datums/components/README.md +++ b/code/datums/components/README.md @@ -6,4 +6,4 @@ Loosely adapted from /vg/. This is an entity component system for adding behavio See [this thread](https://tgstation13.org/phpBB/viewtopic.php?f=5&t=22674) for an introduction to the system as a whole. -### See/Define signals and their arguments in [__DEFINES\components.dm](..\..\__DEFINES\components.dm) +### See/Define signals and their arguments in [__DEFINES\components.dm](../../__DEFINES/components.dm) diff --git a/code/datums/components/_component.dm b/code/datums/components/_component.dm index 13c8a733c28..88e13ae5ffe 100644 --- a/code/datums/components/_component.dm +++ b/code/datums/components/_component.dm @@ -233,6 +233,17 @@ /datum/component/proc/InheritComponent(datum/component/C, i_am_original) return + +/** + * Called on a component when a component of the same type was added to the same parent with COMPONENT_DUPE_SELECTIVE + * See `/datum/component/var/dupe_mode` + * `C`'s type will always be the same of the called component + * return TRUE if you are absorbing the component, otherwise FALSE if you are fine having it exist as a duplicate component + */ +/datum/component/proc/CheckDupeComponent(datum/component/C, ...) + return + + /** * Callback Just before this component is transferred * @@ -295,7 +306,7 @@ */ /datum/proc/GetComponent(datum/component/c_type) RETURN_TYPE(c_type) - if(initial(c_type.dupe_mode) == COMPONENT_DUPE_ALLOWED) + if(initial(c_type.dupe_mode) == COMPONENT_DUPE_ALLOWED || initial(c_type.dupe_mode) == COMPONENT_DUPE_SELECTIVE) stack_trace("GetComponent was called to get a component of which multiple copies could be on an object. This can easily break and should be changed. Type: \[[c_type]\]") var/list/dc = datum_components if(!dc) @@ -314,7 +325,7 @@ */ /datum/proc/GetExactComponent(datum/component/c_type) RETURN_TYPE(c_type) - if(initial(c_type.dupe_mode) == COMPONENT_DUPE_ALLOWED) + if(initial(c_type.dupe_mode) == COMPONENT_DUPE_ALLOWED || initial(c_type.dupe_mode) == COMPONENT_DUPE_SELECTIVE) stack_trace("GetComponent was called to get a component of which multiple copies could be on an object. This can easily break and should be changed. Type: \[[c_type]\]") var/list/dc = datum_components if(!dc) @@ -390,6 +401,18 @@ old_comp.InheritComponent(null, TRUE, arguments) else old_comp.InheritComponent(new_comp, TRUE) + if(COMPONENT_DUPE_SELECTIVE) + var/list/arguments = args.Copy() + arguments[1] = new_comp + var/make_new_component = TRUE + for(var/i in GetComponents(new_type)) + var/datum/component/C = i + if(C.CheckDupeComponent(arglist(arguments))) + make_new_component = FALSE + QDEL_NULL(new_comp) + break + if(!new_comp && make_new_component) + new_comp = new nt(arglist(args)) else if(!new_comp) new_comp = new nt(arglist(args)) // There's a valid dupe mode but there's no old component, act like normal else if(!new_comp) diff --git a/code/datums/components/armor_plate.dm b/code/datums/components/armor_plate.dm index 6f1ba6a8392..f026c89c607 100644 --- a/code/datums/components/armor_plate.dm +++ b/code/datums/components/armor_plate.dm @@ -12,6 +12,8 @@ RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/examine) RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/applyplate) RegisterSignal(parent, COMSIG_PARENT_PREQDELETED, .proc/dropplates) + if(istype(parent, /obj/mecha/working/ripley)) + RegisterSignal(parent, COMSIG_ATOM_UPDATE_OVERLAYS, .proc/apply_mech_overlays) if(_maxamount) maxamount = _maxamount @@ -76,3 +78,12 @@ if(ismecha(parent)) //items didn't drop the plates before and it causes erroneous behavior for the time being with collapsible helmets for(var/i in 1 to amount) new upgrade_item(get_turf(parent)) + +/datum/component/armor_plate/proc/apply_mech_overlays(obj/mecha/mech, list/overlays) + if(amount) + var/overlay_string = "ripley-g" + if(amount >= 3) + overlay_string += "-full" + if(!mech.occupant) + overlay_string += "-open" + overlays += overlay_string diff --git a/code/datums/components/butchering.dm b/code/datums/components/butchering.dm index 7209cb9d2b0..98d519dd6a8 100644 --- a/code/datums/components/butchering.dm +++ b/code/datums/components/butchering.dm @@ -32,7 +32,7 @@ if(ishuman(M) && source.force && source.get_sharpness()) var/mob/living/carbon/human/H = M - if((H.health <= H.crit_threshold || (user.pulling == H && user.grab_state >= GRAB_NECK) || H.IsSleeping()) && user.zone_selected == BODY_ZONE_HEAD) // Only sleeping, neck grabbed, or crit, can be sliced. + if((user.pulling == H && user.grab_state >= GRAB_AGGRESSIVE) && user.zone_selected == BODY_ZONE_HEAD) // Only aggressive grabbed can be sliced. if(H.has_status_effect(/datum/status_effect/neck_slice)) user.show_message("[H]'s neck has already been already cut, you can't make the bleeding any worse!", MSG_VISUAL, \ "Their neck has already been already cut, you can't make the bleeding any worse!") @@ -118,7 +118,7 @@ if(!istype(L)) return var/obj/machinery/recycler/eater = parent - if(eater.safety_mode || (eater.stat & (BROKEN|NOPOWER))) //I'm so sorry. + if(eater.safety_mode || (eater.machine_stat & (BROKEN|NOPOWER))) //I'm so sorry. return if(L.stat == DEAD && (L.butcher_results || L.guaranteed_butcher_results)) Butcher(parent, L) diff --git a/code/datums/components/caltrop.dm b/code/datums/components/caltrop.dm index d6804564cb7..4bff66fc7da 100644 --- a/code/datums/components/caltrop.dm +++ b/code/datums/components/caltrop.dm @@ -15,10 +15,6 @@ RegisterSignal(parent, list(COMSIG_MOVABLE_CROSSED), .proc/Crossed) /datum/component/caltrop/proc/Crossed(datum/source, atom/movable/AM) - var/atom/A = parent - if(!A.has_gravity()) - return - if(!prob(probability)) return @@ -30,6 +26,12 @@ if((flags & CALTROP_IGNORE_WALKERS) && H.m_intent == MOVE_INTENT_WALK) return + //move these next two down a level if you add more mobs to this. + if(H.is_flying() || H.is_floating()) //check if they are able to pass over us + return //gravity checking only our parent would prevent us from triggering they're using magboots / other gravity assisting items that would cause them to still touch us. + if(H.buckled) //if they're buckled to something, that something should be checked instead. + return + var/picked_def_zone = pick(BODY_ZONE_L_LEG, BODY_ZONE_R_LEG) var/obj/item/bodypart/O = H.get_bodypart(picked_def_zone) if(!istype(O)) @@ -42,15 +44,13 @@ if(!(flags & CALTROP_BYPASS_SHOES) && (H.shoes || feetCover)) return - if((H.movement_type & FLYING) || H.buckled) - return - var/damage = rand(min_damage, max_damage) if(HAS_TRAIT(H, TRAIT_LIGHT_STEP)) damage *= 0.75 H.apply_damage(damage, BRUTE, picked_def_zone) if(cooldown < world.time - 10) //cooldown to avoid message spam. + var/atom/A = parent if(!H.incapacitated(ignore_restraints = TRUE)) H.visible_message("[H] steps on [A].", \ "You step on [A]!") diff --git a/code/datums/components/crafting/crafting.dm b/code/datums/components/crafting/crafting.dm index 3f45d5709ca..adf81dda997 100644 --- a/code/datums/components/crafting/crafting.dm +++ b/code/datums/components/crafting/crafting.dm @@ -1,7 +1,6 @@ /datum/component/personal_crafting/Initialize() - if(!ismob(parent)) - return COMPONENT_INCOMPATIBLE - RegisterSignal(parent, COMSIG_MOB_CLIENT_LOGIN, .proc/create_mob_button) + if(ismob(parent)) + RegisterSignal(parent, COMSIG_MOB_CLIENT_LOGIN, .proc/create_mob_button) /datum/component/personal_crafting/proc/create_mob_button(mob/user, client/CL) var/datum/hud/H = user.hud_used @@ -49,9 +48,6 @@ var/display_craftable_only = FALSE var/display_compact = TRUE - - - /* This is what procs do: get_environment - gets a list of things accessable for crafting by user get_surroundings - takes a list of things and makes a list of key-types to values-amounts of said type in the list @@ -61,61 +57,72 @@ del_reqs - takes recipe and a user, loops over the recipes reqs var and tries to find everything in the list make by get_environment and delete it/add to parts list, then returns the said list */ - - - -/datum/component/personal_crafting/proc/check_contents(datum/crafting_recipe/R, list/contents) +/** + * Check that the contents of the recipe meet the requirements. + * + * user: The /mob that initated the crafting. + * R: The /datum/crafting_recipe being attempted. + * contents: List of items to search for R's reqs. + */ +/datum/component/personal_crafting/proc/check_contents(atom/a, datum/crafting_recipe/R, list/contents) + var/list/item_instances = contents["instances"] contents = contents["other"] - main_loop: - for(var/A in R.reqs) - var/needed_amount = R.reqs[A] - for(var/B in contents) - if(ispath(B, A)) - if (R.blacklist.Find(B)) - continue - if(contents[B] >= R.reqs[A]) - continue main_loop - else - needed_amount -= contents[B] - if(needed_amount <= 0) - continue main_loop - else - continue - return FALSE - for(var/A in R.chem_catalysts) - if(contents[A] < R.chem_catalysts[A]) - return FALSE - return TRUE -/datum/component/personal_crafting/proc/get_environment(mob/user, list/blacklist = null) + var/list/requirements_list = list() + + // Process all requirements + for(var/requirement_path in R.reqs) + // Check we have the appropriate amount available in the contents list + var/needed_amount = R.reqs[requirement_path] + for(var/content_item_path in contents) + // Right path and not blacklisted + if(!ispath(content_item_path, requirement_path) || R.blacklist.Find(content_item_path)) + continue + + needed_amount -= contents[content_item_path] + if(needed_amount <= 0) + break + + if(needed_amount > 0) + return FALSE + + // Store the instances of what we will use for R.check_requirements() for requirement_path + var/list/instances_list = list() + for(var/instance_path in item_instances) + if(ispath(instance_path, requirement_path)) + instances_list += item_instances[instance_path] + + requirements_list[requirement_path] = instances_list + + for(var/requirement_path in R.chem_catalysts) + if(contents[requirement_path] < R.chem_catalysts[requirement_path]) + return FALSE + + return R.check_requirements(a, requirements_list) + +/datum/component/personal_crafting/proc/get_environment(atom/a, list/blacklist = null, radius_range = 1) . = list() - for(var/obj/item/I in user.held_items) - . += I - if(!isturf(user.loc)) - return - var/list/L = block(get_step(user, SOUTHWEST), get_step(user, NORTHEAST)) - for(var/A in L) - var/turf/T = A - if(T.Adjacent(user)) - for(var/B in T) - var/atom/movable/AM = B - if(AM.flags_1 & HOLOGRAM_1) - continue - . += AM - for(var/slot in list(ITEM_SLOT_RPOCKET, ITEM_SLOT_LPOCKET)) - . += user.get_item_by_slot(slot) - if(blacklist) - for(var/obj/B in .) - if(blacklist.Find(B.type)) - . -= B -/datum/component/personal_crafting/proc/get_surroundings(mob/user) + if(!isturf(a.loc)) + return + + for(var/atom/movable/AM in range(radius_range, a)) + if(AM.flags_1 & HOLOGRAM_1) + continue + . += AM + +/datum/component/personal_crafting/proc/get_surroundings(atom/a) . = list() .["tool_behaviour"] = list() .["other"] = list() - for(var/obj/item/I in get_environment(user)) + .["instances"] = list() + for(var/obj/item/I in get_environment(a)) if(I.flags_1 & HOLOGRAM_1) continue + if(.["instances"][I.type]) + .["instances"][I.type] += I + else + .["instances"][I.type] = list(I) if(istype(I, /obj/item/stack)) var/obj/item/stack/S = I .["other"][I.type] += S.amount @@ -130,13 +137,13 @@ .["other"][A.type] += A.volume .["other"][I.type] += 1 -/datum/component/personal_crafting/proc/check_tools(mob/user, datum/crafting_recipe/R, list/contents) +/datum/component/personal_crafting/proc/check_tools(atom/a, datum/crafting_recipe/R, list/contents) if(!R.tools.len) return TRUE var/list/possible_tools = list() var/list/present_qualities = list() present_qualities |= contents["tool_behaviour"] - for(var/obj/item/I in user.contents) + for(var/obj/item/I in a.contents) if(istype(I, /obj/item/storage)) for(var/obj/item/SI in I.contents) possible_tools += SI.type @@ -161,30 +168,28 @@ return FALSE return TRUE -/datum/component/personal_crafting/proc/construct_item(mob/user, datum/crafting_recipe/R) - var/list/contents = get_surroundings(user) +/datum/component/personal_crafting/proc/construct_item(atom/a, datum/crafting_recipe/R) + var/list/contents = get_surroundings(a) var/send_feedback = 1 - if(check_contents(R, contents)) - if(check_tools(user, R, contents)) - if(do_after(user, R.time, target = user)) - contents = get_surroundings(user) - if(!check_contents(R, contents)) - return ", missing component." - if(!check_tools(user, R, contents)) - return ", missing tool." - var/list/parts = del_reqs(R, user) - var/atom/movable/I = new R.result (get_turf(user.loc)) - I.CheckParts(parts, R) - if(isitem(I)) - user.put_in_hands(I) - if(send_feedback) - SSblackbox.record_feedback("tally", "object_crafted", 1, I.type) - return 0 - return "." + if(check_contents(a, R, contents)) + if(check_tools(a, R, contents)) + //If we're a mob we'll try a do_after; non mobs will instead instantly construct the item + if(ismob(a) && !do_after(a, R.time, target = a)) + return "." + contents = get_surroundings(a) + if(!check_contents(a, R, contents)) + return ", missing component." + if(!check_tools(a, R, contents)) + return ", missing tool." + var/list/parts = del_reqs(R, a) + var/atom/movable/I = new R.result (get_turf(a.loc)) + I.CheckParts(parts, R) + if(send_feedback) + SSblackbox.record_feedback("tally", "object_crafted", 1, I.type) + return I //Send the item back to whatever called this proc so it can handle whatever it wants to do with the new item return ", missing tool." return ", missing component." - /*Del reqs works like this: Loop over reqs var of the recipe @@ -209,7 +214,7 @@ del_reqs return the list of parts resulting object will receive as argument of CheckParts proc, on the atom level it will add them all to the contents, on all other levels it calls ..() and does whatever is needed afterwards but from contents list already */ -/datum/component/personal_crafting/proc/del_reqs(datum/crafting_recipe/R, mob/user) +/datum/component/personal_crafting/proc/del_reqs(datum/crafting_recipe/R, atom/a) var/list/surroundings var/list/Deletion = list() . = list() @@ -218,7 +223,7 @@ main_loop: for(var/A in R.reqs) amt = R.reqs[A] - surroundings = get_environment(user, R.blacklist) + surroundings = get_environment(a, R.blacklist) surroundings -= Deletion if(ispath(A, /datum/reagent)) var/datum/reagent/RG = new A @@ -311,6 +316,7 @@ if(user == parent) ui_interact(user) +//For the UI related things we're going to assume the user is a mob rather than typesetting it to an atom as the UI isn't generated if the parent is an atom /datum/component/personal_crafting/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.not_incapacitated_turf_state) ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) @@ -323,7 +329,6 @@ ui = new(user, src, ui_key, "personal_crafting", "Crafting Menu", 700, 800, master_ui, state) ui.open() - /datum/component/personal_crafting/ui_data(mob/user) var/list/data = list() data["busy"] = busy @@ -343,7 +348,7 @@ if((R.category != cur_category) || (R.subcategory != cur_subcategory)) continue - craftability["[REF(R)]"] = check_contents(R, surroundings) + craftability["[REF(R)]"] = check_contents(user, R, surroundings) data["craftability"] = craftability return data @@ -375,7 +380,6 @@ data["crafting_recipes"] = crafting_recipes return data - /datum/component/personal_crafting/ui_act(action, params) if(..()) return @@ -384,11 +388,16 @@ var/datum/crafting_recipe/TR = locate(params["recipe"]) in GLOB.crafting_recipes busy = TRUE ui_interact(usr) - var/fail_msg = construct_item(usr, TR) - if(!fail_msg) + var/atom/movable/result = construct_item(usr, TR) + if(!istext(result)) //We made an item and didn't get a fail message + if(ismob(usr)) //In case the user is actually possessing a non mob like a machine + var/mob/m = usr + m.put_in_hands(result) + else + result.forceMove(usr.loc) to_chat(usr, "[TR.name] constructed.") else - to_chat(usr, "Construction failed[fail_msg]") + to_chat(usr, "Construction failed[result]") busy = FALSE if("toggle_recipes") display_craftable_only = !display_craftable_only diff --git a/code/datums/components/crafting/guncrafting.dm b/code/datums/components/crafting/guncrafting.dm index d96be9be106..ec2481366fe 100644 --- a/code/datums/components/crafting/guncrafting.dm +++ b/code/datums/components/crafting/guncrafting.dm @@ -11,5 +11,6 @@ /obj/item/weaponcrafting/stock name = "rifle stock" desc = "A classic rifle stock that doubles as a grip, roughly carved out of wood." + custom_materials = list(/datum/material/wood = MINERAL_MATERIAL_AMOUNT * 6) icon = 'icons/obj/improvised.dmi' icon_state = "riflestock" diff --git a/code/datums/components/crafting/recipes.dm b/code/datums/components/crafting/recipes.dm index e3d242d663e..8bc450a4e89 100644 --- a/code/datums/components/crafting/recipes.dm +++ b/code/datums/components/crafting/recipes.dm @@ -16,15 +16,14 @@ if(!(result in reqs)) blacklist += result -/datum/crafting_recipe/pin_removal - name = "Pin Removal" - result = /obj/item/gun - reqs = list(/obj/item/gun = 1) - parts = list(/obj/item/gun = 1) - tools = list(TOOL_WELDER, TOOL_SCREWDRIVER, TOOL_WIRECUTTER) - time = 50 - category = CAT_WEAPONRY - subcategory = CAT_WEAPON +/** + * Run custom pre-craft checks for this recipe + * + * user: The /mob that initiated the crafting + * collected_requirements: A list of lists of /obj/item instances that satisfy reqs. Top level list is keyed by requirement path. + */ +/datum/crafting_recipe/proc/check_requirements(mob/user, list/collected_requirements) + return TRUE /datum/crafting_recipe/IED name = "IED" @@ -60,6 +59,10 @@ category = CAT_WEAPONRY subcategory = CAT_WEAPON +/datum/crafting_recipe/strobeshield/New() + ..() + blacklist |= subtypesof(/obj/item/shield/riot/) + /datum/crafting_recipe/molotov name = "Molotov" result = /obj/item/reagent_containers/food/drinks/bottle/molotov @@ -114,7 +117,7 @@ name = "Tail Club" result = /obj/item/tailclub reqs = list(/obj/item/organ/tail/lizard = 1, - /obj/item/stack/sheet/metal = 1) + /obj/item/stack/sheet/metal = 1) time = 40 category = CAT_WEAPONRY subcategory = CAT_WEAPON @@ -123,7 +126,7 @@ name = "Liz O' Nine Tails" result = /obj/item/melee/chainofcommand/tailwhip reqs = list(/obj/item/organ/tail/lizard = 1, - /obj/item/stack/cable_coil = 1) + /obj/item/stack/cable_coil = 1) time = 40 category = CAT_WEAPONRY subcategory = CAT_WEAPON @@ -132,7 +135,7 @@ name = "Cat O' Nine Tails" result = /obj/item/melee/chainofcommand/tailwhip/kitty reqs = list(/obj/item/organ/tail/cat = 1, - /obj/item/stack/cable_coil = 1) + /obj/item/stack/cable_coil = 1) time = 40 category = CAT_WEAPONRY subcategory = CAT_WEAPON @@ -519,7 +522,7 @@ result = /obj/item/clothing/accessory/talisman time = 20 reqs = list(/obj/item/stack/sheet/bone = 2, - /obj/item/stack/sheet/sinew = 1) + /obj/item/stack/sheet/sinew = 1) category = CAT_PRIMAL /datum/crafting_recipe/bonecodpiece @@ -527,7 +530,7 @@ result = /obj/item/clothing/accessory/skullcodpiece time = 20 reqs = list(/obj/item/stack/sheet/bone = 2, - /obj/item/stack/sheet/animalhide/goliath_hide = 1) + /obj/item/stack/sheet/animalhide/goliath_hide = 1) category = CAT_PRIMAL /datum/crafting_recipe/skilt @@ -535,7 +538,7 @@ result = /obj/item/clothing/accessory/skilt time = 20 reqs = list(/obj/item/stack/sheet/bone = 1, - /obj/item/stack/sheet/sinew = 2) + /obj/item/stack/sheet/sinew = 2) category = CAT_PRIMAL /datum/crafting_recipe/bracers @@ -543,7 +546,7 @@ result = /obj/item/clothing/gloves/bracer time = 20 reqs = list(/obj/item/stack/sheet/bone = 2, - /obj/item/stack/sheet/sinew = 1) + /obj/item/stack/sheet/sinew = 1) category = CAT_PRIMAL /datum/crafting_recipe/skullhelm @@ -598,7 +601,7 @@ result = /obj/item/twohanded/spear/bonespear time = 30 reqs = list(/obj/item/stack/sheet/bone = 4, - /obj/item/stack/sheet/sinew = 1) + /obj/item/stack/sheet/sinew = 1) category = CAT_PRIMAL /datum/crafting_recipe/boneaxe @@ -606,7 +609,7 @@ result = /obj/item/twohanded/fireaxe/boneaxe time = 50 reqs = list(/obj/item/stack/sheet/bone = 6, - /obj/item/stack/sheet/sinew = 3) + /obj/item/stack/sheet/sinew = 3) category = CAT_PRIMAL /datum/crafting_recipe/bonfire @@ -658,9 +661,9 @@ result = /obj/item/pressure_plate time = 5 reqs = list(/obj/item/stack/sheet/metal = 1, - /obj/item/stack/tile/plasteel = 1, - /obj/item/stack/cable_coil = 2, - /obj/item/assembly/igniter = 1) + /obj/item/stack/tile/plasteel = 1, + /obj/item/stack/cable_coil = 2, + /obj/item/assembly/igniter = 1) category = CAT_MISC @@ -698,8 +701,8 @@ result = /obj/structure/guillotine time = 150 // Building a functioning guillotine takes time reqs = list(/obj/item/stack/sheet/plasteel = 3, - /obj/item/stack/sheet/mineral/wood = 20, - /obj/item/stack/cable_coil = 10) + /obj/item/stack/sheet/mineral/wood = 20, + /obj/item/stack/cable_coil = 10) tools = list(TOOL_SCREWDRIVER, TOOL_WRENCH, TOOL_WELDER) category = CAT_MISC @@ -713,6 +716,14 @@ /obj/item/stack/cable_coil = 5) category = CAT_MISC +/datum/crafting_recipe/aitater/check_requirements(mob/user, list/collected_requirements) + var/obj/item/aicard/aicard = collected_requirements[/obj/item/aicard][1] + if(!aicard.AI) + return TRUE + + to_chat(user, "You can't craft an intelliTater with an AI in the card!") + return FALSE + /datum/crafting_recipe/aispook name = "intelliLantern" result = /obj/item/aicard/aispook diff --git a/code/datums/components/crafting/tailoring.dm b/code/datums/components/crafting/tailoring.dm index 6973fd04ad3..00c02511814 100644 --- a/code/datums/components/crafting/tailoring.dm +++ b/code/datums/components/crafting/tailoring.dm @@ -104,9 +104,9 @@ reqs = list(/obj/item/clothing/glasses/hud/diagnostic/sunglasses = 1) category = CAT_CLOTHING -/datum/crafting_recipe/beergoggles - name = "Beer Goggles" - result = /obj/item/clothing/glasses/sunglasses/reagent +/datum/crafting_recipe/scienceglasses + name = "Science Glasses" + result = /obj/item/clothing/glasses/sunglasses/chemical time = 20 tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER) reqs = list(/obj/item/clothing/glasses/science = 1, @@ -114,8 +114,8 @@ /obj/item/stack/cable_coil = 5) category = CAT_CLOTHING -/datum/crafting_recipe/beergogglesremoval - name = "Beer Goggles removal" +/datum/crafting_recipe/scienceglassesremoval + name = "Science Glasses Dissemble" result = /obj/item/clothing/glasses/sunglasses time = 20 tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER) diff --git a/code/datums/components/decal.dm b/code/datums/components/decal.dm index ec5465f31c6..8fb3405af0d 100644 --- a/code/datums/components/decal.dm +++ b/code/datums/components/decal.dm @@ -7,7 +7,7 @@ var/first_dir // This only stores the dir arg from init -/datum/component/decal/Initialize(_icon, _icon_state, _dir, _cleanable=CLEAN_GOD, _color, _layer=TURF_LAYER, _description, _alpha=255) +/datum/component/decal/Initialize(_icon, _icon_state, _dir, _cleanable=CLEAN_NEVER, _color, _layer=TURF_LAYER, _description, _alpha=255) if(!isatom(parent) || !generate_appearance(_icon, _icon_state, _dir, _layer, _color, _alpha)) return COMPONENT_INCOMPATIBLE first_dir = _dir @@ -19,7 +19,7 @@ /datum/component/decal/RegisterWithParent() if(first_dir) RegisterSignal(parent, COMSIG_ATOM_DIR_CHANGE, .proc/rotate_react) - if(cleanable) + if(cleanable != CLEAN_NEVER) RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, .proc/clean_react) if(description) RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/examine) diff --git a/code/datums/components/edible.dm b/code/datums/components/edible.dm new file mode 100644 index 00000000000..22825fe3de2 --- /dev/null +++ b/code/datums/components/edible.dm @@ -0,0 +1,237 @@ +/*! + +This component makes it possible to make things edible. What this means is that you can take a bite or force someone to take a bite (in the case of items). +These items take a specific time to eat, and can do most of the things our original food items could. + +Behavior that's still missing from this component that original food items had that should either be put into seperate components or somewhere else: + Components: + Drying component (jerky etc) + Customizable component (custom pizzas etc) + Processable component (Slicing and cooking behavior essentialy, making it go from item A to B when conditions are met.) + Dunkable component (Dunking things into reagent containers to absorb a specific amount of reagents) + + Misc: + Something for cakes (You can store things inside) + +*/ +/datum/component/edible + ///Amount of reagents taken per bite + var/bite_consumption = 2 + ///Amount of bites taken so far + var/bitecount = 0 + ///Flags for food + var/food_flags = NONE + ///Bitfield of the types of this food + var/foodtypes = NONE + ///Amount of seconds it takes to eat this food + var/eat_time = 30 + ///Defines how much it lowers someones satiety (Need to eat, essentialy) + var/junkiness = 0 + ///Message to send when eating + var/list/eatverbs + ///Callback to be ran for when you take a bite of something + var/datum/callback/after_eat + ///Last time we checked for food likes + var/last_check_time + +/datum/component/edible/Initialize(list/initial_reagents, food_flags = NONE, foodtypes = NONE, volume = 50, eat_time = 30, list/tastes, list/eatverbs = list("bite","chew","nibble","gnaw","gobble","chomp"), bite_consumption = 2, datum/callback/after_eat) + if(!isatom(parent)) + return COMPONENT_INCOMPATIBLE + + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/examine) + RegisterSignal(parent, COMSIG_ATOM_ATTACK_ANIMAL, .proc/UseByAnimal) + if(isitem(parent)) + RegisterSignal(parent, COMSIG_ITEM_ATTACK, .proc/UseFromHand) + else if(isturf(parent)) + RegisterSignal(parent, COMSIG_ATOM_ATTACK_HAND, .proc/TryToEatTurf) + + src.bite_consumption = bite_consumption + src.food_flags = food_flags + src.foodtypes = foodtypes + src.eat_time = eat_time + src.eatverbs = eatverbs + src.junkiness = junkiness + src.after_eat = after_eat + + var/atom/owner = parent + + owner.create_reagents(volume, INJECTABLE) + + if(initial_reagents) + for(var/rid in initial_reagents) + var/amount = initial_reagents[rid] + if(tastes && tastes.len && (rid == /datum/reagent/consumable/nutriment || rid == /datum/reagent/consumable/nutriment/vitamin)) + owner.reagents.add_reagent(rid, amount, tastes.Copy()) + else + owner.reagents.add_reagent(rid, amount) + +/datum/component/edible/proc/examine(datum/source, mob/user, list/examine_list) + if(!food_flags & FOOD_IN_CONTAINER) + switch (bitecount) + if (0) + return + if(1) + examine_list += "[parent] was bitten by someone!" + if(2,3) + examine_list += "[parent] was bitten [bitecount] times!" + else + examine_list += "[parent] was bitten multiple times!" + +/datum/component/edible/proc/UseFromHand(obj/item/source, mob/living/M, mob/living/user) + return TryToEat(M, user) + +/datum/component/edible/proc/TryToEatTurf(datum/source, mob/user) + return TryToEat(user, user) + +///All the checks for the act of eating itself and +/datum/component/edible/proc/TryToEat(mob/living/eater, mob/living/feeder) + + var/atom/owner = parent + + if(feeder.a_intent == INTENT_HARM) + return + if(!owner.reagents.total_volume)//Shouldn't be needed but it checks to see if it has anything left in it. + to_chat(feeder, "None of [owner] left, oh no!") + qdel(parent) + return + if(!CanConsume(eater, feeder)) + return + var/fullness = eater.nutrition + 10 //The theoretical fullness of the person eating if they were to eat this + for(var/datum/reagent/consumable/C in eater.reagents.reagent_list) //we add the nutrition value of what we're currently digesting + fullness += C.nutriment_factor * C.volume / C.metabolization_rate + + . = COMPONENT_ITEM_NO_ATTACK //Point of no return I suppose + + if(eater == feeder)//If you're eating it yourself. + if(!do_mob(feeder, eater, eat_time)) //Gotta pass the minimal eat time + return + var/eatverb = pick(eatverbs) + if(junkiness && eater.satiety < -150 && eater.nutrition > NUTRITION_LEVEL_STARVING + 50 && !HAS_TRAIT(eater, TRAIT_VORACIOUS)) + to_chat(eater, "You don't feel like eating any more junk food at the moment!") + return + else if(fullness <= 50) + eater.visible_message("[eater] hungrily [eatverb]s \the [parent], gobbling it down!", "You hungrily [eatverb] \the [parent], gobbling it down!") + else if(fullness > 50 && fullness < 150) + eater.visible_message("[eater] hungrily [eatverb]s \the [parent].", "You hungrily [eatverb] \the [parent].") + else if(fullness > 150 && fullness < 500) + eater.visible_message("[eater] [eatverb]s \the [parent].", "You [eatverb] \the [parent].") + else if(fullness > 500 && fullness < 600) + eater.visible_message("[eater] unwillingly [eatverb]s a bit of \the [parent].", "You unwillingly [eatverb] a bit of \the [parent].") + else if(fullness > (600 * (1 + eater.overeatduration / 2000))) // The more you eat - the more you can eat + eater.visible_message("[eater] cannot force any more of \the [parent] to go down [eater.p_their()] throat!", "You cannot force any more of \the [parent] to go down your throat!") + return + else //If you're feeding it to someone else. + if(isbrain(eater)) + to_chat(feeder, "[eater] doesn't seem to have a mouth!") + return + if(fullness <= (600 * (1 + eater.overeatduration / 1000))) + eater.visible_message("[feeder] attempts to feed [eater] [parent].", \ + "[feeder] attempts to feed you [parent].") + else + eater.visible_message("[feeder] cannot force any more of [parent] down [eater]'s throat!", \ + "[feeder] cannot force any more of [parent] down your throat!") + return + if(!do_mob(feeder, eater)) //Wait 3 seconds before you can feed + return + + log_combat(feeder, eater, "fed", owner.reagents.log_list()) + eater.visible_message("[feeder] forces [eater] to eat [parent]!", \ + "[feeder] forces you to eat [parent]!") + + TakeBite(eater, feeder) + +///This function lets the eater take a bite and transfers the reagents to the eater. +/datum/component/edible/proc/TakeBite(mob/living/eater, mob/living/feeder) + + var/atom/owner = parent + + if(!owner.reagents) + return FALSE + if(eater.satiety > -200) + eater.satiety -= junkiness + playsound(eater.loc,'sound/items/eatfood.ogg', rand(10,50), TRUE) + if(owner.reagents.total_volume) + SEND_SIGNAL(parent, COMSIG_FOOD_EATEN, eater, feeder) + var/fraction = min(bite_consumption / owner.reagents.total_volume, 1) + owner.reagents.trans_to(eater, bite_consumption, transfered_by = feeder, method = INGEST) + bitecount++ + On_Consume(eater) + checkLiked(fraction, eater) + + //Invoke our after eat callback if it is valid + if(after_eat) + after_eat.Invoke(eater, feeder) + + return TRUE + +///Checks whether or not the eater can actually consume the food +/datum/component/edible/proc/CanConsume(mob/living/eater, mob/living/feeder) + if(!iscarbon(eater)) + return FALSE + var/mob/living/carbon/C = eater + var/covered = "" + if(C.is_mouth_covered(head_only = 1)) + covered = "headgear" + else if(C.is_mouth_covered(mask_only = 1)) + covered = "mask" + if(covered) + var/who = (isnull(feeder) || eater == feeder) ? "your" : "[eater.p_their()]" + to_chat(feeder, "You have to remove [who] [covered] first!") + return FALSE + return TRUE + +///Check foodtypes to see if we should send a moodlet +/datum/component/edible/proc/checkLiked(var/fraction, mob/M) + if(last_check_time + 50 > world.time) + return FALSE + if(!ishuman(M)) + return FALSE + var/mob/living/carbon/human/H = M + if(HAS_TRAIT(H, TRAIT_AGEUSIA) && foodtypes & H.dna.species.toxic_food) + to_chat(H, "You don't feel so good...") + H.adjust_disgust(25 + 30 * fraction) + else + if(foodtypes & H.dna.species.toxic_food) + to_chat(H,"What the hell was that thing?!") + H.adjust_disgust(25 + 30 * fraction) + SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "toxic_food", /datum/mood_event/disgusting_food) + else if(foodtypes & H.dna.species.disliked_food) + to_chat(H,"That didn't taste very good...") + H.adjust_disgust(11 + 15 * fraction) + SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "gross_food", /datum/mood_event/gross_food) + else if(foodtypes & H.dna.species.liked_food) + to_chat(H,"I love this taste!") + H.adjust_disgust(-5 + -2.5 * fraction) + SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "fav_food", /datum/mood_event/favorite_food) + if((foodtypes & BREAKFAST) && world.time - SSticker.round_start_time < STOP_SERVING_BREAKFAST) + SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "breakfast", /datum/mood_event/breakfast) + last_check_time = world.time + +///Delete the item when it is fully eaten +/datum/component/edible/proc/On_Consume(mob/living/eater) + + var/atom/owner = parent + + if(!eater) + return + if(!owner.reagents.total_volume) + qdel(parent) + +///Ability to feed food to puppers +/datum/component/edible/proc/UseByAnimal(datum/source, mob/user) + + var/atom/owner = parent + + if(!isdog(user)) + return + var/mob/living/L = user + if(bitecount == 0 || prob(50)) + L.emote("me", 1, "nibbles away at \the [parent]") + bitecount++ + . = COMPONENT_ITEM_NO_ATTACK + L.taste(owner.reagents) // why should carbons get all the fun? + if(bitecount >= 5) + var/sattisfaction_text = pick("burps from enjoyment", "yaps for more", "woofs twice", "looks at the area where \the [parent] was") + if(sattisfaction_text) + L.emote("me", 1, "[sattisfaction_text]") + qdel(parent) diff --git a/code/datums/components/footstep.dm b/code/datums/components/footstep.dm index e0de6259bf4..442236ae9ff 100644 --- a/code/datums/components/footstep.dm +++ b/code/datums/components/footstep.dm @@ -42,7 +42,7 @@ return var/mob/living/LM = parent - if(!T.footstep || LM.buckled || LM.lying || !CHECK_MULTIPLE_BITFIELDS(LM.mobility_flags, MOBILITY_STAND | MOBILITY_MOVE) || LM.throwing || LM.movement_type & (VENTCRAWLING | FLYING)) + if(!T.footstep || LM.buckled || LM.lying || !((LM.mobility_flags & (MOBILITY_STAND | MOBILITY_MOVE)) == (MOBILITY_STAND | MOBILITY_MOVE)) || LM.throwing || LM.movement_type & (VENTCRAWLING | FLYING)) if (LM.lying && !LM.buckled && !(!T.footstep || LM.movement_type & (VENTCRAWLING | FLYING))) //play crawling sound if we're lying playsound(T, 'sound/effects/footstep/crawl1.ogg', 15 * volume) return diff --git a/code/datums/components/forced_gravity.dm b/code/datums/components/forced_gravity.dm deleted file mode 100644 index fe9cfc861b3..00000000000 --- a/code/datums/components/forced_gravity.dm +++ /dev/null @@ -1,20 +0,0 @@ -/datum/component/forced_gravity - var/gravity - var/ignore_space = FALSE //If forced gravity should also work on space turfs - -/datum/component/forced_gravity/Initialize(forced_value = 1) - if(!isatom(parent)) - return COMPONENT_INCOMPATIBLE - RegisterSignal(parent, COMSIG_ATOM_HAS_GRAVITY, .proc/gravity_check) - if(isturf(parent)) - RegisterSignal(parent, COMSIG_TURF_HAS_GRAVITY, .proc/turf_gravity_check) - - gravity = forced_value - -/datum/component/forced_gravity/proc/gravity_check(datum/source, turf/location, list/gravs) - if(!ignore_space && isspaceturf(location)) - return - gravs += gravity - -/datum/component/forced_gravity/proc/turf_gravity_check(datum/source, atom/checker, list/gravs) - return gravity_check(null, parent, gravs) diff --git a/code/datums/components/gps.dm b/code/datums/components/gps.dm index 3118deb6c2a..890a854694c 100644 --- a/code/datums/components/gps.dm +++ b/code/datums/components/gps.dm @@ -133,12 +133,11 @@ GLOBAL_LIST_EMPTY(GPS_list) switch(action) if("rename") var/atom/parentasatom = parent - var/a = input("Please enter desired tag.", parentasatom.name, gpstag) as text|null + var/a = stripped_input(usr, "Please enter desired tag.", parentasatom.name, gpstag, 20) if (!a) return - a = copytext(sanitize(a), 1, 20) gpstag = a . = TRUE parentasatom.name = "global positioning system ([gpstag])" diff --git a/code/datums/components/material_container.dm b/code/datums/components/material_container.dm index 9bf2dc3819e..29931c900ef 100644 --- a/code/datums/components/material_container.dm +++ b/code/datums/components/material_container.dm @@ -42,7 +42,7 @@ RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/OnExamine) for(var/mat in mat_list) //Make the assoc list ref | amount - var/datum/material/M = getmaterialref(mat) || mat + var/datum/material/M = SSmaterials.GetMaterialRef(mat) materials[M] = 0 /datum/component/material_container/proc/OnExamine(datum/source, mob/user) @@ -128,9 +128,9 @@ return primary_mat /// For inserting an amount of material -/datum/component/material_container/proc/insert_amount_mat(amt, var/datum/material/mat) +/datum/component/material_container/proc/insert_amount_mat(amt, var/datum/material/mat) if(!istype(mat)) - mat = getmaterialref(mat) + mat = SSmaterials.GetMaterialRef(mat) if(amt > 0 && has_space(amt)) var/total_amount_saved = total_amount if(mat) @@ -143,9 +143,9 @@ return FALSE /// Uses an amount of a specific material, effectively removing it. -/datum/component/material_container/proc/use_amount_mat(amt, var/datum/material/mat) +/datum/component/material_container/proc/use_amount_mat(amt, var/datum/material/mat) if(!istype(mat)) - mat = getmaterialref(mat) + mat = SSmaterials.GetMaterialRef(mat) var/amount = materials[mat] if(mat) if(amount >= amt) @@ -155,9 +155,9 @@ return FALSE /// Proc for transfering materials to another container. -/datum/component/material_container/proc/transer_amt_to(var/datum/component/material_container/T, amt, var/datum/material/mat) +/datum/component/material_container/proc/transer_amt_to(var/datum/component/material_container/T, amt, var/datum/material/mat) if(!istype(mat)) - mat = getmaterialref(mat) + mat = SSmaterials.GetMaterialRef(mat) if((amt==0)||(!T)||(!mat)) return FALSE if(amt<0) @@ -184,13 +184,13 @@ /datum/component/material_container/proc/use_materials(list/mats, multiplier=1) if(!mats || !length(mats)) return FALSE - + var/list/mats_to_remove = list() //Assoc list MAT | AMOUNT for(var/x in mats) //Loop through all required materials var/datum/material/req_mat = x if(!istype(req_mat)) - req_mat = getmaterialref(req_mat) //Get the ref if necesary + req_mat = SSmaterials.GetMaterialRef(req_mat) //Get the ref if necesary if(!materials[req_mat]) //Do we have the resource? return FALSE //Can't afford it var/amount_required = mats[x] * multiplier @@ -198,7 +198,7 @@ return FALSE //Can't afford it mats_to_remove[req_mat] += amount_required //Add it to the assoc list of things to remove continue - + var/total_amount_save = total_amount for(var/i in mats_to_remove) @@ -207,7 +207,7 @@ return total_amount_save - total_amount /// For spawning mineral sheets at a specific location. Used by machines to output sheets. -/datum/component/material_container/proc/retrieve_sheets(sheet_amt, var/datum/material/M, target = null) +/datum/component/material_container/proc/retrieve_sheets(sheet_amt, var/datum/material/M, target = null) if(!M.sheet_type) return 0 //Add greyscale sheet handling here later if(sheet_amt <= 0) @@ -231,7 +231,7 @@ /// Proc to get all the materials and dump them as sheets -/datum/component/material_container/proc/retrieve_all(target = null) +/datum/component/material_container/proc/retrieve_all(target = null) var/result = 0 for(var/MAT in materials) var/amount = materials[MAT] @@ -251,7 +251,7 @@ var/datum/material/req_mat = x if(!istype(req_mat)) if(ispath(req_mat)) //Is this an actual material, or is it a category? - req_mat = getmaterialref(req_mat) //Get the ref + req_mat = SSmaterials.GetMaterialRef(req_mat) //Get the ref else // Its a category. (For example MAT_CATEGORY_RIGID) if(!has_enough_of_category(req_mat, mats[x], multiplier)) //Do we have enough of this category? @@ -265,7 +265,7 @@ return TRUE /// Returns all the categories in a recipe. -/datum/component/material_container/proc/get_categories(list/mats) +/datum/component/material_container/proc/get_categories(list/mats) var/list/categories = list() for(var/x in mats) //Loop through all required materials if(!istext(x)) //This means its not a category @@ -275,12 +275,12 @@ /// Returns TRUE if you have enough of the specified material. -/datum/component/material_container/proc/has_enough_of_material(var/datum/material/req_mat, amount, multiplier=1) +/datum/component/material_container/proc/has_enough_of_material(var/datum/material/req_mat, amount, multiplier=1) if(!materials[req_mat]) //Do we have the resource? return FALSE //Can't afford it var/amount_required = amount * multiplier if(materials[req_mat] >= amount_required) // do we have enough of the resource? - return TRUE + return TRUE return FALSE //Can't afford it /// Returns TRUE if you have enough of a specified material category (Which could be multiple materials) @@ -292,7 +292,7 @@ return FALSE /// Turns a material amount into the amount of sheets it should output -/datum/component/material_container/proc/amount2sheet(amt) +/datum/component/material_container/proc/amount2sheet(amt) if(amt >= MINERAL_MATERIAL_AMOUNT) return round(amt / MINERAL_MATERIAL_AMOUNT) return FALSE @@ -314,7 +314,7 @@ return material_amount /// Returns the amount of a specific material in this container. -/datum/component/material_container/proc/get_material_amount(var/datum/material/mat) +/datum/component/material_container/proc/get_material_amount(var/datum/material/mat) if(!istype(mat)) - mat = getmaterialref(mat) + mat = SSmaterials.GetMaterialRef(mat) return(materials[mat]) diff --git a/code/datums/components/mood.dm b/code/datums/components/mood.dm index 13d3cdcd589..9b5ae3572ba 100644 --- a/code/datums/components/mood.dm +++ b/code/datums/components/mood.dm @@ -200,7 +200,7 @@ if(!override && HAS_TRAIT(parent, TRAIT_UNSTABLE)) maximum = sanity if(amount > maximum) - amount = max(maximum, sanity) + amount = min(maximum, sanity) if(amount == sanity) //Prevents stuff from flicking around. return sanity = amount @@ -340,6 +340,10 @@ clear_event(null, "charge") if(ETHEREAL_CHARGE_ALMOSTFULL to ETHEREAL_CHARGE_FULL) add_event(null, "charge", /datum/mood_event/charged) + if(ETHEREAL_CHARGE_FULL to ETHEREAL_CHARGE_OVERLOAD) + add_event(null, "charge", /datum/mood_event/overcharged) + if(ETHEREAL_CHARGE_OVERLOAD to ETHEREAL_CHARGE_DANGEROUS) + add_event(null, "charge", /datum/mood_event/supercharged) /datum/component/mood/proc/check_area_mood(datum/source, area/A) update_beauty(A) diff --git a/code/datums/components/nanites.dm b/code/datums/components/nanites.dm index 7b26d84e57f..3fa59b1535b 100644 --- a/code/datums/components/nanites.dm +++ b/code/datums/components/nanites.dm @@ -12,6 +12,8 @@ var/list/datum/nanite_program/programs = list() var/max_programs = NANITE_PROGRAM_LIMIT + var/list/datum/nanite_program/protocol/protocols = list() ///Separate list of protocol programs, to avoid looping through the whole programs list when cheking for conflicts + var/start_time = 0 ///Timestamp to when the nanites were first inserted in the host var/stealth = FALSE //if TRUE, does not appear on HUDs and health scans var/diagnostics = TRUE //if TRUE, displays program list when scanned by nanite scanners @@ -29,6 +31,8 @@ if(!(host_mob.mob_biotypes & (MOB_ORGANIC|MOB_UNDEAD))) //Shouldn't happen, but this avoids HUD runtimes in case a silicon gets them somehow. return COMPONENT_INCOMPATIBLE + start_time = world.time + host_mob.hud_set_nanite_indicator() START_PROCESSING(SSnanites, src) @@ -114,7 +118,7 @@ cloud_sync() next_sync = world.time + NANITE_SYNC_DELAY set_nanite_bar() - + /datum/component/nanites/proc/delete_nanites() qdel(src) @@ -188,7 +192,7 @@ holder.icon_state = "nanites[nanite_percent]" /datum/component/nanites/proc/on_emp(datum/source, severity) - nanite_volume *= (rand(0.60, 0.90)) //Lose 10-40% of nanites + nanite_volume *= (rand(60, 90) * 0.01) //Lose 10-40% of nanites adjust_nanites(null, -(rand(5, 50))) //Lose 5-50 flat nanite volume if(prob(40/severity)) cloud_id = 0 @@ -197,7 +201,7 @@ NP.on_emp(severity) /datum/component/nanites/proc/on_shock(datum/source, shock_damage) - nanite_volume *= (rand(0.45, 0.80)) //Lose 20-55% of nanites + nanite_volume *= (rand(45, 80) * 0.01) //Lose 20-55% of nanites adjust_nanites(null, -(rand(5, 50))) //Lose 5-50 flat nanite volume for(var/X in programs) var/datum/nanite_program/NP = X diff --git a/code/datums/components/orbiter.dm b/code/datums/components/orbiter.dm index a60a077d3d0..44665479192 100644 --- a/code/datums/components/orbiter.dm +++ b/code/datums/components/orbiter.dm @@ -17,10 +17,6 @@ begin_orbit(orbiter, radius, clockwise, rotation_speed, rotation_segments, pre_rotation) -/datum/component/orbiter/PostTransfer() - if(!isatom(parent) || isarea(parent)) - return COMPONENT_INCOMPATIBLE - /datum/component/orbiter/RegisterWithParent() var/atom/target = parent @@ -28,13 +24,10 @@ if(ismovableatom(target)) tracker = new(target, CALLBACK(src, .proc/move_react)) - RegisterSignal(parent, COMSIG_MOVABLE_UPDATE_GLIDE_SIZE, .proc/orbiter_glide_size_update) - /datum/component/orbiter/UnregisterFromParent() var/atom/target = parent target.orbiters = null QDEL_NULL(tracker) - UnregisterSignal(parent, COMSIG_MOVABLE_UPDATE_GLIDE_SIZE) /datum/component/orbiter/Destroy() var/atom/master = parent @@ -54,7 +47,7 @@ /datum/component/orbiter/PostTransfer() if(!isatom(parent) || isarea(parent) || !get_turf(parent)) return COMPONENT_INCOMPATIBLE - move_react() + move_react(parent) /datum/component/orbiter/proc/begin_orbit(atom/movable/orbiter, radius, clockwise, rotation_speed, rotation_segments, pre_rotation) if(orbiter.orbiting) @@ -82,12 +75,6 @@ orbiter.transform = shift orbiter.SpinAnimation(rotation_speed, -1, clockwise, rotation_segments, parallel = FALSE) - if(ismob(orbiter)) - var/mob/M = orbiter - M.updating_glide_size = FALSE - if(ismovableatom(parent)) - var/atom/movable/AM = parent - orbiter.glide_size = AM.glide_size //we stack the orbits up client side, so we can assign this back to normal server side without it breaking the orbit orbiter.transform = initial_transform @@ -103,10 +90,6 @@ orbiters -= orbiter orbiter.stop_orbit(src) orbiter.orbiting = null - if(ismob(orbiter)) - var/mob/M = orbiter - M.updating_glide_size = TRUE - M.glide_size = 8 if(!refreshing && !length(orbiters) && !QDELING(src)) qdel(src) @@ -137,11 +120,6 @@ return end_orbit(orbiter) -/datum/component/orbiter/proc/orbiter_glide_size_update(datum/source, target) - for(var/orbiter in orbiters) - var/atom/movable/AM = orbiter - AM.glide_size = target - ///////////////////// /atom/movable/proc/orbit(atom/A, radius = 10, clockwise = FALSE, rotation_speed = 20, rotation_segments = 36, pre_rotation = TRUE) diff --git a/code/datums/components/plumbing/_plumbing.dm b/code/datums/components/plumbing/_plumbing.dm index bca558ea80e..17105b0c5de 100644 --- a/code/datums/components/plumbing/_plumbing.dm +++ b/code/datums/components/plumbing/_plumbing.dm @@ -134,7 +134,8 @@ for(var/D in GLOB.cardinals) if(D & (demand_connects | supply_connects)) for(var/obj/machinery/duct/duct in get_step(parent, D)) - duct.attempt_connect() + duct.remove_connects(turn(D, 180)) + duct.update_icon() ///settle wherever we are, and start behaving like a piece of plumbing /datum/component/plumbing/proc/enable() @@ -156,7 +157,7 @@ if(istype(A, /obj/machinery/duct)) var/obj/machinery/duct/duct = A duct.attempt_connect() - else + else var/datum/component/plumbing/P = A.GetComponent(/datum/component/plumbing) if(P) direct_connect(P, D) diff --git a/code/datums/components/plumbing/reaction_chamber.dm b/code/datums/components/plumbing/reaction_chamber.dm index 2f92a4b6a1d..df00cdec4c1 100644 --- a/code/datums/components/plumbing/reaction_chamber.dm +++ b/code/datums/components/plumbing/reaction_chamber.dm @@ -31,8 +31,8 @@ return reagents.flags &= ~NO_REACT - reagents.handle_reactions() RC.emptying = TRUE + reagents.handle_reactions() /datum/component/plumbing/reaction_chamber/can_give(amount, reagent, datum/ductnet/net) . = ..() diff --git a/code/datums/components/riding.dm b/code/datums/components/riding.dm index 1d851934477..529492e3ed7 100644 --- a/code/datums/components/riding.dm +++ b/code/datums/components/riding.dm @@ -21,6 +21,9 @@ var/del_on_unbuckle_all = FALSE + /// If the "vehicle" is a mob, respect MOBILITY_MOVE on said mob. + var/respect_mob_mobility = TRUE + /datum/component/riding/Initialize() if(!ismovableatom(parent)) return COMPONENT_INCOMPATIBLE @@ -32,14 +35,10 @@ var/atom/movable/AM = parent restore_position(M) unequip_buckle_inhands(M) - M.updating_glide_size = TRUE if(del_on_unbuckle_all && !AM.has_buckled_mobs()) qdel(src) /datum/component/riding/proc/vehicle_mob_buckle(datum/source, mob/living/M, force = FALSE) - var/atom/movable/AM = parent - M.set_glide_size(AM.glide_size) - M.updating_glide_size = FALSE handle_vehicle_offsets() /datum/component/riding/proc/handle_vehicle_layer() @@ -57,10 +56,8 @@ /datum/component/riding/proc/vehicle_moved(datum/source) var/atom/movable/AM = parent - AM.set_glide_size(DELAY_TO_GLIDE_SIZE(vehicle_move_delay)) - for(var/mob/M in AM.buckled_mobs) - ride_check(M) - M.set_glide_size(AM.glide_size) + for(var/i in AM.buckled_mobs) + ride_check(i) handle_vehicle_offsets() handle_vehicle_layer() @@ -73,16 +70,21 @@ AM.unbuckle_mob(M) return TRUE -/datum/component/riding/proc/force_dismount(mob/living/M) +/datum/component/riding/proc/force_dismount(mob/living/M, gentle = FALSE) var/atom/movable/AM = parent AM.unbuckle_mob(M) if(isanimal(AM) || iscyborg(AM)) var/turf/target = get_edge_target_turf(AM, AM.dir) var/turf/targetm = get_step(get_turf(AM), AM.dir) M.Move(targetm) - M.visible_message("[M] is thrown clear of [AM]!", \ - "You're thrown clear of [AM]!") - M.throw_at(target, 14, 5, AM) + if(gentle) + M.visible_message("[M] is thrown clear of [AM]!", \ + "You're thrown clear of [AM]!") + M.throw_at(target, 8, 3, AM, gentle = TRUE) + else + M.visible_message("[M] is thrown violently from [AM]!", \ + "You're thrown violently from [AM]!") + M.throw_at(target, 14, 5, AM, gentle = FALSE) M.Knockdown(3 SECONDS) /datum/component/riding/proc/handle_vehicle_offsets() @@ -181,6 +183,10 @@ return if(!Process_Spacemove(direction) || !isturf(AM.loc)) return + if(isliving(AM) && respect_mob_mobility) + var/mob/living/M = AM + if(!(M.mobility_flags & MOBILITY_MOVE)) + return step(AM, direction) if((direction & (direction - 1)) && (AM.loc == next)) //moved diagonally @@ -370,4 +376,4 @@ if(rider in AM.buckled_mobs) AM.unbuckle_mob(rider) . = ..() - + diff --git a/code/datums/components/storage/concrete/bag_of_holding.dm b/code/datums/components/storage/concrete/bag_of_holding.dm index d5b0c5e077e..5c8ad6933da 100644 --- a/code/datums/components/storage/concrete/bag_of_holding.dm +++ b/code/datums/components/storage/concrete/bag_of_holding.dm @@ -5,7 +5,7 @@ var/list/obj/item/storage/backpack/holding/matching = typecache_filter_list(W.GetAllContents(), typecacheof(/obj/item/storage/backpack/holding)) matching -= A if(istype(W, /obj/item/storage/backpack/holding) || matching.len) - var/safety = alert(user, "Doing this will have extremely dire consequences for the station and its crew. Be sure you know what you're doing.", "Put in [A.name]?", "Abort", "Proceed") + var/safety = alert(user, "Doing this will have extremely dire consequences for the station and its crew. Be sure you know what you're doing.", "Put in [A.name]?", "Proceed", "Abort") if(safety != "Proceed" || QDELETED(A) || QDELETED(W) || QDELETED(user) || !user.canUseTopic(A, BE_CLOSE, iscarbon(user))) return var/turf/loccheck = get_turf(A) diff --git a/code/datums/components/storage/storage.dm b/code/datums/components/storage/storage.dm index 4b98d3b7688..1e12ff9fd33 100644 --- a/code/datums/components/storage/storage.dm +++ b/code/datums/components/storage/storage.dm @@ -606,7 +606,7 @@ if(!stop_messages) to_chat(M, "[host] cannot hold [I]!") return FALSE - if(is_type_in_typecache(I, cant_hold)) //Check for specific items which this container can't hold. + if(is_type_in_typecache(I, cant_hold) || HAS_TRAIT(I, TRAIT_NO_STORAGE_INSERT)) //Items which this container can't hold. if(!stop_messages) to_chat(M, "[host] cannot hold [I]!") return FALSE @@ -764,11 +764,9 @@ show_to(user) /datum/component/storage/proc/signal_on_pickup(datum/source, mob/user) - var/atom/A = parent update_actions() - for(var/mob/M in range(1, A)) - if(M.active_storage == src) - close(M) + for(var/mob/M in can_see_contents() - user) + close(M) /datum/component/storage/proc/signal_take_obj(datum/source, atom/movable/AM, new_loc, force = FALSE) if(!(AM in real_location())) diff --git a/code/datums/components/tactical.dm b/code/datums/components/tactical.dm index 7c742a769b4..4cea1484a52 100644 --- a/code/datums/components/tactical.dm +++ b/code/datums/components/tactical.dm @@ -15,7 +15,7 @@ UnregisterSignal(parent, list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED)) unmodify() -/datum/component/fantasy/Destroy() +/datum/component/tactical/Destroy() unmodify() return ..() @@ -37,5 +37,5 @@ if(!ismob(master.loc)) return user = master.loc - + user.remove_alt_appearance("sneaking_mission") diff --git a/code/datums/components/waddling.dm b/code/datums/components/waddling.dm deleted file mode 100644 index 47ca60c8a19..00000000000 --- a/code/datums/components/waddling.dm +++ /dev/null @@ -1,22 +0,0 @@ -/datum/component/waddling - dupe_mode = COMPONENT_DUPE_UNIQUE_PASSARGS - -/datum/component/waddling/Initialize() - . = ..() - if(!ismovableatom(parent)) - return COMPONENT_INCOMPATIBLE - if(isliving(parent)) - RegisterSignal(parent, list(COMSIG_MOVABLE_MOVED), .proc/LivingWaddle) - else - RegisterSignal(parent, list(COMSIG_MOVABLE_MOVED), .proc/Waddle) - -/datum/component/waddling/proc/LivingWaddle() - var/mob/living/L = parent - if(L.incapacitated() || !(L.mobility_flags & MOBILITY_STAND)) - return - Waddle() - -/datum/component/waddling/proc/Waddle() - animate(parent, pixel_z = 4, time = 0) - animate(pixel_z = 0, transform = turn(matrix(), pick(-12, 0, 12)), time=2) - animate(pixel_z = 0, transform = matrix(), time = 0) diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm index 14963229cc6..23b19d08141 100644 --- a/code/datums/datacore.dm +++ b/code/datums/datacore.dm @@ -1,13 +1,13 @@ - +//TODO: someone please get rid of this shit /datum/datacore - var/medical[] = list() + var/list/medical = list() var/medicalPrintCount = 0 - var/general[] = list() - var/security[] = list() + var/list/general = list() + var/list/security = list() var/securityPrintCount = 0 var/securityCrimeCounter = 0 - //This list tracks characters spawned in the world and cannot be modified in-game. Currently referenced by respawn_character(). - var/locked[] = list() + ///This list tracks characters spawned in the world and cannot be modified in-game. Currently referenced by respawn_character(). + var/list/locked = list() /datum/data var/name = "data" @@ -121,16 +121,44 @@ if(foundrecord) foundrecord.fields["rank"] = assignment -/datum/datacore/proc/get_manifest(monochrome, OOC) - var/list/heads = list() - var/list/sec = list() - var/list/eng = list() - var/list/med = list() - var/list/sci = list() - var/list/sup = list() - var/list/civ = list() - var/list/bot = list() - var/list/misc = list() +/datum/datacore/proc/get_manifest() + var/list/manifest_out = list() + var/list/departments = list( + "Command" = GLOB.command_positions, + "Security" = GLOB.security_positions, + "Engineering" = GLOB.engineering_positions, + "Medical" = GLOB.medical_positions, + "Science" = GLOB.science_positions, + "Supply" = GLOB.supply_positions, + "Civilian" = GLOB.civilian_positions, + "Silicon" = GLOB.nonhuman_positions + ) + for(var/datum/data/record/t in GLOB.data_core.general) + var/name = t.fields["name"] + var/rank = t.fields["rank"] + var/has_department = FALSE + for(var/department in departments) + var/list/jobs = departments[department] + if(rank in jobs) + if(!manifest_out[department]) + manifest_out[department] = list() + manifest_out[department] += list(list( + "name" = name, + "rank" = rank + )) + has_department = TRUE + break + if(!has_department) + if(!manifest_out["Misc"]) + manifest_out["Misc"] = list() + manifest_out["Misc"] += list(list( + "name" = name, + "rank" = rank + )) + return manifest_out + +/datum/datacore/proc/get_manifest_html(monochrome = FALSE) + var/list/manifest = get_manifest() var/dat = {"
+ var/dat = {"[src.name]

Tracking beacons data

"} var/list/trackerlist = list() for(var/obj/mecha/MC in GLOB.mechas_list) diff --git a/code/game/mecha/mecha_topic.dm b/code/game/mecha/mecha_topic.dm index ac3e281d18c..20627db4607 100644 --- a/code/game/mecha/mecha_topic.dm +++ b/code/game/mecha/mecha_topic.dm @@ -5,7 +5,9 @@ /obj/mecha/proc/get_stats_html() . = {" - [name] data + + + [name] data " + var/dat = "Personal Data Assistant" dat += assets.css_tag() dat += emoji_s.css_tag() @@ -448,13 +452,7 @@ GLOBAL_LIST_EMPTY(PDAs) owner = id.registered_name update_label() if("Eject")//Ejects the cart, only done from hub. - if (!isnull(cartridge)) - U.put_in_hands(cartridge) - to_chat(U, "You remove [cartridge] from [src].") - scanmode = PDA_SCANNER_NONE - cartridge.host_pda = null - cartridge = null - update_icon() + eject_cart(U) //MENU FUNCTIONS=================================== @@ -475,7 +473,7 @@ GLOBAL_LIST_EMPTY(PDAs) //MAIN FUNCTIONS=================================== if("Light") - toggle_light() + toggle_light(U) if("Medical Scan") if(scanmode == PDA_SCANNER_MEDICAL) scanmode = PDA_SCANNER_NONE @@ -535,13 +533,13 @@ GLOBAL_LIST_EMPTY(PDAs) if("Clear")//Clears messages tnote = null if("Ringtone") - var/t = input(U, "Please enter new ringtone", name, ttone) as text|null + var/t = stripped_input(U, "Please enter new ringtone", name, ttone, 20) if(in_range(src, U) && loc == U && t) if(SEND_SIGNAL(src, COMSIG_PDA_CHANGE_RINGTONE, U, t) & COMPONENT_STOP_RINGTONE_CHANGE) U << browse(null, "window=pda") return else - ttone = copytext(sanitize(t), 1, 20) + ttone = t else U << browse(null, "window=pda") return @@ -607,10 +605,10 @@ GLOBAL_LIST_EMPTY(PDAs) U << browse(null, "window=pda") return -/obj/item/pda/proc/remove_id() - if(issilicon(usr) || !usr.canUseTopic(src, BE_CLOSE, FALSE, NO_TK)) +/obj/item/pda/proc/remove_id(mob/user) + if(issilicon(user) || !user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK)) return - do_remove_id(usr) + do_remove_id(user) /obj/item/pda/proc/do_remove_id(mob/user) @@ -624,6 +622,7 @@ GLOBAL_LIST_EMPTY(PDAs) . = id id = null + updateSelfDialog() update_icon() if(ishuman(loc)) @@ -744,27 +743,32 @@ GLOBAL_LIST_EMPTY(PDAs) /obj/item/pda/proc/create_message(mob/living/U, obj/item/pda/P) send_message(U,list(P)) -/obj/item/pda/AltClick() +/obj/item/pda/AltClick(mob/user) ..() if(id) - remove_id() + remove_id(user) else - remove_pen() + remove_pen(user) -/obj/item/pda/CtrlClick() +/obj/item/pda/CtrlClick(mob/user) ..() if(isturf(loc)) //stops the user from dragging the PDA by ctrl-clicking it. return - remove_pen() + remove_pen(user) + +/obj/item/pda/CtrlShiftClick(mob/user) + ..() + eject_cart(user) /obj/item/pda/verb/verb_toggle_light() + set name = "Toggle light" set category = "Object" - set name = "Toggle Flashlight" + set src in oview(1) - toggle_light() + toggle_light(usr) /obj/item/pda/verb/verb_remove_id() set category = "Object" @@ -772,7 +776,7 @@ GLOBAL_LIST_EMPTY(PDAs) set src in usr if(id) - remove_id() + remove_id(usr) else to_chat(usr, "This PDA does not have an ID in it!") @@ -781,10 +785,17 @@ GLOBAL_LIST_EMPTY(PDAs) set name = "Remove Pen" set src in usr - remove_pen() + remove_pen(usr) -/obj/item/pda/proc/toggle_light() - if(issilicon(usr) || !usr.canUseTopic(src, BE_CLOSE)) +/obj/item/pda/verb/verb_eject_cart() + set category = "Object" + set name = "Eject Cartridge" + set src in usr + + eject_cart(usr) + +/obj/item/pda/proc/toggle_light(mob/user) + if(issilicon(user) || !user.canUseTopic(src, BE_CLOSE)) return if(fon) fon = FALSE @@ -793,25 +804,40 @@ GLOBAL_LIST_EMPTY(PDAs) fon = TRUE set_light(f_lum) update_icon() + for(var/X in actions) + var/datum/action/A = X + A.UpdateButtonIcon() -/obj/item/pda/proc/remove_pen() +/obj/item/pda/proc/remove_pen(mob/user) - if(issilicon(usr) || !usr.canUseTopic(src, BE_CLOSE, FALSE, NO_TK)) + if(issilicon(user) || !user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK)) //TK doesn't work even with this removed but here for readability return if(inserted_item) - usr.put_in_hands(inserted_item) - to_chat(usr, "You remove [inserted_item] from [src].") + user.put_in_hands(inserted_item) + to_chat(user, "You remove [inserted_item] from [src].") inserted_item = null update_icon() else - to_chat(usr, "This PDA does not have a pen in it!") + to_chat(user, "This PDA does not have a pen in it!") + +/obj/item/pda/proc/eject_cart(mob/user) + if(issilicon(user) || !user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK)) //TK disabled to stop cartridge teleporting into hand + return + if (!isnull(cartridge)) + user.put_in_hands(cartridge) + to_chat(user, "You eject [cartridge] from [src].") + scanmode = PDA_SCANNER_NONE + cartridge.host_pda = null + cartridge = null + updateSelfDialog() + update_icon() //trying to insert or remove an id /obj/item/pda/proc/id_check(mob/user, obj/item/card/id/I) if(!I) if(id && (src in user.contents)) - remove_id() + remove_id(user) return TRUE else var/obj/item/card/id/C = user.get_active_held_item() @@ -842,12 +868,14 @@ GLOBAL_LIST_EMPTY(PDAs) // access to status display signals /obj/item/pda/attackby(obj/item/C, mob/user, params) - if(istype(C, /obj/item/cartridge) && !cartridge) + if(istype(C, /obj/item/cartridge)) if(!user.transferItemToLoc(C, src)) return + eject_cart(user) cartridge = C cartridge.host_pda = src to_chat(user, "You insert [cartridge] into [src].") + updateSelfDialog() update_icon() else if(istype(C, /obj/item/card/id)) @@ -1041,7 +1069,7 @@ GLOBAL_LIST_EMPTY(PDAs) if(incapacitated()) return if(!isnull(aiPDA)) - var/HTML = "AI PDA Message Log[aiPDA.tnote]" + var/HTML = "AI PDA Message Log[aiPDA.tnote]" user << browse(HTML, "window=log;size=400x444;border=1;can_resize=1;can_close=1;can_minimize=0") else to_chat(user, "You do not have a PDA! You should make an issue report about this.") diff --git a/code/game/objects/items/devices/PDA/cart.dm b/code/game/objects/items/devices/PDA/cart.dm index f4a9f4f8d84..ea45a473a44 100644 --- a/code/game/objects/items/devices/PDA/cart.dm +++ b/code/game/objects/items/devices/PDA/cart.dm @@ -231,13 +231,8 @@ Code: + +
"} if (41) //crew manifest - menu = "

[PDAIMG(notes)] Crew Manifest

" - menu += "Entries cannot be modified from this terminal.

" - if(GLOB.data_core.general) - for (var/datum/data/record/t in sortRecord(GLOB.data_core.general)) - menu += "[t.fields["name"]] - [t.fields["rank"]]
" - menu += "
" + menu += "
[GLOB.data_core.get_manifest_html(monochrome=TRUE)]
" if (42) //status displays @@ -263,7 +258,7 @@ Code: var/turf/pda_turf = get_turf(src) for(var/obj/machinery/computer/monitor/pMon in GLOB.machines) - if(pMon.stat & (NOPOWER | BROKEN)) //check to make sure the computer is functional + if(pMon.machine_stat & (NOPOWER | BROKEN)) //check to make sure the computer is functional continue if(pda_turf.z != pMon.z) //and that we're on the same zlevel as the computer (lore: limited signal strength) continue @@ -306,10 +301,14 @@ Code: var/list/S = list(" Off","AOff"," On", " AOn") var/list/chg = list("N","C","F") - +//Neither copytext nor copytext_char is appropriate here; neither 30 UTF-8 code units nor 30 code points equates to 30 columns of output. +//Some glyphs are very tall or very wide while others are small or even take up no space at all. +//Emojis can take modifiers which are many characters but render as only one glyph. +//A proper solution here (as far as Unicode goes, maybe not ideal as far as markup goes, a table would be better) +//would be to use [A.area.name] for(var/obj/machinery/power/apc/A in L) - menu += copytext(add_tspace(A.area.name, 30), 1, 30) - menu += " [S[A.equipment+1]] [S[A.lighting+1]] [S[A.environ+1]] [add_lspace(DisplayPower(A.lastused_total), 6)] [A.cell ? "[add_lspace(round(A.cell.percent()), 3)]% [chg[A.charging+1]]" : " N/C"]
" + menu += copytext_char(add_trailing(A.area.name, 30, " "), 1, 30) + menu += " [S[A.equipment+1]] [S[A.lighting+1]] [S[A.environ+1]] [add_leading(DisplayPower(A.lastused_total), 6, " ")] [A.cell ? "[add_leading(round(A.cell.percent()), 3, " ")]% [chg[A.charging+1]]" : " N/C"]
" menu += "" diff --git a/code/game/objects/items/devices/camera_bug.dm b/code/game/objects/items/devices/camera_bug.dm index 10708c1be26..fc1b6380f26 100644 --- a/code/game/objects/items/devices/camera_bug.dm +++ b/code/game/objects/items/devices/camera_bug.dm @@ -39,7 +39,7 @@ get_cameras() for(var/cam_tag in bugged_cameras) var/obj/machinery/camera/camera = bugged_cameras[cam_tag] - if(camera.bug == src) + if(camera && camera.bug == src) camera.bug = null bugged_cameras = list() if(tracking) @@ -78,7 +78,7 @@ if( world.time > (last_net_update + 100)) bugged_cameras = list() for(var/obj/machinery/camera/camera in GLOB.cameranet.cameras) - if(camera.stat || !camera.can_use()) + if(camera.machine_stat || !camera.can_use()) continue if(length(list("ss13","mine", "rd", "labor", "toxins", "minisat")&camera.network)) bugged_cameras[camera.c_tag] = camera @@ -95,6 +95,8 @@ html = "

Select a camera:

\[Cancel camera view\]
" for(var/entry in cameras) var/obj/machinery/camera/C = cameras[entry] + if(QDELETED(C)) + continue var/functions = "" if(C.bug == src) functions = " - \[Monitor\]\[Disable\]" diff --git a/code/game/objects/items/devices/desynchronizer.dm b/code/game/objects/items/devices/desynchronizer.dm index 2dd5609c79e..d9735dea15b 100644 --- a/code/game/objects/items/devices/desynchronizer.dm +++ b/code/game/objects/items/devices/desynchronizer.dm @@ -14,6 +14,7 @@ var/last_use = 0 var/next_use = 0 var/obj/effect/abstract/sync_holder/sync_holder + var/resync_timer /obj/item/desynchronizer/attack_self(mob/living/user) if(world.time < next_use) @@ -54,16 +55,20 @@ SEND_SIGNAL(AM, COMSIG_MOVABLE_SECLUDED_LOCATION) last_use = world.time icon_state = "desynchronizer-on" - addtimer(CALLBACK(src, .proc/resync), duration) + resync_timer = addtimer(CALLBACK(src, .proc/resync), duration , TIMER_STOPPABLE) /obj/item/desynchronizer/proc/resync() new /obj/effect/temp_visual/desynchronizer(sync_holder.drop_location()) QDEL_NULL(sync_holder) + if(resync_timer) + deltimer(resync_timer) + resync_timer = null icon_state = initial(icon_state) next_use = world.time + (world.time - last_use) // Could be 2*world.time-last_use but that would just be confusing /obj/item/desynchronizer/Destroy() - resync() + if(sync_holder) + resync() return ..() /obj/effect/abstract/sync_holder diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 3c893760a9a..8fe7c4b711b 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -50,7 +50,7 @@ /obj/item/flashlight/attack(mob/living/carbon/M, mob/living/carbon/human/user) add_fingerprint(user) - if(istype(M) && on && user.zone_selected in list(BODY_ZONE_PRECISE_EYES, BODY_ZONE_PRECISE_MOUTH)) + if(istype(M) && on && (user.zone_selected in list(BODY_ZONE_PRECISE_EYES, BODY_ZONE_PRECISE_MOUTH))) if((HAS_TRAIT(user, TRAIT_CLUMSY) || HAS_TRAIT(user, TRAIT_DUMB)) && prob(50)) //too dumb to use flashlight properly return ..() //just hit them in the head @@ -388,7 +388,7 @@ return TRUE /obj/item/flashlight/emp/attack(mob/living/M, mob/living/user) - if(on && user.zone_selected in list(BODY_ZONE_PRECISE_EYES, BODY_ZONE_PRECISE_MOUTH)) // call original attack when examining organs + if(on && (user.zone_selected in list(BODY_ZONE_PRECISE_EYES, BODY_ZONE_PRECISE_MOUTH))) // call original attack when examining organs ..() return diff --git a/code/game/objects/items/devices/forcefieldprojector.dm b/code/game/objects/items/devices/forcefieldprojector.dm index 25a98c3dd7f..3126977722e 100644 --- a/code/game/objects/items/devices/forcefieldprojector.dm +++ b/code/game/objects/items/devices/forcefieldprojector.dm @@ -98,10 +98,10 @@ generator = null return ..() -/obj/structure/projected_forcefield/CanPass(atom/movable/mover, turf/target) +/obj/structure/projected_forcefield/CanAllowThrough(atom/movable/mover, turf/target) + . = ..() if(istype(mover) && (mover.pass_flags & PASSGLASS)) - return 1 - return !density + return TRUE /obj/structure/projected_forcefield/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0) playsound(loc, 'sound/weapons/egloves.ogg', 80, TRUE) diff --git a/code/game/objects/items/devices/geiger_counter.dm b/code/game/objects/items/devices/geiger_counter.dm index 7039bed6ba6..94f8c3f0fcf 100644 --- a/code/game/objects/items/devices/geiger_counter.dm +++ b/code/game/objects/items/devices/geiger_counter.dm @@ -86,27 +86,25 @@ . += "The last radiation amount detected was [last_tick_amount]" -/obj/item/geiger_counter/update_icon() +/obj/item/geiger_counter/update_icon_state() if(!scanning) icon_state = "geiger_off" - return 1 - if(obj_flags & EMAGGED) + else if(obj_flags & EMAGGED) icon_state = "geiger_on_emag" - return 1 - switch(radiation_count) - if(-INFINITY to RAD_LEVEL_NORMAL) - icon_state = "geiger_on_1" - if(RAD_LEVEL_NORMAL + 1 to RAD_LEVEL_MODERATE) - icon_state = "geiger_on_2" - if(RAD_LEVEL_MODERATE + 1 to RAD_LEVEL_HIGH) - icon_state = "geiger_on_3" - if(RAD_LEVEL_HIGH + 1 to RAD_LEVEL_VERY_HIGH) - icon_state = "geiger_on_4" - if(RAD_LEVEL_VERY_HIGH + 1 to RAD_LEVEL_CRITICAL) - icon_state = "geiger_on_4" - if(RAD_LEVEL_CRITICAL + 1 to INFINITY) - icon_state = "geiger_on_5" - ..() + else + switch(radiation_count) + if(-INFINITY to RAD_LEVEL_NORMAL) + icon_state = "geiger_on_1" + if(RAD_LEVEL_NORMAL + 1 to RAD_LEVEL_MODERATE) + icon_state = "geiger_on_2" + if(RAD_LEVEL_MODERATE + 1 to RAD_LEVEL_HIGH) + icon_state = "geiger_on_3" + if(RAD_LEVEL_HIGH + 1 to RAD_LEVEL_VERY_HIGH) + icon_state = "geiger_on_4" + if(RAD_LEVEL_VERY_HIGH + 1 to RAD_LEVEL_CRITICAL) + icon_state = "geiger_on_4" + if(RAD_LEVEL_CRITICAL + 1 to INFINITY) + icon_state = "geiger_on_5" /obj/item/geiger_counter/proc/update_sound() var/datum/looping_sound/geiger/loop = soundloop diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm index 119d9dce93c..2ba67135243 100644 --- a/code/game/objects/items/devices/lightreplacer.dm +++ b/code/game/objects/items/devices/lightreplacer.dm @@ -152,7 +152,7 @@ ReplaceLight(target, user) to_chat(user, status_string()) -/obj/item/lightreplacer/update_icon() +/obj/item/lightreplacer/update_icon_state() icon_state = "lightreplacer[(obj_flags & EMAGGED ? 1 : 0)]" /obj/item/lightreplacer/proc/status_string() diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm index 93c4a11ab4f..2259a04fd68 100644 --- a/code/game/objects/items/devices/multitool.dm +++ b/code/game/objects/items/devices/multitool.dm @@ -27,9 +27,10 @@ drop_sound = 'sound/items/handling/multitool_drop.ogg' pickup_sound = 'sound/items/handling/multitool_pickup.ogg' custom_materials = list(/datum/material/iron=50, /datum/material/glass=20) - var/obj/machinery/buffer // simple machine buffer for device linkage + custom_premium_price = 450 toolspeed = 1 usesound = 'sound/weapons/empty.ogg' + var/obj/machinery/buffer // simple machine buffer for device linkage var/mode = 0 /obj/item/multitool/examine(mob/user) diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm index 004810a2a60..7f8b7498540 100644 --- a/code/game/objects/items/devices/paicard.dm +++ b/code/game/objects/items/devices/paicard.dm @@ -109,7 +109,7 @@ to_chat(usr,"You [transmit_holder ? "enable" : "disable"] your pAI's [transmitting ? "outgoing" : "incoming"] radio transmissions!") to_chat(pai,"Your owner has [transmit_holder ? "enabled" : "disabled"] your [transmitting ? "outgoing" : "incoming"] radio transmissions!") if(href_list["setlaws"]) - var/newlaws = copytext(sanitize(input("Enter any additional directives you would like your pAI personality to follow. Note that these directives will not override the personality's allegiance to its imprinted master. Conflicting directives will be ignored.", "pAI Directive Configuration", pai.laws.supplied[1]) as message|null),1,MAX_MESSAGE_LEN) + var/newlaws = stripped_multiline_input(usr, "Enter any additional directives you would like your pAI personality to follow. Note that these directives will not override the personality's allegiance to its imprinted master. Conflicting directives will be ignored.", "pAI Directive Configuration", pai.laws.supplied[1], MAX_MESSAGE_LEN) if(newlaws && pai) pai.add_supplied_law(0,newlaws) if(href_list["toggle_holo"]) diff --git a/code/game/objects/items/devices/polycircuit.dm b/code/game/objects/items/devices/polycircuit.dm new file mode 100644 index 00000000000..0415f845207 --- /dev/null +++ b/code/game/objects/items/devices/polycircuit.dm @@ -0,0 +1,56 @@ +/obj/item/stack/circuit_stack + name = "polycircuit aggregate" + desc = "A dense, overdesigned cluster of electronics which attempted to function as a multipurpose circuit electronic. Circuits can be removed from it... if you don't bleed out in the process." + icon_state = "circuit_mess" + item_state = "rods" + w_class = WEIGHT_CLASS_TINY + max_amount = 8 + var/circuit_type = /obj/item/electronics/airlock + var/chosen_circuit = "airlock" + +/obj/item/stack/circuit_stack/attack_self(mob/user)// Prevents the crafting menu, and tells you how to use it. + to_chat(user, "You can't use [src] by itself, you'll have to try and remove one of these circuits by hand... carefully.") + +/obj/item/stack/circuit_stack/attack_hand(mob/user) + var/mob/living/carbon/human/H = user + if(user.get_inactive_held_item() != src) + return ..() + else + if(zero_amount()) + return + chosen_circuit = input("What type of circuit would you like to remove?", "Choose a Circuit Type", chosen_circuit) in list("airlock","firelock","fire alarm","air alarm","APC","cancel") + if(zero_amount()) + return + if(loc != user) + return + switch(chosen_circuit) + if("cancel") + to_chat(user, "You wisely avoid putting your hands anywhere near [src].") + return + if("airlock") + circuit_type = /obj/item/electronics/airlock + if("firelock") + circuit_type = /obj/item/electronics/firelock + if("fire alarm") + circuit_type = /obj/item/electronics/firealarm + if("air alarm") + circuit_type = /obj/item/electronics/airalarm + if("APC") + circuit_type = /obj/item/electronics/apc + to_chat(user, "You spot your circuit, and carefully attempt to remove it from [src], hold still!") + if(do_after(user, 30, target = user)) + if(!src || QDELETED(src))//Sanity Check. + return + var/returned_circuit = new circuit_type(src) + user.put_in_hands(returned_circuit) + use(1) + if(!amount) + to_chat(user, "You navigate the sharp edges of circuitry and remove the last board.") + else + to_chat(user, "You navigate the sharp edges of circuitry and remove a single board from [src]") + else + H.apply_damage(15, BRUTE, pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM)) + to_chat(user, "You give yourself a wicked cut on [src]'s many sharp corners and edges!") + +/obj/item/stack/circuit_stack/full + amount = 8 diff --git a/code/game/objects/items/devices/powersink.dm b/code/game/objects/items/devices/powersink.dm index 3c64e26211d..e02f79d3170 100644 --- a/code/game/objects/items/devices/powersink.dm +++ b/code/game/objects/items/devices/powersink.dm @@ -26,7 +26,7 @@ var/obj/structure/cable/attached // the attached cable -/obj/item/powersink/update_icon() +/obj/item/powersink/update_icon_state() icon_state = "powersink[mode == OPERATING]" /obj/item/powersink/proc/set_mode(value) diff --git a/code/game/objects/items/devices/quantum_keycard.dm b/code/game/objects/items/devices/quantum_keycard.dm index fc9ccddaf9e..3a4dd7177c8 100644 --- a/code/game/objects/items/devices/quantum_keycard.dm +++ b/code/game/objects/items/devices/quantum_keycard.dm @@ -25,7 +25,7 @@ to_chat(user, "The keycard beeps twice and disconnects the quantum link.") qpad = null -/obj/item/quantum_keycard/update_icon() +/obj/item/quantum_keycard/update_icon_state() if(qpad) icon_state = "quantum_keycard_on" else diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index e786aef5402..a9dd5fd778d 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -27,6 +27,7 @@ /obj/item/radio/intercom/examine(mob/user) . = ..() + . += "Use [MODE_TOKEN_INTERCOM] when nearby to speak into it." if(!unfastened) . += "It's screwed and secured to the wall." else diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index f496d5cd57d..8917927b4ee 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -10,6 +10,13 @@ NANITE SCANNER GENE SCANNER */ + +// Describes the two modes of scanning available for health analyzers +#define SCANMODE_HEALTH 0 +#define SCANMODE_CHEMICAL 1 +#define SCANNER_CONDENSED 0 +#define SCANNER_VERBOSE 1 + /obj/item/t_scanner name = "\improper T-ray scanner" desc = "A terahertz-ray emitter and scanner used to detect underfloor objects such as cables and pipes." @@ -30,7 +37,7 @@ GENE SCANNER /obj/item/t_scanner/proc/toggle_on() on = !on - icon_state = copytext(icon_state, 1, length(icon_state))+"[on]" + icon_state = copytext_char(icon_state, 1, -1) + "[on]" if(on) START_PROCESSING(SSobj, src) else @@ -78,7 +85,7 @@ GENE SCANNER item_state = "healthanalyzer" lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' - desc = "A hand-held body scanner able to distinguish vital signs of the subject." + desc = "A hand-held body scanner capable of distinguishing vital signs of the subject." flags_1 = CONDUCT_1 item_flags = NOBLUDGEON slot_flags = ITEM_SLOT_BELT @@ -87,8 +94,8 @@ GENE SCANNER throw_speed = 3 throw_range = 7 custom_materials = list(/datum/material/iron=200) - var/mode = 1 - var/scanmode = 0 + var/mode = SCANNER_VERBOSE + var/scanmode = SCANMODE_HEALTH var/advanced = FALSE custom_price = 300 @@ -97,48 +104,47 @@ GENE SCANNER return BRUTELOSS /obj/item/healthanalyzer/attack_self(mob/user) - if(!scanmode) - to_chat(user, "You switch the health analyzer to scan chemical contents.") - scanmode = 1 - else - to_chat(user, "You switch the health analyzer to check physical health.") - scanmode = 0 + scanmode = !scanmode + to_chat(user, "You switch the health analyzer to [scanmode ? "scan chemical contents" : "check physical health"].") /obj/item/healthanalyzer/attack(mob/living/M, mob/living/carbon/human/user) flick("[icon_state]-scan", src) //makes it so that it plays the scan animation upon scanning, including clumsy scanning // Clumsiness/brain damage check - if ((HAS_TRAIT(user, TRAIT_CLUMSY) || HAS_TRAIT(user, TRAIT_DUMB)) && prob(50)) user.visible_message("[user] analyzes the floor's vitals!", \ "You stupidly try to analyze the floor's vitals!") - to_chat(user, "Analyzing results for The floor:\n\tOverall status: Healthy") - to_chat(user, "Key: Suffocation/Toxin/Burn/Brute") - to_chat(user, "\tDamage specifics: 0-0-0-0") - to_chat(user, "Body temperature: ???") + to_chat(user, "Analyzing results for The floor:\n\tOverall status: Healthy\ + \nKey: Suffocation/Toxin/Burn/Brute\ + \n\tDamage specifics: 0-0-0-0\ + \nBody temperature: ???") return user.visible_message("[user] analyzes [M]'s vitals.", \ "You analyze [M]'s vitals.") - if(scanmode == 0) + if(scanmode == SCANMODE_HEALTH) healthscan(user, M, mode, advanced) - else if(scanmode == 1) + else chemscan(user, M) add_fingerprint(user) // Used by the PDA medical scanner too -/proc/healthscan(mob/user, mob/living/M, mode = 1, advanced = FALSE) +/proc/healthscan(mob/user, mob/living/M, mode = SCANNER_VERBOSE, advanced = FALSE) if(isliving(user) && (user.incapacitated() || user.eye_blind)) return - //Damage specifics + + // the final list of strings to render + var/render_list = list() + + // Damage specifics var/oxy_loss = M.getOxyLoss() var/tox_loss = M.getToxLoss() var/fire_loss = M.getFireLoss() var/brute_loss = M.getBruteLoss() - var/mob_status = (M.stat == DEAD ? "Deceased" : "[round(M.health/M.maxHealth,0.01)*100] % healthy") + var/mob_status = (M.stat == DEAD ? "Deceased" : "[round(M.health/M.maxHealth,0.01)*100]% healthy") if(HAS_TRAIT(M, TRAIT_FAKEDEATH) && !advanced) mob_status = "Deceased" @@ -147,29 +153,29 @@ GENE SCANNER if(ishuman(M)) var/mob/living/carbon/human/H = M if(H.undergoing_cardiac_arrest() && H.stat != DEAD) - to_chat(user, "Subject suffering from heart attack: Apply defibrillation or other electric shock immediately!") + render_list += "Subject suffering from heart attack: Apply defibrillation or other electric shock immediately!\n" - to_chat(user, "Analyzing results for [M]:\n\tOverall status: [mob_status]") + render_list += "Analyzing results for [M]:\nOverall status: [mob_status]\n" // Damage descriptions if(brute_loss > 10) - to_chat(user, "\t[brute_loss > 50 ? "Severe" : "Minor"] tissue damage detected.") + render_list += "[brute_loss > 50 ? "Severe" : "Minor"] tissue damage detected.\n" if(fire_loss > 10) - to_chat(user, "\t[fire_loss > 50 ? "Severe" : "Minor"] burn damage detected.") + render_list += "[fire_loss > 50 ? "Severe" : "Minor"] burn damage detected.\n" if(oxy_loss > 10) - to_chat(user, "\t[oxy_loss > 50 ? "Severe" : "Minor"] oxygen deprivation detected.") + render_list += "[oxy_loss > 50 ? "Severe" : "Minor"] oxygen deprivation detected.\n" if(tox_loss > 10) - to_chat(user, "\t[tox_loss > 50 ? "Severe" : "Minor"] amount of toxin damage detected.") + render_list += "[tox_loss > 50 ? "Severe" : "Minor"] amount of toxin damage detected.\n" if(M.getStaminaLoss()) - to_chat(user, "\tSubject appears to be suffering from fatigue.") + render_list += "Subject appears to be suffering from fatigue.\n" if(advanced) - to_chat(user, "\tFatigue Level: [M.getStaminaLoss()]%.") + render_list += "Fatigue Level: [M.getStaminaLoss()]%.\n" if (M.getCloneLoss()) - to_chat(user, "\tSubject appears to have [M.getCloneLoss() > 30 ? "Severe" : "Minor"] cellular damage.") + render_list += "Subject appears to have [M.getCloneLoss() > 30 ? "Severe" : "Minor"] cellular damage.\n" if(advanced) - to_chat(user, "\tCellular Damage Level: [M.getCloneLoss()].") + render_list += "Cellular Damage Level: [M.getCloneLoss()].\n" if (!M.getorgan(/obj/item/organ/brain)) - to_chat(user, "\tSubject lacks a brain.") + render_list += "Subject lacks a brain.\n" if(iscarbon(M)) var/mob/living/carbon/C = M if(LAZYLEN(C.get_traumas())) @@ -185,83 +191,32 @@ GENE SCANNER trauma_desc += "permanent " trauma_desc += B.scan_desc trauma_text += trauma_desc - to_chat(user, "\tCerebral traumas detected: subject appears to be suffering from [english_list(trauma_text)].") + render_list += "Cerebral traumas detected: subject appears to be suffering from [english_list(trauma_text)].\n" if(C.roundstart_quirks.len) - to_chat(user, "\tSubject has the following physiological traits: [C.get_trait_string()].") + render_list += "Subject has the following physiological traits: [C.get_trait_string()].\n" if(advanced) - to_chat(user, "\tBrain Activity Level: [(200 - M.getOrganLoss(ORGAN_SLOT_BRAIN))/2]%.") + render_list += "Brain Activity Level: [(200 - M.getOrganLoss(ORGAN_SLOT_BRAIN))/2]%.\n" if (M.radiation) - to_chat(user, "\tSubject is irradiated.") + render_list += "Subject is irradiated.\n" if(advanced) - to_chat(user, "\tRadiation Level: [M.radiation]%.") + render_list += "Radiation Level: [M.radiation]%.\n" if(advanced && M.hallucinating()) - to_chat(user, "\tSubject is hallucinating.") - - //Eyes and ears - if(advanced) - if(iscarbon(M)) - var/mob/living/carbon/C = M - var/obj/item/organ/ears/ears = C.getorganslot(ORGAN_SLOT_EARS) - to_chat(user, "\t==EAR STATUS==") - if(istype(ears)) - var/healthy = TRUE - if(HAS_TRAIT_FROM(C, TRAIT_DEAF, GENETIC_MUTATION)) - healthy = FALSE - to_chat(user, "\tSubject is genetically deaf.") - else if(HAS_TRAIT(C, TRAIT_DEAF)) - healthy = FALSE - to_chat(user, "\tSubject is deaf.") - else - if(ears.damage) - to_chat(user, "\tSubject has [ears.damage > ears.maxHealth ? "permanent ": "temporary "]hearing damage.") - healthy = FALSE - if(ears.deaf) - to_chat(user, "\tSubject is [ears.damage > ears.maxHealth ? "permanently ": "temporarily "] deaf.") - healthy = FALSE - if(healthy) - to_chat(user, "\tHealthy.") - else - to_chat(user, "\tSubject does not have ears.") - var/obj/item/organ/eyes/eyes = C.getorganslot(ORGAN_SLOT_EYES) - to_chat(user, "\t==EYE STATUS==") - if(istype(eyes)) - var/healthy = TRUE - if(HAS_TRAIT(C, TRAIT_BLIND)) - to_chat(user, "\tSubject is blind.") - healthy = FALSE - if(HAS_TRAIT(C, TRAIT_NEARSIGHT)) - to_chat(user, "\tSubject is nearsighted.") - healthy = FALSE - if(eyes.damage > 30) - to_chat(user, "\tSubject has severe eye damage.") - healthy = FALSE - else if(eyes.damage > 20) - to_chat(user, "\tSubject has significant eye damage.") - healthy = FALSE - else if(eyes.damage) - to_chat(user, "\tSubject has minor eye damage.") - healthy = FALSE - if(healthy) - to_chat(user, "\tHealthy.") - else - to_chat(user, "\tSubject does not have eyes.") - + render_list += "Subject is hallucinating.\n" // Body part damage report - if(iscarbon(M) && mode == 1) + if(iscarbon(M) && mode == SCANNER_VERBOSE) var/mob/living/carbon/C = M var/list/damaged = C.get_damaged_bodyparts(1,1) if(length(damaged)>0 || oxy_loss>0 || tox_loss>0 || fire_loss>0) - var/list/dmgreport = list() - dmgreport += "
\ + var/dmgreport = "General status:\ +
\ \ \ \ \ \ - \ \ \ @@ -274,109 +229,105 @@ GENE SCANNER \ " dmgreport += "
Damage:BruteBurnToxinSuffocation
Overall:[CEILING(brute_loss,1)][CEILING(fire_loss,1)][(org.brute_dam > 0) ? "[CEILING(org.brute_dam,1)]" : "0"][(org.burn_dam > 0) ? "[CEILING(org.burn_dam,1)]" : "0"]
" - to_chat(user, dmgreport.Join()) + render_list += dmgreport // tables do not need extra linebreak + //Eyes and ears + if(advanced && iscarbon(M)) + var/mob/living/carbon/C = M + + // Ear status + var/obj/item/organ/ears/ears = C.getorganslot(ORGAN_SLOT_EARS) + var/message = "\nSubject does not have ears." + if(istype(ears)) + message = "" + if(HAS_TRAIT_FROM(C, TRAIT_DEAF, GENETIC_MUTATION)) + message = "\nSubject is genetically deaf." + else if(HAS_TRAIT(C, TRAIT_DEAF)) + message = "\nSubject is deaf." + else + if(ears.damage) + message += "\nSubject has [ears.damage > ears.maxHealth ? "permanent ": "temporary "]hearing damage." + if(ears.deaf) + message += "\nSubject is [ears.damage > ears.maxHealth ? "permanently ": "temporarily "] deaf." + render_list += "Ear status:[message == "" ? "\nHealthy." : message]\n" + + // Eye status + var/obj/item/organ/eyes/eyes = C.getorganslot(ORGAN_SLOT_EYES) + message = "\nSubject does not have eyes." + if(istype(eyes)) + message = "" + if(HAS_TRAIT(C, TRAIT_BLIND)) + message += "\nSubject is blind." + if(HAS_TRAIT(C, TRAIT_NEARSIGHT)) + message += "\nSubject is nearsighted." + if(eyes.damage > 30) + message += "\nSubject has severe eye damage." + else if(eyes.damage > 20) + message += "\nSubject has significant eye damage." + else if(eyes.damage) + message += "\nSubject has minor eye damage." + render_list += "Eye status:[message == "" ? "\nHealthy." : message]\n" - //Organ damages report if(ishuman(M)) var/mob/living/carbon/human/H = M - var/minor_damage - var/major_damage - var/max_damage - var/report_organs = FALSE - //Piece together the lists to be reported - for(var/O in H.internal_organs) - var/obj/item/organ/organ = O - if(organ.organ_flags & ORGAN_FAILING) - report_organs = TRUE //if we report one organ, we report all organs, even if the lists are empty, just for consistency - if(max_damage) - max_damage += ", " //prelude the organ if we've already reported an organ - max_damage += organ.name //this just slaps the organ name into the string of text - else - max_damage = "\tNon-Functional Organs: " //our initial statement - max_damage += organ.name - else if(organ.damage > organ.high_threshold) - report_organs = TRUE - if(major_damage) - major_damage += ", " - major_damage += organ.name - else - major_damage = "\tSeverely Damaged Organs: " - major_damage += organ.name - else if(organ.damage > organ.low_threshold) - report_organs = TRUE - if(minor_damage) - minor_damage += ", " - minor_damage += organ.name - else - minor_damage = "\tMildly Damaged Organs: " - minor_damage += organ.name + // Organ damage + if (H.internal_organs && H.internal_organs.len) + var/render = FALSE + var/toReport = "Organs:\ + \ + \ + [advanced ? "" : ""]\ + " + + for(var/obj/item/organ/organ in H.internal_organs) + var/status = "" + if (organ.organ_flags & ORGAN_FAILING) status = "Non-Functional" + else if (organ.damage > organ.high_threshold) status = "Severely Damaged" + else if (organ.damage > organ.low_threshold) status = "Mildly Damaged" + if (status != "") + render = TRUE + toReport += "\ + [advanced ? "" : ""]\ + " + + if (render) + render_list += toReport + "
OrganDmgStatus
[organ.name][CEILING(organ.damage,1)][status]
" // tables do not need extra linebreak - if(report_organs) //we either finish the list, or set it to be empty if no organs were reported in that category - if(!max_damage) - max_damage = "\tNon-Functional Organs: " - else - max_damage += "" - if(!major_damage) - major_damage = "\tSeverely Damaged Organs: " - else - major_damage += "" - if(!minor_damage) - minor_damage = "\tMildly Damaged Organs: " - else - minor_damage += "" - to_chat(user, minor_damage) - to_chat(user, major_damage) - to_chat(user, max_damage) //Genetic damage if(advanced && H.has_dna()) - to_chat(user, "\tGenetic Stability: [H.dna.stability]%.") + render_list += "Genetic Stability: [H.dna.stability]%.\n" - // Species and body temperature - if(ishuman(M)) - var/mob/living/carbon/human/H = M + // Species and body temperature var/datum/species/S = H.dna.species - var/mutant = FALSE - if (H.dna.check_mutation(HULK)) - mutant = TRUE - else if (S.mutantlungs != initial(S.mutantlungs)) - mutant = TRUE - else if (S.mutant_brain != initial(S.mutant_brain)) - mutant = TRUE - else if (S.mutant_heart != initial(S.mutant_heart)) - mutant = TRUE - else if (S.mutanteyes != initial(S.mutanteyes)) - mutant = TRUE - else if (S.mutantears != initial(S.mutantears)) - mutant = TRUE - else if (S.mutanthands != initial(S.mutanthands)) - mutant = TRUE - else if (S.mutanttongue != initial(S.mutanttongue)) - mutant = TRUE - else if (S.mutanttail != initial(S.mutanttail)) - mutant = TRUE - else if (S.mutantliver != initial(S.mutantliver)) - mutant = TRUE - else if (S.mutantstomach != initial(S.mutantstomach)) - mutant = TRUE - else if (S.flying_species != initial(S.flying_species)) - mutant = TRUE + var/mutant = H.dna.check_mutation(HULK) \ + || S.mutantlungs != initial(S.mutantlungs) \ + || S.mutant_brain != initial(S.mutant_brain) \ + || S.mutant_heart != initial(S.mutant_heart) \ + || S.mutanteyes != initial(S.mutanteyes) \ + || S.mutantears != initial(S.mutantears) \ + || S.mutanthands != initial(S.mutanthands) \ + || S.mutanttongue != initial(S.mutanttongue) \ + || S.mutanttail != initial(S.mutanttail) \ + || S.mutantliver != initial(S.mutantliver) \ + || S.mutantstomach != initial(S.mutantstomach) \ + || S.flying_species != initial(S.flying_species) - to_chat(user, "Species: [S.name][mutant ? "-derived mutant" : ""]") - to_chat(user, "Body temperature: [round(M.bodytemperature-T0C,0.1)] °C ([round(M.bodytemperature*1.8-459.67,0.1)] °F)") + render_list += "Species: [S.name][mutant ? "-derived mutant" : ""]\n" + render_list += "Body temperature: [round(M.bodytemperature-T0C,0.1)] °C ([round(M.bodytemperature*1.8-459.67,0.1)] °F)\n" // Time of death if(M.tod && (M.stat == DEAD || ((HAS_TRAIT(M, TRAIT_FAKEDEATH)) && !advanced))) - to_chat(user, "Time of Death: [M.tod]") + render_list += "Time of Death: [M.tod]\n" var/tdelta = round(world.time - M.timeofdeath) - if(tdelta < (DEFIB_TIME_LIMIT * 10)) - to_chat(user, "Subject died [DisplayTimeText(tdelta)] ago, defibrillation may be possible!") + render_list += "Subject died [DisplayTimeText(tdelta)] ago.\n" for(var/thing in M.diseases) var/datum/disease/D = thing if(!(D.visibility_flags & HIDDEN_SCANNER)) - to_chat(user, "Warning: [D.form] detected\nName: [D.name].\nType: [D.spread_text].\nStage: [D.stage]/[D.max_stages].\nPossible Cure: [D.cure_text]") + render_list += "Warning: [D.form] detected\n\ +
Name: [D.name].\nType: [D.spread_text].\nStage: [D.stage]/[D.max_stages].\nPossible Cure: [D.cure_text]
\ + " // divs do not need extra linebreak // Blood Level if(M.has_dna()) @@ -386,46 +337,47 @@ GENE SCANNER if(ishuman(C)) var/mob/living/carbon/human/H = C if(H.bleed_rate) - to_chat(user, "Subject is bleeding!") + render_list += "Subject is bleeding!\n" var/blood_percent = round((C.blood_volume / BLOOD_VOLUME_NORMAL)*100) var/blood_type = C.dna.blood_type - if(blood_id != /datum/reagent/blood)//special blood substance + if(blood_id != /datum/reagent/blood) // special blood substance var/datum/reagent/R = GLOB.chemical_reagents_list[blood_id] - if(R) - blood_type = R.name - else - blood_type = blood_id + blood_type = R ? R.name : blood_id if(C.blood_volume <= BLOOD_VOLUME_SAFE && C.blood_volume > BLOOD_VOLUME_OKAY) - to_chat(user, "Blood level: LOW [blood_percent] %, [C.blood_volume] cl, type: [blood_type]") + render_list += "Blood level: LOW [blood_percent] %, [C.blood_volume] cl, type: [blood_type]\n" else if(C.blood_volume <= BLOOD_VOLUME_OKAY) - to_chat(user, "Blood level: CRITICAL [blood_percent] %, [C.blood_volume] cl, type: [blood_type]") + render_list += "Blood level: CRITICAL [blood_percent] %, [C.blood_volume] cl, type: [blood_type]\n" else - to_chat(user, "Blood level: [blood_percent] %, [C.blood_volume] cl, type: [blood_type]") + render_list += "Blood level: [blood_percent] %, [C.blood_volume] cl, type: [blood_type]\n" var/cyberimp_detect for(var/obj/item/organ/cyberimp/CI in C.internal_organs) if(CI.status == ORGAN_ROBOTIC && !CI.syndicate_implant) - cyberimp_detect += "[C.name] is modified with a [CI.name].
" + cyberimp_detect += "[!cyberimp_detect ? "[CI.get_examine_string(user)]" : ", [CI.get_examine_string(user)]"]" if(cyberimp_detect) - to_chat(user, "Detected cybernetic modifications:") - to_chat(user, "[cyberimp_detect]") + render_list += "Detected cybernetic modifications:\n" + render_list += "[cyberimp_detect]\n" + SEND_SIGNAL(M, COMSIG_NANITE_SCAN, user, FALSE) + to_chat(user, jointext(render_list, ""), trailing_newline = FALSE) // we handled the last
so we don't need handholding /proc/chemscan(mob/living/user, mob/living/M) - if(istype(M)) - if(M.reagents) - if(M.reagents.reagent_list.len) - to_chat(user, "Subject contains the following reagents:") - for(var/datum/reagent/R in M.reagents.reagent_list) - to_chat(user, "[round(R.volume, 0.001)] units of [R.name][R.overdosed == 1 ? " - OVERDOSING" : "."]") - else - to_chat(user, "Subject contains no reagents.") - if(M.reagents.addiction_list.len) - to_chat(user, "Subject is addicted to the following reagents:") - for(var/datum/reagent/R in M.reagents.addiction_list) - to_chat(user, "[R.name]") - else - to_chat(user, "Subject is not addicted to any reagents.") + if(istype(M) && M.reagents) + var/render_list = list() + if(M.reagents.reagent_list.len) + render_list += "Subject contains the following reagents:\n" + for(var/datum/reagent/R in M.reagents.reagent_list) + render_list += "[round(R.volume, 0.001)] units of [R.name][R.overdosed == 1 ? " - OVERDOSING" : "."]\n" + else + render_list += "Subject contains no reagents.\n" + if(M.reagents.addiction_list.len) + render_list += "Subject is addicted to the following reagents:\n" + for(var/datum/reagent/R in M.reagents.addiction_list) + render_list += "[R.name]\n" + else + render_list += "Subject is not addicted to any reagents.\n" + + to_chat(user, jointext(render_list, ""), trailing_newline = FALSE) // we handled the last
so we don't need handholding /obj/item/healthanalyzer/verb/toggle_mode() set name = "Switch Verbosity" @@ -435,11 +387,7 @@ GENE SCANNER return mode = !mode - switch (mode) - if(1) - to_chat(usr, "The scanner now shows specific limb damage.") - if(0) - to_chat(usr, "The scanner no longer shows limb damage.") + to_chat(usr, mode == SCANNER_VERBOSE ? "The scanner now shows specific limb damage." : "The scanner no longer shows limb damage.") /obj/item/healthanalyzer/advanced name = "advanced health analyzer" @@ -488,16 +436,13 @@ GENE SCANNER if(!istype(location)) return + var/render_list = list() var/datum/gas_mixture/environment = location.return_air() - var/pressure = environment.return_pressure() var/total_moles = environment.total_moles() - to_chat(user, "Results:") - if(abs(pressure - ONE_ATMOSPHERE) < 10) - to_chat(user, "Pressure: [round(pressure, 0.01)] kPa") - else - to_chat(user, "Pressure: [round(pressure, 0.01)] kPa") + render_list += "Results:\ + \nPressure: [round(pressure, 0.01)] kPa\n" if(total_moles) var/list/env_gases = environment.gases @@ -507,25 +452,10 @@ GENE SCANNER var/co2_concentration = env_gases[/datum/gas/carbon_dioxide][MOLES]/total_moles var/plasma_concentration = env_gases[/datum/gas/plasma][MOLES]/total_moles - if(abs(n2_concentration - N2STANDARD) < 20) - to_chat(user, "Nitrogen: [round(n2_concentration*100, 0.01)] % ([round(env_gases[/datum/gas/nitrogen][MOLES], 0.01)] mol)") - else - to_chat(user, "Nitrogen: [round(n2_concentration*100, 0.01)] % ([round(env_gases[/datum/gas/nitrogen][MOLES], 0.01)] mol)") - - if(abs(o2_concentration - O2STANDARD) < 2) - to_chat(user, "Oxygen: [round(o2_concentration*100, 0.01)] % ([round(env_gases[/datum/gas/oxygen][MOLES], 0.01)] mol)") - else - to_chat(user, "Oxygen: [round(o2_concentration*100, 0.01)] % ([round(env_gases[/datum/gas/oxygen][MOLES], 0.01)] mol)") - - if(co2_concentration > 0.01) - to_chat(user, "CO2: [round(co2_concentration*100, 0.01)] % ([round(env_gases[/datum/gas/carbon_dioxide][MOLES], 0.01)] mol)") - else - to_chat(user, "CO2: [round(co2_concentration*100, 0.01)] % ([round(env_gases[/datum/gas/carbon_dioxide][MOLES], 0.01)] mol)") - - if(plasma_concentration > 0.005) - to_chat(user, "Plasma: [round(plasma_concentration*100, 0.01)] % ([round(env_gases[/datum/gas/plasma][MOLES], 0.01)] mol)") - else - to_chat(user, "Plasma: [round(plasma_concentration*100, 0.01)] % ([round(env_gases[/datum/gas/plasma][MOLES], 0.01)] mol)") + render_list += "Nitrogen: [round(n2_concentration*100, 0.01)] % ([round(env_gases[/datum/gas/nitrogen][MOLES], 0.01)] mol)\ + \nOxygen: [round(o2_concentration*100, 0.01)] % ([round(env_gases[/datum/gas/oxygen][MOLES], 0.01)] mol)\ + \nCO2: [round(co2_concentration*100, 0.01)] % ([round(env_gases[/datum/gas/carbon_dioxide][MOLES], 0.01)] mol)\ + \nPlasma: [round(plasma_concentration*100, 0.01)] % ([round(env_gases[/datum/gas/plasma][MOLES], 0.01)] mol)\n" environment.garbage_collect() @@ -533,14 +463,14 @@ GENE SCANNER if(id in GLOB.hardcoded_gases) continue var/gas_concentration = env_gases[id][MOLES]/total_moles - to_chat(user, "[env_gases[id][GAS_META][META_GAS_NAME]]: [round(gas_concentration*100, 0.01)] % ([round(env_gases[id][MOLES], 0.01)] mol)") - to_chat(user, "Temperature: [round(environment.temperature-T0C, 0.01)] °C ([round(environment.temperature, 0.01)] K)") + render_list += "[env_gases[id][GAS_META][META_GAS_NAME]]: [round(gas_concentration*100, 0.01)] % ([round(env_gases[id][MOLES], 0.01)] mol)\n" + render_list += "Temperature: [round(environment.temperature-T0C, 0.01)] °C ([round(environment.temperature, 0.01)] K)\n" + to_chat(user, jointext(render_list, ""), trailing_newline = FALSE) // we handled the last
so we don't need handholding /obj/item/analyzer/AltClick(mob/user) //Barometer output for measuring when the next storm happens ..() if(user.canUseTopic(src, BE_CLOSE)) - if(cooldown) to_chat(user, "[src]'s barometer function is preparing itself.") return @@ -605,14 +535,15 @@ GENE SCANNER return FALSE var/icon = target + var/render_list = list() if(!silent && isliving(user)) user.visible_message("[user] has used the analyzer on [icon2html(icon, viewers(user))] [target].", "You use the analyzer on [icon2html(icon, user)] [target].") - to_chat(user, "Results of analysis of [icon2html(icon, user)] [target].") + render_list += "Results of analysis of [icon2html(icon, user)] [target]." var/list/airs = islist(mixture) ? mixture : list(mixture) for(var/g in airs) if(airs.len > 1) //not a unary gas mixture - to_chat(user, "Node [airs.Find(g)]") + render_list += "Node [airs.Find(g)]" var/datum/gas_mixture/air_contents = g var/total_moles = air_contents.total_moles() @@ -622,26 +553,23 @@ GENE SCANNER var/cached_scan_results = air_contents.analyzer_results if(total_moles > 0) - to_chat(user, "Moles: [round(total_moles, 0.01)] mol") - to_chat(user, "Volume: [volume] L") - to_chat(user, "Pressure: [round(pressure,0.01)] kPa") + render_list += "Moles: [round(total_moles, 0.01)] mol\ + \nVolume: [volume] L\ + \nPressure: [round(pressure,0.01)] kPa" var/list/cached_gases = air_contents.gases for(var/id in cached_gases) var/gas_concentration = cached_gases[id][MOLES]/total_moles - to_chat(user, "[cached_gases[id][GAS_META][META_GAS_NAME]]: [round(gas_concentration*100, 0.01)] % ([round(cached_gases[id][MOLES], 0.01)] mol)") - to_chat(user, "Temperature: [round(temperature - T0C,0.01)] °C ([round(temperature, 0.01)] K)") - + render_list += "[cached_gases[id][GAS_META][META_GAS_NAME]]: [round(gas_concentration*100, 0.01)] % ([round(cached_gases[id][MOLES], 0.01)] mol)" + render_list += "Temperature: [round(temperature - T0C,0.01)] °C ([round(temperature, 0.01)] K)" else - if(airs.len > 1) - to_chat(user, "This node is empty!") - else - to_chat(user, "[target] is empty!") + render_list += airs.len > 1 ? "This node is empty!" : "[target] is empty!" if(cached_scan_results && cached_scan_results["fusion"]) //notify the user if a fusion reaction was detected - var/instability = round(cached_scan_results["fusion"], 0.01) - to_chat(user, "Large amounts of free neutrons detected in the air indicate that a fusion reaction took place.") - to_chat(user, "Instability of the last fusion reaction: [instability].") + render_list += "Large amounts of free neutrons detected in the air indicate that a fusion reaction took place.\ + \nInstability of the last fusion reaction: [round(cached_scan_results["fusion"], 0.01)]." + + to_chat(user, jointext(render_list, "\n")) // we let the join apply newlines so we do need handholding return TRUE //slime scanner @@ -671,36 +599,35 @@ GENE SCANNER slime_scan(T, user) /proc/slime_scan(mob/living/simple_animal/slime/T, mob/living/user) - to_chat(user, "========================") - to_chat(user, "Slime scan results:") - to_chat(user, "[T.colour] [T.is_adult ? "adult" : "baby"] slime") - to_chat(user, "Nutrition: [T.nutrition]/[T.get_max_nutrition()]") + var/to_render = "========================\ + \nSlime scan results:\ + \n[T.colour] [T.is_adult ? "adult" : "baby"] slime\ + \nNutrition: [T.nutrition]/[T.get_max_nutrition()]" if (T.nutrition < T.get_starve_nutrition()) - to_chat(user, "Warning: slime is starving!") + to_render += "\nWarning: slime is starving!" else if (T.nutrition < T.get_hunger_nutrition()) - to_chat(user, "Warning: slime is hungry") - to_chat(user, "Electric change strength: [T.powerlevel]") - to_chat(user, "Health: [round(T.health/T.maxHealth,0.01)*100]%") + to_render += "\nWarning: slime is hungry" + to_render += "\nElectric change strength: [T.powerlevel]\nHealth: [round(T.health/T.maxHealth,0.01)*100]%" if (T.slime_mutation[4] == T.colour) - to_chat(user, "This slime does not evolve any further.") + to_render += "\nThis slime does not evolve any further." else if (T.slime_mutation[3] == T.slime_mutation[4]) if (T.slime_mutation[2] == T.slime_mutation[1]) - to_chat(user, "Possible mutation: [T.slime_mutation[3]]") - to_chat(user, "Genetic destability: [T.mutation_chance/2] % chance of mutation on splitting") + to_render += "\nPossible mutation: [T.slime_mutation[3]]\ + \nGenetic destability: [T.mutation_chance/2] % chance of mutation on splitting" else - to_chat(user, "Possible mutations: [T.slime_mutation[1]], [T.slime_mutation[2]], [T.slime_mutation[3]] (x2)") - to_chat(user, "Genetic destability: [T.mutation_chance] % chance of mutation on splitting") + to_render += "\nPossible mutations: [T.slime_mutation[1]], [T.slime_mutation[2]], [T.slime_mutation[3]] (x2)\ + \nGenetic destability: [T.mutation_chance] % chance of mutation on splitting" else - to_chat(user, "Possible mutations: [T.slime_mutation[1]], [T.slime_mutation[2]], [T.slime_mutation[3]], [T.slime_mutation[4]]") - to_chat(user, "Genetic destability: [T.mutation_chance] % chance of mutation on splitting") + to_render += "\nPossible mutations: [T.slime_mutation[1]], [T.slime_mutation[2]], [T.slime_mutation[3]], [T.slime_mutation[4]]\ + \nGenetic destability: [T.mutation_chance] % chance of mutation on splitting" if (T.cores > 1) - to_chat(user, "Multiple cores detected") - to_chat(user, "Growth progress: [T.amount_grown]/[SLIME_EVOLUTION_THRESHOLD]") + to_render += "\nMultiple cores detected" + to_render += "\nGrowth progress: [T.amount_grown]/[SLIME_EVOLUTION_THRESHOLD]" if(T.effectmod) - to_chat(user, "Core mutation in progress: [T.effectmod]") - to_chat(user, "Progress in core mutation: [T.applied] / [SLIME_EXTRACT_CROSSING_REQUIRED]") - to_chat(user, "========================") + to_render += "\nCore mutation in progress: [T.effectmod]\ + \nProgress in core mutation: [T.applied] / [SLIME_EXTRACT_CROSSING_REQUIRED]" + to_chat(user, to_render + "\n========================") /obj/item/nanite_scanner @@ -807,10 +734,10 @@ GENE SCANNER if(sequence) var/display - for(var/i in 0 to length(sequence) / DNA_MUTATION_BLOCKS-1) + for(var/i in 0 to length_char(sequence) / DNA_MUTATION_BLOCKS-1) if(i) display += "-" - display += copytext(sequence, 1 + i*DNA_MUTATION_BLOCKS, DNA_MUTATION_BLOCKS*(1+i) + 1) + display += copytext_char(sequence, 1 + i*DNA_MUTATION_BLOCKS, DNA_MUTATION_BLOCKS*(1+i) + 1) to_chat(user, "[display]
") @@ -870,3 +797,8 @@ GENE SCANNER /obj/item/scanner_wand/proc/return_patient() var/returned_target = selected_target return returned_target + +#undef SCANMODE_HEALTH +#undef SCANMODE_CHEMICAL +#undef SCANNER_CONDENSED +#undef SCANNER_VERBOSE diff --git a/code/game/objects/items/devices/sensor_device.dm b/code/game/objects/items/devices/sensor_device.dm index 07b975f1338..b934ba5fa2a 100644 --- a/code/game/objects/items/devices/sensor_device.dm +++ b/code/game/objects/items/devices/sensor_device.dm @@ -6,6 +6,7 @@ w_class = WEIGHT_CLASS_SMALL slot_flags = ITEM_SLOT_BELT custom_price = 1750 + custom_premium_price = 1750 /obj/item/sensor_device/attack_self(mob/user) GLOB.crewmonitor.show(user,src) //Proc already exists, just had to call it diff --git a/code/game/objects/items/devices/swapper.dm b/code/game/objects/items/devices/swapper.dm index ac5e778533e..b08f83b3618 100644 --- a/code/game/objects/items/devices/swapper.dm +++ b/code/game/objects/items/devices/swapper.dm @@ -20,12 +20,11 @@ linked_swapper = null return ..() -/obj/item/swapper/update_icon() +/obj/item/swapper/update_icon_state() if(linked_swapper) icon_state = "swapper-linked" else icon_state = "swapper" - ..() /obj/item/swapper/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/swapper)) diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm index 2c746e77c0e..e38a4e05e5c 100644 --- a/code/game/objects/items/devices/taperecorder.dm +++ b/code/game/objects/items/devices/taperecorder.dm @@ -83,7 +83,7 @@ eject(usr) -/obj/item/taperecorder/update_icon() +/obj/item/taperecorder/update_icon_state() if(!mytape) icon_state = "taperecorder_empty" else if(recording) diff --git a/code/game/objects/items/dice.dm b/code/game/objects/items/dice.dm index 034a9858e2e..0e15f306885 100644 --- a/code/game/objects/items/dice.dm +++ b/code/game/objects/items/dice.dm @@ -153,8 +153,9 @@ obj/item/dice/d6/ebony w_class = WEIGHT_CLASS_SMALL sides = 100 -/obj/item/dice/d100/update_icon() - return +/obj/item/dice/d100/ComponentInitialize() + . = ..() + AddElement(/datum/element/update_icon_blocker) /obj/item/dice/eightbd20 name = "strange d20" @@ -163,8 +164,9 @@ obj/item/dice/d6/ebony sides = 20 special_faces = list("It is certain","It is decidedly so","Without a doubt","Yes, definitely","You may rely on it","As I see it, yes","Most likely","Outlook good","Yes","Signs point to yes","Reply hazy try again","Ask again later","Better not tell you now","Cannot predict now","Concentrate and ask again","Don't count on it","My reply is no","My sources say no","Outlook not so good","Very doubtful") -/obj/item/dice/eightbd20/update_icon() - return +/obj/item/dice/eightbd20/ComponentInitialize() + . = ..() + AddElement(/datum/element/update_icon_blocker) /obj/item/dice/fourdd6 name = "4d d6" @@ -173,8 +175,9 @@ obj/item/dice/d6/ebony sides = 48 special_faces = list("Cube-Side: 1-1","Cube-Side: 1-2","Cube-Side: 1-3","Cube-Side: 1-4","Cube-Side: 1-5","Cube-Side: 1-6","Cube-Side: 2-1","Cube-Side: 2-2","Cube-Side: 2-3","Cube-Side: 2-4","Cube-Side: 2-5","Cube-Side: 2-6","Cube-Side: 3-1","Cube-Side: 3-2","Cube-Side: 3-3","Cube-Side: 3-4","Cube-Side: 3-5","Cube-Side: 3-6","Cube-Side: 4-1","Cube-Side: 4-2","Cube-Side: 4-3","Cube-Side: 4-4","Cube-Side: 4-5","Cube-Side: 4-6","Cube-Side: 5-1","Cube-Side: 5-2","Cube-Side: 5-3","Cube-Side: 5-4","Cube-Side: 5-5","Cube-Side: 5-6","Cube-Side: 6-1","Cube-Side: 6-2","Cube-Side: 6-3","Cube-Side: 6-4","Cube-Side: 6-5","Cube-Side: 6-6","Cube-Side: 7-1","Cube-Side: 7-2","Cube-Side: 7-3","Cube-Side: 7-4","Cube-Side: 7-5","Cube-Side: 7-6","Cube-Side: 8-1","Cube-Side: 8-2","Cube-Side: 8-3","Cube-Side: 8-4","Cube-Side: 8-5","Cube-Side: 8-6") -/obj/item/dice/fourdd6/update_icon() - return +/obj/item/dice/fourdd6/ComponentInitialize() + . = ..() + AddElement(/datum/element/update_icon_blocker) /obj/item/dice/attack_self(mob/user) diceroll(user) @@ -211,9 +214,9 @@ obj/item/dice/d6/ebony else if(!src.throwing) //Dice was thrown and is coming to rest visible_message("[src] rolls to a stop, landing on [result]. [comment]") -/obj/item/dice/update_icon() - cut_overlays() - add_overlay("[src.icon_state]-[src.result]") +/obj/item/dice/update_overlays() + . = ..() + . += "[icon_state]-[result]" /obj/item/dice/microwave_act(obj/machinery/microwave/M) if(microwave_riggable) diff --git a/code/game/objects/items/eightball.dm b/code/game/objects/items/eightball.dm index 43afa6b839d..210c0846307 100644 --- a/code/game/objects/items/eightball.dm +++ b/code/game/objects/items/eightball.dm @@ -95,16 +95,47 @@ // except it actually ASKS THE DEAD (wooooo) /obj/item/toy/eightball/haunted - shake_time = 150 - cooldown_time = 1800 + shake_time = 30 SECONDS + cooldown_time = 3 MINUTES flags_1 = HEAR_1 var/last_message var/selected_message - var/list/votes + //these kind of store the same thing but one is easier to work with. + var/list/votes = list() + var/list/voted = list() + var/static/list/haunted_answers = list( + "yes" = list( + "It is certain", + "It is decidedly so", + "Without a doubt", + "Yes definitely", + "You may rely on it", + "As I see it, yes", + "Most likely", + "Outlook good", + "Yes", + "Signs point to yes" + ), + "maybe" = list( + "Reply hazy try again", + "Ask again later", + "Better not tell you now", + "Cannot predict now", + "Concentrate and ask again" + ), + "no" = list( + "Don't count on it", + "My reply is no", + "My sources say no", + "Outlook not so good", + "Very doubtful" + ) + ) /obj/item/toy/eightball/haunted/Initialize(mapload) . = ..() - votes = list() + for (var/answer in haunted_answers) + votes[answer] = 0 GLOB.poi_list |= src /obj/item/toy/eightball/haunted/Destroy() @@ -137,38 +168,31 @@ if(isobserver(usr)) interact(usr) -/obj/item/toy/eightball/haunted/proc/get_vote_tallies() - var/list/answers = list() - for(var/ckey in votes) - var/selected = votes[ckey] - if(selected in answers) - answers[selected]++ - else - answers[selected] = 1 - - return answers - - /obj/item/toy/eightball/haunted/get_answer() - if(!votes.len) - return pick(possible_answers) + var/top_amount = 0 + var/top_vote - var/list/tallied_votes = get_vote_tallies() + for(var/vote in votes) + var/amount_of_votes = length(votes[vote]) + if(amount_of_votes > top_amount) + top_vote = vote + top_amount = amount_of_votes + //If one option actually has votes and there's a tie, pick between them 50/50 + else if(top_amount && amount_of_votes == top_amount && prob(50)) + top_vote = vote + top_amount = amount_of_votes - // I miss python sorting, then I wouldn't have to muck about with - // all this - var/most_popular_answer - var/most_amount = 0 - // yes, if there is a tie, there is an arbitary decision - // but we never said the spirit world was fair - for(var/A in tallied_votes) - var/amount = tallied_votes[A] - if(amount > most_amount) - most_popular_answer = A + if(isnull(top_vote)) + top_vote = pick(votes) - return most_popular_answer + for(var/vote in votes) + votes[vote] = 0 -/obj/item/toy/eightball/haunted/ui_interact(mob/user, ui_key="main", datum/tgui/ui=null, force_open=0, datum/tgui/master_ui=null, datum/ui_state/state = GLOB.observer_state) + voted.Cut() + + return top_vote + +/obj/item/toy/eightball/haunted/ui_interact(mob/user, ui_key="main", datum/tgui/ui=null, force_open=0, datum/tgui/master_ui=null, datum/ui_state/state = GLOB.always_state) ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) @@ -179,21 +203,13 @@ var/list/data = list() data["shaking"] = shaking data["question"] = selected_message - var/list/tallied_votes = get_vote_tallies() data["answers"] = list() - - for(var/pa in possible_answers) + for(var/pa in haunted_answers) var/list/L = list() L["answer"] = pa - var/amount = 0 - if(pa in tallied_votes) - amount = tallied_votes[pa] - L["amount"] = amount - var/selected = FALSE - if(votes[user.ckey] == pa) - selected = TRUE - L["selected"] = selected + L["amount"] = votes[pa] + L["selected"] = voted[user.ckey] data["answers"] += list(L) return data @@ -206,8 +222,11 @@ switch(action) if("vote") var/selected_answer = params["answer"] - if(!(selected_answer in possible_answers)) + if(!(selected_answer in haunted_answers)) + return + if(user.ckey in voted) return else - votes[user.ckey] = selected_answer + votes[selected_answer] += 1 + voted[user.ckey] = selected_answer . = TRUE diff --git a/code/game/objects/items/etherealdiscoball.dm b/code/game/objects/items/etherealdiscoball.dm index 685e83b8940..571b1043fb5 100644 --- a/code/game/objects/items/etherealdiscoball.dm +++ b/code/game/objects/items/etherealdiscoball.dm @@ -65,9 +65,11 @@ update_icon() TimerID = addtimer(CALLBACK(src, .proc/DiscoFever), 5, TIMER_STOPPABLE) //Call ourselves every 0.5 seconds to change colors -/obj/structure/etherealball/update_icon() - cut_overlays() +/obj/structure/etherealball/update_icon_state() icon_state = "ethdisco_head_[TurnedOn]" + +/obj/structure/etherealball/update_overlays() + . = ..() var/mutable_appearance/base_overlay = mutable_appearance(icon, "ethdisco_base") base_overlay.appearance_flags = RESET_COLOR - add_overlay(base_overlay) + . += base_overlay diff --git a/code/game/objects/items/flamethrower.dm b/code/game/objects/items/flamethrower.dm index 7ca22bc8b32..8a53c952413 100644 --- a/code/game/objects/items/flamethrower.dm +++ b/code/game/objects/items/flamethrower.dm @@ -29,6 +29,10 @@ var/igniter_type = /obj/item/assembly/igniter trigger_guard = TRIGGER_GUARD_NORMAL +/obj/item/flamethrower/ComponentInitialize() + . = ..() + AddElement(/datum/element/update_icon_updates_onmob) + /obj/item/flamethrower/Destroy() if(weldtool) qdel(weldtool) @@ -51,21 +55,17 @@ igniter.flamethrower_process(location) -/obj/item/flamethrower/update_icon() - cut_overlays() +/obj/item/flamethrower/update_icon_state() + item_state = "flamethrower_[lit]" + +/obj/item/flamethrower/update_overlays() + . = ..() if(igniter) - add_overlay("+igniter[status]") + . += "+igniter[status]" if(ptank) - add_overlay("+ptank") + . += "+ptank" if(lit) - add_overlay("+lit") - item_state = "flamethrower_1" - else - item_state = "flamethrower_0" - if(ismob(loc)) - var/mob/M = loc - M.update_inv_hands() - return + . += "+lit" /obj/item/flamethrower/afterattack(atom/target, mob/user, flag) . = ..() diff --git a/code/game/objects/items/granters.dm b/code/game/objects/items/granters.dm index 7d2da157b3c..92f9b70a089 100644 --- a/code/game/objects/items/granters.dm +++ b/code/game/objects/items/granters.dm @@ -12,7 +12,7 @@ /obj/item/book/granter/proc/turn_page(mob/user) playsound(user, pick('sound/effects/pageturn1.ogg','sound/effects/pageturn2.ogg','sound/effects/pageturn3.ogg'), 30, TRUE) - if(do_after(user,50, user)) + if(do_after(user, 50, TRUE, src)) if(remarks.len) to_chat(user, "[pick(remarks)]") else @@ -57,9 +57,9 @@ on_reading_stopped() reading = FALSE return - if(do_after(user,50, user)) + if(do_after(user, 50, TRUE, src)) on_reading_finished(user) - reading = FALSE + reading = FALSE return TRUE ///ACTION BUTTONS/// diff --git a/code/game/objects/items/grenades/antigravity.dm b/code/game/objects/items/grenades/antigravity.dm index 43b2f949867..cf7dc928ae0 100644 --- a/code/game/objects/items/grenades/antigravity.dm +++ b/code/game/objects/items/grenades/antigravity.dm @@ -2,16 +2,16 @@ name = "antigravity grenade" icon_state = "emp" item_state = "emp" - + var/range = 7 var/forced_value = 0 var/duration = 300 /obj/item/grenade/antigravity/prime() update_mob() - + for(var/turf/T in view(range,src)) - var/datum/component/C = T.AddComponent(/datum/component/forced_gravity,forced_value) - QDEL_IN(C,duration) - + T.AddElement(/datum/element/forced_gravity, forced_value) + addtimer(CALLBACK(T, /datum/.proc/RemoveElement, forced_value), duration) + qdel(src) diff --git a/code/game/objects/items/grenades/festive.dm b/code/game/objects/items/grenades/festive.dm new file mode 100644 index 00000000000..4e35987cdd3 --- /dev/null +++ b/code/game/objects/items/grenades/festive.dm @@ -0,0 +1,117 @@ +//~*~*~*~*SPARKLER*~*~*~*~*~*~ + +/obj/item/sparkler + name = "sparkler" + desc = "A little stick coated with metal power and barium nitrate, burns with a pleasing sparkle." + icon = 'icons/obj/holiday_misc.dmi' + icon_state = "sparkler" + w_class = WEIGHT_CLASS_TINY + heat = 1000 + var/burntime = 60 + var/lit = FALSE + +/obj/item/sparkler/fire_act(exposed_temperature, exposed_volume) + light() + +/obj/item/sparkler/attackby(obj/item/W, mob/user, params) + var/ignition_msg = W.ignition_effect(src, user) + if(ignition_msg) + light(user, ignition_msg) + else + return ..() + +/obj/item/sparkler/proc/light(mob/user, message) + if(lit) + return + if(user && message) + user.visible_message(message) + lit = TRUE + icon_state = "sparkler_on" + force = 6 + hitsound = 'sound/items/welder.ogg' + name = "lit [initial(name)]" + attack_verb = list("burnt") + set_light(l_range = 2, l_power = 2) + damtype = "fire" + START_PROCESSING(SSobj, src) + playsound(src, 'sound/effects/fuse.ogg', 20, TRUE) + update_icon() + +/obj/item/sparkler/process() + burntime-- + if(burntime < 1) + new /obj/item/stack/rods(drop_location()) + qdel(src) + else + open_flame(heat) + +/obj/item/sparkler/Destroy() + STOP_PROCESSING(SSobj, src) + ..() + +/obj/item/sparkler/ignition_effect(atom/A, mob/user) + . = "[user] gracefully lights [A] with [src]." + +/obj/item/sparkler/get_temperature() + return lit * heat + +//~*~*~*~*FIRECRACKER*~*~*~*~*~*~ + +/obj/item/grenade/firecracker + name = "large firecracker" + desc = "Outlawed in most of the sector. Doubles as an excellent finger remover." + icon = 'icons/obj/holiday_misc.dmi' + icon_state = "firecracker" + lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + w_class = WEIGHT_CLASS_SMALL + item_state = "flare" + throw_speed = 3 + throw_range = 7 + det_time = 30 + +/obj/item/grenade/firecracker/attack_self(mob/user) // You need to light it manually. + return + +/obj/item/grenade/firecracker/attackby(obj/item/W, mob/user, params) + var/ignition_msg = W.ignition_effect(src, user) + if(ignition_msg && !active) + visible_message(ignition_msg) + preprime(user) + else + return ..() + +/obj/item/grenade/firecracker/fire_act(exposed_temperature, exposed_volume) + prime() + +obj/item/grenade/firecracker/wirecutter_act(mob/living/user, obj/item/I) + if(active) + return + if(det_time) + det_time -= 10 + to_chat(user, "You shorten the fuse of [src] with [I].") + playsound(src, 'sound/items/wirecutter.ogg', 20, TRUE) + icon_state = initial(icon_state) + "_[det_time]" + update_icon() + else + to_chat(user, "You've already removed all of the fuse!") + +obj/item/grenade/firecracker/preprime(mob/user, delayoverride, msg = TRUE, volume = 80) + var/turf/T = get_turf(src) + log_grenade(user, T) + if(user) + add_fingerprint(user) + if(msg) + to_chat(user, "You prime [src]! [capitalize(DisplayTimeText(det_time))]!") + playsound(src, 'sound/effects/fuse.ogg', volume, TRUE) + active = TRUE + icon_state = initial(icon_state) + "_active" + addtimer(CALLBACK(src, .proc/prime), isnull(delayoverride)? det_time : delayoverride) + +/obj/item/grenade/firecracker/prime() + update_mob() + var/explosion_loc = get_turf(src) + qdel(src) + explosion(explosion_loc,-1,-1,2) + + diff --git a/code/game/objects/items/handcuffs.dm b/code/game/objects/items/handcuffs.dm index 99d50fc91f2..310d3b65264 100644 --- a/code/game/objects/items/handcuffs.dm +++ b/code/game/objects/items/handcuffs.dm @@ -229,7 +229,7 @@ . = ..() update_icon() -/obj/item/restraints/legcuffs/beartrap/update_icon() +/obj/item/restraints/legcuffs/beartrap/update_icon_state() icon_state = "[initial(icon_state)][armed]" /obj/item/restraints/legcuffs/beartrap/suicide_act(mob/user) @@ -319,7 +319,7 @@ gender = NEUTER var/knockdown = 0 -/obj/item/restraints/legcuffs/bola/throw_at(atom/target, range, speed, mob/thrower, spin=1, diagonals_first = 0, datum/callback/callback) +/obj/item/restraints/legcuffs/bola/throw_at(atom/target, range, speed, mob/thrower, spin=1, diagonals_first = 0, datum/callback/callback, gentle = FALSE) if(!..()) return playsound(src.loc,'sound/weapons/bolathrow.ogg', 75, TRUE) diff --git a/code/game/objects/items/hot_potato.dm b/code/game/objects/items/hot_potato.dm index 671c15e5d7d..aa7a20480d8 100644 --- a/code/game/objects/items/hot_potato.dm +++ b/code/game/objects/items/hot_potato.dm @@ -157,7 +157,7 @@ colorize(null) active = FALSE -/obj/item/hot_potato/update_icon() +/obj/item/hot_potato/update_icon_state() icon_state = active? icon_on : icon_off /obj/item/hot_potato/syndicate diff --git a/code/game/objects/items/hourglass.dm b/code/game/objects/items/hourglass.dm index d7b6d105fbf..f4997089c68 100644 --- a/code/game/objects/items/hourglass.dm +++ b/code/game/objects/items/hourglass.dm @@ -29,7 +29,7 @@ to_chat(user,"You stop the [src].") //Sand magically flows back because that's more convinient to use. stop() -/obj/item/hourglass/update_icon() +/obj/item/hourglass/update_icon_state() if(timing_id) icon_state = "hourglass_active" else diff --git a/code/game/objects/items/implants/implant_misc.dm b/code/game/objects/items/implants/implant_misc.dm index 7e5641dcdf3..baf6bb3966d 100644 --- a/code/game/objects/items/implants/implant_misc.dm +++ b/code/game/objects/items/implants/implant_misc.dm @@ -34,6 +34,7 @@ . = ..() uses-- to_chat(imp_in, "You feel a sudden surge of energy!") + imp_in.SetKnockdown(0) imp_in.set_resting(FALSE) imp_in.reagents.add_reagent(/datum/reagent/medicine/badstims, 6) if(!uses) diff --git a/code/game/objects/items/implants/implant_stealth.dm b/code/game/objects/items/implants/implant_stealth.dm index c390301824c..74f04c67969 100644 --- a/code/game/objects/items/implants/implant_stealth.dm +++ b/code/game/objects/items/implants/implant_stealth.dm @@ -35,7 +35,7 @@ alpha = 255 addtimer(CALLBACK(src, .proc/go_invisible), 10, TIMER_OVERRIDE|TIMER_UNIQUE) -/obj/structure/closet/cardboard/agent/Bump(atom/movable/A) +/obj/structure/closet/cardboard/agent/Bump(atom/A) . = ..() if(isliving(A)) reveal() diff --git a/code/game/objects/items/implants/implantcase.dm b/code/game/objects/items/implants/implantcase.dm index 5a06aff10fc..5368b6e1bb5 100644 --- a/code/game/objects/items/implants/implantcase.dm +++ b/code/game/objects/items/implants/implantcase.dm @@ -14,13 +14,11 @@ var/imp_type -/obj/item/implantcase/update_icon() +/obj/item/implantcase/update_icon_state() if(imp) icon_state = "implantcase-[imp.implant_color]" - reagents = imp.reagents else icon_state = "implantcase-0" - reagents = null /obj/item/implantcase/attackby(obj/item/W, mob/user, params) @@ -46,6 +44,7 @@ imp = I.imp I.imp = null update_icon() + reagents = imp.reagents I.update_icon() else if(imp) @@ -54,6 +53,7 @@ imp.forceMove(I) I.imp = imp imp = null + reagents = null update_icon() I.update_icon() @@ -65,6 +65,7 @@ if(imp_type) imp = new imp_type(src) update_icon() + reagents = imp.reagents /obj/item/implantcase/tracking diff --git a/code/game/objects/items/implants/implantchair.dm b/code/game/objects/items/implants/implantchair.dm index c295a8ea618..b5af9750bf0 100644 --- a/code/game/objects/items/implants/implantchair.dm +++ b/code/game/objects/items/implants/implantchair.dm @@ -98,16 +98,17 @@ visible_message("[M] has been implanted by [src].") return TRUE -/obj/machinery/implantchair/update_icon() +/obj/machinery/implantchair/update_icon_state() icon_state = initial(icon_state) if(state_open) icon_state += "_open" if(occupant) icon_state += "_occupied" + +/obj/machinery/implantchair/update_overlays() + . = ..() if(ready) - add_overlay("ready") - else - cut_overlays() + . += "ready" /obj/machinery/implantchair/proc/replenish() if(ready_implants < max_implants) diff --git a/code/game/objects/items/implants/implanter.dm b/code/game/objects/items/implants/implanter.dm index 0b9890760ca..77e3c2c95a6 100644 --- a/code/game/objects/items/implants/implanter.dm +++ b/code/game/objects/items/implants/implanter.dm @@ -14,7 +14,7 @@ var/imp_type = null -/obj/item/implanter/update_icon() +/obj/item/implanter/update_icon_state() if(imp) icon_state = "implanter1" else diff --git a/code/game/objects/items/implants/implantpad.dm b/code/game/objects/items/implants/implantpad.dm index 5358fdaea65..6973aa4beff 100644 --- a/code/game/objects/items/implants/implantpad.dm +++ b/code/game/objects/items/implants/implantpad.dm @@ -11,7 +11,7 @@ w_class = WEIGHT_CLASS_SMALL var/obj/item/implantcase/case = null -/obj/item/implantpad/update_icon() +/obj/item/implantpad/update_icon_state() icon_state = "implantpad-[!QDELETED(case)]" /obj/item/implantpad/examine(mob/user) diff --git a/code/game/objects/items/inducer.dm b/code/game/objects/items/inducer.dm index 1b61f796433..0222c818e01 100644 --- a/code/game/objects/items/inducer.dm +++ b/code/game/objects/items/inducer.dm @@ -162,13 +162,13 @@ if(opened) . += "Its battery compartment is open." -/obj/item/inducer/update_icon() - cut_overlays() +/obj/item/inducer/update_overlays() + . = ..() if(opened) if(!cell) - add_overlay("inducer-nobat") + . += "inducer-nobat" else - add_overlay("inducer-bat") + . += "inducer-bat" /obj/item/inducer/sci icon_state = "inducer-sci" diff --git a/code/game/objects/items/kitchen.dm b/code/game/objects/items/kitchen.dm index 8f884acd403..670b59f063d 100644 --- a/code/game/objects/items/kitchen.dm +++ b/code/game/objects/items/kitchen.dm @@ -215,6 +215,7 @@ throwforce = 5 throw_speed = 3 throw_range = 7 + custom_materials = list(/datum/material/wood = MINERAL_MATERIAL_AMOUNT * 1.5) w_class = WEIGHT_CLASS_NORMAL attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked") custom_price = 200 diff --git a/code/game/objects/items/manuals.dm b/code/game/objects/items/manuals.dm index 4825cb3a5ca..be7915f67f0 100644 --- a/code/game/objects/items/manuals.dm +++ b/code/game/objects/items/manuals.dm @@ -14,6 +14,7 @@ //book contents below dat = {" +