diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 71fe793c3cc..7f5a9263de6 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -2,13 +2,13 @@ ## What Does This PR Do - + ## Why It's Good For The Game - + ## Images of changes - + ## Changelog :cl: @@ -27,3 +27,4 @@ experiment: Added an experimental thingy + diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 88eec1aece6..4b5975725c0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -50,7 +50,7 @@ jobs: tools/ci/install_byond.sh source $HOME/BYOND/byond/bin/byondsetup tools/ci/generate_maplist.sh - tools/ci/dm.sh -Mci_map_testing paradise.dme + tools/ci/dm.sh -DCIMAP paradise.dme unit_tests_and_sql: name: Unit Tests + SQL Validation diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000000..b6d5ddfed6d --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,5 @@ +{ + "workbench.editorAssociations": { + "*.dmi": "imagePreview.previewEditor" + } +} \ No newline at end of file diff --git a/SQL/paradise_schema.sql b/SQL/paradise_schema.sql index 8917d28d6bb..f73134e6704 100644 --- a/SQL/paradise_schema.sql +++ b/SQL/paradise_schema.sql @@ -99,7 +99,7 @@ CREATE TABLE `customuseritems` ( `cuiJobMask` text NOT NULL, PRIMARY KEY (`id`), KEY `cuiCKey` (`cuiCKey`) -) ENGINE=MyISAM AUTO_INCREMENT=56 DEFAULT CHARSET=utf8mb4; +) ENGINE=InnoDB AUTO_INCREMENT=56 DEFAULT CHARSET=utf8mb4; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -126,7 +126,7 @@ CREATE TABLE `death` ( `fireloss` int(11) NOT NULL, `oxyloss` int(11) NOT NULL, PRIMARY KEY (`id`) -) ENGINE=MyISAM AUTO_INCREMENT=166546 DEFAULT CHARSET=utf8mb4; +) ENGINE=InnoDB AUTO_INCREMENT=166546 DEFAULT CHARSET=utf8mb4; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -241,7 +241,7 @@ CREATE TABLE `feedback` ( `version` tinyint(3) UNSIGNED NOT NULL, `json` LONGTEXT NOT NULL COLLATE 'utf8mb4_general_ci', PRIMARY KEY (`id`) -) ENGINE=MyISAM AUTO_INCREMENT=257638 DEFAULT CHARSET=utf8mb4; +) ENGINE=InnoDB AUTO_INCREMENT=257638 DEFAULT CHARSET=utf8mb4; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -277,6 +277,7 @@ CREATE TABLE `player` ( `fupdate` smallint(4) DEFAULT '0', `parallax` tinyint(1) DEFAULT '8', `byond_date` DATE DEFAULT NULL, + `2fa_status` ENUM('DISABLED','ENABLED_IP','ENABLED_ALWAYS') NOT NULL DEFAULT 'DISABLED' COLLATE 'utf8mb4_general_ci', PRIMARY KEY (`id`), UNIQUE KEY `ckey` (`ckey`), KEY `lastseen` (`lastseen`), @@ -321,7 +322,7 @@ CREATE TABLE `karma` ( `spenderip` text NOT NULL, `time` datetime NOT NULL, PRIMARY KEY (`id`) -) ENGINE=MyISAM AUTO_INCREMENT=73614 DEFAULT CHARSET=utf8mb4; +) ENGINE=InnoDB AUTO_INCREMENT=73614 DEFAULT CHARSET=utf8mb4; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -338,7 +339,7 @@ CREATE TABLE `karmatotals` ( `karmaspent` int(11) NOT NULL DEFAULT 0, PRIMARY KEY (`id`), KEY `byondkey` (`byondkey`) -) ENGINE=MyISAM AUTO_INCREMENT=25715 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=25715 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -359,7 +360,7 @@ CREATE TABLE `library` ( PRIMARY KEY (`id`), KEY `ckey` (`ckey`), KEY `flagged` (`flagged`) -) ENGINE=MyISAM AUTO_INCREMENT=4537 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=4537 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -375,7 +376,7 @@ CREATE TABLE `legacy_population` ( `admincount` int(11) DEFAULT NULL, `time` datetime NOT NULL, PRIMARY KEY (`id`) -) ENGINE=MyISAM AUTO_INCREMENT=2550 DEFAULT CHARSET=utf8mb4; +) ENGINE=InnoDB AUTO_INCREMENT=2550 DEFAULT CHARSET=utf8mb4; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -392,7 +393,7 @@ CREATE TABLE `whitelist` ( `species` mediumtext COLLATE utf8mb4_unicode_ci DEFAULT NULL, PRIMARY KEY (`id`), KEY `ckey` (`ckey`) -) ENGINE=MyISAM AUTO_INCREMENT=4080 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=4080 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; @@ -585,3 +586,16 @@ CREATE TABLE `round` ( `station_name` VARCHAR(80) NULL, PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + + +-- +-- Table structure for table `2fa_secrets` +-- +CREATE TABLE `2fa_secrets` ( + `ckey` VARCHAR(50) NOT NULL COLLATE 'utf8mb4_general_ci', + `secret` VARCHAR(64) NOT NULL COLLATE 'utf8mb4_general_ci', + `date_setup` DATETIME NOT NULL DEFAULT current_timestamp(), + `last_time` DATETIME NULL DEFAULT NULL, + PRIMARY KEY (`ckey`) USING BTREE +) +COLLATE='utf8mb4_general_ci' ENGINE=InnoDB; diff --git a/SQL/paradise_schema_prefixed.sql b/SQL/paradise_schema_prefixed.sql index b3c8f1f7643..16ea512fb08 100644 --- a/SQL/paradise_schema_prefixed.sql +++ b/SQL/paradise_schema_prefixed.sql @@ -98,7 +98,7 @@ CREATE TABLE `SS13_customuseritems` ( `cuiPropAdjust` text, `cuiJobMask` text NOT NULL, PRIMARY KEY (`id`) -) ENGINE=MyISAM AUTO_INCREMENT=56 DEFAULT CHARSET=utf8mb4; +) ENGINE=InnoDB AUTO_INCREMENT=56 DEFAULT CHARSET=utf8mb4; ALTER TABLE `SS13_customuseritems` ADD INDEX(`cuiCKey`); /*!40101 SET character_set_client = @saved_cs_client */; @@ -126,7 +126,7 @@ CREATE TABLE `SS13_death` ( `fireloss` int(11) NOT NULL, `oxyloss` int(11) NOT NULL, PRIMARY KEY (`id`) -) ENGINE=MyISAM AUTO_INCREMENT=166546 DEFAULT CHARSET=utf8mb4; +) ENGINE=InnoDB AUTO_INCREMENT=166546 DEFAULT CHARSET=utf8mb4; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -240,7 +240,7 @@ CREATE TABLE `SS13_feedback` ( `version` tinyint(3) UNSIGNED NOT NULL, `json` LONGTEXT NOT NULL COLLATE 'utf8mb4_general_ci', PRIMARY KEY (`id`) -) ENGINE=MyISAM AUTO_INCREMENT=257638 DEFAULT CHARSET=utf8mb4; +) ENGINE=InnoDB AUTO_INCREMENT=257638 DEFAULT CHARSET=utf8mb4; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -276,6 +276,7 @@ CREATE TABLE `SS13_player` ( `fupdate` smallint(4) DEFAULT '0', `parallax` tinyint(1) DEFAULT '8', `byond_date` DATE DEFAULT NULL, + `2fa_status` ENUM('DISABLED','ENABLED_IP','ENABLED_ALWAYS') NOT NULL DEFAULT 'DISABLED' COLLATE 'utf8mb4_general_ci', PRIMARY KEY (`id`), UNIQUE KEY `ckey` (`ckey`), KEY `lastseen` (`lastseen`), @@ -320,7 +321,7 @@ CREATE TABLE `SS13_karma` ( `spenderip` text NOT NULL, `time` datetime NOT NULL, PRIMARY KEY (`id`) -) ENGINE=MyISAM AUTO_INCREMENT=73614 DEFAULT CHARSET=utf8mb4; +) ENGINE=InnoDB AUTO_INCREMENT=73614 DEFAULT CHARSET=utf8mb4; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -337,7 +338,7 @@ CREATE TABLE `SS13_karmatotals` ( `karmaspent` int(11) NOT NULL DEFAULT 0, PRIMARY KEY (`id`), KEY `byondkey` (`byondkey`) -) ENGINE=MyISAM AUTO_INCREMENT=25715 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=25715 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -358,7 +359,7 @@ CREATE TABLE `SS13_library` ( PRIMARY KEY (`id`), KEY `ckey` (`ckey`), KEY `flagged` (`flagged`) -) ENGINE=MyISAM AUTO_INCREMENT=4537 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=4537 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -374,7 +375,7 @@ CREATE TABLE `SS13_legacy_population` ( `admincount` int(11) DEFAULT NULL, `time` datetime NOT NULL, PRIMARY KEY (`id`) -) ENGINE=MyISAM AUTO_INCREMENT=2550 DEFAULT CHARSET=utf8mb4; +) ENGINE=InnoDB AUTO_INCREMENT=2550 DEFAULT CHARSET=utf8mb4; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -391,7 +392,7 @@ CREATE TABLE `SS13_whitelist` ( `species` mediumtext COLLATE utf8mb4_unicode_ci DEFAULT NULL, PRIMARY KEY (`id`), KEY `ckey` (`ckey`) -) ENGINE=MyISAM AUTO_INCREMENT=4080 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=4080 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; @@ -582,3 +583,15 @@ CREATE TABLE `SS13_round` ( `station_name` VARCHAR(80) NULL, PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + +-- +-- Table structure for table `2fa_secrets` +-- +CREATE TABLE `SS13_2fa_secrets` ( + `ckey` VARCHAR(50) NOT NULL COLLATE 'utf8mb4_general_ci', + `secret` VARCHAR(64) NOT NULL COLLATE 'utf8mb4_general_ci', + `date_setup` DATETIME NOT NULL DEFAULT current_timestamp(), + `last_time` DATETIME NULL DEFAULT NULL, + PRIMARY KEY (`ckey`) USING BTREE +) +COLLATE='utf8mb4_general_ci' ENGINE=InnoDB; diff --git a/SQL/updates/22-23.sql b/SQL/updates/22-23.sql new file mode 100644 index 00000000000..975e8acd413 --- /dev/null +++ b/SQL/updates/22-23.sql @@ -0,0 +1,11 @@ +# Updating SQL from version 22 to 23 -AffectedArc07 +# Converts existing MyISAM tables to InnoDB + +ALTER TABLE `customuseritems` ENGINE=InnoDB; +ALTER TABLE `death` ENGINE=InnoDB; +ALTER TABLE `feedback` ENGINE=InnoDB; +ALTER TABLE `karma` ENGINE=InnoDB; +ALTER TABLE `karmatotals` ENGINE=InnoDB; +ALTER TABLE `legacy_population` ENGINE=InnoDB; +ALTER TABLE `library` ENGINE=InnoDB; +ALTER TABLE `whitelist` ENGINE=InnoDB; diff --git a/SQL/updates/23-24.sql b/SQL/updates/23-24.sql new file mode 100644 index 00000000000..9beee82ae82 --- /dev/null +++ b/SQL/updates/23-24.sql @@ -0,0 +1,13 @@ +# Updates DB from 23 to 24 -AffectedArc07 +# Add new column to player table for 2FA status +ALTER TABLE `player` ADD COLUMN `2fa_status` ENUM('DISABLED','ENABLED_IP','ENABLED_ALWAYS') NOT NULL DEFAULT 'DISABLED' AFTER `byond_date`; + +# Create new table for 2FA tokens +CREATE TABLE `2fa_secrets` ( + `ckey` VARCHAR(50) NOT NULL COLLATE 'utf8mb4_general_ci', + `secret` VARCHAR(64) NOT NULL COLLATE 'utf8mb4_general_ci', + `date_setup` DATETIME NOT NULL DEFAULT current_timestamp(), + `last_time` DATETIME NULL DEFAULT NULL, + PRIMARY KEY (`ckey`) USING BTREE +) +COLLATE='utf8mb4_general_ci' ENGINE=InnoDB; diff --git a/SpacemanDMM.toml b/SpacemanDMM.toml index b1c71c30062..fced4d4090e 100644 --- a/SpacemanDMM.toml +++ b/SpacemanDMM.toml @@ -1,12 +1,38 @@ -[langserver] -dreamchecker = true - +# Keep the keys in this file alphabetical please [code_standards] -disallow_relative_type_definitions = true disallow_relative_proc_definitions = true +disallow_relative_type_definitions = true + +[debugger] +engine = "auxtools" [dmdoc] use_typepath_names = true -[debugger] -engine = "auxtools" +[langserver] +dreamchecker = true + +[map_renderer] +hide_invisible = [ + "/obj/effect/landmark", + "/obj/effect/mapping_helpers", + "/obj/effect/spawner/random_barrier", + "/obj/effect/spawner/random_spawners", +] + +[map_renderer.fancy_layers] +# -10 +"/turf/simulated/floor/plating" = -10 +"/turf/space" = -10 +# -2 +"/turf/simulated/floor/bluegrid" = -2 +"/turf/simulated/floor/carpet" = -2 +"/turf/simulated/floor/engine" = -2 +"/turf/simulated/floor/plasteel" = -2 +"/turf/simulated/floor/wood" = -2 +"/turf/simulated/wall" = -2 + +[map_renderer.render_passes] +icon-smoothing = false +icon-smoothing-2016 = true +smart-cables = false diff --git a/_maps/base_map.dm b/_maps/base_map.dm new file mode 100644 index 00000000000..2c44a73bb67 --- /dev/null +++ b/_maps/base_map.dm @@ -0,0 +1,5 @@ +#include "map_files\generic\centcomm.dmm" +#define CC_TRANSITION_CONFIG DECLARE_LEVEL(CENTCOMM, SELFLOOPING, list(ADMIN_LEVEL, BLOCK_TELEPORT, IMPEDES_MAGIC)) +#ifdef CIMAP +#include "ci_map_testing.dm" +#endif diff --git a/_maps/cyberiad.dm b/_maps/cyberiad.dm deleted file mode 100644 index ebdcba2a08e..00000000000 --- a/_maps/cyberiad.dm +++ /dev/null @@ -1,27 +0,0 @@ -/* -All z-levels should be identical in size. Their numbers should not matter. -The order of z-levels should not matter as long as their attributes are properly defined at MAP_TRANSITION_CONFIG. -Old code checked for the number of the z-level (for example whether there are any revheads on Z1), -currently it should check for the define (for example whether there are any revheads on any z-levels defined as STATION_LEVEL). -z1 = centcomm -z2 = station -z3 = lavaland -*/ - -#if !defined(USING_MAP_DATUM) - #include "map_files\generic\centcomm.dmm" - #include "map_files\cyberiad\cyberiad.dmm" - #include "map_files\generic\Lavaland.dmm" - - #define MAP_TRANSITION_CONFIG list(\ -DECLARE_LEVEL(CENTCOMM, SELFLOOPING, list(ADMIN_LEVEL, BLOCK_TELEPORT, IMPEDES_MAGIC)),\ -DECLARE_LEVEL(MAIN_STATION, CROSSLINKED, list(STATION_LEVEL, STATION_CONTACT, REACHABLE, AI_OK)),\ -DECLARE_LEVEL(MINING, SELFLOOPING, list(ORE_LEVEL, REACHABLE, STATION_CONTACT, HAS_WEATHER, AI_OK))) - - #define USING_MAP_DATUM /datum/map/cyberiad - -#elif !defined(MAP_OVERRIDE) - - #warn a map has already been included, ignoring Cyberiad. - -#endif diff --git a/_maps/delta.dm b/_maps/delta.dm deleted file mode 100644 index 89540207d8d..00000000000 --- a/_maps/delta.dm +++ /dev/null @@ -1,30 +0,0 @@ -/* -All z-levels should be identical in size. Their numbers should not matter. -The order of z-levels should not matter as long as their attributes are properly defined at MAP_TRANSITION_CONFIG. -Old code checked for the number of the z-level (for example whether there are any revheads on Z1), -currently it should check for the define (for example whether there are any revheads on any z-levels defined as STATION_LEVEL). -z1 = centcomm -z2 = station -z3 = lavaland - -Original design by Okand37 of TG Station -Lovingly ported by Purpose2 to Paradise -*/ - -#if !defined(USING_MAP_DATUM) - #include "map_files\generic\centcomm.dmm" - #include "map_files\delta\delta.dmm" - #include "map_files\generic\Lavaland.dmm" - - #define MAP_TRANSITION_CONFIG list(\ -DECLARE_LEVEL(CENTCOMM, SELFLOOPING, list(ADMIN_LEVEL, BLOCK_TELEPORT, IMPEDES_MAGIC)),\ -DECLARE_LEVEL(MAIN_STATION, CROSSLINKED, list(STATION_LEVEL, STATION_CONTACT, REACHABLE, AI_OK)),\ -DECLARE_LEVEL(MINING, SELFLOOPING, list(ORE_LEVEL, REACHABLE, STATION_CONTACT, HAS_WEATHER, AI_OK))) - - #define USING_MAP_DATUM /datum/map/delta - -#elif !defined(MAP_OVERRIDE) - - #warn a map has already been included, ignoring Delta. - -#endif diff --git a/_maps/map_datums.dm b/_maps/map_datums.dm new file mode 100644 index 00000000000..0e355540dc8 --- /dev/null +++ b/_maps/map_datums.dm @@ -0,0 +1 @@ +// See code/modules/mapping for map datums diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 0eed170f63f..cfbf6b0b87e 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -14,6 +14,14 @@ }, /turf/space, /area/space/nearstation) +"aac" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/medical/reception) "aaD" = ( /obj/effect/landmark{ name = "carpspawn" @@ -277,6 +285,9 @@ icon_state = "4-8" }, /obj/machinery/hydroponics/constructable, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -315,7 +326,6 @@ d2 = 4; icon_state = "2-4" }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -344,9 +354,6 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/unary/vent_pump{ - on = 1 - }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -374,6 +381,17 @@ /obj/effect/spawner/window/shuttle, /turf/simulated/floor/plating, /area/shuttle/pod_2) +"acw" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralcorner" + }, +/area/hallway/primary/central) "acx" = ( /obj/structure/cable{ d2 = 2; @@ -410,8 +428,13 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/item/reagent_containers/glass/bucket, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -420,16 +443,20 @@ /obj/item/plant_analyzer, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/hydroponics/constructable, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, /area/security/permabrig) "acD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -449,7 +476,6 @@ /area/security/permabrig) "acI" = ( /obj/machinery/status_display{ - density = 0; layer = 4; pixel_x = 32 }, @@ -470,21 +496,13 @@ /area/security/permabrig) "acL" = ( /obj/effect/spawner/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ d2 = 2; icon_state = "0-2" }, /obj/structure/cable/yellow, -/turf/simulated/floor/plating, -/area/security/permabrig) -"acM" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable/yellow{ - d2 = 2; - icon_state = "0-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/security/permabrig) "acN" = ( @@ -492,11 +510,9 @@ /area/security/permabrig) "acO" = ( /obj/machinery/door/poddoor{ - density = 1; icon_state = "pdoor1"; id_tag = "SecJusticeChamber"; - name = "Justice Vent"; - opacity = 1 + name = "Justice Vent" }, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plating, @@ -592,7 +608,6 @@ network = list("SS13","Prison") }, /obj/item/radio/intercom/locked/prison{ - dir = 2; name = "Prison Intercom (General)"; pixel_y = 24 }, @@ -616,23 +631,13 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; icon_state = "2-4" }, -/turf/simulated/floor/plasteel{ - icon_state = "floorgrime" - }, -/area/security/permabrig) -"acZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -651,7 +656,6 @@ /area/security/permabrig) "adb" = ( /obj/machinery/status_display{ - density = 0; layer = 4; pixel_y = 32 }, @@ -661,9 +665,8 @@ }, /area/security/permabrig) "adc" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 2; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 9; @@ -682,8 +685,8 @@ }, /area/security/permabrig) "ade" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -761,8 +764,7 @@ base_state = "right"; dir = 4; icon_state = "right"; - name = "Unisex Showers"; - req_access_txt = "0" + name = "Unisex Showers" }, /obj/machinery/light/small, /turf/simulated/floor/plasteel{ @@ -803,7 +805,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/item/reagent_containers/food/condiment/peppermill{ pixel_x = 3 }, @@ -811,6 +812,8 @@ pixel_x = -3; pixel_y = 5 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/security/permabrig) "adr" = ( @@ -823,13 +826,6 @@ icon_state = "floorgrime" }, /area/security/permabrig) -"ads" = ( -/obj/structure/chair/stool, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - icon_state = "floorgrime" - }, -/area/security/permabrig) "adt" = ( /obj/structure/table, /obj/structure/bedsheetbin, @@ -864,15 +860,16 @@ /turf/simulated/floor/plating, /area/security/permabrig) "adx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/light/small{ dir = 8 }, /obj/machinery/sparker{ - dir = 2; id = "executionburn"; pixel_x = -25 }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "warndark"; @@ -885,6 +882,9 @@ name = "mounted justice flash"; pixel_x = 28 }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "warndark"; @@ -896,16 +896,18 @@ /obj/item/clothing/suit/straight_jacket, /obj/item/clothing/glasses/sunglasses/blindfold, /obj/item/clothing/mask/muzzle, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/item/radio/electropack, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/security/permabrig) "adA" = ( /obj/machinery/door/airlock{ - name = "Unisex Restroom"; - req_access_txt = "0" + name = "Unisex Restroom" }, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" @@ -944,12 +946,14 @@ /area/security/permabrig) "adE" = ( /obj/item/radio/intercom/locked/prison{ - dir = 2; name = "Prison Intercom (General)"; pixel_y = -28 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" @@ -984,8 +988,7 @@ /obj/item/clothing/shoes/magboots, /obj/machinery/camera{ c_tag = "Engineering Secure Storage South"; - dir = 4; - network = list("SS13") + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -1038,14 +1041,14 @@ d2 = 2; icon_state = "1-2" }, +/obj/item/toy/cards/deck, +/obj/item/toy/cards/deck, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/item/toy/cards/deck, -/obj/item/toy/cards/deck, /turf/simulated/floor/plasteel, /area/security/permabrig) "adS" = ( /obj/structure/chair/stool, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/security/permabrig) "adT" = ( @@ -1080,10 +1083,6 @@ /turf/simulated/floor/plating, /area/security/permabrig) "adY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/table, /obj/item/folder/red{ pixel_x = 3 @@ -1094,6 +1093,8 @@ /obj/item/storage/fancy/cigarettes, /obj/item/flash, /obj/item/reagent_containers/spray/pepper, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -1105,10 +1106,6 @@ }, /area/security/podbay) "aea" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "warndark"; @@ -1117,7 +1114,6 @@ /area/security/permabrig) "aeb" = ( /obj/machinery/atmospherics/unary/outlet_injector/on{ - dir = 2; name = "justice injector" }, /turf/simulated/floor/plasteel{ @@ -1127,12 +1123,9 @@ }, /area/security/permabrig) "aec" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "warndark"; tag = "icon-warndark" }, @@ -1176,6 +1169,7 @@ d2 = 4; icon_state = "1-4" }, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel, /area/security/permabrig) "aeq" = ( @@ -1214,6 +1208,7 @@ icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -1228,21 +1223,9 @@ icon_state = "floorgrime" }, /area/security/permabrig) -"aeu" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - icon_state = "floorgrime" - }, -/area/security/permabrig) "aev" = ( /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -1257,13 +1240,11 @@ /area/security/permabrig) "aex" = ( /obj/effect/spawner/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/firedoor, /obj/machinery/door/poddoor{ density = 0; icon_state = "open"; id_tag = "executionfireblast"; - name = "blast door"; opacity = 0 }, /turf/simulated/floor/plasteel{ @@ -1279,9 +1260,6 @@ req_access_txt = "3" }, /obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, /obj/structure/window/reinforced{ dir = 8 }, @@ -1298,7 +1276,6 @@ density = 0; icon_state = "open"; id_tag = "executionfireblast"; - name = "blast door"; opacity = 0 }, /turf/simulated/floor/plasteel{ @@ -1308,17 +1285,14 @@ "aez" = ( /obj/effect/spawner/window/reinforced, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, /obj/machinery/door/poddoor{ density = 0; icon_state = "open"; id_tag = "executionfireblast"; - name = "blast door"; opacity = 0 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkredfull"; @@ -1345,10 +1319,13 @@ /turf/space, /area/solar/auxstarboard) "aeB" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ +/obj/machinery/light, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/light, /turf/simulated/floor/plasteel, /area/security/permabrig) "aeC" = ( @@ -1381,13 +1358,19 @@ }) "aeO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, /area/security/permabrig) "aeP" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -1399,30 +1382,19 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, /area/security/permabrig) "aeR" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 - }, /obj/machinery/light, -/turf/simulated/floor/plasteel{ - icon_state = "floorgrime" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/area/security/permabrig) -"aeS" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" @@ -1493,13 +1465,9 @@ pixel_x = -3; pixel_y = 2 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, /obj/machinery/alarm{ desc = "This particular atmos control unit appears to have no access restrictions."; dir = 4; - icon_state = "alarm0"; locked = 0; name = "all-access air alarm"; pixel_x = -24; @@ -1507,7 +1475,6 @@ req_one_access = "0" }, /obj/machinery/door_control{ - dir = 2; id = "SecJusticeChamber"; layer = 4; name = "Justice Vent Control"; @@ -1550,9 +1517,6 @@ }, /area/security/permabrig) "aeY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /obj/structure/table, /obj/item/flashlight/lamp, /obj/structure/reagent_dispensers/peppertank{ @@ -1564,7 +1528,6 @@ /area/security/permabrig) "aeZ" = ( /obj/machinery/power/apc{ - cell_type = 2500; dir = 1; name = "Prisoner Education Chamber APC"; pixel_y = 24 @@ -1577,7 +1540,7 @@ name = "educational injections"; pixel_x = 2 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, /turf/simulated/floor/plasteel{ @@ -1585,16 +1548,13 @@ }, /area/security/permabrig) "afa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /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/unary/vent_scrubber/on{ - dir = 2 + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -1617,10 +1577,19 @@ id_tag = "permabolt3"; name = "Cell 3" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, /area/security/permabrig) +"afl" = ( +/obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/quartermaster/storage) "afo" = ( /obj/structure/cable{ d2 = 8; @@ -1639,7 +1608,6 @@ name = "Cell Bolt Control"; normaldoorcontrol = 1; pixel_y = 25; - req_access_txt = "0"; specialfunctions = 4 }, /turf/simulated/floor/plasteel{ @@ -1675,8 +1643,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -1693,6 +1661,8 @@ id_tag = "permabolt1"; name = "Cell 1" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -1713,12 +1683,8 @@ name = "Cell Bolt Control"; normaldoorcontrol = 1; pixel_y = 25; - req_access_txt = "0"; specialfunctions = 4 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -1757,7 +1723,6 @@ name = "Cell Bolt Control"; normaldoorcontrol = 1; pixel_y = 25; - req_access_txt = "0"; specialfunctions = 4 }, /turf/simulated/floor/plasteel{ @@ -1765,9 +1730,6 @@ }, /area/security/permabrig) "afB" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 2 - }, /obj/machinery/light{ dir = 8 }, @@ -1775,6 +1737,9 @@ dir = 4; pixel_x = -23 }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -1789,24 +1754,18 @@ }, /area/security/permabrig) "afD" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 +/obj/structure/chair/office/dark{ + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/structure/chair/office/dark{ - dir = 1 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/security/permabrig) "afE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -1819,7 +1778,9 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -1856,9 +1817,8 @@ /turf/simulated/wall/mineral/titanium, /area/shuttle/pod_3) "afO" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -1908,10 +1868,12 @@ pixel_x = 5 }, /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_x = -28 }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -1922,11 +1884,8 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -1945,13 +1904,15 @@ /obj/machinery/light_switch{ pixel_x = 26 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -1962,9 +1923,11 @@ name = "Door Bolt Control"; normaldoorcontrol = 1; pixel_y = -25; - req_access_txt = "0"; specialfunctions = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -1993,9 +1956,8 @@ id = "insaneflash"; pixel_x = 26 }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 7; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -2007,6 +1969,12 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -2029,8 +1997,7 @@ "agc" = ( /obj/machinery/camera{ c_tag = "Atmospherics - Starboard Aft"; - dir = 1; - network = list("SS13") + dir = 1 }, /obj/structure/lattice, /turf/space, @@ -2099,6 +2066,7 @@ /turf/simulated/floor/plating, /area/shuttle/pod_3) "agm" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -2127,10 +2095,8 @@ id = "PCell 3"; pixel_x = -28 }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - layer = 2.4; - on = 1 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" @@ -2170,24 +2136,12 @@ /turf/simulated/floor/plating, /area/security/hos) "ags" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, /obj/machinery/flasher{ id = "PCell 2"; pixel_x = -28 }, -/turf/simulated/floor/plasteel{ - icon_state = "floorgrime" - }, -/area/security/permabrig) -"agu" = ( -/obj/structure/table, -/obj/item/paper, -/obj/item/pen{ - pixel_x = -3; - pixel_y = 5 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" @@ -2202,7 +2156,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -2212,10 +2168,8 @@ id = "PCell 1"; pixel_x = -28 }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - layer = 2.4; - on = 1 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" @@ -2228,11 +2182,7 @@ pixel_y = 5 }, /obj/structure/table/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whitered" }, /area/security/permabrig) @@ -2241,11 +2191,7 @@ /obj/structure/bed/roller, /obj/machinery/iv_drip, /obj/machinery/iv_drip, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whitered" }, /area/security/permabrig) @@ -2255,14 +2201,9 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whitered" }, /area/security/permabrig) @@ -2374,8 +2315,7 @@ base_state = "right"; dir = 1; icon_state = "right"; - name = "gas ports"; - req_access_txt = "0" + name = "gas ports" }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -2387,11 +2327,8 @@ }, /obj/machinery/meter, /obj/machinery/door/window/westleft{ - base_state = "left"; dir = 1; - icon_state = "left"; - name = "gas ports"; - req_access_txt = "0" + name = "gas ports" }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -2411,8 +2348,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -2423,8 +2360,6 @@ name = "Long-Term Cell 3"; req_access_txt = "2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -2439,8 +2374,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -2450,8 +2385,6 @@ name = "Long-Term Cell 1"; req_access_txt = "2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -2521,11 +2454,8 @@ /area/security/armoury) "agZ" = ( /obj/machinery/space_heater, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - external_pressure_bound = 101.325; - on = 1; - pressure_checks = 1 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -2555,9 +2485,6 @@ }, /area/security/hos) "ahd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -2578,8 +2505,13 @@ d2 = 4; icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "redcorner" }, /area/security/permabrig) @@ -2650,15 +2582,27 @@ icon_state = "dark" }, /area/security/podbay) +"ahq" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "arrival" + }, +/area/hallway/secondary/entry{ + name = "Arrivals" + }) "ahx" = ( /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/computer/security/telescreen{ desc = "Used for watching Prison Wing holding areas."; name = "Prison Monitor"; @@ -2670,8 +2614,13 @@ d2 = 4; icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "redcorner" }, /area/security/permabrig) @@ -2712,21 +2661,32 @@ }, /area/security/permabrig) "ahB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ d1 = 1; d2 = 4; icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - level = 1 + dir = 5 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "redcorner" }, /area/security/permabrig) +"ahC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/plating, +/area/maintenance/fpmaint2{ + name = "Port Maintenance" + }) "ahD" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -2741,8 +2701,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "redcorner" }, /area/security/permabrig) @@ -2764,11 +2726,13 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "redcorner" }, /area/security/permabrig) @@ -2778,10 +2742,13 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "redcorner" }, /area/security/permabrig) @@ -2794,8 +2761,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "redcorner" }, /area/security/permabrig) @@ -2813,9 +2782,6 @@ pixel_y = 25; req_access_txt = "2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/flasher_button{ id = "PCell 2"; pixel_x = 6; @@ -2826,8 +2792,13 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "redcorner" }, /area/security/permabrig) @@ -2842,10 +2813,9 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "redcorner" }, /area/security/permabrig) @@ -2861,8 +2831,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "redcorner" }, /area/security/permabrig) @@ -2870,9 +2842,8 @@ /obj/machinery/newscaster/security_unit{ pixel_y = -30 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -2887,9 +2858,6 @@ pixel_y = 25; req_access_txt = "2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/flasher_button{ id = "PCell 1"; pixel_x = 6; @@ -2900,21 +2868,13 @@ d2 = 8; icon_state = "4-8" }, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "redcorner" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/area/security/permabrig) -"ahN" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "redcorner" }, /area/security/permabrig) @@ -2926,9 +2886,6 @@ pixel_x = 1; pixel_y = 24 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d2 = 8; icon_state = "0-8" @@ -2939,11 +2896,15 @@ }, /obj/machinery/camera{ c_tag = "Prison Hallway Starboard"; - dir = 2; network = list("SS13","Prison") }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "redcorner" }, /area/security/permabrig) @@ -2953,9 +2914,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/flasher_button{ id = "insaneflash"; pixel_y = 26 @@ -2965,12 +2923,13 @@ d2 = 8; icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6; - level = 1 + dir = 4 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "redcorner" }, /area/security/permabrig) @@ -2986,8 +2945,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "redcorner" }, /area/security/permabrig) @@ -3023,12 +2984,11 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "redcorner" }, /area/security/permabrig) @@ -3050,10 +3010,6 @@ }, /area/security/armoury) "ahV" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 2; - on = 1 - }, /obj/machinery/light/small{ dir = 1 }, @@ -3073,11 +3029,9 @@ }, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_x = -29; pixel_y = 23 @@ -3088,12 +3042,10 @@ /area/security/hos) "ahX" = ( /obj/machinery/status_display{ - density = 0; layer = 4; pixel_x = -32; pixel_y = 32 }, -/obj/machinery/atmospherics/unary/vent_pump, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -3121,12 +3073,10 @@ /area/security/hos) "aib" = ( /obj/machinery/status_display{ - density = 0; layer = 4; pixel_x = 32; pixel_y = 32 }, -/obj/machinery/atmospherics/unary/vent_scrubber, /obj/structure/cable/yellow{ d1 = 2; d2 = 8; @@ -3140,10 +3090,6 @@ /obj/structure/extinguisher_cabinet{ pixel_y = -30 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "redcorner" @@ -3166,7 +3112,6 @@ "aig" = ( /obj/machinery/shower{ dir = 4; - icon_state = "shower"; tag = "icon-shower (EAST)" }, /obj/machinery/door/window/eastright{ @@ -3280,9 +3225,7 @@ }, /area/security/armoury) "aiq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -3304,7 +3247,6 @@ pixel_y = -3 }, /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_y = 30 }, @@ -3313,9 +3255,6 @@ }, /area/security/armoury) "aiw" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, /obj/machinery/light/small{ dir = 1 }, @@ -3334,15 +3273,12 @@ layer = 4.1; tag = "icon-applebush" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel, /area/security/permabrig) "aiy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "redcorner" @@ -3375,9 +3311,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "redcorner" @@ -3386,29 +3319,17 @@ "aiC" = ( /obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/light_switch{ - dir = 2; name = "light switch "; pixel_y = -22 }, /obj/structure/reagent_dispensers/fueltank, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/security/podbay) -"aiD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "redcorner" - }, -/area/security/permabrig) "aiE" = ( /obj/structure/table, /obj/item/folder/red{ @@ -3428,9 +3349,6 @@ /obj/effect/landmark{ name = "lightsout" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "redcorner" @@ -3441,10 +3359,6 @@ dir = 1; pixel_y = -22 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "redcorner" @@ -3457,23 +3371,23 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "redcorner" }, /area/security/permabrig) "aiI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "redcorner" }, /area/security/permabrig) "aiJ" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "redcorner" @@ -3487,7 +3401,6 @@ "aiL" = ( /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /obj/structure/chair/comfy/black{ @@ -3514,12 +3427,6 @@ tag = "icon-vault (NORTH)" }, /area/security/armoury) -"aiN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/security/armoury) "aiO" = ( /obj/structure/rack, /obj/item/gun/energy/laser{ @@ -3563,9 +3470,7 @@ /turf/space, /area/solar/auxport) "aiS" = ( -/obj/structure/closet/secure_closet/brig{ - anchored = 1 - }, +/obj/structure/closet/secure_closet/brig, /obj/machinery/firealarm{ dir = 1; pixel_y = -24 @@ -3627,7 +3532,6 @@ d2 = 8; icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -3666,7 +3570,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -3693,11 +3596,8 @@ /turf/simulated/floor/plating, /area/security/hos) "ajd" = ( -/obj/structure/closet/secure_closet/brig{ - anchored = 1 - }, +/obj/structure/closet/secure_closet/brig, /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_y = -30 }, @@ -3707,9 +3607,7 @@ }, /area/security/permabrig) "aje" = ( -/obj/structure/closet/secure_closet/brig{ - anchored = 1 - }, +/obj/structure/closet/secure_closet/brig, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -3722,7 +3620,6 @@ /area/security/permabrig) "ajf" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -3793,9 +3690,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -3838,8 +3732,8 @@ }, /area/security/brig) "ajv" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -3906,8 +3800,7 @@ }, /obj/machinery/camera{ c_tag = "Head of Security's Office"; - dir = 8; - network = list("SS13") + dir = 8 }, /obj/machinery/computer/security/telescreen/entertainment{ pixel_y = -32 @@ -3929,8 +3822,7 @@ "ajC" = ( /obj/machinery/power/solar_control{ id = "foreport"; - name = "Fore Port Solar Control"; - track = 0 + name = "Fore Port Solar Control" }, /obj/structure/cable{ d2 = 4; @@ -3940,7 +3832,6 @@ /area/maintenance/auxsolarport) "ajD" = ( /obj/machinery/status_display{ - density = 0; layer = 4; pixel_y = 32 }, @@ -3969,7 +3860,6 @@ /area/security/permabrig) "ajG" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/security/glass{ name = "Prison Wing"; req_access_txt = "1" @@ -3978,6 +3868,8 @@ /area/security/permabrig) "ajH" = ( /obj/effect/spawner/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/security/permabrig) "ajI" = ( @@ -3988,7 +3880,6 @@ /turf/simulated/wall, /area/security/permabrig) "ajJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/light/small{ dir = 4 }, @@ -4059,6 +3950,9 @@ /area/maintenance/auxsolarport) "ajO" = ( /obj/structure/bed/dogbed, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/carpet, /area/security/hos) "ajP" = ( @@ -4097,7 +3991,6 @@ /turf/simulated/floor/plasteel, /area/engine/equipmentstorage) "ajT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -4115,20 +4008,6 @@ icon_state = "redfull" }, /area/security/permabrig) -"ajU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; - id_tag = "Prison Gate"; - name = "Security Blast Door"; - opacity = 0 - }, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel{ - icon_state = "redfull" - }, -/area/security/permabrig) "ajV" = ( /turf/simulated/wall, /area/security/armoury) @@ -4154,14 +4033,16 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/security/hos) "ajZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "vault"; @@ -4176,15 +4057,23 @@ /obj/effect/landmark/start{ name = "Head of Security" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/carpet, /area/security/hos) "akb" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/carpet, /area/security/hos) "akc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 6; @@ -4198,8 +4087,9 @@ d2 = 8; icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, /turf/simulated/floor/plasteel{ icon_state = "vault"; @@ -4226,7 +4116,6 @@ "akg" = ( /obj/machinery/power/apc{ cell_type = 5000; - dir = 2; name = "Armory APC"; pixel_x = 1; pixel_y = -24 @@ -4234,15 +4123,14 @@ /obj/machinery/light, /obj/machinery/camera/motion{ c_tag = "Armory - Internal"; - dir = 1; - network = list("SS13") + dir = 1 }, /obj/structure/cable/yellow{ d2 = 4; icon_state = "0-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "vault"; @@ -4255,8 +4143,10 @@ name = "\improper Recreation Area" }) "aki" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/crew_quarters/fitness{ @@ -4264,8 +4154,10 @@ }) "akj" = ( /obj/structure/chair, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/crew_quarters/fitness{ @@ -4278,8 +4170,8 @@ }) "akl" = ( /obj/structure/chair, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -4297,9 +4189,8 @@ name = "\improper Recreation Area" }) "akn" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 }, /turf/simulated/floor/plasteel, /area/crew_quarters/fitness{ @@ -4323,8 +4214,6 @@ req_access = null; req_access_txt = "3" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/security/armoury) "aks" = ( @@ -4358,8 +4247,7 @@ pixel_y = 8 }, /obj/machinery/camera/autoname{ - dir = 4; - network = list("SS13") + dir = 4 }, /turf/simulated/floor/plating, /area/maintenance/auxsolarport) @@ -4370,10 +4258,6 @@ icon_state = "1-4"; tag = "90Curve" }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 2; - on = 1 - }, /obj/effect/landmark{ name = "xeno_spawn"; pixel_x = -1 @@ -4390,7 +4274,6 @@ dir = 4 }, /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_x = 29 }, @@ -4432,23 +4315,22 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /mob/living/simple_animal/hostile/retaliate/araneus, /turf/simulated/floor/carpet, /area/security/hos) "akC" = ( /obj/structure/table/reinforced, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/item/clothing/head/beret/sec, /obj/item/clothing/suit/jacket/pilot, /obj/machinery/alarm{ pixel_y = 24 }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -4477,8 +4359,7 @@ /obj/machinery/light/small, /obj/machinery/camera{ c_tag = "Security - EVA Storage"; - dir = 1; - network = list("SS13") + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -4487,7 +4368,6 @@ }, /area/security/permabrig) "akG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -4534,6 +4414,8 @@ }, /area/security/main) "akK" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -4567,6 +4449,8 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault"; @@ -4584,21 +4468,13 @@ d2 = 4; icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/security/podbay) "akP" = ( /obj/machinery/camera{ - c_tag = "Engineering - Storage"; - dir = 2; - network = list("SS13") + c_tag = "Engineering - Storage" }, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/suit_storage_unit/engine/secure, @@ -4613,9 +4489,6 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /turf/simulated/floor/plasteel{ icon_state = "vault"; tag = "icon-vault" @@ -4627,7 +4500,6 @@ name = "Prison Wing"; req_access_txt = "1" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -4652,17 +4524,10 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /turf/simulated/floor/carpet, /area/security/hos) "akT" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/security/glass{ name = "Prison Wing"; req_access_txt = "1" @@ -4682,9 +4547,6 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /turf/simulated/floor/plasteel{ icon_state = "vault"; tag = "icon-vault" @@ -4696,8 +4558,7 @@ }, /obj/machinery/camera{ c_tag = "Security - Secure Gear Storage"; - dir = 4; - network = list("SS13") + dir = 4 }, /obj/machinery/flasher/portable, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -4740,7 +4601,6 @@ dir = 1 }, /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_y = 26 }, @@ -4749,13 +4609,15 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" }, /area/security/main) "ala" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/security/armoury) "alb" = ( @@ -4771,9 +4633,7 @@ dir = 1 }, /obj/machinery/door/window/eastright{ - base_state = "right"; dir = 8; - icon_state = "right"; name = "Fitness Ring" }, /turf/simulated/floor/plasteel{ @@ -4829,7 +4689,7 @@ /obj/machinery/alarm{ pixel_y = 24 }, -/obj/machinery/atmospherics/unary/vent_pump, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel, /area/crew_quarters/fitness{ name = "\improper Recreation Area" @@ -4859,16 +4719,16 @@ d2 = 8; icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 + dir = 4 }, /turf/simulated/floor/plasteel, /area/security/armoury) @@ -4938,6 +4798,8 @@ name = "privacy shutters"; opacity = 0 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/security/hos) "alv" = ( @@ -4951,7 +4813,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plating, /area/maintenance/auxsolarport) @@ -5027,9 +4888,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/carpet, /area/security/hos) "alB" = ( @@ -5038,6 +4898,8 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -5051,8 +4913,7 @@ "alD" = ( /obj/structure/closet/secure_closet/security, /obj/machinery/camera{ - c_tag = "Atmospherics - Control Room"; - network = list("SS13") + c_tag = "Atmospherics - Control Room" }, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" @@ -5060,12 +4921,14 @@ /area/security/main) "alE" = ( /obj/machinery/light_switch{ - dir = 2; name = "light switch "; pixel_y = -22 }, /obj/structure/table/reinforced, /obj/item/book/manual/security_space_law, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -5099,20 +4962,7 @@ }, /turf/simulated/floor/plating, /area/security/podbay) -"alJ" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/security/podbay) "alK" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -5142,14 +4992,12 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "red" }, /area/security/brig) "alO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "red" @@ -5195,8 +5043,6 @@ d2 = 8; icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/carpet, /area/security/hos) "alS" = ( @@ -5210,6 +5056,9 @@ pixel_y = -28 }, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -5227,7 +5076,7 @@ /turf/simulated/floor/plating, /area/maintenance/fore) "alX" = ( -/obj/machinery/atmospherics/unary/vent_scrubber, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -5252,7 +5101,6 @@ name = "referee suit" }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/crew_quarters/fitness{ @@ -5269,18 +5117,6 @@ name = "\improper Recreation Area" }) "amc" = ( -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "vault" - }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) -"amd" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "vault" @@ -5372,13 +5208,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/fore) -"amp" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 2; - on = 1 - }, -/turf/simulated/floor/plating, -/area/maintenance/disposal) "amq" = ( /obj/structure/table, /obj/item/restraints/handcuffs, @@ -5392,6 +5221,9 @@ /obj/machinery/newscaster/security_unit{ pixel_y = -30 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -5399,7 +5231,6 @@ "amr" = ( /obj/machinery/door/airlock/engineering{ icon_state = "door_closed"; - locked = 0; name = "Fore Port Solar Access"; req_access_txt = "10" }, @@ -5408,13 +5239,11 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/maintenance/auxsolarport) "ams" = ( /obj/structure/sink{ dir = 8; - icon_state = "sink"; pixel_x = -12; pixel_y = 2 }, @@ -5423,7 +5252,6 @@ name = "Lock Control"; normaldoorcontrol = 1; pixel_y = -25; - req_access_txt = "0"; specialfunctions = 4 }, /obj/structure/mirror{ @@ -5472,7 +5300,6 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ name = "Gear Room"; - req_access_txt = "0"; req_one_access_txt = "1;4" }, /turf/simulated/floor/plasteel, @@ -5491,19 +5318,14 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" }, /area/security/main) -"amz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 6 - }, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) "amA" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -5530,11 +5352,8 @@ dir = 1; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -5571,8 +5390,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -5625,10 +5444,10 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -5671,12 +5490,11 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - level = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -5705,11 +5523,9 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/crew_quarters/fitness{ name = "\improper Recreation Area" @@ -5717,19 +5533,6 @@ "amO" = ( /turf/simulated/wall, /area/security/main) -"amP" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 2; - external_pressure_bound = 101.325; - on = 1; - pressure_checks = 1 - }, -/obj/structure/closet/secure_closet/security, -/turf/simulated/floor/plasteel{ - icon_state = "vault"; - tag = "icon-vault" - }, -/area/security/main) "amQ" = ( /obj/structure/closet/secure_closet/security, /turf/simulated/floor/plasteel{ @@ -5744,18 +5547,6 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - icon_state = "vault"; - tag = "icon-vault" - }, -/area/security/main) -"amT" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 2 - }, -/obj/structure/closet/secure_closet/security, /turf/simulated/floor/plasteel{ icon_state = "vault"; tag = "icon-vault" @@ -5812,27 +5603,10 @@ icon_state = "dark" }, /area/security/podbay) -"amY" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "redcorner" - }, -/area/security/brig) "amZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, /turf/simulated/floor/plasteel, /area/security/armoury) "ana" = ( @@ -5841,25 +5615,16 @@ name = "Evidence Storage"; req_access_txt = "3" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, /turf/simulated/floor/plasteel, /area/security/armoury) "anb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/security/armoury) @@ -5903,7 +5668,7 @@ /obj/structure/chair{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/crew_quarters/fitness{ name = "\improper Recreation Area" @@ -5945,6 +5710,11 @@ "anq" = ( /turf/simulated/wall/r_wall, /area/engine/mechanic_workshop) +"anr" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/carpet, +/area/ntrep) "ans" = ( /turf/simulated/wall, /area/maintenance/auxsolarstarboard) @@ -5974,25 +5744,24 @@ /area/maintenance/disposal) "any" = ( /obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plating, -/area/maintenance/disposal) -"anz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 }, -/obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plating, /area/maintenance/disposal) "anA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; icon_state = "2-4" }, /obj/effect/decal/warning_stripes/southwestcorner, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/disposal) "anB" = ( @@ -6008,6 +5777,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" @@ -6018,10 +5790,13 @@ d2 = 8; icon_state = "4-8" }, +/obj/effect/decal/warning_stripes/west, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" @@ -6037,10 +5812,13 @@ d2 = 8; icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" @@ -6048,24 +5826,10 @@ "anE" = ( /obj/structure/closet/firecloset, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) -"anG" = ( -/obj/item/vending_refill/cola, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 2; - on = 1 - }, -/turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" }) "anH" = ( -/obj/machinery/atmospherics/unary/portables_connector{ - dir = 4 - }, -/obj/machinery/portable_atmospherics/canister/air, /obj/machinery/power/apc{ dir = 1; name = "Fore Maintenance APC"; @@ -6075,6 +5839,12 @@ d2 = 4; icon_state = "0-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/plating, /area/maintenance/fore) "anI" = ( @@ -6130,14 +5900,15 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/plasteel, /area/security/armoury) "anM" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -6148,33 +5919,32 @@ d2 = 8; icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10; - initialize_directions = 10; - level = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "showroomfloor" - }, -/area/security/main) -"anN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, /area/security/main) +"anN" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "showroomfloor" + }, +/area/security/main) "anO" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" @@ -6189,8 +5959,6 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -27 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -6235,9 +6003,14 @@ pixel_y = 10 }, /obj/item/pen, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/security/main) "anV" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "red" @@ -6279,14 +6052,11 @@ /turf/simulated/floor/plasteel, /area/security/armoury) "aoc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ name = "Gear Room"; - req_access_txt = "0"; req_one_access_txt = "1;4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -6311,6 +6081,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -6323,8 +6096,7 @@ "aog" = ( /obj/machinery/camera{ c_tag = "Security - Office - Port"; - dir = 4; - network = list("SS13") + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -6358,6 +6130,7 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault"; @@ -6390,7 +6163,6 @@ name = "Evidence Storage"; req_access_txt = "3" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault"; @@ -6398,12 +6170,10 @@ }, /area/security/armoury) "aoo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -6431,8 +6201,7 @@ }, /obj/machinery/camera{ c_tag = "Brig - Infirmary"; - dir = 1; - network = list("SS13") + dir = 1 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -6446,28 +6215,17 @@ /obj/item/reagent_containers/iv_bag/blood/random, /obj/item/reagent_containers/iv_bag/blood/random, /obj/item/reagent_containers/iv_bag/blood/random, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "whitered" }, /area/security/brig) -"aos" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - external_pressure_bound = 0; - frequency = 1441; - id_tag = "tox_out"; - initialize_directions = 1; - internal_pressure_bound = 4000; - on = 1; - pressure_checks = 2; - pump_direction = 0 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "redcorner" - }, -/area/security/brig) "aot" = ( /obj/structure/closet{ name = "Evidence Closet" @@ -6509,7 +6267,6 @@ }, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -6524,17 +6281,6 @@ icon_state = "red" }, /area/security/main) -"aoy" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 2 - }, -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "vault" - }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) "aoA" = ( /obj/structure/chair{ dir = 8 @@ -6556,7 +6302,6 @@ pixel_y = 24 }, /obj/structure/cable/yellow{ - d1 = 0; d2 = 2; icon_state = "0-2" }, @@ -6565,8 +6310,8 @@ }, /area/crew_quarters/sleep) "aoF" = ( -/obj/machinery/atmospherics/unary/vent_scrubber, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel, /area/crew_quarters/fitness{ name = "\improper Recreation Area" @@ -6576,21 +6321,15 @@ /area/maintenance/starboard) "aoH" = ( /obj/machinery/hologram/holopad, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, /turf/simulated/floor/plasteel{ icon_state = "redfull" }, /area/security/main) "aoI" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -6605,6 +6344,7 @@ /obj/machinery/light{ dir = 4 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -6655,7 +6395,6 @@ }, /obj/machinery/door/window{ base_state = "right"; - dir = 4; icon_state = "right"; layer = 3 }, @@ -6688,7 +6427,6 @@ "aoW" = ( /obj/structure/table, /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_y = 26 }, @@ -6719,10 +6457,13 @@ /turf/simulated/floor/plating, /area/maintenance/disposal) "aoZ" = ( +/obj/effect/decal/warning_stripes/east, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" @@ -6732,18 +6473,18 @@ name = "Secure Storage Room"; req_access_txt = "65" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" }) "apb" = ( +/obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" @@ -6799,6 +6540,10 @@ /obj/structure/extinguisher_cabinet{ pixel_x = 30 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "redcorner" @@ -6816,9 +6561,7 @@ }, /area/security/brig) "apk" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 2 - }, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -6843,19 +6586,13 @@ /area/security/brig) "apm" = ( /obj/machinery/hologram/holopad, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel, -/area/security/brig) -"apn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "redcorner" - }, +/turf/simulated/floor/plasteel, /area/security/brig) "apo" = ( /obj/structure/closet{ @@ -6868,10 +6605,6 @@ }, /area/security/warden) "app" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault"; @@ -6891,19 +6624,23 @@ }, /area/security/brig) "apr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/security/brig) "aps" = ( /obj/item/storage/fancy/donut_box, /obj/structure/table, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "cafeteria"; @@ -6920,9 +6657,7 @@ }, /area/security/main) "apu" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault"; @@ -6933,9 +6668,6 @@ /obj/structure/table, /obj/item/storage/box/evidence, /obj/item/storage/box/evidence, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault"; @@ -6974,6 +6706,9 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "red" @@ -7000,8 +6735,6 @@ /obj/effect/landmark/start{ name = "Head of Security" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/security/main) "apF" = ( @@ -7011,8 +6744,7 @@ "apG" = ( /obj/machinery/camera{ c_tag = "Security - Office - Starboard"; - dir = 8; - network = list("SS13") + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -7048,18 +6780,17 @@ /turf/simulated/floor/engine, /area/security/podbay) "apL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - level = 1 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -7077,17 +6808,14 @@ /obj/effect/landmark{ name = "JoinLateCryo" }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - external_pressure_bound = 101.325; - on = 1; - pressure_checks = 1 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 4; icon_state = "1-4" }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -7108,7 +6836,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, /obj/machinery/flasher{ id = "secentranceflasher"; @@ -7120,8 +6847,7 @@ req_access_txt = "63" }, /obj/effect/mapping_helpers/airlock/unres{ - dir = 1; - icon_state = "airlock_unres_helper" + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -7130,8 +6856,7 @@ /area/security/brig) "apQ" = ( /obj/machinery/sleeper{ - dir = 4; - icon_state = "sleeper-open" + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -7159,15 +6884,6 @@ icon_state = "left"; name = "Fitness Ring" }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) -"apU" = ( -/obj/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -7175,9 +6891,8 @@ name = "\improper Recreation Area" }) "apV" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 2; - on = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/carpet/arcade, /area/crew_quarters/fitness{ @@ -7215,7 +6930,6 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/crew_quarters/fitness{ @@ -7228,7 +6942,6 @@ /area/security/brig) "aqc" = ( /obj/machinery/door/airlock/maintenance{ - name = "maintenance access"; req_access_txt = "12" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -7266,9 +6979,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "red" }, @@ -7313,7 +7023,6 @@ "aqs" = ( /obj/machinery/door/window/eastright{ base_state = "left"; - dir = 4; icon_state = "left"; name = "Danger: Conveyor Access"; req_access_txt = "12" @@ -7325,8 +7034,8 @@ /area/maintenance/disposal) "aqt" = ( /obj/effect/decal/warning_stripes/north, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/starboard) "aqu" = ( @@ -7344,7 +7053,10 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/universal{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /turf/simulated/floor/plating, @@ -7379,8 +7091,7 @@ base_state = "right"; dir = 2; icon_state = "right"; - name = "windoor"; - req_access_txt = "0" + name = "windoor" }, /obj/item/book/manual/engineering_hacking, /obj/item/tape/random, @@ -7444,15 +7155,6 @@ }, /turf/simulated/floor/plating, /area/security/brig) -"aqH" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/security/brig) "aqI" = ( /obj/structure/table, /obj/machinery/firealarm{ @@ -7472,15 +7174,6 @@ icon_state = "redcorner" }, /area/security/brig) -"aqK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "vault"; - tag = "icon-vault (WEST)" - }, -/area/security/warden) "aqL" = ( /obj/structure/table, /turf/simulated/floor/plasteel{ @@ -7497,16 +7190,6 @@ d2 = 4; icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11; - level = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11; - level = 1 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -7527,17 +7210,17 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -7546,18 +7229,16 @@ name = "\improper Recreation Area" }) "aqP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -7565,9 +7246,11 @@ }, /area/security/brig) "aqQ" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -7582,11 +7265,10 @@ icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -7600,7 +7282,6 @@ dir = 1 }, /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_y = -28 }, @@ -7615,8 +7296,7 @@ }, /obj/machinery/camera{ c_tag = "Security - Gear Room"; - dir = 8; - network = list("SS13") + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -7630,6 +7310,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "red" @@ -7647,6 +7328,7 @@ }, /area/security/main) "aqW" = ( +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "red" @@ -7691,8 +7373,6 @@ "arb" = ( /obj/structure/table/reinforced, /obj/item/paper, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/security/main) "arc" = ( @@ -7701,6 +7381,8 @@ pixel_x = -3; pixel_y = 5 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/security/main) "ard" = ( @@ -7718,18 +7400,17 @@ /obj/machinery/door/airlock/public/glass{ name = "Cryodorms" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -7746,12 +7427,10 @@ req_access_txt = "63" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -7761,16 +7440,15 @@ /area/security/evidence) "arh" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/crew_quarters/fitness{ name = "\improper Recreation Area" @@ -7798,9 +7476,7 @@ }, /area/security/brig) "arl" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 2 - }, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel, /area/crew_quarters/fitness{ name = "\improper Recreation Area" @@ -7809,7 +7485,6 @@ /obj/structure/chair{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -7819,6 +7494,9 @@ }) "arn" = ( /obj/machinery/hologram/holopad, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/carpet/arcade, /area/crew_quarters/fitness{ name = "\improper Arcade" @@ -7827,6 +7505,9 @@ /obj/structure/chair{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -7848,35 +7529,8 @@ }, /turf/simulated/floor/plating, /area/maintenance/disposal) -"art" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/engine/gravitygenerator) -"aru" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/engine/gravitygenerator) -"arv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/engine/gravitygenerator) "arw" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -7915,10 +7569,6 @@ /turf/simulated/floor/plating, /area/maintenance/disposal) "arF" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 2; - on = 1 - }, /obj/machinery/conveyor/east{ id = "garbage" }, @@ -7927,7 +7577,6 @@ /area/maintenance/disposal) "arG" = ( /obj/machinery/door/window/eastright{ - dir = 4; name = "Danger: Conveyor Access"; req_access_txt = "12" }, @@ -7937,9 +7586,6 @@ /turf/simulated/floor/plating, /area/maintenance/disposal) "arH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -7949,6 +7595,12 @@ icon_state = "4-8" }, /obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/fore) "arI" = ( @@ -7971,29 +7623,13 @@ /obj/machinery/space_heater, /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) -"arL" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, -/obj/effect/landmark{ - name = "xeno_spawn"; - pixel_x = -1 - }, -/turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" }) "arM" = ( /obj/machinery/door/window/westleft{ - base_state = "left"; dir = 4; - icon_state = "left"; - name = "Infirmary"; - req_access_txt = "0" + name = "Infirmary" }, /turf/simulated/floor/plasteel{ dir = 4; @@ -8001,17 +7637,8 @@ tag = "icon-whitehall (WEST)" }, /area/security/brig) -"arN" = ( -/obj/machinery/atmospherics/unary/portables_connector{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) "arO" = ( /obj/machinery/mineral/stacking_unit_console{ - dir = 2; machinedir = 8; pixel_x = 32 }, @@ -8037,8 +7664,11 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plating, /area/maintenance/fore) @@ -8057,6 +7687,12 @@ dir = 4 }, /obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/fore) "arS" = ( @@ -8087,17 +7723,11 @@ name = "xeno_spawn"; pixel_x = -1 }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 2; - on = 1 - }, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" }) "arV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "vault"; tag = "icon-vault" @@ -8113,9 +7743,6 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plating, /area/maintenance/fore) "arX" = ( @@ -8137,10 +7764,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/security/brig) "arZ" = ( @@ -8164,16 +7787,6 @@ /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/security/armoury) -"asc" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" - }, -/area/security/brig) "asd" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable/yellow{ @@ -8186,6 +7799,9 @@ /obj/machinery/light/small, /obj/structure/table, /obj/item/hand_labeler, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault"; @@ -8197,7 +7813,6 @@ name = "Evidence Closet" }, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -24 }, @@ -8229,11 +7844,8 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 + dir = 5 }, /turf/simulated/floor/plasteel{ icon_state = "red" @@ -8275,15 +7887,12 @@ dir = 1; pixel_y = -24 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -8294,17 +7903,13 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "red" @@ -8325,8 +7930,9 @@ d2 = 8; icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "red" }, @@ -8361,6 +7967,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "red" }, @@ -8378,16 +7987,11 @@ }, /obj/structure/disposalpipe/sortjunction{ dir = 4; - icon_state = "pipe-j1s"; sortType = 21; tag = "icon-pipe-j1s (EAST)" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "red" }, @@ -8407,27 +8011,24 @@ dir = 2; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/plasteel{ icon_state = "red" }, /area/security/main) "asu" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "0"; req_one_access_txt = "1;4;38;12" }, -/turf/simulated/floor/plating, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) -"asv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plating, /area/crew_quarters/fitness{ name = "\improper Recreation Area" }) @@ -8447,13 +8048,15 @@ icon_state = "pipe-j2s"; sortType = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "red" }, /area/security/main) "asx" = ( /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -24 }, @@ -8504,6 +8107,12 @@ icon_state = "pipe-c" }, /obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/fore) "asB" = ( @@ -8512,13 +8121,10 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel, /area/crew_quarters/fitness{ name = "\improper Recreation Area" @@ -8542,42 +8148,17 @@ /area/crew_quarters/fitness{ name = "\improper Recreation Area" }) -"asD" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralcorner" - }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) "asE" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 2 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 }, /turf/simulated/floor/carpet/arcade, /area/crew_quarters/fitness{ name = "\improper Arcade" }) -"asF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "neutralcorner" - }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) "asI" = ( /obj/structure/grille, /turf/simulated/floor/plating, @@ -8588,9 +8169,9 @@ "asK" = ( /obj/machinery/camera{ c_tag = "Gravity Generator Room"; - dir = 8; - network = list("SS13") + dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -8600,13 +8181,11 @@ /obj/machinery/door/airlock/public/glass{ name = "Primary Tool Storage" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/storage/primary) "asM" = ( @@ -8616,11 +8195,10 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -8642,8 +8220,6 @@ name = "Gravity Generator Area"; req_access_txt = "19; 61" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -8653,15 +8229,13 @@ base_state = "right"; dir = 4; icon_state = "right"; - name = "Infirmary"; - req_access_txt = "0" + name = "Infirmary" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -8688,8 +8262,7 @@ "asU" = ( /obj/machinery/power/solar_control{ id = "forestarboard"; - name = "Fore Starboard Solar Control"; - track = 0 + name = "Fore Starboard Solar Control" }, /obj/structure/cable{ d2 = 4; @@ -8699,8 +8272,7 @@ /area/maintenance/auxsolarstarboard) "asV" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/structure/extinguisher_cabinet{ pixel_x = 27 @@ -8724,6 +8296,9 @@ icon_state = "1-2" }, /obj/machinery/photocopier, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -8751,13 +8326,11 @@ name = "Disposal Conveyor Access"; req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/disposal) "atd" = ( /obj/machinery/power/apc{ - dir = 2; name = "Disposal APC"; pixel_y = -24 }, @@ -8766,14 +8339,17 @@ /turf/simulated/floor/plating, /area/maintenance/disposal) "ate" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" @@ -8786,19 +8362,21 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" }) "atg" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 - }, /obj/effect/landmark{ name = "xeno_spawn"; pixel_x = -1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" @@ -8832,9 +8410,6 @@ name = "Port Maintenance" }) "atl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /obj/structure/disposalpipe/segment{ dir = 4; icon_state = "pipe-c" @@ -8844,12 +8419,11 @@ d2 = 4; icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/fore) "atm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" @@ -8859,6 +8433,12 @@ d2 = 8; icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/plating, /area/maintenance/fore) "ato" = ( @@ -8867,10 +8447,9 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" @@ -8878,7 +8457,6 @@ "atp" = ( /obj/structure/sink{ dir = 8; - icon_state = "sink"; pixel_x = -12; pixel_y = 2 }, @@ -8886,9 +8464,6 @@ dir = 4; pixel_y = -28 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -8900,8 +8475,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/security/brig) "atr" = ( @@ -8912,12 +8487,10 @@ /area/security/brig) "ats" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /turf/simulated/floor/plasteel, /area/security/brig) @@ -8937,19 +8510,22 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/security/brig) "atw" = ( /obj/machinery/camera{ c_tag = "Security - Gear Room"; - dir = 8; - network = list("SS13") + dir = 8 }, /obj/machinery/light{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "redcorner" @@ -8957,18 +8533,14 @@ /area/security/brig) "atx" = ( /obj/machinery/door/airlock{ - name = "Unisex Restroom"; - req_access_txt = "0" + name = "Unisex Restroom" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/security/brig) "aty" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ name = "Security Office"; - req_access_txt = "0"; req_one_access_txt = "1;4" }, /turf/simulated/floor/plasteel, @@ -8978,15 +8550,14 @@ /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/security/glass{ name = "Security Office"; - req_access_txt = "0"; req_one_access_txt = "1;4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/security/main) @@ -8998,6 +8569,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/starboard) "atB" = ( @@ -9031,6 +8603,8 @@ /obj/structure/table, /obj/item/folder/red, /obj/item/flash, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/security/main) "atH" = ( @@ -9057,6 +8631,12 @@ /obj/item/stack/packageWrap, /obj/item/stack/packageWrap, /obj/item/stack/packageWrap, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/storage/primary) "atK" = ( @@ -9069,22 +8649,16 @@ }, /obj/structure/sink{ dir = 4; - icon_state = "sink"; pixel_x = 12; pixel_y = 2 }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, /area/security/brig) "atM" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -9139,7 +8713,6 @@ dir = 4; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -9157,9 +8730,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/crew_quarters/fitness{ @@ -9230,9 +8801,6 @@ /turf/simulated/floor/plating, /area/maintenance/starboard) "aue" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -9244,8 +8812,8 @@ pixel_y = 1 }, /obj/effect/decal/warning_stripes/northwest, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 }, /turf/simulated/floor/plasteel, /area/engine/gravitygenerator) @@ -9255,9 +8823,7 @@ dir = 1; location = "Disposals" }, -/obj/structure/plasticflaps{ - opacity = 0 - }, +/obj/structure/plasticflaps, /obj/machinery/door/window/northright{ dir = 2; name = "delivery door"; @@ -9290,8 +8856,7 @@ pixel_y = 8 }, /obj/machinery/camera/autoname{ - dir = 4; - network = list("SS13") + dir = 4 }, /turf/simulated/floor/plating, /area/maintenance/auxsolarstarboard) @@ -9302,10 +8867,6 @@ icon_state = "1-4"; tag = "90Curve" }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 2; - on = 1 - }, /obj/effect/landmark{ name = "xeno_spawn"; pixel_x = -1 @@ -9322,7 +8883,6 @@ dir = 4 }, /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_x = 29 }, @@ -9334,9 +8894,6 @@ name = "Brig Emergency Storage"; req_access_txt = "63" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -9345,6 +8902,12 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/security/brig) "aup" = ( @@ -9353,9 +8916,6 @@ /turf/space, /area/space/nearstation) "auq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/west, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, @@ -9411,7 +8971,6 @@ name = "Port Maintenance" }) "aux" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/north, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, @@ -9430,21 +8989,10 @@ /obj/item/storage/toolbox/emergency, /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) -"auA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" }) "auB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /obj/item/bucket_sensor, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, @@ -9492,7 +9040,6 @@ "auH" = ( /obj/machinery/vending/coffee, /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_y = -28 }, @@ -9504,10 +9051,6 @@ name = "\improper Recreation Area" }) "auI" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ @@ -9566,8 +9109,7 @@ /obj/machinery/power/apc{ dir = 8; name = "west bump"; - pixel_x = -24; - shock_proof = 0 + pixel_x = -24 }, /obj/structure/cable/yellow{ d2 = 2; @@ -9607,7 +9149,7 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, /turf/simulated/floor/plasteel{ @@ -9615,8 +9157,9 @@ }, /area/security/warden) "auS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -9632,19 +9175,9 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - external_pressure_bound = 0; - frequency = 1441; - id_tag = "n2_out"; - initialize_directions = 1; - internal_pressure_bound = 4000; - on = 1; - pressure_checks = 2; - pump_direction = 0 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 + dir = 6 }, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" @@ -9668,14 +9201,6 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - level = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - level = 1 - }, /turf/simulated/floor/plasteel, /area/security/brig) "auW" = ( @@ -9692,8 +9217,7 @@ base_state = "right"; dir = 4; icon_state = "right"; - name = "Outer Window"; - req_access_txt = "0" + name = "Outer Window" }, /obj/machinery/door/window/brigdoor{ dir = 8; @@ -9726,14 +9250,8 @@ d2 = 8; icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10; - initialize_directions = 10; - level = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "redcorner" @@ -9749,9 +9267,7 @@ name = "Evidence Storage"; req_access_txt = "3" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/warning_stripes/yellow, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "dark"; @@ -9786,18 +9302,13 @@ /obj/structure/urinal{ pixel_y = 28 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6; - level = 1 - }, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, /area/security/brig) "avf" = ( /obj/machinery/door/airlock{ - name = "Unisex Restroom"; - req_access_txt = "0" + name = "Unisex Restroom" }, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" @@ -9815,13 +9326,15 @@ dir = 4 }, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/security/processing) "avh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -9830,10 +9343,6 @@ /obj/structure/sign/nosmoking_1{ pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 - }, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -9841,7 +9350,6 @@ "avj" = ( /obj/machinery/light/small{ dir = 4; - icon_state = "bulb1"; tag = "icon-bulb1 (EAST)" }, /turf/simulated/floor/plasteel{ @@ -9853,7 +9361,6 @@ /obj/machinery/door/airlock/security{ name = "Interrogation Monitoring"; req_access = null; - req_access_txt = "0"; req_one_access_txt = "1;4" }, /turf/simulated/floor/plasteel{ @@ -9893,9 +9400,6 @@ }, /area/security/main) "avo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /obj/structure/disposalpipe/segment{ dir = 4; icon_state = "pipe-c" @@ -9906,28 +9410,14 @@ icon_state = "2-4" }, /obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/plating, /area/maintenance/fore) -"avp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/airlock{ - name = "Unisex Restroom"; - req_access_txt = "0" - }, -/turf/simulated/floor/plasteel{ - icon_state = "showroomfloor" - }, -/area/security/brig) -"avq" = ( -/obj/machinery/cryopod/right, -/obj/machinery/light{ - dir = 8; - icon_state = "tube1" - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/crew_quarters/sleep) "avr" = ( /turf/simulated/wall, /area/crew_quarters/mrchangs) @@ -9939,6 +9429,9 @@ }, /area/security/processing) "avt" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -9951,8 +9444,10 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -10002,10 +9497,6 @@ }, /area/crew_quarters/courtroom) "avC" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 2; - on = 1 - }, /obj/effect/landmark{ name = "xeno_spawn"; pixel_x = -1 @@ -10023,47 +9514,45 @@ /turf/simulated/floor/plating, /area/maintenance/starboard) "avF" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, /obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/engine/gravitygenerator) "avG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; icon_state = "2-4" }, /obj/effect/decal/warning_stripes/southwest, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/plasteel, /area/engine/gravitygenerator) "avH" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, /obj/machinery/power/terminal, /obj/structure/cable/yellow{ d2 = 8; icon_state = "0-8" }, /obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/engine/gravitygenerator) "avI" = ( /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/machinery/hologram/holopad, @@ -10074,11 +9563,7 @@ }, /obj/effect/decal/warning_stripes/south, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - level = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 + dir = 4 }, /turf/simulated/floor/plasteel, /area/engine/gravitygenerator) @@ -10102,7 +9587,6 @@ pixel_y = 23 }, /obj/machinery/status_display{ - density = 0; pixel_y = 32 }, /obj/machinery/conveyor/north{ @@ -10121,7 +9605,6 @@ d2 = 4; icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plating, /area/maintenance/auxsolarstarboard) @@ -10148,9 +9631,6 @@ }, /area/engine/mechanic_workshop) "avQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /obj/effect/landmark{ name = "xeno_spawn"; pixel_x = -1 @@ -10172,19 +9652,12 @@ icon_state = "1-4" }, /obj/effect/decal/warning_stripes/north, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 }, /turf/simulated/floor/plasteel, /area/engine/gravitygenerator) "avS" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 - }, /obj/machinery/light, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plating, @@ -10218,12 +9691,7 @@ /area/engine/gravitygenerator) "avW" = ( /obj/machinery/door/airlock/maintenance_hatch{ - name = "Supply Bay Bridge Access"; - req_access_txt = "0"; - req_one_access_txt = "0" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + name = "Supply Bay Bridge Access" }, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ @@ -10266,25 +9734,13 @@ /area/crew_quarters/sleep) "awb" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/machinery/conveyor/north{ id = "QMLoad2" }, /turf/simulated/floor/plating, /area/quartermaster/storage) -"awc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Supply Bay Bridge Access"; - req_access_txt = "0"; - req_one_access_txt = "0" - }, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) "awd" = ( /turf/simulated/wall/r_wall, /area/security/processing) @@ -10295,10 +9751,6 @@ name = "Port Maintenance" }) "awf" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, /obj/machinery/light, /obj/effect/landmark{ name = "xeno_spawn"; @@ -10314,14 +9766,11 @@ name = "Storage Room"; req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/maintenance/fore) "awh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/maintenance{ name = "Brig Maintenance"; - req_access_txt = "0"; req_one_access_txt = "63;12" }, /obj/structure/disposalpipe/segment, @@ -10330,6 +9779,8 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/fore) "awi" = ( @@ -10353,29 +9804,12 @@ base_state = "right"; dir = 4; icon_state = "right"; - name = "Labor Camp Desk"; - req_access_txt = "0" + name = "Labor Camp Desk" }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/security/brig) -"awk" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/decal/warning_stripes/north, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel, -/area/engine/gravitygenerator) "awl" = ( /obj/structure/table, /obj/machinery/light/small{ @@ -10401,6 +9835,9 @@ icon_state = "2-8" }, /obj/effect/decal/warning_stripes/northeast, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/engine/gravitygenerator) "awo" = ( @@ -10430,9 +9867,6 @@ name = "\improper Recreation Area" }) "awr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -10442,6 +9876,12 @@ icon_state = "4-8" }, /obj/item/roller, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "whitered" }, @@ -10460,6 +9900,12 @@ d2 = 4; icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "redcorner" @@ -10475,8 +9921,12 @@ d2 = 8; icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/security/brig) "awu" = ( @@ -10538,19 +9988,6 @@ icon_state = "redcorner" }, /area/security/brig) -"awB" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/security/brig) "awC" = ( /obj/machinery/newscaster/security_unit{ pixel_x = 32; @@ -10565,7 +10002,6 @@ /area/security/brig) "awD" = ( /obj/machinery/status_display{ - density = 0; layer = 4; pixel_y = 32 }, @@ -10639,12 +10075,15 @@ dir = 4 }, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/security/processing) "awK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plating, @@ -10652,7 +10091,6 @@ name = "Port Maintenance" }) "awL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plating, /area/maintenance/starboard) @@ -10700,12 +10138,11 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6; - level = 1 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 }, /turf/simulated/floor/plasteel, /area/crew_quarters/sleep) @@ -10713,11 +10150,10 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/crew_quarters/sleep) @@ -10733,6 +10169,9 @@ }, /obj/structure/chair/office/light, /obj/effect/decal/warning_stripes/southeast, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/plasteel, /area/engine/gravitygenerator) "awV" = ( @@ -10750,9 +10189,7 @@ /obj/machinery/door_control{ id = "supplybridge"; name = "Shuttle Bay Space Bridge Control"; - pixel_y = 27; - req_access_txt = "0"; - req_one_access_txt = "0" + pixel_y = 27 }, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plating, @@ -10763,15 +10200,18 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, /obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/fore) "awZ" = ( @@ -10783,19 +10223,15 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/effect/decal/warning_stripes/north, -/turf/simulated/floor/plating, -/area/maintenance/fore) -"axa" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - level = 1 + dir = 4 }, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fore) "axb" = ( /obj/structure/closet, /obj/effect/spawner/lootdrop/maintenance{ @@ -10809,22 +10245,19 @@ name = "Gravity Generator Room"; req_access_txt = "19;23" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/engine/gravitygenerator) "axd" = ( /obj/machinery/door/airlock/engineering{ icon_state = "door_closed"; - locked = 0; name = "Fore Starboard Solar Access"; req_access_txt = "10" }, @@ -10833,7 +10266,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/maintenance/auxsolarstarboard) "axe" = ( @@ -10844,8 +10276,7 @@ /obj/machinery/door_control{ id = "supplybridge"; name = "Shuttle Bay Space Bridge Control"; - pixel_y = 27; - req_access_txt = "0" + pixel_y = 27 }, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plating, @@ -10853,11 +10284,11 @@ name = "Port Maintenance" }) "axf" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - external_pressure_bound = 101.325; - on = 1; - pressure_checks = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -10885,18 +10316,15 @@ /obj/machinery/door_control{ id = "Secure Gate"; name = "Cell Window Control"; - normaldoorcontrol = 0; pixel_x = -5; pixel_y = -3; - req_access_txt = "0"; specialfunctions = 4 }, /obj/machinery/door_control{ id = "briglockdown"; name = "Brig Lockdown Control"; pixel_x = 5; - pixel_y = -3; - req_access_txt = "0" + pixel_y = -3 }, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" @@ -10909,11 +10337,12 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "red" @@ -10936,18 +10365,6 @@ }, /obj/effect/decal/warning_stripes/southwest, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) -"axm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" }) @@ -10955,32 +10372,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) -"axo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) -"axp" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" @@ -11006,9 +10397,6 @@ dir = 4; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /turf/simulated/floor/plating, /area/maintenance/fore) "axs" = ( @@ -11017,12 +10405,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/sortjunction{ dir = 4; - icon_state = "pipe-j1s"; sortType = 2 }, /turf/simulated/floor/plating, @@ -11041,15 +10425,15 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, /turf/simulated/floor/plating, /area/maintenance/fore) "axu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; @@ -11060,6 +10444,12 @@ icon_state = "pipe-c" }, /obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/plating, /area/maintenance/fore) "axv" = ( @@ -11071,12 +10461,14 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/door/airlock/maintenance{ + req_one_access_txt = "12;63" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "0"; - req_one_access_txt = "12;63" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plating, /area/maintenance/fore) @@ -11104,6 +10496,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -11118,6 +10513,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -11132,13 +10530,16 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/spawner/lootdrop{ loot = list(/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes); name = "maint grille or trash spawner" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/fore) "axA" = ( @@ -11169,6 +10570,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -11181,9 +10585,7 @@ }, /obj/structure/table/wood, /obj/item/radio/intercom{ - broadcasting = 0; frequency = 1424; - listening = 1; name = "Interrogation Intercom"; pixel_y = -31 }, @@ -11203,25 +10605,17 @@ icon_state = "pipe-c" }, /obj/structure/chair/stool, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "red" }, /area/security/processing) -"axI" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel, -/area/security/brig) "axK" = ( /obj/structure/sign/pods, /turf/simulated/wall/r_wall, @@ -11246,6 +10640,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "red" @@ -11272,12 +10672,8 @@ name = "Cabin Bolt Control"; normaldoorcontrol = 1; pixel_x = -25; - req_access_txt = "0"; specialfunctions = 4 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 2 - }, /obj/structure/bed, /obj/item/bedsheet, /turf/simulated/floor/carpet, @@ -11300,15 +10696,15 @@ /turf/simulated/floor/plating, /area/maintenance/starboard) "axS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /obj/machinery/light{ dir = 1; on = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, /turf/simulated/floor/plasteel, /area/crew_quarters/fitness{ @@ -11338,11 +10734,8 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/crew_quarters/fitness{ name = "\improper Recreation Area" @@ -11381,10 +10774,13 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plating, /area/maintenance/fore) "aya" = ( @@ -11392,11 +10788,20 @@ /turf/simulated/floor/wood, /area/crew_quarters/mrchangs) "ayb" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/wood, /area/crew_quarters/mrchangs) "ayc" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -11413,21 +10818,18 @@ /obj/effect/landmark{ name = "lightsout" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/crew_quarters/sleep) "aye" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/crew_quarters/sleep) @@ -11436,21 +10838,20 @@ id_tag = "Cabin4"; name = "Cabin 5" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/wood, /area/crew_quarters/sleep) "ayg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 + dir = 4 }, /turf/simulated/floor/carpet, /area/crew_quarters/sleep) @@ -11459,13 +10860,15 @@ name = "xeno_spawn"; pixel_x = -1 }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/carpet, /area/crew_quarters/sleep) "ayi" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/carpet, /area/crew_quarters/sleep) "ayk" = ( @@ -11473,36 +10876,11 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plating, /area/maintenance/starboard) -"ayl" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, -/obj/effect/landmark{ - name = "xeno_spawn"; - pixel_x = -1 - }, -/turf/simulated/floor/plating, -/area/maintenance/starboard) -"aym" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/plating, -/area/maintenance/starboard) "ayn" = ( /obj/structure/closet, /obj/item/stock_parts/matter_bin, /turf/simulated/floor/plating, /area/maintenance/starboard) -"ayo" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Storage Room"; - req_access_txt = "12" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plating, -/area/maintenance/starboard) "ayp" = ( /obj/structure/dresser, /obj/machinery/newscaster{ @@ -11523,10 +10901,11 @@ base_state = "right"; dir = 2; icon_state = "right"; - name = "Reception Window"; - req_access_txt = "0" + name = "Reception Window" }, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/security/warden) "ayr" = ( @@ -11539,10 +10918,13 @@ d2 = 4; icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, /obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/plating, /area/maintenance/starboard) "ays" = ( @@ -11585,15 +10967,14 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/starboard) "ayw" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ name = "Gear Room"; - req_access_txt = "0"; req_one_access_txt = "1;4" }, /obj/structure/disposalpipe/segment, @@ -11603,8 +10984,6 @@ icon_state = "1-2" }, /obj/effect/decal/warning_stripes/yellow, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/security/brig) "ayx" = ( @@ -11656,13 +11035,6 @@ /area/hallway/secondary/entry{ name = "Arrivals" }) -"ayD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) "ayE" = ( /obj/machinery/alarm{ dir = 4; @@ -11688,7 +11060,6 @@ /turf/simulated/floor/plating, /area/maintenance/fore) "ayH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -11711,6 +11082,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/engine/gravitygenerator) "ayK" = ( @@ -11719,15 +11093,6 @@ /area/quartermaster/miningdock{ name = "\improper Mining Office" }) -"ayL" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable/yellow{ - d2 = 4; - icon_state = "0-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/security/brig) "ayN" = ( /obj/structure/closet/radiation, /obj/structure/sign/securearea{ @@ -11759,7 +11124,6 @@ }, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/effect/decal/warning_stripes/northeast, @@ -11773,6 +11137,7 @@ }, /obj/structure/disposalpipe/junction, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/security/brig) "ayT" = ( @@ -11790,7 +11155,6 @@ }, /area/security/warden) "ayV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ d1 = 2; d2 = 8; @@ -11818,9 +11182,7 @@ dir = 1 }, /obj/machinery/camera{ - c_tag = "Warden's Office"; - dir = 2; - network = list("SS13") + c_tag = "Warden's Office" }, /obj/structure/disposalpipe/segment{ dir = 2; @@ -11839,8 +11201,7 @@ id = "armoryshutter"; name = "Armory Shutter"; pixel_x = 5; - pixel_y = -3; - req_access_txt = "0" + pixel_y = -3 }, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" @@ -11853,9 +11214,6 @@ }, /area/security/processing) "ayZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ icon_state = "redfull" @@ -11868,32 +11226,14 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11; - level = 1 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "red" }, /area/security/processing) -"azb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10; - initialize_directions = 10; - level = 1 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "red" - }, -/area/security/processing) "azc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -11902,16 +11242,18 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "whitered" }, /area/security/brig) "azd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 - }, /turf/simulated/floor/plasteel{ icon_state = "redfull" }, @@ -11933,12 +11275,6 @@ /obj/machinery/atmospherics/unary/portables_connector, /turf/simulated/floor/plating, /area/maintenance/starboard) -"azg" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 2 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/mrchangs) "azh" = ( /obj/machinery/light/small{ dir = 4; @@ -11971,9 +11307,6 @@ icon_state = "4-8" }, /obj/effect/decal/warning_stripes/southeast, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/engine/gravitygenerator) "azo" = ( @@ -11996,7 +11329,6 @@ dir = 2; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/structure/cable/yellow{ d1 = 1; d2 = 4; @@ -12008,7 +11340,12 @@ icon_state = "1-8" }, /obj/effect/decal/warning_stripes/south, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/engine/gravitygenerator) "azr" = ( @@ -12026,11 +11363,14 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/door/airlock/maintenance{ + req_access_txt = "12" + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plating, /area/maintenance/starboard) @@ -12064,17 +11404,6 @@ icon_state = "yellow" }, /area/engine/engineering) -"azw" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable/yellow{ - d2 = 8; - icon_state = "0-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = "0" - }, -/turf/simulated/floor/plating, -/area/security/brig) "azx" = ( /turf/simulated/floor/plasteel{ dir = 4; @@ -12087,9 +11416,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plating, /area/maintenance/starboard) "azA" = ( @@ -12110,9 +11436,6 @@ }, /area/security/brig) "azB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 4; @@ -12161,9 +11484,6 @@ name = "north bump"; pixel_y = 24 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 2 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -12225,9 +11545,6 @@ }, /area/engine/engineering) "azK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -12242,6 +11559,15 @@ icon_state = "1-8" }, /obj/effect/decal/warning_stripes/east, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" @@ -12251,6 +11577,12 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/fore) "azN" = ( @@ -12263,9 +11595,6 @@ d2 = 4; icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" @@ -12291,12 +11620,17 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/door/airlock/maintenance{ + req_one_access_txt = "12;50" + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "0"; - req_one_access_txt = "12;50" +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plating, /area/maintenance/fore) @@ -12309,7 +11643,6 @@ "azR" = ( /obj/machinery/door/airlock/maintenance{ name = "Cargo Bay Warehouse Maintenance"; - req_access_txt = "0"; req_one_access_txt = "48;50" }, /obj/structure/disposalpipe/segment, @@ -12317,19 +11650,7 @@ /area/quartermaster/sorting{ name = "\improper Warehouse" }) -"azS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) "azT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -12341,6 +11662,7 @@ req_access_txt = "48" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock{ @@ -12381,9 +11703,6 @@ /area/crew_quarters/sleep) "aAa" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "redcorner" @@ -12404,7 +11723,12 @@ dir = 1; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, /turf/simulated/floor/plasteel, /area/security/brig) "aAc" = ( @@ -12416,11 +11740,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 + dir = 4 }, /turf/simulated/floor/plasteel, /area/security/brig) @@ -12433,13 +11757,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/security/brig) "aAe" = ( @@ -12447,7 +11768,6 @@ pixel_x = 27 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/crew_quarters/sleep) @@ -12473,9 +11793,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -12492,10 +11809,6 @@ d2 = 8; icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -12526,9 +11839,11 @@ /obj/effect/landmark{ name = "lightsout" }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/security/brig) @@ -12550,8 +11865,7 @@ /obj/machinery/power/apc{ dir = 8; name = "west bump"; - pixel_x = -24; - shock_proof = 0 + pixel_x = -24 }, /obj/structure/cable/yellow{ d2 = 4; @@ -12574,23 +11888,9 @@ d2 = 8; icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1; - level = 1 - }, -/turf/simulated/floor/plasteel, -/area/security/brig) -"aAs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 + dir = 1 }, /turf/simulated/floor/plasteel, /area/security/brig) @@ -12606,17 +11906,14 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "red" }, /area/security/processing) "aAu" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, /obj/structure/chair/stool, /turf/simulated/floor/plasteel{ dir = 6; @@ -12640,6 +11937,9 @@ "aAx" = ( /obj/structure/table, /obj/item/flashlight/lamp, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -12658,6 +11958,9 @@ dir = 8; network = list("interrogation") }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -12678,13 +11981,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/crew_quarters/mrchangs) -"aAD" = ( -/obj/structure/chair/wood{ - dir = 1 - }, -/obj/machinery/atmospherics/unary/vent_pump, -/turf/simulated/floor/wood, -/area/crew_quarters/mrchangs) "aAE" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable/yellow{ @@ -12697,23 +11993,12 @@ }, /turf/simulated/floor/plating, /area/security/brig) -"aAG" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel, -/area/crew_quarters/sleep) "aAH" = ( /obj/machinery/camera{ c_tag = "Dormitories - Fore"; dir = 8 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/crew_quarters/sleep) @@ -12726,9 +12011,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/sign/securearea{ desc = "A warning sign which reads 'RADIOACTIVE AREA'"; dir = 1; @@ -12740,6 +12022,12 @@ dir = 1 }, /obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/starboard) "aAJ" = ( @@ -12756,9 +12044,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/sign/securearea{ desc = "A warning sign which reads 'RADIOACTIVE AREA'"; dir = 1; @@ -12791,8 +12076,6 @@ name = "Holding Cell"; req_access_txt = "2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "red" }, @@ -12804,6 +12087,9 @@ network = list("MiniSat","tcomm"); pixel_x = -29 }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "yellow" @@ -12834,6 +12120,9 @@ /obj/structure/chair/office/dark{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/plasteel, /area/engine/engineering) "aAX" = ( @@ -12844,12 +12133,13 @@ name = "Port Maintenance" }) "aAY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/fore) "aAZ" = ( @@ -12865,12 +12155,13 @@ dir = 2; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/fore) "aBb" = ( @@ -12881,42 +12172,29 @@ /obj/structure/disposalpipe/trunk{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "redcorner" }, /area/security/brig) -"aBh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "redcorner" - }, -/area/security/brig) "aBi" = ( /obj/machinery/light, /obj/machinery/camera{ c_tag = "Brig - Hallway - Port"; - dir = 1; - network = list("SS13") + dir = 1 }, /obj/machinery/door_timer{ id = "Cell 1"; name = "Cell 1"; pixel_y = -32 }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "red" }, /area/security/brig) -"aBj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "redcorner" - }, -/area/security/brig) "aBl" = ( /obj/machinery/door_timer{ id = "Cell 2"; @@ -12927,12 +12205,6 @@ icon_state = "red" }, /area/security/brig) -"aBm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - icon_state = "red" - }, -/area/security/brig) "aBn" = ( /obj/machinery/door_timer{ id = "Cell 3"; @@ -12940,14 +12212,12 @@ pixel_y = -32 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "redcorner" }, /area/security/brig) "aBo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "red" @@ -12959,7 +12229,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "red" @@ -12970,34 +12239,29 @@ /turf/simulated/floor/plating, /area/crew_quarters/sleep) "aBs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/airlock/public/glass{ name = "Cryodorms" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/crew_quarters/sleep) "aBu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/security/brig) "aBw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "redcorner" }, /area/security/brig) @@ -13007,7 +12271,6 @@ /obj/machinery/door/airlock/public/glass{ name = "Recreation Area" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -13019,12 +12282,10 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "redcorner" }, /area/security/brig) @@ -13046,14 +12307,6 @@ icon_state = "dark" }, /area/security/brig) -"aBD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/security/brig) "aBE" = ( /obj/structure/chair{ dir = 4 @@ -13073,12 +12326,8 @@ name = "Dorm Bolt Control"; normaldoorcontrol = 1; pixel_x = -25; - req_access_txt = "0"; specialfunctions = 4 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 2 - }, /turf/simulated/floor/wood, /area/crew_quarters/sleep) "aBG" = ( @@ -13092,14 +12341,6 @@ icon_state = "dark" }, /area/security/brig) -"aBH" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/security/brig) "aBI" = ( /turf/simulated/wall, /area/crew_quarters/locker/locker_toilet{ @@ -13122,45 +12363,29 @@ }, /area/security/podbay) "aBL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d2 = 4; icon_state = "0-4" }, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -24 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /turf/simulated/floor/wood, /area/crew_quarters/mrchangs) "aBM" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" }, /area/crew_quarters/sleep) "aBN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/door/airlock/public/glass{ name = "Fore Primary Hallway" }, @@ -13169,9 +12394,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/wood, /area/crew_quarters/mrchangs) "aBO" = ( @@ -13185,8 +12407,12 @@ d2 = 8; icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, /turf/simulated/floor/plasteel, /area/crew_quarters/sleep) "aBP" = ( @@ -13198,16 +12424,16 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 + dir = 4 }, /turf/simulated/floor/wood, /area/crew_quarters/sleep) "aBQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 }, /turf/simulated/floor/wood, /area/crew_quarters/sleep) @@ -13216,17 +12442,19 @@ name = "xeno_spawn"; pixel_x = -1 }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 - }, /obj/machinery/light/small, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/wood, /area/crew_quarters/sleep) "aBS" = ( /obj/structure/chair/wood{ dir = 1 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/wood, /area/crew_quarters/sleep) "aBT" = ( @@ -13244,10 +12472,10 @@ dir = 4; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, /turf/simulated/floor/plating, @@ -13271,20 +12499,6 @@ }, /turf/simulated/floor/plating, /area/bridge) -"aBW" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/starboard) "aBX" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -13294,13 +12508,13 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, /obj/effect/decal/warning_stripes/north, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/starboard) "aBY" = ( @@ -13331,13 +12545,16 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/spawner/lootdrop{ loot = list(/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes); name = "maint grille or trash spawner" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/starboard) "aCa" = ( @@ -13350,6 +12567,9 @@ d2 = 8; icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, @@ -13361,9 +12581,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/light/small{ dir = 1 }, @@ -13387,7 +12604,6 @@ /obj/machinery/door/airlock/public/glass{ name = "Recreation Area" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -13403,12 +12619,6 @@ "aCg" = ( /turf/simulated/wall/r_wall, /area/engine/engineering) -"aCh" = ( -/obj/machinery/atmospherics/unary/vent_pump/on, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/engine/engineering) "aCi" = ( /obj/machinery/newscaster{ pixel_y = 32 @@ -13436,10 +12646,6 @@ /obj/machinery/newscaster/security_unit{ pixel_y = -30 }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, /turf/simulated/floor/plasteel{ icon_state = "red" }, @@ -13450,12 +12656,7 @@ pixel_y = -26; req_access_txt = "1" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - level = 1 - }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "redcorner" }, /area/security/brig) @@ -13466,6 +12667,8 @@ icon_state = "1-2" }, /obj/effect/spawner/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/crew_quarters/sleep) "aCn" = ( @@ -13525,12 +12728,13 @@ /area/security/brig) "aCw" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/fore) "aCx" = ( @@ -13565,9 +12769,7 @@ "aCA" = ( /obj/structure/table, /obj/item/folder/red, -/obj/item/taperecorder{ - pixel_y = 0 - }, +/obj/item/taperecorder, /obj/item/radio/intercom{ broadcasting = 1; frequency = 1424; @@ -13575,9 +12777,6 @@ name = "Interrogation Intercom"; pixel_y = -24 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -13585,7 +12784,6 @@ "aCB" = ( /obj/structure/table/reinforced, /obj/structure/closet/fireaxecabinet{ - pixel_x = 0; pixel_y = 32 }, /turf/simulated/floor/plasteel{ @@ -13657,6 +12855,8 @@ name = "Cell 1"; req_access_txt = "2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "red" }, @@ -13691,6 +12891,8 @@ name = "Cell 2"; req_access_txt = "2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "red" }, @@ -13717,14 +12919,13 @@ name = "Cell 3"; req_access_txt = "2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "red" }, /area/security/brig) "aCK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ id_tag = "innerbrig"; @@ -13732,9 +12933,10 @@ req_access_txt = "63" }, /obj/effect/mapping_helpers/airlock/unres{ - dir = 1; - icon_state = "airlock_unres_helper" + dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "red" }, @@ -13751,15 +12953,13 @@ icon_state = "2-8" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/airlock/security/glass{ id_tag = "innerbrig"; name = "Brig"; req_access_txt = "63" }, /obj/effect/mapping_helpers/airlock/unres{ - dir = 1; - icon_state = "airlock_unres_helper" + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "red" @@ -13812,19 +13012,12 @@ req_access = null; req_access_txt = "4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/security/detectives_office) "aCS" = ( /turf/simulated/wall, /area/security/detectives_office) "aCT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -13834,6 +13027,12 @@ icon_state = "4-8" }, /obj/machinery/light/small, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "whitered" }, @@ -13842,9 +13041,6 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/alarm{ - pixel_y = 26 - }, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -13909,18 +13105,17 @@ pixel_x = 30 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/crew_quarters/sleep) "aCZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/starboard) @@ -13930,20 +13125,20 @@ /area/maintenance/starboard) "aDb" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/highsecurity{ name = "Gravity Generator Foyer"; req_access_txt = "10" }, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/engine/gravitygenerator) "aDc" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/engine/engineering) "aDd" = ( @@ -13962,14 +13157,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/starboard) -"aDf" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 2 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/engine/engineering) "aDg" = ( /obj/structure/table, /obj/machinery/computer/crew, @@ -13978,14 +13165,14 @@ }, /area/security/warden) "aDi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /obj/machinery/camera{ c_tag = "Engineering Supermatter Fore"; dir = 8; network = list("SS13","engine") }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -14133,12 +13320,14 @@ name = "Warden" }, /obj/structure/chair/office/dark, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, /area/security/warden) "aDE" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -14147,8 +13336,8 @@ }, /area/security/nuke_storage) "aDF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/bluegrid{ icon_state = "gcircuit"; @@ -14157,6 +13346,12 @@ /area/security/nuke_storage) "aDG" = ( /obj/machinery/nuclearbomb, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" @@ -14168,8 +13363,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/bluegrid{ icon_state = "gcircuit"; @@ -14177,9 +13372,8 @@ }, /area/security/nuke_storage) "aDI" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -14205,9 +13399,6 @@ /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable{ d1 = 2; d2 = 8; @@ -14226,8 +13417,8 @@ id = "Cell 1"; pixel_x = -28 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" @@ -14244,15 +13435,12 @@ }, /area/security/brig) "aDO" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - external_pressure_bound = 101.325; - on = 1; - pressure_checks = 1 - }, /obj/machinery/light/small{ dir = 4 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -14262,32 +13450,31 @@ id = "Cell 2"; pixel_x = -28 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, /area/security/brig) "aDQ" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, /obj/machinery/flasher{ id = "Cell 3"; pixel_x = -28 }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, /area/security/brig) "aDR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/machinery/light/small{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "red" @@ -14309,7 +13496,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "red" @@ -14325,18 +13511,6 @@ icon_state = "floorgrime" }, /area/security/brig) -"aDW" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "floorgrime" - }, -/area/security/brig) "aDX" = ( /obj/structure/chair, /turf/simulated/floor/plasteel{ @@ -14405,6 +13579,10 @@ d2 = 4; icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -14425,10 +13603,9 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/carpet, /area/security/detectives_office) "aEc" = ( @@ -14443,11 +13620,11 @@ /turf/simulated/floor/carpet, /area/security/detectives_office) "aEd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -14512,13 +13689,6 @@ /area/crew_quarters/locker/locker_toilet{ name = "\improper Restrooms" }) -"aEl" = ( -/obj/item/cigbutt, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) "aEm" = ( /obj/machinery/washing_machine, /turf/simulated/floor/plasteel{ @@ -14528,8 +13698,7 @@ "aEn" = ( /obj/machinery/door/airlock/engineering/glass{ name = "Supermatter Engine Room"; - req_access_txt = "10"; - req_one_access_txt = "0" + req_access_txt = "10" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -14562,18 +13731,16 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, /obj/structure/disposalpipe/junction{ dir = 4; icon_state = "pipe-j2"; tag = "icon-pipe-j1 (WEST)" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /turf/simulated/floor/plasteel, /area/crew_quarters/sleep) @@ -14586,14 +13753,13 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/crew_quarters/sleep) @@ -14609,10 +13775,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/plating, @@ -14652,10 +13818,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/plating, @@ -14669,9 +13835,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/spawner/lootdrop{ loot = list(/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes); name = "maint grille or trash spawner" @@ -14679,6 +13842,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/starboard) "aEw" = ( @@ -14691,9 +13857,6 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -14702,6 +13865,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/plating, /area/maintenance/starboard) "aEx" = ( @@ -14720,8 +13886,7 @@ /obj/machinery/door/window/southright{ dir = 4; name = "Engineering Deliveries"; - req_access_txt = "10"; - req_one_access_txt = "0" + req_access_txt = "10" }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, @@ -14761,11 +13926,12 @@ name = "\improper Mining Office" }) "aEC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/spawner/lootdrop{ loot = list(/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes); name = "maint grille or trash spawner" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" @@ -14779,13 +13945,13 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/west, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/starboard) "aEE" = ( @@ -14846,22 +14012,6 @@ dir = 8; icon_state = "brown" }, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) -"aEN" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) -"aEO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/plasteel, /area/quartermaster/miningdock{ name = "\improper Mining Office" }) @@ -14876,9 +14026,7 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10; - initialize_directions = 10; - level = 1 + dir = 6 }, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock{ @@ -14892,6 +14040,9 @@ pixel_y = 28; req_access_txt = "48" }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "brown" @@ -14919,13 +14070,10 @@ }, /obj/machinery/door/window/westleft{ base_state = "right"; - dir = 8; icon_state = "right"; - name = "Outer Window"; - req_access_txt = "0" + name = "Outer Window" }, /obj/machinery/door/window/brigdoor{ - dir = 4; name = "Security Desk"; req_access_txt = "1" }, @@ -14934,6 +14082,9 @@ }, /area/security/brig) "aET" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -14941,10 +14092,8 @@ name = "\improper Warehouse" }) "aEU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/space_heater, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" @@ -14956,7 +14105,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -14982,13 +14130,6 @@ icon_state = "vault" }, /area/security/nuke_storage) -"aEY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/bluegrid{ - icon_state = "gcircuit"; - luminosity = 2 - }, -/area/security/nuke_storage) "aEZ" = ( /turf/simulated/floor/bluegrid{ icon_state = "gcircuit"; @@ -15056,8 +14197,7 @@ }, /obj/machinery/camera{ c_tag = "Labor Shuttle Dock"; - dir = 8; - network = list("SS13") + dir = 8 }, /obj/machinery/flasher{ id = "PRelease"; @@ -15107,20 +14247,9 @@ icon_state = "red" }, /area/security/brig) -"aFn" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/obj/machinery/light/small{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - icon_state = "floorgrime" - }, -/area/security/brig) "aFo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" @@ -15132,38 +14261,24 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, /area/security/brig) "aFq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/alarm{ dir = 1; pixel_y = -22 }, -/turf/simulated/floor/plasteel{ - icon_state = "floorgrime" - }, -/area/security/brig) -"aFr" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - external_pressure_bound = 101.325; - on = 1; - pressure_checks = 1 - }, -/obj/machinery/light/small{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" @@ -15176,8 +14291,7 @@ }, /obj/machinery/camera{ c_tag = "Detective's Office"; - dir = 4; - network = list("SS13") + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -15185,6 +14299,7 @@ /area/security/detectives_office) "aFt" = ( /obj/machinery/hologram/holopad, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -15195,10 +14310,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/carpet, /area/security/detectives_office) "aFv" = ( @@ -15219,7 +14330,6 @@ "aFx" = ( /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/computer/secure_data, @@ -15233,7 +14343,6 @@ /area/maintenance/fore) "aFz" = ( /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "redcorner" }, /area/security/brig) @@ -15250,8 +14359,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "red" }, @@ -15268,23 +14375,9 @@ }, /turf/simulated/floor/plating, /area/security/brig) -"aFD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/plasteel{ - icon_state = "freezerfloor" - }, -/area/crew_quarters/locker/locker_toilet{ - name = "\improper Restrooms" - }) "aFE" = ( /obj/structure/closet/emcloset, /obj/machinery/status_display{ - density = 0; pixel_y = 32 }, /turf/simulated/floor/plasteel{ @@ -15375,7 +14468,6 @@ dir = 1 }, /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_y = 28 }, @@ -15386,15 +14478,6 @@ icon_state = "barber" }, /area/crew_quarters/sleep) -"aFL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/maintenance/starboard) "aFM" = ( /obj/structure/rack{ dir = 8; @@ -15447,12 +14530,13 @@ req_access_txt = "48" }, /obj/effect/decal/warning_stripes/arrow{ - dir = 4; - icon_state = "4" + dir = 4 }, /obj/effect/decal/warning_stripes/yellow/partial{ - dir = 4; - icon_state = "3" + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" @@ -15471,27 +14555,27 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/machinery/atmospherics/unary/vent_pump{ - on = 1 - }, /obj/machinery/flasher{ id = "Cell 4"; pixel_x = -28 }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, /area/security/brig) "aFX" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, /area/security/brig) "aFY" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/visible, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -15504,14 +14588,11 @@ /area/engine/engineering) "aGb" = ( /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_y = 21 }, /obj/machinery/camera{ - c_tag = "Engineering - Fore"; - dir = 2; - network = list("SS13") + c_tag = "Engineering - Fore" }, /obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plasteel, @@ -15519,7 +14600,6 @@ "aGc" = ( /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /obj/effect/decal/warning_stripes/northwest, @@ -15551,8 +14631,7 @@ }, /obj/machinery/camera{ c_tag = "Mining Office"; - dir = 8; - network = list("SS13") + dir = 8 }, /obj/machinery/mineral/equipment_vendor, /turf/simulated/floor/plasteel{ @@ -15564,10 +14643,8 @@ }) "aGi" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /obj/item/storage/box/donkpockets, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -15575,15 +14652,16 @@ name = "\improper Warehouse" }) "aGj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" @@ -15637,26 +14715,19 @@ /area/security/nuke_storage) "aGo" = ( /obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "vault" }, /area/security/nuke_storage) "aGp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "vault" }, @@ -15673,10 +14744,6 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 - }, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "vault" @@ -15686,8 +14753,8 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/machinery/atmospherics/unary/vent_pump{ - on = 1 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" @@ -15723,9 +14790,6 @@ /turf/simulated/floor/plating, /area/construction) "aGx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ id_tag = "outerbrig"; @@ -15733,9 +14797,10 @@ req_access_txt = "63" }, /obj/effect/mapping_helpers/airlock/unres{ - dir = 1; - icon_state = "airlock_unres_helper" + dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -15761,7 +14826,6 @@ name = "Security Desk"; req_access_txt = "63" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -15789,8 +14853,8 @@ /area/security/brig) "aGC" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/engine/engineering) "aGD" = ( @@ -15799,16 +14863,19 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/security/detectives_office) "aGE" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/flasher{ id = "Cell 5"; pixel_x = 28 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -15822,9 +14889,6 @@ }, /area/security/processing) "aGG" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, /turf/simulated/floor/carpet, /area/security/detectives_office) "aGH" = ( @@ -15841,8 +14905,10 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "red" }, @@ -15859,11 +14925,8 @@ }) "aGL" = ( /obj/machinery/door/airlock{ - name = "Unisex Showers"; - req_access_txt = "0" + name = "Unisex Showers" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -15921,13 +14984,10 @@ name = "Mime" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11; - level = 1 + dir = 8 }, /turf/simulated/floor/plasteel, /area/crew_quarters/sleep) @@ -15941,23 +15001,22 @@ /turf/simulated/floor/plasteel, /area/crew_quarters/sleep) "aGU" = ( +/obj/machinery/door/airlock/tranquillite, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 + dir = 4 }, -/obj/machinery/door/airlock/tranquillite, /turf/simulated/floor/mineral/tranquillite, /area/crew_quarters/sleep) "aGV" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /turf/simulated/floor/mineral/tranquillite, /area/crew_quarters/sleep) "aGW" = ( @@ -15966,7 +15025,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/maintenance/starboard) "aGX" = ( @@ -15991,8 +15049,7 @@ /obj/structure/reagent_dispensers/fueltank, /obj/machinery/camera{ c_tag = "Mining Dock"; - dir = 8; - network = list("SS13") + dir = 8 }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, @@ -16015,8 +15072,8 @@ name = "Storage Wing" }) "aHc" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 2 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/engine/engineering) @@ -16120,6 +15177,9 @@ /obj/effect/landmark/start{ name = "Shaft Miner" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock{ name = "\improper Mining Office" @@ -16128,7 +15188,6 @@ /obj/structure/closet/secure_closet/miner, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -16140,13 +15199,8 @@ }) "aHu" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6; - level = 1 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -16154,8 +15208,10 @@ name = "\improper Warehouse" }) "aHv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" @@ -16184,6 +15240,9 @@ lootcount = 3; name = "3maintenance loot spawner" }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -16191,9 +15250,6 @@ name = "\improper Warehouse" }) "aHy" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, /obj/machinery/light_construct/small{ dir = 4 }, @@ -16209,13 +15265,13 @@ locked = 1; req_access_txt = "53" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "vault" @@ -16258,20 +15314,18 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/bluegrid{ icon_state = "gcircuit"; luminosity = 2 }, /area/security/nuke_storage) "aHL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/machinery/firealarm{ dir = 8; pixel_x = -26 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "red" @@ -16279,7 +15333,6 @@ /area/security/brig) "aHM" = ( /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/hallway/primary/fore) @@ -16289,7 +15342,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/extinguisher_cabinet{ pixel_x = 27 }, @@ -16299,15 +15351,15 @@ }, /area/security/brig) "aHO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "redcorner" }, /area/hallway/primary/fore) "aHP" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "redcorner" @@ -16319,7 +15371,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "redcorner" @@ -16348,18 +15399,15 @@ /obj/machinery/door_control{ id = "Secure Gate"; name = "Cell Window Control"; - normaldoorcontrol = 0; pixel_x = 5; pixel_y = 27; - req_access_txt = "0"; specialfunctions = 4 }, /obj/machinery/door_control{ id = "briglockdown"; name = "Brig Lockdown Control"; pixel_x = 5; - pixel_y = 37; - req_access_txt = "0" + pixel_y = 37 }, /obj/machinery/light/small{ dir = 1 @@ -16390,6 +15438,7 @@ /obj/structure/filingcabinet/chestdrawer{ pixel_y = 3 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -16400,12 +15449,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - external_pressure_bound = 101.325; - on = 1; - pressure_checks = 1 - }, /obj/machinery/flasher_button{ id = "holdingflash"; name = "holding cell flasher button"; @@ -16415,16 +15458,16 @@ }, /obj/machinery/camera{ c_tag = "Brig - Desk"; - dir = 8; - network = list("SS13") + dir = 8 }, /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_x = 29; pixel_y = -2 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -16444,9 +15487,8 @@ }, /area/crew_quarters/sleep) "aHW" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -16456,14 +15498,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" }) "aHY" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" @@ -16525,8 +15567,8 @@ /turf/simulated/floor/plating, /area/bridge) "aIc" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/mineral/tranquillite, /area/crew_quarters/sleep) @@ -16547,7 +15589,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -16561,27 +15603,18 @@ /obj/effect/decal/cleanable/fungus, /turf/simulated/floor/plating, /area/maintenance/fore) -"aIh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "freezerfloor" - }, -/area/crew_quarters/locker/locker_toilet{ - name = "\improper Restrooms" - }) "aIi" = ( /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, +/obj/effect/decal/warning_stripes/south, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/plasteel, /area/engine/engineering) "aIk" = ( @@ -16591,8 +15624,7 @@ icon_state = "1-2" }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -16604,6 +15636,7 @@ pixel_y = 8 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel, /area/crew_quarters/sleep) "aIm" = ( @@ -16617,6 +15650,9 @@ /obj/machinery/light/small{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/mineral/tranquillite, /area/crew_quarters/sleep) "aIn" = ( @@ -16629,6 +15665,9 @@ pixel_y = 32 }, /obj/structure/closet/secure_closet/mime, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/mineral/tranquillite, /area/crew_quarters/sleep) "aIp" = ( @@ -16639,9 +15678,6 @@ /area/crew_quarters/sleep) "aIq" = ( /obj/structure/statue/tranquillite/mime, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /turf/simulated/floor/mineral/tranquillite, /area/crew_quarters/sleep) "aIr" = ( @@ -16652,10 +15688,6 @@ /turf/simulated/wall, /area/crew_quarters/sleep) "aIs" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 - }, /obj/item/flag/mime, /turf/simulated/floor/mineral/tranquillite, /area/crew_quarters/sleep) @@ -16667,21 +15699,19 @@ /area/crew_quarters/sleep) "aIu" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, /obj/machinery/door/airlock/engineering, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/engine/engineering) "aIv" = ( @@ -16691,10 +15721,13 @@ icon_state = "2-4" }, /obj/effect/decal/warning_stripes/northeast, -/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel, /area/engine/equipmentstorage) "aIw" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/engine/equipmentstorage) "aIy" = ( @@ -16721,15 +15754,17 @@ /turf/simulated/floor/plasteel, /area/engine/engineering) "aIB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/engine/engineering) "aIC" = ( @@ -16762,42 +15797,41 @@ }, /obj/effect/decal/warning_stripes/east, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 + dir = 5 }, /turf/simulated/floor/plasteel, /area/engine/equipmentstorage) "aIE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, /obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /turf/simulated/floor/plasteel, /area/engine/engineering) "aIF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /obj/effect/decal/warning_stripes/east, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/engine/engineering) "aIG" = ( @@ -16836,21 +15870,14 @@ }, /turf/simulated/floor/plating, /area/bridge) -"aII" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "redcorner" - }, -/area/security/brig) "aIJ" = ( +/obj/effect/decal/cleanable/cobweb2, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/obj/effect/decal/cleanable/cobweb2, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" @@ -16869,15 +15896,6 @@ name = "Shaft Miner" }, /turf/simulated/floor/plasteel, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) -"aIP" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, -/turf/simulated/floor/plasteel, /area/quartermaster/miningdock{ name = "\improper Mining Office" }) @@ -16887,10 +15905,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock{ @@ -16902,11 +15918,6 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - level = 1 - }, /turf/simulated/floor/carpet, /area/security/detectives_office) "aIS" = ( @@ -16962,13 +15973,13 @@ name = "Storage Wing" }) "aIY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "vault"; @@ -16998,7 +16009,6 @@ "aJa" = ( /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /turf/simulated/floor/plasteel, @@ -17015,10 +16025,21 @@ codes_txt = "patrol;next_patrol=1.5-Fore-Central"; location = "1-BrigCells" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/plasteel, /area/hallway/primary/fore) "aJe" = ( -/obj/machinery/atmospherics/unary/vent_scrubber, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hallway/primary/fore) "aJf" = ( @@ -17027,6 +16048,12 @@ d2 = 4; icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hallway/primary/fore) "aJg" = ( @@ -17035,14 +16062,17 @@ d2 = 4; icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, /turf/simulated/floor/plasteel, /area/hallway/primary/fore) "aJh" = ( @@ -17051,6 +16081,12 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hallway/primary/fore) "aJi" = ( @@ -17064,16 +16100,11 @@ d2 = 4; icon_state = "2-4" }, -/turf/simulated/floor/plasteel, -/area/hallway/primary/fore) -"aJj" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 + dir = 4 }, /turf/simulated/floor/plasteel, /area/hallway/primary/fore) @@ -17087,7 +16118,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 + dir = 4 }, /turf/simulated/floor/plasteel, /area/hallway/primary/fore) @@ -17097,13 +16128,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/hallway/primary/fore) "aJm" = ( @@ -17112,25 +16138,17 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=1-BrigCells"; location = "0-SecurityDesk" }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - external_pressure_bound = 0; - frequency = 1441; - id_tag = "tox_out"; - initialize_directions = 1; - internal_pressure_bound = 4000; - on = 1; - pressure_checks = 2; - pump_direction = 0 - }, /mob/living/simple_animal/bot/secbot/beepsky, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/plasteel, /area/hallway/primary/fore) "aJn" = ( @@ -17139,9 +16157,6 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /turf/simulated/floor/plasteel, /area/hallway/primary/fore) "aJp" = ( @@ -17163,9 +16178,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -17178,15 +16191,11 @@ }, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -17212,9 +16221,6 @@ dir = 1; on = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/north, /obj/machinery/meter, /turf/simulated/floor/engine, @@ -17233,10 +16239,9 @@ }, /obj/machinery/camera{ c_tag = "Restrooms"; - dir = 4; - network = list("SS13") + dir = 4 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -17274,7 +16279,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/security/warden) "aJz" = ( @@ -17284,12 +16288,10 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - level = 1 + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" @@ -17303,11 +16305,11 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" @@ -17318,8 +16320,7 @@ "aJB" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock{ - name = "Unisex Restrooms"; - req_access_txt = "0" + name = "Unisex Restrooms" }, /obj/structure/cable/yellow{ d1 = 4; @@ -17330,7 +16331,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" @@ -17350,10 +16351,10 @@ icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -17362,6 +16363,10 @@ /area/crew_quarters/sleep) "aJD" = ( /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -17378,13 +16383,13 @@ "aJG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/crew_quarters/sleep) "aJI" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -17392,9 +16397,7 @@ /area/engine/equipmentstorage) "aJJ" = ( /obj/effect/spawner/window/reinforced/plasma, -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/visible/red, /turf/simulated/floor/engine, /area/engine/engineering) "aJK" = ( @@ -17411,13 +16414,6 @@ /obj/effect/decal/warning_stripes/southwest, /turf/simulated/floor/plasteel, /area/engine/engineering) -"aJM" = ( -/obj/effect/decal/warning_stripes/south, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/engine/equipmentstorage) "aJN" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable/yellow, @@ -17443,9 +16439,6 @@ icon_state = "1-4" }, /obj/effect/decal/warning_stripes/southeast, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /turf/simulated/floor/plasteel, /area/engine/equipmentstorage) "aJR" = ( @@ -17459,10 +16452,10 @@ d2 = 8; icon_state = "4-8" }, +/obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -17475,17 +16468,13 @@ d2 = 4; icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/effect/decal/warning_stripes/yellow/partial{ - dir = 1; - icon_state = "3" + dir = 1 }, /obj/effect/decal/warning_stripes/arrow{ - dir = 1; - icon_state = "4" + dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" @@ -17505,21 +16494,6 @@ /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/engine/equipmentstorage) -"aJU" = ( -/obj/effect/decal/warning_stripes/east, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - level = 1 - }, -/turf/simulated/floor/plasteel, -/area/engine/engineering) -"aJV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/engine, -/area/engine/engineering) "aJW" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 10; @@ -17549,26 +16523,12 @@ "aJZ" = ( /obj/machinery/door/airlock/engineering/glass{ name = "Supermatter Engine Room"; - req_access_txt = "10"; - req_one_access_txt = "0" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + req_access_txt = "10" }, /turf/simulated/floor/engine, /area/engine/engineering) -"aKb" = ( -/obj/effect/spawner/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/yellow{ - d2 = 4; - icon_state = "0-4" - }, -/turf/simulated/floor/plating, -/area/security/brig) "aKc" = ( /obj/effect/spawner/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ d2 = 8; icon_state = "0-8" @@ -17586,7 +16546,6 @@ pixel_x = -5 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "brown" }, /area/quartermaster/miningdock{ @@ -17598,13 +16557,10 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "brown" }, /area/quartermaster/miningdock{ @@ -17620,7 +16576,6 @@ name = "\improper Mining Office" }) "aKg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -17631,6 +16586,7 @@ name = "Vault Storage" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "vault"; @@ -17641,16 +16597,16 @@ }) "aKi" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "0"; req_one_access_txt = "12;63;48;50" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/fore) "aKj" = ( @@ -17726,24 +16682,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/unary/vent_pump, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/hallway/primary/fore) -"aKt" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -17754,18 +16692,12 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security{ name = "Security-Storage Backroom"; req_access = null; req_access_txt = "63" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -17776,17 +16708,11 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "redcorner" @@ -17798,12 +16724,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "redcorner" @@ -17822,16 +16742,13 @@ }, /area/hallway/primary/fore) "aKy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -17839,9 +16756,6 @@ }, /area/hallway/primary/fore) "aKz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -17851,7 +16765,6 @@ dir = 1; pixel_y = -24 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "redcorner" @@ -17874,6 +16787,8 @@ name = "Cell 4"; req_access_txt = "2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -17896,18 +16811,14 @@ name = "Cell 5"; req_access_txt = "2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" }, /area/security/brig) "aKC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "redcorner" @@ -17921,9 +16832,7 @@ pixel_y = 32 }, /obj/machinery/camera{ - c_tag = "Fore Primary Hallway Cells"; - dir = 2; - network = list("SS13") + c_tag = "Fore Primary Hallway Cells" }, /turf/simulated/floor/plasteel{ dir = 1; @@ -17931,30 +16840,11 @@ }, /area/hallway/primary/fore) "aKE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "redcorner" - }, -/area/hallway/primary/fore) -"aKF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "redcorner" @@ -17966,21 +16856,37 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/hallway/primary/fore) -"aKI" = ( +"aKH" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/plasteel{ + icon_state = "floorgrime" + }, +/area/security/brig) +"aKI" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "redcorner" }, /area/hallway/primary/fore) "aKK" = ( /obj/item/radio/beacon, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "redcorner" }, /area/hallway/primary/fore) @@ -17989,7 +16895,6 @@ dir = 1 }, /obj/machinery/status_display{ - density = 0; layer = 4; pixel_y = 32 }, @@ -18049,7 +16954,6 @@ "aKS" = ( /obj/machinery/light/small, /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_y = -26 }, @@ -18064,17 +16968,6 @@ /obj/structure/lattice, /turf/space, /area/space/nearstation) -"aKU" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/starboard) "aKV" = ( /obj/machinery/firealarm{ dir = 4; @@ -18097,7 +16990,6 @@ name = "Lock Control"; normaldoorcontrol = 1; pixel_x = -25; - req_access_txt = "0"; specialfunctions = 4 }, /obj/effect/landmark/start{ @@ -18143,7 +17035,6 @@ "aLc" = ( /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/newscaster{ @@ -18165,12 +17056,6 @@ c_tag = "Dormitories - Aft"; dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -18178,23 +17063,12 @@ /area/crew_quarters/sleep) "aLe" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/crew_quarters/sleep) "aLf" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/crew_quarters/sleep) @@ -18202,17 +17076,9 @@ /obj/machinery/light/small, /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/crew_quarters/sleep) @@ -18220,19 +17086,22 @@ /obj/effect/landmark/start{ name = "Clown" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/crew_quarters/sleep) "aLi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 + dir = 4 }, /turf/simulated/floor/wood, /area/crew_quarters/sleep) @@ -18243,24 +17112,26 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 - }, /obj/structure/chair/office/dark, /obj/effect/landmark/start{ name = "Clown" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/wood, /area/crew_quarters/sleep) "aLk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /turf/simulated/floor/wood, /area/crew_quarters/sleep) "aLl" = ( /obj/structure/closet/secure_closet/clown, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/wood, /area/crew_quarters/sleep) "aLo" = ( @@ -18274,11 +17145,9 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/quartermaster/sorting{ @@ -18381,6 +17250,12 @@ icon_state = "4-8" }, /obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/engine, /area/engine/engineering) "aLx" = ( @@ -18470,8 +17345,6 @@ name = "Courtroom"; opacity = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -18485,15 +17358,15 @@ dir = 8; name = "Mix Bypass" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable{ d1 = 2; d2 = 8; icon_state = "2-8" }, /obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/engine, /area/engine/engineering) "aLP" = ( @@ -18503,10 +17376,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/effect/decal/warning_stripes/northwest, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/quartermaster/storage) @@ -18525,6 +17396,7 @@ /area/engine/equipmentstorage) "aLS" = ( /obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "aLT" = ( @@ -18536,8 +17408,7 @@ /area/quartermaster/storage) "aLU" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, @@ -18548,38 +17419,11 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, /turf/simulated/floor/plasteel, /area/construction/Storage{ name = "Storage Wing" }) "aLW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "browncorner" - }, -/area/construction/Storage{ - name = "Storage Wing" - }) -"aLX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "browncorner" @@ -18593,11 +17437,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "browncorner" @@ -18611,27 +17452,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1; - level = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10; - initialize_directions = 10; - level = 1 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "browncorner" - }, -/area/construction/Storage{ - name = "Storage Wing" - }) -"aMa" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "browncorner" @@ -18655,16 +17475,19 @@ /obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt, /mob/living/simple_animal/mouse, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/fore) "aMd" = ( /obj/structure/chair/office/dark, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -18672,13 +17495,6 @@ "aMe" = ( /obj/structure/table, /obj/machinery/recharger, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -18695,7 +17511,9 @@ /turf/simulated/floor/plating, /area/turret_protected/ai_upload) "aMh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "redcorner" @@ -18707,17 +17525,10 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/hallway/primary/fore) -"aMj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "redcorner" - }, -/area/hallway/primary/fore) "aMk" = ( /turf/simulated/wall, /area/crew_quarters/courtroom) @@ -18812,7 +17623,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/light/small{ dir = 8 }, @@ -18825,14 +17635,6 @@ icon_state = "neutralcorner" }, /area/crew_quarters/sleep) -"aMu" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, -/turf/simulated/floor/plasteel, -/area/crew_quarters/sleep) "aMw" = ( /obj/structure/closet/secure_closet/personal, /obj/item/clothing/under/assistantformal, @@ -18842,9 +17644,6 @@ }, /area/crew_quarters/sleep) "aMx" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, /obj/item/flag/clown, /turf/simulated/floor/wood, /area/crew_quarters/sleep) @@ -18892,10 +17691,6 @@ /area/crew_quarters/sleep) "aMC" = ( /obj/structure/statue/bananium/clown, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - level = 1 - }, /turf/simulated/floor/wood, /area/crew_quarters/sleep) "aMD" = ( @@ -18909,17 +17704,20 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /obj/effect/decal/warning_stripes/west, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/fore) -"aME" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/fore) +"aME" = ( /obj/machinery/light/small{ dir = 1 }, @@ -18927,9 +17725,6 @@ pixel_y = 30 }, /obj/effect/decal/warning_stripes/northeast, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, /turf/simulated/floor/plasteel, /area/construction/Storage{ name = "Storage Wing" @@ -18948,9 +17743,6 @@ /turf/simulated/floor/plasteel, /area/hallway/primary/fore) "aMH" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -18958,30 +17750,16 @@ }, /obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes/northwest, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/construction/Storage{ name = "Storage Wing" }) -"aMI" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 2 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/decal/warning_stripes/north, -/turf/simulated/floor/engine, -/area/engine/engineering) "aMJ" = ( /obj/machinery/door/window{ dir = 1; - name = "glass door"; - req_access_txt = "0" + name = "glass door" }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -18990,7 +17768,6 @@ "aMK" = ( /obj/machinery/light/small, /obj/machinery/power/apc{ - dir = 2; name = "Restrooms APC"; pixel_y = -26 }, @@ -18998,7 +17775,7 @@ d2 = 4; icon_state = "0-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -19031,9 +17808,6 @@ /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -19051,18 +17825,16 @@ /turf/simulated/floor/plasteel, /area/engine/engineering) "aMS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 4; icon_state = "1-4" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "aMT" = ( @@ -19071,16 +17843,16 @@ icon_state = "map-left-MS"; pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) @@ -19088,9 +17860,6 @@ /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -19105,36 +17874,32 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 + dir = 4 }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "aMX" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 8; icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/engine/engineering) "aMY" = ( @@ -19143,13 +17908,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/machinery/camera{ - c_tag = "Cargo Bay - Fore"; - dir = 2; - network = list("SS13") + c_tag = "Cargo Bay - Fore" }, /obj/structure/sign/double/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)."; @@ -19157,8 +17917,11 @@ pixel_y = 32 }, /obj/effect/decal/warning_stripes/northeastcorner, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) @@ -19168,24 +17931,21 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4; icon_state = "pipe-c" }, /obj/effect/decal/warning_stripes/southeastcorner, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 + dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "aNa" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/mining{ name = "Cargo Bay"; - req_access_txt = "0"; req_one_access_txt = "48;50" }, /obj/effect/decal/warning_stripes/yellow, @@ -19199,9 +17959,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 4; @@ -19213,12 +17970,10 @@ }, /obj/effect/decal/warning_stripes/northwestcorner, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "aNc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 8; @@ -19228,8 +17983,11 @@ dir = 4 }, /obj/effect/decal/warning_stripes/southeast, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 + dir = 4 }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) @@ -19249,6 +18007,12 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "browncorner" @@ -19267,6 +18031,12 @@ d2 = 8; icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "browncorner" @@ -19283,7 +18053,6 @@ }, /obj/machinery/requests_console{ department = "Mining"; - departmentType = 0; pixel_y = -30 }, /turf/simulated/floor/plasteel{ @@ -19308,11 +18077,11 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -19328,28 +18097,26 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 + dir = 4 }, /turf/simulated/floor/plasteel, /area/construction/Storage{ name = "Storage Wing" }) "aNk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, /turf/simulated/floor/plasteel, /area/construction/Storage{ @@ -19357,9 +18124,6 @@ }) "aNl" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -19370,9 +18134,11 @@ req_access = null; req_access_txt = "63" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -19413,41 +18179,23 @@ /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/crew_quarters/courtroom) -"aNr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "redcorner" - }, -/area/hallway/primary/fore) "aNs" = ( /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 8; icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/hallway/primary/fore) "aNt" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "redcorner" }, /area/hallway/primary/fore) @@ -19468,8 +18216,6 @@ /area/crew_quarters/courtroom) "aNw" = ( /obj/item/radio/intercom{ - broadcasting = 0; - listening = 1; name = "Station Intercom (General)"; pixel_y = 20 }, @@ -19499,12 +18245,12 @@ }, /obj/machinery/camera{ c_tag = "Storage Wing - Security Access Door"; - dir = 4; - network = list("SS13") + dir = 4 }, /obj/machinery/light/small{ dir = 8 }, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -19535,9 +18281,6 @@ }, /area/crew_quarters/courtroom) "aND" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -19546,32 +18289,11 @@ /obj/structure/extinguisher_cabinet{ pixel_y = -30 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "redcorner" }, /area/hallway/primary/fore) -"aNE" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/mining{ - name = "Cargo Bay"; - req_access_txt = "0"; - req_one_access_txt = "48;50" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/warning_stripes/yellow, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/construction/Storage{ - name = "Storage Wing" - }) "aNF" = ( /obj/structure/rack{ dir = 8; @@ -19614,19 +18336,12 @@ /turf/simulated/floor/wood, /area/lawoffice) "aNJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/power/apc{ cell_type = 5000; - dir = 2; name = "Fore Primary Hallway APC"; pixel_y = -27 }, /obj/structure/cable/yellow, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "redcorner" @@ -19644,17 +18359,10 @@ name = "\improper Restrooms" }) "aNL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_y = -26 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "redcorner" @@ -19669,29 +18377,6 @@ /area/crew_quarters/locker/locker_toilet{ name = "\improper Restrooms" }) -"aNN" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutralcorner" - }, -/area/crew_quarters/sleep) -"aNO" = ( -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel, -/area/crew_quarters/sleep) -"aNP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "neutralcorner" - }, -/area/crew_quarters/sleep) "aNQ" = ( /turf/simulated/wall, /area/hallway/secondary/construction{ @@ -19703,7 +18388,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/spawner/lootdrop{ loot = list(/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes); name = "maint grille or trash spawner" @@ -19713,14 +18397,12 @@ "aNS" = ( /obj/effect/decal/cleanable/cobweb, /obj/machinery/field/generator{ - anchored = 0; state = 2 }, /turf/simulated/floor/plating, /area/storage/secure) "aNT" = ( /obj/machinery/field/generator{ - anchored = 0; state = 2 }, /turf/simulated/floor/plating, @@ -19731,9 +18413,7 @@ dir = 1 }, /obj/machinery/camera{ - c_tag = "Engineering - Secure Storage"; - dir = 2; - network = list("SS13") + c_tag = "Engineering - Secure Storage" }, /turf/simulated/floor/plating, /area/storage/secure) @@ -19744,18 +18424,20 @@ "aNX" = ( /obj/machinery/camera{ c_tag = "Cargo Bay - Storage Wing Entrance"; - dir = 1; - network = list("SS13") + dir = 1 }, /obj/effect/decal/warning_stripes/southeast, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/construction/Storage{ name = "Storage Wing" }) "aNY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -19765,20 +18447,20 @@ dir = 4 }, /obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 + dir = 4 }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "aOa" = ( /obj/machinery/door/airlock/engineering/glass{ name = "Supermatter Engine Room"; - req_access_txt = "10"; - req_one_access_txt = "0" - }, -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 2 + req_access_txt = "10" }, +/obj/machinery/atmospherics/pipe/simple/visible, /turf/simulated/floor/engine, /area/engine/engineering) "aOb" = ( @@ -19800,9 +18482,6 @@ /turf/simulated/wall/r_wall, /area/engine/supermatter) "aOf" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -19813,9 +18492,8 @@ icon_state = "pipe-c" }, /obj/effect/decal/warning_stripes/southwest, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel, /area/construction/Storage{ name = "Storage Wing" @@ -19870,6 +18548,9 @@ pixel_y = -30 }, /obj/item/restraints/handcuffs, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -19877,7 +18558,6 @@ "aOk" = ( /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /turf/simulated/floor/plasteel, @@ -19899,13 +18579,6 @@ }, /turf/simulated/floor/plating, /area/quartermaster/storage) -"aOs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel, -/area/quartermaster/storage) "aOu" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, @@ -19928,7 +18601,6 @@ name = "Lock Control"; normaldoorcontrol = 1; pixel_x = -25; - req_access_txt = "0"; specialfunctions = 4 }, /turf/simulated/floor/plasteel{ @@ -19939,50 +18611,31 @@ }) "aOx" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/machinery/door/airlock/mining{ name = "Cargo Bay"; - req_access_txt = "0"; req_one_access_txt = "48;50" }, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 + dir = 4 }, /turf/simulated/floor/plasteel, /area/construction/Storage{ name = "Storage Wing" }) "aOy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, /obj/machinery/door/airlock/maintenance{ - req_access_txt = "0"; - req_one_access_txt = "12;63;48;50" - }, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) -"aOz" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "0"; req_one_access_txt = "12;63;48;50" }, /turf/simulated/floor/plating, @@ -19998,16 +18651,6 @@ icon_state = "dark" }, /area/crew_quarters/sleep) -"aOC" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Primary Tool Storage" - }, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "brown" - }, -/area/storage/primary) "aOD" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -20030,16 +18673,6 @@ "aOG" = ( /turf/simulated/wall/r_wall, /area/turret_protected/ai_upload) -"aOH" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "redcorner" - }, -/area/hallway/primary/fore) "aOK" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security{ @@ -20059,12 +18692,6 @@ /obj/structure/extinguisher_cabinet{ pixel_x = 27 }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - external_pressure_bound = 101.325; - on = 1; - pressure_checks = 1 - }, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -20157,18 +18784,14 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/unary/vent_pump, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/security/brig) "aOZ" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock{ - name = "Unisex Restrooms"; - req_access_txt = "0" + name = "Unisex Restrooms" }, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" @@ -20179,8 +18802,7 @@ "aPa" = ( /obj/machinery/atmospherics/pipe/manifold/visible/cyan{ dir = 8; - initialize_directions = 11; - level = 2 + initialize_directions = 11 }, /obj/structure/cable{ d1 = 1; @@ -20197,23 +18819,16 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/security/brig) -"aPc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "redcorner" - }, -/area/security/brig) "aPe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" @@ -20283,9 +18898,7 @@ dir = 1 }, /obj/machinery/camera{ - c_tag = "Brig - Hallway - Entrance"; - dir = 2; - network = list("SS13") + c_tag = "Brig - Hallway - Entrance" }, /turf/simulated/floor/plasteel{ dir = 1; @@ -20306,8 +18919,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/engine/engineering) @@ -20324,7 +18937,6 @@ "aPr" = ( /obj/structure/table, /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_y = 21 }, @@ -20334,8 +18946,7 @@ "aPs" = ( /obj/machinery/atmospherics/pipe/manifold/visible/cyan{ dir = 8; - initialize_directions = 11; - level = 2 + initialize_directions = 11 }, /obj/structure/cable{ d1 = 1; @@ -20367,12 +18978,10 @@ cell_type = 25000; dir = 1; name = "Engineering Engine Super APC"; - pixel_x = 0; pixel_y = 24; shock_proof = 1 }, /obj/structure/cable/yellow{ - d1 = 0; d2 = 2; icon_state = "0-2" }, @@ -20402,7 +19011,6 @@ }, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/plasteel, @@ -20416,12 +19024,15 @@ icon_state = "4-8" }, /obj/effect/decal/warning_stripes/northeast, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/atmospherics/binary/valve/digital/open{ name = "Output Release" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/engine, /area/engine/engineering) "aPz" = ( @@ -20527,14 +19138,6 @@ /area/hallway/secondary/construction{ name = "\improper Garden" }) -"aPJ" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel, -/area/quartermaster/storage) "aPK" = ( /obj/structure/table, /obj/machinery/computer/guestpass, @@ -20544,8 +19147,7 @@ "aPL" = ( /obj/machinery/door/airlock/engineering/glass{ name = "Supermatter Engine Room"; - req_access_txt = "10"; - req_one_access_txt = "0" + req_access_txt = "10" }, /obj/structure/cable/yellow{ d1 = 4; @@ -20560,12 +19162,10 @@ pixel_y = 1 }, /obj/effect/decal/warning_stripes/arrow{ - dir = 8; - icon_state = "4" + dir = 8 }, /obj/effect/decal/warning_stripes/yellow/partial{ - dir = 8; - icon_state = "3" + dir = 8 }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) @@ -20593,20 +19193,9 @@ /area/quartermaster/storage) "aPP" = ( /obj/structure/closet/crate, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, /obj/item/stack/ore/glass, /obj/item/stack/ore/iron, /obj/effect/decal/warning_stripes/yellow/hollow, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel, -/area/quartermaster/storage) -"aPQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "aPR" = ( @@ -20625,7 +19214,6 @@ "aPS" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; pixel_x = 11 }, /obj/structure/mirror{ @@ -20637,41 +19225,7 @@ /area/crew_quarters/locker/locker_toilet{ name = "\improper Restrooms" }) -"aPT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) -"aPU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/airlock/command/glass{ - name = "Bridge Access"; - req_access_txt = "19" - }, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; - id_tag = "bridge blast"; - name = "Bridge Blast Doors"; - opacity = 0 - }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/bridge) "aPV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 8; @@ -20687,12 +19241,12 @@ name = "Port Maintenance" }) "aPW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /obj/machinery/atm{ pixel_y = -32 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, /turf/simulated/floor/wood, /area/crew_quarters/mrchangs) "aPX" = ( @@ -20718,6 +19272,8 @@ charge = 100; maxcharge = 15000 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "brown" @@ -20758,7 +19314,6 @@ "aQd" = ( /obj/machinery/shower{ dir = 4; - icon_state = "shower"; tag = "icon-shower (EAST)" }, /obj/structure/curtain/open/shower, @@ -20768,12 +19323,6 @@ /area/crew_quarters/locker/locker_toilet{ name = "\improper Restrooms" }) -"aQg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/wall/r_wall, -/area/turret_protected/ai_upload) "aQh" = ( /obj/machinery/porta_turret, /turf/simulated/floor/plasteel{ @@ -20807,16 +19356,13 @@ /obj/machinery/alarm{ pixel_y = 23 }, -/obj/machinery/atmospherics/unary/vent_pump, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/turret_protected/ai_upload) "aQp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /turf/simulated/floor/plasteel{ @@ -20825,9 +19371,6 @@ }, /area/hallway/primary/fore) "aQr" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutral" @@ -20837,45 +19380,23 @@ /obj/effect/landmark/start{ name = "Internal Affairs Agent" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10; - initialize_directions = 10; - level = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /turf/simulated/floor/plasteel, /area/crew_quarters/courtroom) "aQt" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - external_pressure_bound = 0; - frequency = 1441; - id_tag = "tox_out"; - initialize_directions = 1; - internal_pressure_bound = 4000; - on = 1; - pressure_checks = 2; - pump_direction = 0 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" }, /area/crew_quarters/courtroom) "aQu" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/wood, /area/lawoffice) "aQv" = ( /obj/machinery/shower{ dir = 8; - icon_state = "shower"; tag = "icon-shower (WEST)" }, /obj/effect/landmark/start{ @@ -20889,33 +19410,22 @@ name = "\improper Restrooms" }) "aQw" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 2; - on = 1 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/lawoffice) "aQx" = ( /obj/machinery/photocopier, /obj/machinery/camera{ c_tag = "Law Office"; - dir = 8; - network = list("SS13") + dir = 8 }, /turf/simulated/floor/wood, /area/lawoffice) -"aQy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "redcorner" - }, -/area/security/brig) "aQz" = ( /obj/structure/closet/secure_closet/personal, /obj/item/clothing/under/assistantformal, @@ -20971,17 +19481,15 @@ d2 = 8; icon_state = "2-8" }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/engine/engineering) "aQG" = ( /obj/effect/decal/warning_stripes/arrow{ - dir = 8; - icon_state = "4" + dir = 8 }, /obj/effect/decal/warning_stripes/yellow/partial{ - dir = 8; - icon_state = "3" + dir = 8 }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) @@ -21020,7 +19528,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -21028,6 +19535,8 @@ /area/crew_quarters/locker) "aQK" = ( /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -21036,7 +19545,6 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -21045,13 +19553,9 @@ "aQM" = ( /obj/structure/sink{ dir = 8; - icon_state = "sink"; pixel_x = -12; pixel_y = 2 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /obj/machinery/light_switch{ pixel_x = -26 }, @@ -21063,9 +19567,6 @@ name = "\improper Garden" }) "aQN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" @@ -21074,9 +19575,7 @@ name = "\improper Garden" }) "aQO" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "neutral" @@ -21181,8 +19680,7 @@ /obj/machinery/door/airlock/engineering/glass{ heat_proof = 1; name = "Supermatter Chamber"; - req_access_txt = "10"; - req_one_access_txt = "0" + req_access_txt = "10" }, /obj/structure/cable/yellow{ d1 = 4; @@ -21203,15 +19701,12 @@ /obj/machinery/door/airlock/engineering/glass{ heat_proof = 1; name = "Supermatter Chamber"; - req_access_txt = "10"; - req_one_access_txt = "0" + req_access_txt = "10" }, /turf/simulated/floor/engine, /area/engine/supermatter) "aRe" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/visible/red, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/engine, /area/engine/engineering) @@ -21225,8 +19720,7 @@ /obj/machinery/meter, /obj/machinery/atmospherics/pipe/manifold/visible/cyan{ dir = 8; - initialize_directions = 11; - level = 2 + initialize_directions = 11 }, /obj/structure/cable{ d1 = 1; @@ -21282,34 +19776,15 @@ "aRo" = ( /turf/simulated/floor/plasteel, /area/quartermaster/storage) -"aRp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/quartermaster/storage) -"aRq" = ( -/obj/effect/landmark/start{ - name = "Cargo Technician" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/quartermaster/storage) "aRs" = ( -/obj/machinery/atmospherics/pipe/simple/visible/supply{ - dir = 10 - }, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 10 + }, /turf/simulated/floor/engine, /area/engine/supermatter) "aRt" = ( @@ -21318,7 +19793,6 @@ }, /obj/machinery/shower{ dir = 4; - icon_state = "shower"; tag = "icon-shower (EAST)" }, /obj/structure/curtain/open/shower, @@ -21337,7 +19811,6 @@ }, /obj/machinery/shower{ dir = 8; - icon_state = "shower"; tag = "icon-shower (WEST)" }, /obj/structure/curtain/open/shower, @@ -21362,7 +19835,6 @@ /area/turret_protected/ai_upload) "aRB" = ( /obj/machinery/power/apc{ - dir = 2; name = "Storage Wing APC"; pixel_y = -27 }, @@ -21375,8 +19847,11 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -21386,9 +19861,7 @@ name = "Storage Wing" }) "aRC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_x = -29 }, @@ -21409,6 +19882,7 @@ dir = 4; name = "Prosecution" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "red" @@ -21429,14 +19903,12 @@ icon_state = "1-8" }, /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_y = -26 }, /obj/machinery/camera{ c_tag = "Storage Wing"; - dir = 1; - network = list("SS13") + dir = 1 }, /obj/machinery/light, /obj/structure/cable/yellow{ @@ -21444,6 +19916,8 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "browncorner" @@ -21464,6 +19938,7 @@ dir = 8; name = "Defense" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "green" @@ -21477,32 +19952,23 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/courtroom) -"aRK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/turf/simulated/floor/wood, -/area/lawoffice) "aRL" = ( /obj/effect/landmark/start{ name = "Internal Affairs Agent" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, /turf/simulated/floor/wood, /area/lawoffice) "aRM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/wood, /area/lawoffice) @@ -21519,12 +19985,8 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -21534,7 +19996,6 @@ /obj/structure/filingcabinet/chestdrawer, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/wood, @@ -21545,8 +20006,9 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/security/brig) @@ -21554,13 +20016,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, /mob/living/simple_animal/mouse, +/obj/machinery/atmospherics/pipe/simple/insulated{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -21583,7 +20042,6 @@ name = "Judge" }, /obj/machinery/status_display{ - density = 0; layer = 4; pixel_y = 32 }, @@ -21591,35 +20049,13 @@ dir = 1 }, /obj/machinery/camera{ - c_tag = "Courtroom"; - dir = 2; - network = list("SS13") + c_tag = "Courtroom" }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "blue" }, /area/crew_quarters/courtroom) -"aRT" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutralcorner" - }, -/area/crew_quarters/locker) -"aRU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutralcorner" - }, -/area/crew_quarters/locker) "aRV" = ( /obj/structure/disposalpipe/junction{ dir = 4; @@ -21646,13 +20082,12 @@ /turf/simulated/floor/wood, /area/lawoffice) "aRX" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 2 - }, /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/crew_quarters/locker) "aRY" = ( @@ -21660,7 +20095,6 @@ codes_txt = "patrol;next_patrol=14.5-Recreation"; location = "14.3-Lockers-Dorms" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -21678,7 +20112,6 @@ name = "\improper Garden" }) "aSa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutral" @@ -21691,6 +20124,7 @@ /turf/simulated/floor/plasteel, /area/quartermaster/storage) "aSc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" @@ -21801,26 +20235,14 @@ /area/shuttle/pod_1) "aSt" = ( /obj/item/storage/toolbox/mechanical, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, /obj/effect/landmark{ name = "xeno_spawn"; pixel_x = -1 }, /turf/simulated/floor/plating, /area/construction) -"aSu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/construction) "aSv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plating, /area/construction) "aSw" = ( @@ -21830,8 +20252,6 @@ "aSy" = ( /obj/machinery/hologram/holopad, /obj/effect/decal/warning_stripes/yellow/hollow, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/crew_quarters/courtroom) "aSz" = ( @@ -21883,14 +20303,14 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/engine/engineering) "aSF" = ( @@ -21902,7 +20322,6 @@ pixel_y = -5 }, /obj/machinery/door_control{ - dir = 2; id = "QMLoaddoor2"; layer = 4; name = "Loading Doors"; @@ -21913,20 +20332,14 @@ /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/quartermaster/storage) -"aSG" = ( -/obj/effect/decal/warning_stripes/yellow/hollow, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel, -/area/quartermaster/storage) "aSH" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, /obj/effect/landmark{ name = "JoinLateCryo" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -21956,7 +20369,6 @@ name = "Lock Control"; normaldoorcontrol = 1; pixel_x = -25; - req_access_txt = "0"; specialfunctions = 4 }, /turf/simulated/floor/plasteel{ @@ -21979,7 +20391,6 @@ }, /area/quartermaster/qm) "aSM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -21998,36 +20409,6 @@ /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/quartermaster/storage) -"aSO" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1; - level = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/storage/primary) -"aSP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/storage/primary) -"aSR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10; - initialize_directions = 10; - level = 1 - }, -/turf/simulated/floor/plasteel, -/area/storage/primary) "aSS" = ( /obj/structure/table, /obj/item/assembly/igniter{ @@ -22072,9 +20453,7 @@ dir = 8 }, /obj/machinery/door/window/westleft{ - base_state = "left"; dir = 2; - icon_state = "left"; layer = 3.1; name = "Cyborg Upload Console Window"; req_access_txt = "16" @@ -22125,6 +20504,7 @@ dir = 4; name = "Prosecution" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "red" @@ -22145,33 +20525,16 @@ /area/crew_quarters/courtroom) "aTd" = ( /obj/item/radio/beacon, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, /area/crew_quarters/courtroom) -"aTe" = ( -/obj/machinery/shower{ - dir = 4; - icon_state = "shower"; - tag = "icon-shower (EAST)" - }, -/obj/structure/curtain/open/shower, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "freezerfloor" - }, -/area/crew_quarters/locker/locker_toilet{ - name = "\improper Restrooms" - }) "aTf" = ( /obj/structure/chair{ dir = 8; name = "Defense" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "green" @@ -22192,7 +20555,6 @@ name = "Lock Control"; normaldoorcontrol = 1; pixel_y = -25; - req_access_txt = "0"; specialfunctions = 4 }, /obj/effect/landmark/start{ @@ -22207,16 +20569,9 @@ "aTh" = ( /obj/machinery/shower{ dir = 8; - icon_state = "shower"; tag = "icon-shower (WEST)" }, /obj/structure/curtain/open/shower, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - external_pressure_bound = 101.325; - on = 1; - pressure_checks = 1 - }, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -22224,32 +20579,18 @@ name = "\improper Restrooms" }) "aTi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/atm{ pixel_y = -32 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "redcorner" }, /area/hallway/primary/fore) -"aTj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/wood, -/area/lawoffice) "aTk" = ( /obj/machinery/hologram/holopad, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, /area/lawoffice) "aTm" = ( @@ -22302,10 +20643,6 @@ d2 = 4; icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/crew_quarters/locker) "aTt" = ( @@ -22317,10 +20654,6 @@ /obj/effect/landmark{ name = "lightsout" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -22331,39 +20664,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/crew_quarters/locker) -"aTv" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/crew_quarters/locker) -"aTw" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/crew_quarters/locker) "aTx" = ( @@ -22381,10 +20681,7 @@ dir = 1; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel, /area/crew_quarters/locker) "aTy" = ( @@ -22396,10 +20693,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/crew_quarters/locker) "aTz" = ( @@ -22411,10 +20706,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -22431,14 +20722,7 @@ dir = 4 }, /obj/machinery/door/airlock{ - name = "Garden"; - req_access_txt = "0" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + name = "Garden" }, /turf/simulated/floor/plasteel, /area/hallway/secondary/construction{ @@ -22453,12 +20737,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutral" @@ -22504,6 +20782,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" @@ -22525,8 +20804,7 @@ /obj/machinery/disposal, /obj/machinery/camera{ c_tag = "Garden"; - dir = 8; - network = list("SS13") + dir = 8 }, /obj/structure/disposalpipe/trunk{ dir = 8 @@ -22553,13 +20831,13 @@ /area/engine/engineering) "aTK" = ( /obj/structure/window/plasmareinforced, -/obj/machinery/atmospherics/pipe/manifold/visible/supply{ - dir = 8 - }, /obj/machinery/power/rad_collector{ anchored = 1 }, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/manifold/visible/supply{ + dir = 8 + }, /turf/simulated/floor/engine, /area/engine/supermatter) "aTL" = ( @@ -22628,12 +20906,11 @@ name = "Quartermaster"; req_access_txt = "41" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/quartermaster/qm) @@ -22647,11 +20924,10 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -22668,12 +20944,7 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10; - initialize_directions = 10; - level = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 + dir = 4 }, /turf/simulated/floor/plasteel, /area/quartermaster/qm) @@ -22688,6 +20959,9 @@ /obj/structure/chair/office/dark{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/quartermaster/qm) "aUa" = ( @@ -22720,12 +20994,10 @@ "aUd" = ( /obj/structure/window/reinforced, /obj/effect/decal/warning_stripes/arrow{ - dir = 8; - icon_state = "4" + dir = 8 }, /obj/effect/decal/warning_stripes/yellow/partial{ - dir = 8; - icon_state = "3" + dir = 8 }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) @@ -22742,9 +21014,7 @@ icon_state = "cafeteria"; tag = "icon-cafeteria (NORTHEAST)" }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "aUf" = ( /obj/item/reagent_containers/spray/plantbgone, /obj/item/reagent_containers/glass/bottle/nutrient/ez, @@ -22769,14 +21039,12 @@ "aUh" = ( /obj/machinery/camera{ c_tag = "Engineering - Central"; - dir = 8; - network = list("SS13") + dir = 8 }, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, /area/engine/engineering) "aUi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/command/glass{ name = "Bridge Access"; req_access_txt = "19" @@ -22811,7 +21079,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/bluegrid, /area/turret_protected/ai_upload) "aUl" = ( @@ -22820,6 +21087,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -22839,6 +21109,12 @@ icon_state = "motion0"; uses = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -22873,23 +21149,27 @@ codes_txt = "patrol;next_patrol=0-SecurityDesk"; location = "16-Fore" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel, /area/hallway/primary/fore) "aUq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/machinery/firealarm{ dir = 4; pixel_x = 24 }, /obj/machinery/camera{ c_tag = "Fore Primary Hallway Aft"; - dir = 8; - network = list("SS13") + dir = 8 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "redcorner" }, /area/hallway/primary/fore) @@ -22907,8 +21187,6 @@ name = "Courtroom"; req_access_txt = "42" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -22945,8 +21223,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/lawoffice) "aUw" = ( @@ -22976,14 +21252,12 @@ "aUy" = ( /obj/structure/table, /obj/item/storage/pill_bottle/dice, -/turf/simulated/floor/plasteel, -/area/crew_quarters/locker) -"aUz" = ( -/obj/structure/chair/stool{ - pixel_y = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/crew_quarters/locker) "aUC" = ( @@ -22996,13 +21270,23 @@ pixel_x = 4; pixel_y = -4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/crew_quarters/locker) "aUE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutral" @@ -23023,7 +21307,6 @@ }) "aUH" = ( /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_x = 29 }, @@ -23040,23 +21323,6 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plating, /area/maintenance/starboard) -"aUJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; - id_tag = "kitchenwindow"; - name = "kitchen shutters"; - opacity = 0 - }, -/obj/effect/spawner/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/crew_quarters/kitchen) "aUK" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ @@ -23096,7 +21362,6 @@ id = "AI"; pixel_y = 24 }, -/obj/machinery/atmospherics/unary/vent_scrubber, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -23114,13 +21379,13 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 2; d2 = 8; icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/engine/engineering) @@ -23183,12 +21448,11 @@ icon_state = "pipe-c" }, /obj/effect/decal/warning_stripes/north, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) @@ -23222,12 +21486,11 @@ dir = 4 }, /obj/effect/decal/warning_stripes/northeast, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) @@ -23263,7 +21526,6 @@ /turf/simulated/floor/plasteel, /area/engine/engineering) "aVk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -23281,7 +21543,6 @@ /obj/machinery/atmospherics/unary/portables_connector, /obj/machinery/portable_atmospherics/scrubber, /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_y = 26 }, @@ -23295,24 +21556,16 @@ }, /area/crew_quarters/locker) "aVn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /turf/simulated/floor/plasteel, /area/quartermaster/qm) "aVo" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, /turf/simulated/floor/plasteel, /area/quartermaster/qm) "aVp" = ( /obj/machinery/atmospherics/unary/portables_connector, /obj/machinery/portable_atmospherics/scrubber, /obj/machinery/status_display{ - density = 0; layer = 4; pixel_y = 30 }, @@ -23323,7 +21576,6 @@ }, /area/crew_quarters/locker) "aVq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -23335,14 +21587,10 @@ name = "Port Maintenance" }) "aVr" = ( -/obj/machinery/disposal{ - pixel_y = 0 - }, +/obj/machinery/disposal, /obj/structure/disposalpipe/trunk, /obj/machinery/camera{ - c_tag = "Locker Room Starboard"; - dir = 2; - network = list("SS13") + c_tag = "Locker Room Starboard" }, /obj/structure/sign/pods{ pixel_y = 30 @@ -23393,13 +21641,11 @@ /obj/structure/table, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/camera{ c_tag = "Cargo Bay - Starboard"; - dir = 8; - network = list("SS13") + dir = 8 }, /obj/item/paper_bin{ pixel_x = -1; @@ -23414,7 +21660,6 @@ /obj/item/aiModule/freeformcore, /obj/machinery/door/window{ base_state = "right"; - dir = 4; icon_state = "right"; name = "Core Modules"; req_access_txt = "20" @@ -23434,7 +21679,6 @@ "aVx" = ( /obj/machinery/power/apc{ cell_type = 5000; - dir = 2; name = "Upload APC"; pixel_y = -24 }, @@ -23447,9 +21691,6 @@ dir = 1; network = list("SS13","RD","AIUpload") }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /turf/simulated/floor/bluegrid, /area/turret_protected/ai_upload) "aVy" = ( @@ -23463,14 +21704,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10; - initialize_directions = 10; - level = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -23487,18 +21722,12 @@ dir = 1; network = list("SS13","RD","AIUpload") }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 - }, /turf/simulated/floor/bluegrid, /area/turret_protected/ai_upload) "aVA" = ( /obj/structure/table, /obj/machinery/door/window{ - base_state = "left"; dir = 8; - icon_state = "left"; name = "High-Risk Modules"; req_access_txt = "20" }, @@ -23516,14 +21745,15 @@ }, /area/turret_protected/ai_upload) "aVB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/wood, /area/lawoffice) "aVD" = ( @@ -23540,6 +21770,14 @@ icon_state = "dark" }, /area/crew_quarters/courtroom) +"aVF" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plating, +/area/maintenance/fpmaint2{ + name = "Port Maintenance" + }) "aVG" = ( /obj/machinery/vending/coffee, /turf/simulated/floor/plasteel{ @@ -23553,10 +21791,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j1" + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -23574,9 +21810,6 @@ }, /area/crew_quarters/locker) "aVJ" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -23587,71 +21820,51 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" }, /area/crew_quarters/locker) "aVK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" }, /area/crew_quarters/locker) "aVL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, /obj/machinery/camera{ - c_tag = "Crew Quarters Entrance"; - dir = 2; - network = list("SS13") - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + c_tag = "Crew Quarters Entrance" }, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" }, /area/crew_quarters/locker) "aVO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, /turf/simulated/floor/plasteel, /area/crew_quarters/locker) "aVP" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/structure/chair/stool{ pixel_y = 8 }, @@ -23660,9 +21873,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/crew_quarters/locker) "aVQ" = ( @@ -23671,12 +21881,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -23716,26 +21920,23 @@ /obj/item/clothing/mask/balaclava, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/light/small{ dir = 4 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/crew_quarters/locker) "aVY" = ( /obj/structure/sink{ dir = 8; - icon_state = "sink"; pixel_x = -12; pixel_y = 2 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 10; @@ -23744,17 +21945,6 @@ /area/hallway/secondary/construction{ name = "\improper Garden" }) -"aVZ" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutral" - }, -/area/hallway/secondary/construction{ - name = "\improper Garden" - }) "aWa" = ( /turf/simulated/floor/plasteel{ icon_state = "neutral" @@ -23797,7 +21987,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/item/cigbutt, /turf/simulated/floor/plating, /area/maintenance/starboard) @@ -23823,10 +22012,7 @@ /turf/simulated/floor/engine, /area/engine/engineering) "aWh" = ( -/obj/machinery/camera/autoname{ - dir = 2; - network = list("SS13") - }, +/obj/machinery/camera/autoname, /obj/machinery/hologram/holopad, /obj/machinery/power/apc{ dir = 1; @@ -23865,9 +22051,7 @@ icon_state = "cafeteria"; tag = "icon-cafeteria (NORTHEAST)" }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "aWk" = ( /obj/machinery/door_control{ id = "lawyer_blast"; @@ -23890,9 +22074,6 @@ /turf/simulated/floor/wood, /area/lawoffice) "aWm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /obj/structure/disposalpipe/segment{ dir = 4; icon_state = "pipe-c" @@ -23903,9 +22084,6 @@ icon_state = "4-8" }, /obj/effect/decal/warning_stripes/northwestcorner, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /turf/simulated/floor/plasteel, /area/engine/engineering) "aWn" = ( @@ -23924,15 +22102,14 @@ /turf/simulated/floor/plasteel, /area/engine/engineering) "aWo" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/security/brig) "aWp" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/effect/decal/warning_stripes/east, /obj/structure/closet/firecloset, @@ -23943,13 +22120,13 @@ req_access_txt = "12" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" }) "aWr" = ( /obj/machinery/status_display{ - density = 0; layer = 4; pixel_x = 32 }, @@ -23961,14 +22138,6 @@ }, /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_1) -"aWs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) "aWt" = ( /obj/structure/table, /obj/item/folder/yellow, @@ -23982,6 +22151,9 @@ departmentType = 2; pixel_x = 32 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel, /area/quartermaster/qm) "aWu" = ( @@ -23993,17 +22165,14 @@ }, /obj/machinery/requests_console{ department = "Tool Storage"; - departmentType = 0; pixel_x = 30 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/machinery/camera{ c_tag = "Tool Storage"; - dir = 8; - network = list("SS13") + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -24016,7 +22185,6 @@ /area/maintenance/fore) "aWw" = ( /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_y = 21 }, @@ -24113,18 +22281,6 @@ /obj/structure/shuttle/engine/propulsion/burst, /turf/simulated/wall/mineral/titanium, /area/shuttle/pod_1) -"aWH" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/construction) -"aWI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/construction) "aWK" = ( /obj/structure/rack{ dir = 1 @@ -24172,18 +22328,11 @@ /obj/structure/chair/office/dark{ dir = 8 }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, /obj/item/radio/intercom{ - broadcasting = 0; - listening = 1; name = "Station Intercom (General)"; pixel_y = -28 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "brown" }, /area/quartermaster/qm) @@ -24193,7 +22342,6 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "brown" }, /area/quartermaster/qm) @@ -24212,7 +22360,6 @@ gpstag = "QM0" }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "brown" }, /area/quartermaster/qm) @@ -24221,15 +22368,11 @@ icon_state = "crateopen"; opened = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/effect/spawner/lootdrop/maintenance{ lootcount = 2; name = "2maintenance loot spawner" }, /obj/effect/decal/warning_stripes/yellow/hollow, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "aWT" = ( @@ -24240,9 +22383,10 @@ /area/storage/primary) "aWU" = ( /obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j1" + dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/storage/primary) "aWV" = ( @@ -24267,14 +22411,11 @@ name = "Engineering Power Monitoring Console" }, /obj/machinery/status_display{ - density = 0; layer = 4; pixel_y = 32 }, /obj/machinery/camera{ - c_tag = "Engineering - Power Monitoring"; - dir = 2; - network = list("SS13") + c_tag = "Engineering - Power Monitoring" }, /turf/simulated/floor/plasteel{ icon_state = "vault"; @@ -24287,8 +22428,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -24301,17 +22442,6 @@ icon_state = "dark" }, /area/turret_protected/ai_upload) -"aXa" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/hallway/primary/fore) "aXb" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/centcom{ @@ -24327,15 +22457,20 @@ codes_txt = "patrol;next_patrol=16-Fore"; location = "15-Court" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/crew_quarters/courtroom) "aXg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -24343,16 +22478,7 @@ "aXi" = ( /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) -"aXj" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, -/turf/simulated/floor/plasteel, -/area/crew_quarters/locker) +/area/quartermaster/office) "aXk" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel, @@ -24365,7 +22491,6 @@ pixel_y = -2 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/crew_quarters/locker) @@ -24463,12 +22588,12 @@ /obj/machinery/power/terminal, /obj/structure/cable, /obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/engine/engineering) "aXy" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -24479,49 +22604,43 @@ d2 = 8; icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, /turf/simulated/floor/plasteel, /area/engine/engineering) "aXz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/engine/engineering) "aXB" = ( /obj/structure/table, /obj/item/clipboard, -/obj/item/stamp/qm{ - pixel_y = 0 - }, +/obj/item/stamp/qm, /obj/machinery/status_display{ - density = 0; pixel_x = 32 }, /turf/simulated/floor/plasteel, /area/quartermaster/qm) -"aXC" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 2; - on = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/security/brig) "aXE" = ( /obj/structure/table, /obj/item/aiModule/reset, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/machinery/ai_status_display{ pixel_x = -32 @@ -24538,6 +22657,12 @@ /obj/machinery/power/terminal, /obj/structure/cable, /obj/effect/decal/warning_stripes/southeast, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/engine/engineering) "aXG" = ( @@ -24546,7 +22671,6 @@ dir = 4 }, /obj/machinery/status_display{ - density = 0; layer = 4; pixel_x = 32 }, @@ -24639,17 +22763,21 @@ icon_state = "1-2" }, /obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/engine/engineering) "aXR" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/structure/extinguisher_cabinet{ pixel_x = -27 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "redcorner" @@ -24686,7 +22814,6 @@ /area/construction) "aXX" = ( /obj/machinery/power/apc{ - dir = 2; name = "Construction Area APC"; pixel_y = -24 }, @@ -24703,14 +22830,12 @@ d2 = 8; icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/construction) "aXZ" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/structure/extinguisher_cabinet{ pixel_x = -27 @@ -24763,8 +22888,7 @@ opened = 1 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -24787,8 +22911,9 @@ /turf/simulated/floor/plasteel, /area/quartermaster/storage) "aYm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" @@ -24808,9 +22933,7 @@ icon_state = "cafeteria"; tag = "icon-cafeteria (NORTHEAST)" }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "aYo" = ( /obj/machinery/conveyor_switch/oneway{ id = "QMLoad"; @@ -24864,6 +22987,8 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/storage/primary) "aYt" = ( @@ -24876,7 +23001,6 @@ /turf/simulated/floor/plasteel, /area/storage/primary) "aYv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ d1 = 2; d2 = 8; @@ -24887,7 +23011,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/storage/primary) "aYw" = ( @@ -24908,7 +23031,6 @@ "aYy" = ( /obj/machinery/door/airlock/highsecurity{ icon_state = "door_closed"; - locked = 0; name = "AI Upload"; req_access_txt = "16" }, @@ -24917,8 +23039,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -24934,6 +23056,8 @@ d2 = 8; icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/hallway/primary/fore) "aYA" = ( @@ -24950,6 +23074,9 @@ pixel_x = 5; pixel_y = -32 }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -24987,14 +23114,9 @@ icon_state = "2-4" }, /obj/effect/decal/warning_stripes/northwest, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel, /area/engine/engineering) -"aYF" = ( -/obj/machinery/atmospherics/unary/vent_pump, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/crew_quarters/courtroom) "aYG" = ( /obj/structure/cable{ d1 = 2; @@ -25007,71 +23129,33 @@ icon_state = "4-8" }, /obj/effect/decal/warning_stripes/northeast, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel, /area/engine/engineering) -"aYH" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plasteel, -/area/crew_quarters/locker) -"aYI" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel, -/area/crew_quarters/locker) "aYJ" = ( /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=14.3-Lockers-Dorms"; location = "14.2-Central-CrewQuarters" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/crew_quarters/locker) "aYK" = ( /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/crew_quarters/locker) -"aYL" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1; - level = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/security/brig) "aYM" = ( /obj/machinery/power/apc{ - dir = 2; name = "Locker Room APC"; pixel_x = -1; pixel_y = -26 }, /obj/structure/cable/yellow, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/crew_quarters/locker) @@ -25105,7 +23189,6 @@ pixel_y = -24 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/crew_quarters/locker) @@ -25127,32 +23210,27 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, /turf/simulated/floor/plasteel, /area/engine/engineering) "aYT" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 8; icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10; - initialize_directions = 10; - level = 1 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -25197,13 +23275,12 @@ icon_state = "4-8" }, /obj/effect/decal/warning_stripes/east, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel, /area/engine/engineering) "aYX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; @@ -25229,13 +23306,9 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /obj/effect/decal/warning_stripes/south, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/engine/engineering) "aYZ" = ( @@ -25261,13 +23334,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /turf/simulated/floor/plasteel, /area/security/brig) "aZb" = ( @@ -25286,10 +23354,11 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/security/brig) @@ -25307,10 +23376,11 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/engine/engineering) @@ -25373,6 +23443,7 @@ name = "Arrivals Expansion Area"; req_access_txt = "32" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/hallway/secondary/entry{ name = "Arrivals" @@ -25398,7 +23469,6 @@ name = "Arrivals Expansion Area"; req_access_txt = "32" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/hallway/secondary/entry{ @@ -25410,6 +23480,8 @@ d2 = 8; icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/engine/break_room) "aZt" = ( @@ -25417,13 +23489,11 @@ /area/quartermaster/storage) "aZu" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/machinery/camera{ c_tag = "Cargo Bay - Port"; - dir = 4; - network = list("SS13") + dir = 4 }, /obj/machinery/conveyor/north{ id = "QMLoad" @@ -25431,17 +23501,11 @@ /turf/simulated/floor/plating, /area/quartermaster/storage) "aZw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" }, /obj/effect/decal/warning_stripes/south, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /turf/simulated/floor/plasteel, /area/engine/engineering) "aZx" = ( @@ -25463,9 +23527,7 @@ icon_state = "cafeteria"; tag = "icon-cafeteria (NORTHEAST)" }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "aZA" = ( /obj/structure/table, /obj/item/hatchet, @@ -25501,14 +23563,12 @@ }, /obj/item/storage/box/lights/mixed, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "brown" }, /area/storage/primary) "aZD" = ( /obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "brown" }, /area/storage/primary) @@ -25517,8 +23577,9 @@ /obj/structure/disposalpipe/trunk{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "brown" }, /area/storage/primary) @@ -25526,7 +23587,6 @@ /obj/structure/reagent_dispensers/fueltank, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "brown" }, /area/storage/primary) @@ -25540,20 +23600,16 @@ /obj/item/clothing/gloves/color/fyellow, /obj/machinery/light/small, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "brown" }, /area/storage/primary) "aZH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "brown" }, /area/storage/primary) @@ -25564,6 +23620,9 @@ pixel_x = -27 }, /obj/effect/decal/warning_stripes/southwest, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/plasteel, /area/engine/engineering) "aZJ" = ( @@ -25583,6 +23642,12 @@ req_access_txt = "32" }, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/engine/engineering) "aZN" = ( @@ -25596,22 +23661,14 @@ d2 = 8; icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "vault"; tag = "icon-vault" }, /area/turret_protected/ai_upload_foyer) "aZO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -25626,7 +23683,6 @@ /turf/simulated/floor/engine, /area/engine/engineering) "aZP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ name = "Fore Primary Hallway" @@ -25646,18 +23702,16 @@ /obj/machinery/door/airlock/public/glass{ name = "Fore Primary Hallway" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/hallway/primary/fore) "aZR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ name = "Fore Primary Hallway" }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "redcorner" }, /area/hallway/primary/fore) @@ -25670,8 +23724,6 @@ /area/crew_quarters/courtroom) "aZT" = ( /obj/machinery/power/apc{ - cell_type = 2500; - dir = 2; name = "Courtroom APC"; pixel_x = 1; pixel_y = -24 @@ -25692,31 +23744,16 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - level = 1 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/crew_quarters/courtroom) "aZV" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 8; icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10; - initialize_directions = 10; - level = 1 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -25741,7 +23778,6 @@ }, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -25753,8 +23789,9 @@ dir = 4; pixel_x = 24 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/crew_quarters/locker) @@ -25815,9 +23852,6 @@ d2 = 4; icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /turf/simulated/floor/plating, /area/maintenance/starboard) "bai" = ( @@ -25834,9 +23868,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/spawner/lootdrop{ loot = list(/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes); name = "maint grille or trash spawner" @@ -25849,9 +23880,6 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /turf/simulated/floor/plating, /area/maintenance/starboard) "bam" = ( @@ -25873,8 +23901,7 @@ base_state = "right"; dir = 4; icon_state = "right"; - name = "Crate Disposal Chute"; - req_access_txt = "0" + name = "Crate Disposal Chute" }, /obj/structure/disposalpipe/trunk{ dir = 4 @@ -25891,9 +23918,6 @@ initialize_directions = 12; tag = "icon-intact-g (NORTHEAST)" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable{ d1 = 1; d2 = 4; @@ -25907,9 +23931,6 @@ /obj/machinery/atmospherics/pipe/manifold/visible/yellow{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/engine, /area/engine/engineering) @@ -25932,22 +23953,14 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/security/brig) -"bar" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/effect/spawner/lootdrop/maintenance, -/obj/effect/decal/warning_stripes/yellow/hollow, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel, -/area/quartermaster/storage) "bas" = ( /obj/structure/closet/crate, /obj/structure/disposalpipe/segment, @@ -25977,13 +23990,17 @@ icon_state = "1-2" }, /obj/effect/decal/warning_stripes/south, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, /turf/simulated/floor/plasteel, /area/engine/engineering) "bay" = ( @@ -26025,9 +24042,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plating, /area/maintenance/starboard) @@ -26051,7 +24065,6 @@ dir = 8 }, /obj/machinery/status_display{ - density = 0; pixel_x = 32 }, /obj/effect/decal/warning_stripes/east, @@ -26072,12 +24085,10 @@ /obj/machinery/access_button{ command = "cycle_interior"; frequency = 1379; - layer = 3.3; master_tag = "sol_airlock"; name = "interior access button"; pixel_x = -25; - pixel_y = -25; - req_access_txt = "0" + pixel_y = -25 }, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, @@ -26098,11 +24109,12 @@ "baK" = ( /obj/structure/chair, /obj/machinery/camera{ - c_tag = "Arrivals - Fore Arm - Far"; - dir = 2; - network = list("SS13") + c_tag = "Arrivals - Fore Arm - Far" }, /obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry{ name = "Arrivals" @@ -26114,20 +24126,13 @@ /obj/machinery/light, /obj/machinery/camera{ c_tag = "Courtroom - Gallery"; - dir = 1; - network = list("SS13") - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/crew_quarters/courtroom) "baM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -26139,7 +24144,10 @@ pixel_y = 32 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -26149,28 +24157,18 @@ name = "Arrivals" }) "baN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 8; icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "baO" = ( /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_y = -26 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -26187,9 +24185,9 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/engine/engineering{ dir = 8 @@ -26198,14 +24196,17 @@ /obj/effect/landmark/start{ name = "Cargo Technician" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "baX" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, /obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry{ name = "Arrivals" @@ -26216,11 +24217,10 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, /turf/simulated/floor/plasteel{ @@ -26228,18 +24228,37 @@ icon_state = "cafeteria"; tag = "icon-cafeteria (NORTHEAST)" }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "baZ" = ( /obj/structure/cable/yellow{ d1 = 1; d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "cafeteria"; + tag = "icon-cafeteria (NORTHEAST)" + }, +/area/quartermaster/office) +"bba" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "cafeteria"; + tag = "icon-cafeteria (NORTHEAST)" + }, +/area/quartermaster/office) +"bbb" = ( +/obj/item/radio/intercom{ dir = 4; - level = 1 + name = "Station Intercom (General)"; + pixel_x = 27 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -26249,56 +24268,17 @@ icon_state = "cafeteria"; tag = "icon-cafeteria (NORTHEAST)" }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) -"bba" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - external_pressure_bound = 0; - frequency = 1441; - id_tag = "tox_out"; - initialize_directions = 1; - internal_pressure_bound = 4000; - on = 1; - pressure_checks = 2; - pump_direction = 0 - }, -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" - }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) -"bbb" = ( -/obj/item/radio/intercom{ - dir = 4; - name = "Station Intercom (General)"; - pixel_x = 27 - }, -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" - }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bbe" = ( /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_y = -26 }, /obj/machinery/camera{ c_tag = "Locker Room Port"; - dir = 1; - network = list("SS13") + dir = 1 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/crew_quarters/locker) @@ -26306,12 +24286,8 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering/glass{ name = "Engineering Foyer"; - req_access_txt = "0"; req_one_access_txt = "32;19;70" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -26330,9 +24306,6 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/engine/break_room) "bbg" = ( @@ -26361,6 +24334,15 @@ tag = "icon-vault" }, /area/hallway/primary/central) +"bbj" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/fpmaint2{ + name = "Port Maintenance" + }) "bbk" = ( /obj/machinery/door/airlock/highsecurity{ name = "Secure Network Access"; @@ -26371,17 +24353,13 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "vault"; tag = "icon-vault" }, /area/turret_protected/ai_upload_foyer) -"bbl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/wall/r_wall, -/area/turret_protected/ai_upload_foyer) "bbm" = ( /obj/machinery/alarm{ pixel_y = 23 @@ -26428,9 +24406,7 @@ pixel_y = 32 }, /obj/machinery/camera{ - c_tag = "Central Primary Hallway - Fore"; - dir = 2; - network = list("SS13") + c_tag = "Central Primary Hallway - Fore" }, /turf/simulated/floor/plasteel{ dir = 1; @@ -26438,7 +24414,6 @@ }, /area/hallway/primary/central) "bbq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "redcorner" @@ -26453,9 +24428,6 @@ /turf/simulated/floor/plasteel, /area/hallway/primary/central) "bbs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "redcorner" @@ -26463,7 +24435,6 @@ /area/hallway/primary/central) "bbt" = ( /obj/machinery/firealarm{ - dir = 2; pixel_y = 24 }, /turf/simulated/floor/plasteel{ @@ -26477,7 +24448,6 @@ pixel_y = -32 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/crew_quarters/locker) @@ -26486,7 +24456,6 @@ pixel_x = 27 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/crew_quarters/locker) @@ -26518,8 +24487,6 @@ /obj/machinery/door/airlock/public/glass{ name = "Crew Quarters Access" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/crew_quarters/locker) "bbA" = ( @@ -26540,12 +24507,15 @@ icon_state = "4-8" }, /obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/engine, /area/engine/engineering) "bbD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; @@ -26560,9 +24530,6 @@ /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -26570,15 +24537,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/starboard) -"bbF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/warning_stripes/north, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/entry{ - name = "Arrivals" - }) "bbG" = ( /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" @@ -26642,42 +24600,19 @@ icon_state = "cafeteria"; tag = "icon-cafeteria (NORTHEAST)" }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bbQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/item/storage/pill_bottle/dice, /obj/structure/table/wood/poker, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) -"bbR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/chair/stool{ - pixel_y = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "bbS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/light{ dir = 1 }, /obj/effect/decal/warning_stripes/north, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry{ @@ -26686,8 +24621,7 @@ "bbT" = ( /obj/machinery/camera{ c_tag = "Security Post - Cargo"; - dir = 1; - network = list("SS13") + dir = 1 }, /obj/machinery/vending/cola, /turf/simulated/floor/plasteel{ @@ -26695,14 +24629,11 @@ icon_state = "cafeteria"; tag = "icon-cafeteria (NORTHEAST)" }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bbV" = ( /obj/structure/table, /obj/item/analyzer, /obj/machinery/power/apc{ - dir = 2; name = "Tool Storage APC"; pixel_y = -27 }, @@ -26717,6 +24648,7 @@ /obj/structure/chair{ dir = 1 }, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -26734,9 +24666,6 @@ name = "\improper MiniSat Exterior" }) "bbY" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - on = 1 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -26773,6 +24702,9 @@ dir = 1; layer = 2.9 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, @@ -26798,9 +24730,6 @@ }, /area/storage/primary) "bce" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -26814,7 +24743,10 @@ /obj/effect/decal/warning_stripes/northwestcorner, /obj/effect/decal/warning_stripes/northwestcorner, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry{ @@ -26826,10 +24758,10 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, /obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry{ @@ -26848,17 +24780,14 @@ }, /obj/effect/decal/warning_stripes/east, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 + dir = 4 }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "bcj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 8; @@ -26883,12 +24812,11 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "yellow" }, /area/engine/engineering) @@ -26914,7 +24842,6 @@ icon_state = "0-4" }, /obj/machinery/power/apc{ - dir = 2; name = "AI Upload Access APC"; pixel_y = -27 }, @@ -26928,9 +24855,6 @@ network = list("AIUpload"); pixel_x = -29 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "vault"; @@ -26943,10 +24867,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry{ name = "Arrivals" @@ -26972,12 +24894,6 @@ /obj/machinery/alarm{ pixel_y = 26 }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - external_pressure_bound = 101.325; - on = 1; - pressure_checks = 1 - }, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "vault"; @@ -26991,7 +24907,6 @@ /area/engine/engineering) "bcr" = ( /obj/machinery/requests_console{ - announcementConsole = 0; department = "Engineering"; departmentType = 4; name = "Engineering RC" @@ -27001,71 +24916,27 @@ "bcs" = ( /obj/machinery/hologram/holopad, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/quartermaster/storage) -"bct" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/decal/warning_stripes/yellow/hollow, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel, -/area/engine/engineering) "bcu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/effect/decal/warning_stripes/yellow, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "bcv" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/quartermaster/storage) -"bcw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/quartermaster/storage) -"bcx" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "bcy" = ( @@ -27084,9 +24955,7 @@ icon_state = "cafeteria"; tag = "icon-cafeteria (NORTHEAST)" }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bcA" = ( /obj/machinery/vending/cigarette, /turf/simulated/floor/plasteel{ @@ -27094,29 +24963,7 @@ icon_state = "cafeteria"; tag = "icon-cafeteria (NORTHEAST)" }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) -"bcB" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2"; - tag = "icon-pipe-j1 (WEST)" - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/plasteel, -/area/security/brig) +/area/quartermaster/office) "bcD" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -27126,20 +24973,16 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/mining/glass{ name = "Cargo Break Room"; - req_access_txt = "0"; req_one_access_txt = "48;50" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 + dir = 4 }, /turf/simulated/floor/plasteel, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bcE" = ( /obj/machinery/power/apc{ dir = 8; @@ -27160,9 +25003,6 @@ icon_state = "4-8" }, /obj/item/trash/popcorn, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 4; icon_state = "pipe-c" @@ -27180,11 +25020,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/airlock/maintenance{ - req_access_txt = "0"; req_one_access_txt = "12;63;48;50" }, /turf/simulated/floor/plating, @@ -27197,15 +25033,9 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -27221,40 +25051,24 @@ dir = 2; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" }, /area/hallway/primary/central) "bcK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" }, /area/hallway/primary/central) "bcL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/firealarm{ pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -27266,64 +25080,25 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" }, /area/hallway/primary/central) "bcN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutralcorner" - }, -/area/hallway/primary/central) -"bcO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" }, /area/hallway/primary/central) "bcP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutralcorner" - }, -/area/hallway/primary/central) -"bcQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -27352,34 +25127,7 @@ /obj/item/rcs, /turf/simulated/floor/plasteel, /area/quartermaster/storage) -"bcW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/hallway/primary/central) "bcX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/hallway/primary/central) -"bcY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/hallway/primary/central) "bcZ" = ( @@ -27388,35 +25136,15 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/landmark{ name = "lightsout" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/hallway/primary/central) -"bda" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/hallway/primary/central) "bdb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/hallway/primary/central) @@ -27432,110 +25160,25 @@ icon_state = "neutralcorner" }, /area/hallway/primary/central) -"bdd" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutralcorner" - }, -/area/hallway/primary/central) "bde" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutralcorner" - }, -/area/hallway/primary/central) -"bdf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutralcorner" - }, -/area/hallway/primary/central) -"bdg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutralcorner" - }, -/area/hallway/primary/central) -"bdh" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" }, /area/hallway/primary/central) "bdi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutralcorner" - }, -/area/hallway/primary/central) -"bdj" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" }, /area/hallway/primary/central) "bdk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 4; @@ -27552,32 +25195,6 @@ /obj/effect/decal/warning_stripes/northwestcorner, /turf/simulated/floor/plasteel, /area/quartermaster/storage) -"bdn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/spawner/lootdrop{ - loot = list(/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes); - name = "maint grille or trash spawner" - }, -/turf/simulated/floor/plating, -/area/maintenance/starboard) -"bdo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/maintenance/starboard) "bdp" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/visible/yellow{ @@ -27594,18 +25211,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" }) "bdr" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 8; @@ -27658,13 +25269,11 @@ "bdu" = ( /obj/machinery/camera{ c_tag = "Mini Satellite AI Chamber North"; - dir = 2; network = list("SS13","MiniSat") }, /obj/structure/showcase{ density = 0; desc = "An old, deactivated cyborg. Whilst once actively used to guard against intruders, it now simply intimidates them with its cold, steely gaze."; - dir = 2; icon = 'icons/mob/robots.dmi'; icon_state = "robot_old"; name = "Cyborg Statue"; @@ -27679,9 +25288,7 @@ dir = 8; layer = 2.9 }, -/obj/item/circuitboard/cloning{ - pixel_x = 0 - }, +/obj/item/circuitboard/cloning, /obj/item/circuitboard/med_data{ pixel_x = 3; pixel_y = -3 @@ -27702,7 +25309,6 @@ /obj/structure/showcase{ density = 0; desc = "An old, deactivated cyborg. Whilst once actively used to guard against intruders, it now simply intimidates them with its cold, steely gaze."; - dir = 2; icon = 'icons/mob/robots.dmi'; icon_state = "robot_old"; name = "Cyborg Statue"; @@ -27722,16 +25328,21 @@ /area/storage/tech) "bdy" = ( /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_x = -29 }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "vault" }, /area/engine/chiefs_office) "bdz" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "vault" @@ -27743,9 +25354,10 @@ pixel_y = 30 }, /obj/machinery/camera{ - c_tag = "Chief Engineer's Office"; - dir = 2; - network = list("SS13") + c_tag = "Chief Engineer's Office" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 5; @@ -27755,7 +25367,6 @@ "bdB" = ( /obj/structure/chair, /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_y = 21 }, @@ -27769,6 +25380,12 @@ name = "lightsout" }, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "bdD" = ( @@ -27779,14 +25396,13 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/command{ name = "Chief Engineer's Office"; - req_access_txt = "56"; - req_one_access_txt = "0" + req_access_txt = "56" }, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/engine/chiefs_office) "bdE" = ( @@ -27795,7 +25411,6 @@ pixel_y = 25 }, /obj/machinery/status_display{ - density = 0; layer = 4; pixel_y = 32 }, @@ -27812,13 +25427,8 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/machinery/camera{ - c_tag = "Central Primary Hallway - Fore - AI Upload"; - dir = 2; - network = list("SS13") + c_tag = "Central Primary Hallway - Fore - AI Upload" }, /obj/structure/sign/securearea{ desc = "A warning sign which reads 'HIGH-POWER TURRETS AHEAD'."; @@ -27826,23 +25436,16 @@ pixel_y = 32 }, /obj/effect/decal/warning_stripes/northeastcorner, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, /turf/simulated/floor/plasteel, /area/hallway/primary/central) "bdH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/status_display{ - density = 0; layer = 4; pixel_y = 32 }, /obj/effect/decal/warning_stripes/north, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry{ @@ -27859,8 +25462,8 @@ network = list("SS13","MiniSat") }, /obj/machinery/light/small, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -27919,7 +25522,6 @@ }) "bdQ" = ( /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_y = 21 }, @@ -27945,20 +25547,15 @@ icon_state = "1-2" }, /obj/effect/decal/warning_stripes/north, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/hallway/primary/central) "bdT" = ( -/obj/machinery/status_display{ - density = 0 - }, +/obj/machinery/status_display, /turf/simulated/wall, /area/quartermaster/storage) "bdU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/light/small{ dir = 1 }, @@ -27966,15 +25563,9 @@ pixel_y = 32 }, /obj/effect/decal/warning_stripes/northwestcorner, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/hallway/primary/central) "bdW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -27991,7 +25582,6 @@ "bdX" = ( /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -28001,18 +25591,6 @@ /area/hallway/secondary/entry{ name = "Arrivals" }) -"bdY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/decal/warning_stripes/north, -/turf/simulated/floor/plating, -/area/maintenance/starboard) "bdZ" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -28040,9 +25618,6 @@ /turf/simulated/floor/plasteel, /area/quartermaster/storage) "bec" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -28075,24 +25650,14 @@ /turf/simulated/floor/plating, /area/maintenance/starboard) "beg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/maintenance{ - req_access_txt = "0"; req_one_access_txt = "12;63;48;50" }, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" }) -"beh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutralcorner" - }, -/area/hallway/primary/central) "bei" = ( /obj/structure/cable/yellow{ d1 = 2; @@ -28104,15 +25669,16 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, /obj/structure/disposalpipe/junction{ dir = 1; - icon_state = "pipe-j1"; tag = "icon-pipe-j1 (EAST)" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel, /area/hallway/primary/central) "bej" = ( @@ -28125,6 +25691,12 @@ dir = 8; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hallway/primary/central) "bek" = ( @@ -28133,6 +25705,12 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hallway/primary/central) "bel" = ( @@ -28146,6 +25724,12 @@ d2 = 8; icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hallway/primary/central) "ben" = ( @@ -28155,6 +25739,12 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hallway/primary/central) "beo" = ( @@ -28163,7 +25753,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, /turf/simulated/floor/plasteel, @@ -28174,13 +25765,17 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ d1 = 2; d2 = 8; icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hallway/primary/central) "beq" = ( @@ -28195,6 +25790,8 @@ icon_state = "1-4" }, /obj/machinery/hologram/holopad, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel, /area/hallway/primary/central) "ber" = ( @@ -28207,6 +25804,12 @@ codes_txt = "patrol;next_patrol=2-Storage"; location = "1.5-Fore-Central" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hallway/primary/central) "bes" = ( @@ -28220,18 +25823,8 @@ d2 = 8; icon_state = "1-8" }, -/turf/simulated/floor/plasteel, -/area/hallway/primary/central) -"bet" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/hallway/primary/central) "beu" = ( @@ -28245,6 +25838,12 @@ d2 = 4; icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hallway/primary/central) "bev" = ( @@ -28257,6 +25856,10 @@ codes_txt = "patrol;next_patrol=15-Court"; location = "14.9-CrewQuarters-Central" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, /turf/simulated/floor/plasteel, /area/hallway/primary/central) "bex" = ( @@ -28271,25 +25874,23 @@ d2 = 4; icon_state = "2-4" }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 }, /turf/simulated/floor/plasteel, /area/hallway/primary/central) "bey" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -28321,7 +25922,6 @@ /area/storage/tech) "beD" = ( /obj/machinery/status_display{ - density = 0; layer = 4; pixel_y = 32 }, @@ -28351,6 +25951,7 @@ d2 = 8; icon_state = "2-8" }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault"; @@ -28359,7 +25960,6 @@ /area/storage/tech) "beH" = ( /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_y = 21 }, @@ -28396,7 +25996,6 @@ /obj/structure/table/reinforced, /obj/item/flashlight/lamp, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/engine/chiefs_office) @@ -28414,9 +26013,7 @@ /obj/item/folder/red, /obj/item/folder/red, /obj/item/folder/red, -/obj/item/taperecorder{ - pixel_y = 0 - }, +/obj/item/taperecorder, /obj/item/clothing/glasses/sunglasses/big, /turf/simulated/floor/wood, /area/lawoffice) @@ -28446,15 +26043,6 @@ icon_state = "vault" }, /area/engine/chiefs_office) -"beO" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/entry{ - name = "Arrivals" - }) "beP" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-05"; @@ -28472,11 +26060,9 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/effect/decal/warning_stripes/southwestcorner, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry{ name = "Arrivals" @@ -28520,21 +26106,14 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel, /area/security/brig) -"beV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/plating, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) "beW" = ( /obj/structure/window/reinforced{ dir = 8 @@ -28579,6 +26158,9 @@ dir = 8; network = list("SS13","MiniSat") }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, @@ -28602,23 +26184,6 @@ tag = "icon-vault" }, /area/engine/chiefs_office) -"bfe" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/engineering{ - name = "Engine Room"; - req_access_txt = "10" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/decal/warning_stripes/yellow/hollow, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel, -/area/engine/engineering) "bff" = ( /obj/effect/decal/warning_stripes/yellow/partial, /obj/effect/decal/warning_stripes/arrow{ @@ -28627,9 +26192,6 @@ /turf/simulated/floor/plasteel, /area/quartermaster/storage) "bfg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; @@ -28637,9 +26199,6 @@ }, /obj/effect/spawner/lootdrop/maintenance, /obj/effect/decal/warning_stripes/yellow/hollow, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "bfh" = ( @@ -28683,29 +26242,12 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/maintenance{ - req_access_txt = "0"; req_one_access_txt = "12;48;50;1" }, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" }) -"bfk" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 - }, -/turf/simulated/floor/plasteel, -/area/security/brig) "bfl" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -28734,14 +26276,8 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1; - level = 1 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/security/brig) "bfn" = ( @@ -28753,7 +26289,6 @@ "bfo" = ( /obj/machinery/door/airlock/maintenance{ name = "Cargo Bay Maintenance"; - req_access_txt = "0"; req_one_access_txt = "48;50" }, /obj/structure/cable/yellow{ @@ -28769,18 +26304,13 @@ /area/quartermaster/storage) "bfp" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/effect/decal/warning_stripes/south, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "bfq" = ( /obj/machinery/camera{ c_tag = "Cargo Bay - Aft"; - dir = 1; - network = list("SS13") + dir = 1 }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, @@ -28800,15 +26330,14 @@ }, /area/engine/engineering) "bfs" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, /obj/machinery/shower{ dir = 8; - icon_state = "shower"; tag = "icon-shower (WEST)" }, /obj/effect/decal/warning_stripes/northeast, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel, /area/engine/engineering) "bfu" = ( @@ -28817,11 +26346,9 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/effect/decal/warning_stripes/west, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry{ name = "Arrivals" @@ -28834,22 +26361,14 @@ /area/quartermaster/storage) "bfw" = ( /turf/simulated/wall, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bfx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, /obj/effect/decal/warning_stripes/yellow, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "bfy" = ( @@ -28864,28 +26383,11 @@ "bfz" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 6; - icon_state = "intact"; tag = "icon-intact (SOUTHEAST)" }, /obj/structure/lattice, /turf/space, /area/space/nearstation) -"bfA" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/plasteel, -/area/security/brig) "bfC" = ( /obj/machinery/status_display{ dir = 4; @@ -28893,14 +26395,12 @@ pixel_x = -32 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/bluegrid, /area/turret_protected/ai) "bfD" = ( /obj/machinery/firealarm{ - dir = 2; pixel_y = 24 }, /turf/simulated/floor/plasteel{ @@ -28910,7 +26410,6 @@ /area/hallway/primary/port) "bfE" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "brown" @@ -28930,14 +26429,8 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 - }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/security/brig) "bfG" = ( @@ -28950,8 +26443,7 @@ pixel_x = 32 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /turf/simulated/floor/bluegrid, /area/turret_protected/ai) @@ -28962,6 +26454,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/hallway/primary/central) "bfJ" = ( @@ -28970,7 +26464,6 @@ icon_state = "pipe-c" }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/hallway/primary/central) @@ -28979,7 +26472,6 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/hallway/primary/central) @@ -28989,7 +26481,6 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/hallway/primary/central) @@ -28999,7 +26490,6 @@ d2 = 8; icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/bluegrid, /area/turret_protected/ai) "bfO" = ( @@ -29011,12 +26501,10 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/hallway/primary/central) "bfQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -29026,9 +26514,7 @@ dir = 2; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/hallway/primary/central) @@ -29038,13 +26524,14 @@ pixel_y = -24 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/hallway/primary/central) "bfS" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/hallway/primary/central) @@ -29071,8 +26558,7 @@ "bfX" = ( /obj/machinery/camera{ c_tag = "Central Primary Hallway - Fore - Courtroom"; - dir = 1; - network = list("SS13") + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -29113,7 +26599,6 @@ }) "bgb" = ( /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_x = -27; pixel_y = -29 @@ -29124,15 +26609,10 @@ }, /area/hallway/primary/central) "bgd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/machinery/camera{ c_tag = "Central Primary Hallway - Fore - Starboard Corner"; - dir = 8; - network = list("SS13") + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -29180,12 +26660,10 @@ }, /obj/machinery/camera{ c_tag = "Arrivals - Fore Arm"; - dir = 8; - network = list("SS13") + dir = 8 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -29210,8 +26688,7 @@ /area/maintenance/starboard) "bgk" = ( /obj/machinery/camera/autoname{ - dir = 4; - network = list("SS13") + dir = 4 }, /obj/machinery/vending/artvend, /turf/simulated/floor/plasteel{ @@ -29219,24 +26696,6 @@ icon_state = "brown" }, /area/storage/primary) -"bgl" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 - }, -/turf/simulated/floor/plasteel, -/area/security/brig) "bgm" = ( /obj/structure/rack{ dir = 8; @@ -29261,7 +26720,6 @@ dir = 8 }, /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_x = 29 }, @@ -29334,7 +26792,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/unary/vent_scrubber, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault"; @@ -29434,13 +26892,6 @@ pixel_x = 27 }, /obj/effect/decal/warning_stripes/east, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - level = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "bgA" = ( @@ -29473,29 +26924,12 @@ }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) -"bgE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plasteel, -/area/engine/break_room) "bgF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_y = 21 }, /obj/effect/decal/warning_stripes/north, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/hallway/primary/central) "bgH" = ( @@ -29503,12 +26937,6 @@ pixel_y = 32 }, /obj/effect/decal/warning_stripes/north, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/hallway/primary/central) "bgI" = ( @@ -29526,16 +26954,12 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /turf/simulated/floor/plasteel, /area/security/brig) "bgK" = ( /obj/item/radio/intercom{ - broadcasting = 0; - listening = 1; name = "Station Intercom (General)"; pixel_y = -28 }, @@ -29678,6 +27102,8 @@ dir = 8; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "bgW" = ( @@ -29727,12 +27153,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/carpet, /area/crew_quarters/theatre) "bhb" = ( @@ -29745,9 +27166,7 @@ "bhc" = ( /obj/structure/disposalpipe/segment, /turf/simulated/wall, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bhd" = ( /obj/structure/table, /obj/item/flashlight{ @@ -29764,7 +27183,6 @@ /obj/item/flash, /obj/item/flash, /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_y = 28 }, @@ -29778,16 +27196,11 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "brown" }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bhf" = ( /obj/structure/disposalpipe/segment, /obj/machinery/power/apc{ @@ -29800,15 +27213,14 @@ d2 = 2; icon_state = "0-2" }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, /obj/machinery/light_switch{ pixel_x = 26; pixel_y = 26 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "vault" @@ -29819,9 +27231,7 @@ dir = 1; icon_state = "browncorner" }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bhh" = ( /obj/effect/landmark/start{ name = "Cargo Technician" @@ -29833,22 +27243,17 @@ dir = 4; icon_state = "brown" }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bhi" = ( /obj/structure/table/reinforced, /obj/item/folder/yellow, /obj/machinery/door/firedoor, /obj/machinery/door/window/westleft{ - dir = 8; name = "Cargo Desk"; req_access_txt = "50" }, /turf/simulated/floor/plasteel, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bhj" = ( /obj/machinery/vending/coffee, /obj/effect/decal/warning_stripes/yellow, @@ -29861,7 +27266,6 @@ /area/hallway/primary/port) "bhm" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/landmark{ name = "lightsout" }, @@ -29876,8 +27280,7 @@ }, /obj/machinery/camera{ c_tag = "Cargo - Foyer"; - dir = 8; - network = list("SS13") + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -29893,7 +27296,6 @@ pixel_y = 32 }, /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_x = 29 }, @@ -29904,7 +27306,6 @@ "bhp" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/hallway/primary/central) @@ -29917,6 +27318,8 @@ name = "Custodial Closet"; req_access_txt = "26" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/janitor) "bht" = ( @@ -29926,17 +27329,14 @@ }) "bhu" = ( /obj/machinery/door/airlock{ - name = "Central Emergency Storage"; - req_access_txt = "0" + name = "Central Emergency Storage" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/maintcentral{ name = "Central Maintenance" @@ -29945,15 +27345,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 +/obj/machinery/atmospherics/pipe/simple/visible, +/obj/machinery/atmospherics/pipe/simple/insulated{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" @@ -29964,25 +27358,14 @@ /area/crew_quarters/captain{ name = "\improper Captain's Quarters" }) -"bhz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutralcorner" - }, -/area/hallway/primary/central) "bhA" = ( /obj/structure/lattice, /obj/structure/lattice/catwalk, /turf/space, /area/space/nearstation) "bhB" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/storage/tools) @@ -30005,12 +27388,10 @@ "bhE" = ( /obj/machinery/camera{ c_tag = "Auxiliary Tool Storage"; - dir = 8; - network = list("SS13") + dir = 8 }, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/light/small{ @@ -30028,20 +27409,15 @@ /obj/structure/reagent_dispensers/fueltank, /turf/simulated/floor/plating, /area/maintenance/starboard) -"bhG" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, -/turf/simulated/floor/plating, -/area/maintenance/starboard) "bhH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/bluegrid, /area/turret_protected/ai) "bhI" = ( @@ -30089,10 +27465,6 @@ }, /area/storage/tech) "bhM" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, /obj/effect/landmark{ name = "xeno_spawn"; pixel_x = -1 @@ -30103,32 +27475,6 @@ tag = "icon-vault (WEST)" }, /area/storage/tech) -"bhN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "vault"; - tag = "icon-vault (WEST)" - }, -/area/storage/tech) -"bhP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "vault"; - tag = "icon-vault (WEST)" - }, -/area/storage/tech) "bhQ" = ( /obj/structure/table, /obj/item/screwdriver{ @@ -30155,9 +27501,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -30167,9 +27510,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" @@ -30179,9 +27519,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -30209,21 +27546,14 @@ }) "bhX" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/mining{ name = "Cargo Bay"; - req_access_txt = "0"; req_one_access_txt = "48;50" }, /obj/effect/decal/warning_stripes/yellow, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bhY" = ( /obj/machinery/suit_storage_unit/atmos, /turf/simulated/floor/plasteel{ @@ -30305,39 +27635,27 @@ }, /area/storage/tech) "bif" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/turret_protected/ai) "big" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, /obj/machinery/shower{ dir = 4; - icon_state = "shower"; tag = "icon-shower (EAST)" }, /obj/structure/extinguisher_cabinet{ pixel_x = -27 }, /obj/effect/decal/warning_stripes/northwest, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/engine/engineering) "bih" = ( /obj/machinery/power/terminal{ - dir = 1; - icon_state = "term" - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/turret_protected/ai) -"bii" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - on = 1 + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -30374,7 +27692,9 @@ /turf/simulated/floor/plasteel, /area/engine/engineering) "bil" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /turf/simulated/floor/bluegrid, /area/turret_protected/ai) "bim" = ( @@ -30448,7 +27768,6 @@ }) "bix" = ( /obj/item/radio/intercom{ - broadcasting = 0; name = "Station Intercom (General)"; pixel_y = 20 }, @@ -30471,9 +27790,7 @@ pixel_y = 30 }, /obj/machinery/camera{ - c_tag = "Customs Checkpoint"; - dir = 2; - network = list("SS13") + c_tag = "Customs Checkpoint" }, /turf/simulated/floor/plasteel{ dir = 1; @@ -30490,7 +27807,6 @@ /area/atmos) "biA" = ( /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_y = 28 }, @@ -30500,10 +27816,7 @@ /turf/simulated/floor/plasteel, /area/atmos) "biB" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/visible, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -30527,9 +27840,7 @@ }, /obj/structure/disposalpipe/segment, /turf/simulated/wall, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "biE" = ( /obj/structure/disposalpipe/trunk{ dir = 8 @@ -30542,9 +27853,7 @@ dir = 4 }, /turf/simulated/floor/plating, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "biF" = ( /obj/machinery/conveyor{ dir = 4; @@ -30552,34 +27861,25 @@ }, /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plating, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "biG" = ( /obj/machinery/conveyor{ dir = 4; id = "packageSort2" }, /turf/simulated/floor/plating, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "biH" = ( /obj/machinery/conveyor{ dir = 4; id = "packageSort2" }, -/obj/structure/plasticflaps{ - opacity = 0 - }, +/obj/structure/plasticflaps, /turf/simulated/floor/plating, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "biI" = ( /obj/structure/rack, /obj/machinery/power/apc{ - dir = 2; name = "Cargo Bay APC"; pixel_x = 1; pixel_y = -24 @@ -30617,35 +27917,27 @@ dir = 4 }, /turf/simulated/floor/plasteel, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "biL" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/simulated/floor/plasteel, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "biM" = ( /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" }, /turf/simulated/floor/plasteel, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "biN" = ( /obj/machinery/computer/supplycomp, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "brown" }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "biO" = ( /obj/effect/landmark{ name = "JoinLateCryo" @@ -30664,26 +27956,13 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/mining{ name = "Cargo Bay"; - req_access_txt = "0"; req_one_access_txt = "48;50" }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) -"biR" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, -/turf/simulated/floor/plasteel, -/area/hallway/primary/port) +/area/quartermaster/office) "biS" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/hallway/primary/port) "biT" = ( @@ -30696,7 +27975,6 @@ }, /area/hallway/primary/port) "biU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -30705,11 +27983,10 @@ /obj/machinery/ai_slipper{ icon_state = "motion0" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/bluegrid, /area/turret_protected/ai) "biV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "browncorner" @@ -30723,9 +28000,10 @@ }, /obj/structure/disposalpipe/sortjunction{ dir = 1; - icon_state = "pipe-j1s"; sortType = 22 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/hallway/primary/central) "biX" = ( @@ -30738,7 +28016,6 @@ pixel_x = 24 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/hallway/primary/central) @@ -30753,6 +28030,8 @@ }, /area/janitor) "biZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -30841,12 +28120,9 @@ dir = 9; icon_state = "brown" }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bjg" = ( /obj/machinery/status_display{ - density = 0; pixel_y = 32 }, /obj/structure/table, @@ -30873,6 +28149,7 @@ dir = 4; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/carpet, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" @@ -30898,7 +28175,6 @@ name = "\improper Captain's Quarters" }) "bjl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/extinguisher_cabinet{ pixel_x = -27 }, @@ -30907,10 +28183,8 @@ }, /obj/machinery/camera{ c_tag = "Central Primary Hallway - Fore - Port Corner"; - dir = 4; - network = list("SS13") + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -30931,18 +28205,9 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, -/turf/simulated/floor/plasteel, -/area/hallway/primary/central) -"bjo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, -/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutralcorner" - }, +/turf/simulated/floor/plasteel, /area/hallway/primary/central) "bjp" = ( /obj/structure/table, @@ -30965,7 +28230,6 @@ }, /obj/item/storage/box/lights/mixed, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "yellow" }, /area/storage/tools) @@ -30973,7 +28237,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "yellow" }, /area/storage/tools) @@ -30983,7 +28246,6 @@ /obj/item/airlock_electronics, /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "yellow" }, /area/storage/tools) @@ -31044,6 +28306,9 @@ dir = 1; pixel_y = -24 }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -31055,6 +28320,9 @@ /obj/machinery/camera/autoname{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -31068,7 +28336,6 @@ pixel_y = -30 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/hallway/primary/central) @@ -31078,8 +28345,10 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault"; @@ -31088,12 +28357,9 @@ /area/storage/tech) "bjC" = ( /obj/structure/table, -/obj/machinery/cell_charger{ - pixel_y = 0 - }, +/obj/machinery/cell_charger, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/item/stock_parts/cell/high{ @@ -31115,7 +28381,6 @@ /area/hallway/primary/central) "bjE" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "0"; req_one_access_txt = "12;27;37" }, /turf/simulated/floor/plating, @@ -31125,7 +28390,6 @@ "bjF" = ( /obj/structure/closet/toolcloset, /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_y = 28 }, @@ -31141,11 +28405,9 @@ icon_state = "1-2" }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/computer/security/telescreen{ desc = "A telescreen that connects to the engine's camera network."; dir = 8; @@ -31154,6 +28416,7 @@ network = list("engine"); pixel_x = 30 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "vault" @@ -31168,9 +28431,7 @@ }, /area/engine/chiefs_office) "bjI" = ( -/obj/structure/closet/secure_closet/engineering_chief{ - req_access_txt = "0" - }, +/obj/structure/closet/secure_closet/engineering_chief, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -31178,7 +28439,6 @@ }, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -31207,7 +28467,6 @@ "bjL" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable/yellow{ - d1 = 0; d2 = 2; icon_state = "0-2" }, @@ -31216,6 +28475,12 @@ "bjM" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/engine/break_room) "bjN" = ( @@ -31229,6 +28494,9 @@ name = "Customs" }) "bjQ" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "vault" @@ -31247,19 +28515,20 @@ /turf/simulated/floor/plating, /area/turret_protected/ai) "bjS" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "vault" }, /area/turret_protected/ai) "bjU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -31310,10 +28579,10 @@ }, /area/turret_protected/ai) "bjY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/ai_slipper{ icon_state = "motion0" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/bluegrid, /area/turret_protected/ai) "bka" = ( @@ -31367,9 +28636,7 @@ /area/shuttle/arrival/station) "bkh" = ( /obj/machinery/camera{ - c_tag = "Arrivals Shuttle"; - dir = 2; - network = list("SS13") + c_tag = "Arrivals Shuttle" }, /obj/machinery/light{ dir = 1; @@ -31417,6 +28684,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/security/checkpoint2{ name = "Customs" @@ -31432,7 +28702,7 @@ d2 = 4; icon_state = "2-4" }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/plasteel, @@ -31446,11 +28716,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 + dir = 4 }, /turf/simulated/floor/plasteel, /area/security/checkpoint2{ @@ -31467,16 +28734,11 @@ d2 = 4; icon_state = "2-4" }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - external_pressure_bound = 0; - frequency = 1441; - id_tag = "tox_out"; - initialize_directions = 1; - internal_pressure_bound = 4000; - on = 1; - pressure_checks = 2; - pump_direction = 0 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, /turf/simulated/floor/plasteel, /area/security/checkpoint2{ @@ -31488,6 +28750,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "red" @@ -31536,17 +28801,14 @@ /obj/structure/disposalpipe/segment, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bkv" = ( /obj/machinery/light/small{ dir = 4 }, /obj/machinery/camera{ c_tag = "Engineering - Entrance"; - dir = 8; - network = list("SS13") + dir = 8 }, /obj/effect/decal/warning_stripes/southeast, /turf/simulated/floor/plasteel, @@ -31565,29 +28827,18 @@ /area/engine/engineering) "bkx" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/machinery/light_switch{ pixel_x = -25 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "brown" }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bky" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/effect/decal/warning_stripes/west, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry{ name = "Arrivals" @@ -31595,28 +28846,21 @@ "bkz" = ( /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/machinery/light{ dir = 8 }, /obj/machinery/camera{ c_tag = "Cargo - Office"; - dir = 4; - network = list("SS13") + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "brown" }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bkA" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -31624,51 +28868,36 @@ icon_state = "1-2" }, /turf/simulated/floor/plasteel, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bkB" = ( /mob/living/simple_animal/pet/sloth/paperwork, /turf/simulated/floor/plasteel, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bkC" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bkD" = ( /obj/structure/filingcabinet/filingcabinet, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "brown" }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bkE" = ( /obj/structure/plasticflaps{ opacity = 1 }, /obj/machinery/conveyor{ backwards = 1; - dir = 2; forwards = 2; id = "packageSort2" }, /obj/effect/decal/warning_stripes/yellow/partial, /obj/effect/decal/warning_stripes/arrow, /turf/simulated/floor/plasteel, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) -"bkF" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel, -/area/hallway/primary/port) +/area/quartermaster/office) "bkG" = ( /turf/simulated/floor/plasteel{ dir = 4; @@ -31683,8 +28912,6 @@ }, /area/hallway/primary/port) "bkI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "browncorner" @@ -31692,46 +28919,31 @@ /area/hallway/primary/central) "bkK" = ( /obj/machinery/status_display{ - density = 0; pixel_y = 32 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "brown" }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bkL" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, /turf/simulated/floor/plating, /area/janitor) "bkM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, /area/janitor) "bkN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -31741,9 +28953,6 @@ dir = 4; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -31761,12 +28970,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plating, /area/janitor) "bkP" = ( @@ -31778,12 +28981,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plating, /area/maintenance/maintcentral{ name = "Central Maintenance" @@ -31797,9 +28994,6 @@ dir = 8; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; @@ -31810,9 +29004,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /turf/simulated/floor/plating, /area/maintenance/maintcentral{ name = "Central Maintenance" @@ -31836,17 +29027,13 @@ location = "13.2-Tcommstore" }, /obj/structure/cable/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/hallway/primary/starboard) -"bkV" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/simulated/floor/engine, -/area/engine/mechanic_workshop) "bkW" = ( /turf/simulated/wall/r_wall, /area/bridge) @@ -31866,7 +29053,6 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/binary/valve{ - dir = 2; name = "output gas to space" }, /turf/simulated/floor/plasteel{ @@ -31888,7 +29074,6 @@ }, /obj/structure/chair/comfy/brown{ dir = 8; - icon_state = "comfychair"; tag = "icon-comfychair (WEST)" }, /turf/simulated/floor/carpet, @@ -31902,6 +29087,7 @@ }) "blc" = ( /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/carpet, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" @@ -31920,8 +29106,7 @@ }, /obj/machinery/camera{ c_tag = "Captain's Quarters"; - dir = 8; - network = list("SS13") + dir = 8 }, /turf/simulated/floor/wood, /area/crew_quarters/captain{ @@ -31930,7 +29115,6 @@ "blf" = ( /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /turf/simulated/floor/plasteel{ @@ -31939,10 +29123,6 @@ }, /area/hallway/primary/central) "blg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "yellowcorner" @@ -31950,9 +29130,6 @@ /area/hallway/primary/central) "blh" = ( /obj/structure/closet/wardrobe/pjs, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" @@ -31970,13 +29147,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 - }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "vault" @@ -32014,7 +29184,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/maintenance/starboard) "blo" = ( @@ -32024,7 +29193,6 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering{ name = "Tech Storage"; - req_access_txt = "0"; req_one_access_txt = "23;30" }, /obj/structure/cable/yellow{ @@ -32032,8 +29200,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault"; @@ -32060,13 +29228,13 @@ /obj/effect/spawner/window/reinforced, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bly" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 2; - on = 1 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -32093,7 +29261,6 @@ "blD" = ( /obj/machinery/camera/motion{ c_tag = "Mini Satellite AI Chamber"; - dir = 2; network = list("SS13","MiniSat"); start_active = 1 }, @@ -32148,18 +29315,14 @@ }, /area/turret_protected/ai) "blI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_x = -29 }, /obj/machinery/status_display{ - density = 0; layer = 4; pixel_x = -32 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -32184,6 +29347,9 @@ /obj/machinery/light_switch{ pixel_x = -23 }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "vault" @@ -32249,6 +29415,9 @@ dir = 8; network = list("SS13","MiniSat") }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, @@ -32288,7 +29457,6 @@ "blU" = ( /obj/structure/shuttle/engine/heater{ dir = 4; - icon_state = "heater"; tag = "icon-heater (EAST)" }, /obj/structure/window/reinforced{ @@ -32306,8 +29474,7 @@ /area/shuttle/arrival/station) "blW" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/structure/cable/yellow{ d1 = 1; @@ -32324,7 +29491,6 @@ "blX" = ( /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /obj/structure/closet, @@ -32350,15 +29516,14 @@ /obj/machinery/door/airlock/security{ name = "Interrogation"; req_access = null; - req_access_txt = "0"; req_one_access_txt = "1;4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -32372,8 +29537,6 @@ pixel_y = -8; req_access_txt = "1" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "red" }, @@ -32390,6 +29553,8 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "red" }, @@ -32417,9 +29582,7 @@ }, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plating, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bme" = ( /obj/machinery/space_heater, /obj/structure/disposalpipe/wrapsortjunction{ @@ -32436,9 +29599,7 @@ tag = "icon-pipe-j1 (WEST)" }, /turf/simulated/wall, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bmg" = ( /obj/structure/disposaloutlet{ dir = 4 @@ -32454,9 +29615,7 @@ dir = 8 }, /turf/simulated/floor/plating, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bmh" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, @@ -32482,40 +29641,35 @@ }, /area/hallway/primary/port) "bmj" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 2 - }, -/turf/simulated/floor/plasteel, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) -"bmk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 }, /turf/simulated/floor/plasteel, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) +"bmk" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/quartermaster/office) "bml" = ( /obj/machinery/firealarm{ - dir = 2; pixel_y = 24 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1; - level = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bmm" = ( /obj/machinery/firealarm{ dir = 8; @@ -32525,9 +29679,6 @@ dir = 4; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "vault" @@ -32540,13 +29691,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 }, /turf/simulated/floor/plasteel, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bmo" = ( /obj/structure/table/wood, /obj/machinery/newscaster/security_unit{ @@ -32561,105 +29710,90 @@ name = "\improper Captain's Quarters" }) "bmp" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "brown" }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bmq" = ( /obj/structure/cable/yellow{ d1 = 1; d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bmr" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bms" = ( /obj/structure/disposalpipe/segment, /obj/effect/landmark/start{ name = "Cargo Technician" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bmt" = ( /obj/structure/disposalpipe/segment{ dir = 4; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "brown" }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bmu" = ( /obj/machinery/door/poddoor{ density = 0; @@ -32675,16 +29809,16 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -32695,71 +29829,48 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/hallway/primary/port) -"bmx" = ( -/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /turf/simulated/floor/plasteel, /area/hallway/primary/port) "bmy" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 8; icon_state = "2-8" }, /obj/structure/disposalpipe/junction{ - dir = 2; - icon_state = "pipe-j1" + dir = 2 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/hallway/primary/port) "bmz" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "browncorner" }, /area/hallway/primary/port) "bmA" = ( /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "brown" }, /area/hallway/primary/port) "bmB" = ( /obj/machinery/door/airlock{ - name = "Starboard Emergency Storage"; - req_access_txt = "0" + name = "Starboard Emergency Storage" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/starboard) "bmC" = ( @@ -32772,12 +29883,14 @@ name = "Wags-His-Tail"; real_name = "Wags-His-Tail" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, /area/janitor) "bmD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; @@ -32786,6 +29899,9 @@ /obj/effect/landmark/start{ name = "Janitor" }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -32803,8 +29919,8 @@ /obj/machinery/newscaster{ pixel_x = 30 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 5; @@ -32813,7 +29929,6 @@ /area/engine/chiefs_office) "bmF" = ( /obj/item/tank/internals/air, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/maintenance/maintcentral{ name = "Central Maintenance" @@ -32830,6 +29945,9 @@ /obj/structure/window/reinforced{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, @@ -32849,6 +29967,9 @@ /obj/item/multitool{ pixel_x = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "browncorner" @@ -32864,6 +29985,8 @@ /obj/item/multitool{ pixel_x = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "browncorner" @@ -32875,7 +29998,6 @@ pixel_y = -32 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/crew_quarters/locker) @@ -32898,14 +30020,12 @@ /area/engine/chiefs_office) "bmO" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, /obj/effect/decal/warning_stripes/north, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/maintcentral{ name = "Central Maintenance" @@ -32950,7 +30070,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plating, /area/maintenance/starboard) @@ -32972,7 +30091,6 @@ }, /obj/machinery/camera{ c_tag = "Mini Satellite AI Chamber South"; - dir = 2; network = list("SS13","MiniSat") }, /turf/simulated/floor/bluegrid, @@ -33006,35 +30124,6 @@ }, /obj/item/clothing/mask/cigarette/cigar, /turf/simulated/floor/carpet, -/area/crew_quarters/captain{ - name = "\improper Captain's Quarters" - }) -"bmW" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor/carpet, -/area/crew_quarters/captain{ - name = "\improper Captain's Quarters" - }) -"bmX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/turf/simulated/floor/carpet, -/area/crew_quarters/captain{ - name = "\improper Captain's Quarters" - }) -"bmY" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 - }, -/turf/simulated/floor/carpet, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" }) @@ -33070,71 +30159,38 @@ dir = 1; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/hallway/primary/central) "bnc" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "yellowcorner" }, /area/hallway/primary/central) "bnd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ name = "Starboard Primary Hallway" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellowcorner" }, /area/hallway/primary/starboard) "bne" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellowcorner" }, /area/hallway/primary/starboard) "bnf" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "yellowcorner" - }, -/area/hallway/primary/starboard) -"bng" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellowcorner" @@ -33144,28 +30200,15 @@ /obj/machinery/firealarm{ pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellowcorner" }, /area/hallway/primary/starboard) "bni" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/machinery/camera{ - c_tag = "Starboard Primary Hallway - Tech Storage"; - dir = 2; - network = list("SS13") - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + c_tag = "Starboard Primary Hallway - Tech Storage" }, /turf/simulated/floor/plasteel{ dir = 1; @@ -33173,30 +30216,18 @@ }, /area/hallway/primary/starboard) "bnj" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellowcorner" }, /area/hallway/primary/starboard) "bnk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellowcorner" @@ -33207,73 +30238,37 @@ dir = 4; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellowcorner" }, /area/hallway/primary/starboard) "bnm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellowcorner" }, /area/hallway/primary/starboard) "bnn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/alarm{ pixel_y = 23 }, /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "yellowcorner" - }, -/area/hallway/primary/starboard) -"bno" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellowcorner" }, /area/hallway/primary/starboard) "bnp" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/structure/sign/securearea{ pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellowcorner" @@ -33284,43 +30279,25 @@ dir = 1; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/structure/extinguisher_cabinet{ pixel_x = -27 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "brown" }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bnr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "cautioncorner" }, /area/hallway/primary/starboard) "bns" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=14-Starboard-Central"; location = "13.3-Engineering-Central" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "cautioncorner" @@ -33337,12 +30314,9 @@ /obj/machinery/light, /obj/machinery/camera{ c_tag = "Brig - Hallway - Starboard"; - dir = 1; - network = list("SS13") + dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "redcorner" }, /area/security/brig) @@ -33373,22 +30347,13 @@ pixel_y = 32 }, /obj/structure/table/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellow" }, /area/engine/break_room) "bnx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -33407,11 +30372,9 @@ icon_state = "pipe-j2"; tag = "icon-pipe-j2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -33429,7 +30392,6 @@ /area/engine/break_room) "bnA" = ( /obj/machinery/status_display{ - density = 0; layer = 4; pixel_y = 32 }, @@ -33441,13 +30403,17 @@ name = "\improper Captain's Quarters" }) "bnC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel, /area/engine/break_room) "bnE" = ( @@ -33466,7 +30432,6 @@ "bnF" = ( /obj/structure/shuttle/engine/propulsion{ dir = 4; - icon_state = "propulsion"; tag = "icon-propulsion (WEST)" }, /turf/simulated/floor/plating/airless, @@ -33504,6 +30469,9 @@ /obj/machinery/light_switch{ pixel_y = -28 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -33531,7 +30499,6 @@ dir = 1 }, /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_y = -28 }, @@ -33703,7 +30670,6 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/maintenance{ - req_access_txt = "0"; req_one_access_txt = "12;48;50;1" }, /turf/simulated/floor/plating, @@ -33750,35 +30716,14 @@ }, /area/turret_protected/ai) "boh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) -"boi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) -"boj" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, -/turf/simulated/floor/plasteel, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bok" = ( /obj/structure/chair/office/dark{ dir = 4 }, /turf/simulated/floor/plasteel, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bol" = ( /obj/structure/table, /obj/item/destTagger{ @@ -33789,13 +30734,14 @@ pixel_x = 27 }, /obj/item/rcs, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "arrival" }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bom" = ( /obj/structure/rack{ dir = 8; @@ -33819,9 +30765,7 @@ dir = 8 }, /turf/simulated/floor/plasteel, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "boo" = ( /obj/structure/sign/securearea{ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; @@ -33837,19 +30781,8 @@ icon_state = "dark" }, /area/bridge) -"boq" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel, -/area/hallway/primary/port) "bos" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -33892,7 +30825,6 @@ icon_state = "0-4" }, /obj/machinery/power/apc{ - aidisabled = 0; cell_type = 5000; dir = 1; name = "AI Core APC"; @@ -33911,7 +30843,6 @@ /area/janitor) "boy" = ( /obj/item/storage/box/lights/mixed, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/maintenance/maintcentral{ name = "Central Maintenance" @@ -33937,6 +30868,7 @@ /obj/structure/chair/office/dark{ dir = 8 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -33971,6 +30903,7 @@ /obj/structure/chair/office/dark{ dir = 4 }, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -33994,12 +30927,13 @@ name = "\improper Captain's Quarters" }) "boJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ d1 = 1; d2 = 8; icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/bluegrid, /area/turret_protected/ai) "boK" = ( @@ -34055,12 +30989,14 @@ /obj/item/reagent_containers/spray/cleaner, /obj/machinery/camera{ c_tag = "Custodial Closet"; - dir = 4; - network = list("SS13") + dir = 4 }, /obj/machinery/light/small{ dir = 8 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -34080,6 +31016,12 @@ dir = 4; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, /turf/simulated/floor/plasteel, /area/hallway/primary/central) "boP" = ( @@ -34088,16 +31030,17 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/structure/disposalpipe/junction{ dir = 4; icon_state = "pipe-j2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/hallway/primary/central) @@ -34114,8 +31057,13 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/hallway/primary/starboard) @@ -34128,8 +31076,13 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/hallway/primary/starboard) @@ -34147,28 +31100,13 @@ d2 = 8; icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "neutralcorner" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/area/hallway/primary/starboard) -"boU" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/hallway/primary/starboard) @@ -34186,8 +31124,13 @@ d2 = 4; icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/hallway/primary/starboard) @@ -34201,8 +31144,13 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/hallway/primary/starboard) @@ -34214,11 +31162,15 @@ }, /obj/structure/disposalpipe/junction{ dir = 2; - icon_state = "pipe-j1"; tag = "icon-pipe-j1 (EAST)" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/hallway/primary/starboard) @@ -34232,24 +31184,13 @@ dir = 1; icon_state = "pipe-c" }, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "neutralcorner" - }, -/area/hallway/primary/starboard) -"bpa" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/hallway/primary/starboard) @@ -34263,8 +31204,13 @@ dir = 4 }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/hallway/primary/starboard) @@ -34277,33 +31223,18 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "neutralcorner" - }, -/area/hallway/primary/starboard) -"bpe" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/hallway/primary/starboard) @@ -34317,8 +31248,13 @@ d2 = 8; icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/hallway/primary/starboard) @@ -34327,14 +31263,15 @@ dir = 4; pixel_x = 28 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "cautioncorner" }, /area/hallway/primary/starboard) "bph" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, @@ -34377,33 +31314,36 @@ d2 = 8; icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/engine/break_room) "bpm" = ( /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bpn" = ( /turf/simulated/floor/plasteel, /area/engine/break_room) "bpo" = ( /obj/structure/chair/stool, /obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bpp" = ( /obj/effect/landmark{ name = "blobstart" }, /obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/plasteel, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bpq" = ( /obj/structure/table/reinforced, /obj/item/phone{ @@ -34431,23 +31371,18 @@ }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bpt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/turret_protected/ai) -"bpu" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/turf/simulated/floor/bluegrid, -/area/turret_protected/ai) "bpw" = ( /obj/machinery/light, /obj/structure/chair/comfy/shuttle{ @@ -34468,14 +31403,11 @@ pixel_y = 12 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bpz" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -34497,16 +31429,6 @@ /area/hallway/secondary/entry{ name = "Arrivals" }) -"bpB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/hallway/primary/port) "bpC" = ( /turf/simulated/floor/plasteel{ dir = 9; @@ -34515,62 +31437,46 @@ /area/hallway/primary/port) "bpD" = ( /obj/effect/decal/warning_stripes/yellow/partial{ - dir = 4; - icon_state = "3" - }, -/obj/effect/decal/warning_stripes/arrow{ - dir = 4; - icon_state = "4" - }, -/turf/simulated/floor/plasteel, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) -"bpE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/effect/decal/warning_stripes/arrow{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/quartermaster/office) +"bpE" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/mining/glass{ name = "Mailroom"; - req_access_txt = "0"; req_one_access_txt = "48;50" }, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/plasteel, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) -"bpF" = ( -/obj/machinery/status_display{ - density = 0; - pixel_y = 32 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/turf/simulated/floor/plasteel, +/area/quartermaster/office) +"bpF" = ( +/obj/machinery/status_display{ + pixel_y = 32 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/plasteel, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) -"bpG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/turf/simulated/floor/plasteel, +/area/quartermaster/office) +"bpG" = ( /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "neutral" @@ -34583,12 +31489,6 @@ pixel_y = 32 }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" @@ -34598,8 +31498,10 @@ /obj/machinery/atm{ pixel_x = 32 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/hallway/primary/central) @@ -34618,9 +31520,7 @@ dir = 8 }, /turf/simulated/floor/plating, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bpK" = ( /obj/structure/table/reinforced, /obj/item/folder/yellow, @@ -34629,65 +31529,37 @@ pixel_y = 4 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "arrival" }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bpL" = ( /obj/structure/chair/office/dark, /obj/effect/landmark/start{ name = "Cargo Technician" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "arrival" }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bpM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "arrival" }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bpN" = ( /obj/structure/filingcabinet/filingcabinet, /obj/item/radio/intercom{ - broadcasting = 0; - listening = 1; name = "Station Intercom (General)"; pixel_y = -28 }, /obj/machinery/camera{ c_tag = "Cargo - Mailroom"; - dir = 1; - network = list("SS13") + dir = 1 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "arrival" }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bpO" = ( /obj/structure/table, /obj/item/stack/wrapping_paper, @@ -34731,12 +31603,9 @@ }, /obj/item/storage/box/lights/mixed, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "arrival" }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bpP" = ( /obj/item/storage/box, /obj/structure/table, @@ -34751,13 +31620,10 @@ dir = 6; icon_state = "arrival" }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bpQ" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; pixel_x = 11 }, /obj/item/reagent_containers/glass/bucket, @@ -34774,36 +31640,26 @@ "bpR" = ( /obj/machinery/photocopier, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "brown" }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bpS" = ( /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "brown" }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bpT" = ( /obj/structure/disposalpipe/segment, /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "brown" }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bpU" = ( /obj/effect/landmark{ name = "blobstart" }, /obj/machinery/power/apc{ - cell_type = 2500; dir = 4; name = "Central Maintenance APC"; pixel_x = 26 @@ -34831,23 +31687,17 @@ dir = 4; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "browncorner" }, /area/hallway/primary/port) "bpY" = ( /obj/machinery/status_display{ - density = 0; layer = 4; pixel_y = 32 }, @@ -34855,9 +31705,7 @@ pixel_y = 4 }, /obj/machinery/camera{ - c_tag = "Bridge - Central"; - dir = 2; - network = list("SS13") + c_tag = "Bridge - Central" }, /obj/structure/table/glass, /turf/simulated/floor/plasteel{ @@ -34868,7 +31716,6 @@ /obj/structure/table, /obj/item/toner, /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_x = 30 }, @@ -34877,19 +31724,9 @@ icon_state = "brown" }, /area/hallway/primary/port) -"bqa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutralcorner" - }, -/area/hallway/primary/central) "bqb" = ( /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/hallway/primary/central) @@ -34947,6 +31784,12 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -34986,17 +31829,12 @@ }, /obj/machinery/shower{ dir = 4; - icon_state = "shower"; tag = "icon-shower (EAST)" }, /obj/machinery/door/window/westright{ dir = 4 }, /obj/item/soap/deluxe, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -35010,9 +31848,6 @@ /obj/structure/sink{ pixel_y = 17 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -35023,19 +31858,13 @@ /obj/structure/toilet{ pixel_y = 13 }, -/obj/machinery/light{ - dir = 2; - icon_state = "tube1" - }, +/obj/machinery/light, /obj/effect/landmark/start{ name = "Captain" }, /obj/machinery/light_switch{ pixel_y = -25 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -35046,9 +31875,6 @@ /obj/machinery/door/airlock/silver{ name = "Bathroom" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -35057,10 +31883,8 @@ }) "bqq" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" @@ -35093,15 +31917,12 @@ location = "12-Central-Starboard" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/hallway/primary/central) "bqv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "yellowcorner" }, /area/hallway/primary/central) @@ -35127,8 +31948,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "cautioncorner" @@ -35155,9 +31974,6 @@ }, /area/hallway/primary/starboard) "bqB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/power/apc{ dir = 1; name = "Starboard Hallway APC"; @@ -35167,9 +31983,6 @@ d2 = 2; icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellowcorner" @@ -35196,41 +32009,18 @@ }, /obj/machinery/camera{ c_tag = "Starboard Primary Hallway - Auxiliary Tool Storage"; - dir = 1; - network = list("SS13") + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "cautioncorner" }, /area/hallway/primary/starboard) -"bqG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "cautioncorner" - }, -/area/hallway/primary/starboard) -"bqI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "cautioncorner" - }, -/area/hallway/primary/starboard) "bqJ" = ( /obj/machinery/light, /obj/machinery/camera{ c_tag = "Starboard Primary Hallway - Engineering"; - dir = 1; - network = list("SS13") + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -35254,17 +32044,10 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "neutralcorner" - }, -/area/hallway/primary/starboard) -"bqM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "cautioncorner" + icon_state = "neutralcorner" }, /area/hallway/primary/starboard) "bqN" = ( @@ -35281,13 +32064,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/engine/break_room) -"bqP" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 2; - on = 1 - }, -/turf/simulated/floor/plasteel, -/area/engine/break_room) "bqQ" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -35322,11 +32098,8 @@ /turf/simulated/floor/plasteel, /area/engine/break_room) "bqU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, /turf/simulated/floor/plasteel, /area/engine/break_room) @@ -35336,9 +32109,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" }, @@ -35351,12 +32121,8 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/mining/glass{ name = "Cargo Office"; - req_access_txt = "0"; req_one_access_txt = "48;50" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -35364,12 +32130,13 @@ }, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bqX" = ( /obj/structure/table/reinforced, /obj/item/folder/blue{ @@ -35378,7 +32145,6 @@ /obj/item/pen/multi, /obj/machinery/light/small{ dir = 8; - icon_state = "bulb1"; tag = "icon-bulb1 (WEST)" }, /turf/simulated/floor/plasteel{ @@ -35393,14 +32159,14 @@ /turf/space, /area/space/nearstation) "bqZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /obj/machinery/ai_slipper{ icon_state = "motion0" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, /turf/simulated/floor/bluegrid, /area/turret_protected/ai) @@ -35412,7 +32178,6 @@ /obj/item/pen/multi, /obj/machinery/light/small{ dir = 4; - icon_state = "bulb1"; tag = "icon-bulb1 (EAST)" }, /turf/simulated/floor/plasteel{ @@ -35431,12 +32196,6 @@ pixel_x = -4 }, /obj/structure/table/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellow" @@ -35485,6 +32244,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -35496,18 +32256,6 @@ /area/turret_protected/aisat_interior{ name = "\improper MiniSat Central Foyer" }) -"brj" = ( -/obj/machinery/atmospherics/unary/outlet_injector{ - dir = 2; - frequency = 1443; - icon_state = "on"; - id = "air_in"; - on = 1 - }, -/turf/simulated/floor/plating/airless, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) "brk" = ( /turf/simulated/wall/r_wall, /area/turret_protected/tcomeast{ @@ -35516,8 +32264,6 @@ "brl" = ( /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/security/checkpoint2{ name = "Customs" @@ -35533,15 +32279,6 @@ icon_state = "dark" }, /area/turret_protected/ai) -"brn" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/turret_protected/ai) "brp" = ( /obj/structure/closet/emcloset, /obj/machinery/light, @@ -35598,6 +32335,12 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry{ name = "Arrivals" @@ -35608,6 +32351,12 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "arrival" @@ -35622,6 +32371,12 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hallway/primary/port) "bry" = ( @@ -35630,6 +32385,12 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "neutral" @@ -35641,6 +32402,12 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, @@ -35660,6 +32427,12 @@ d2 = 4; icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, @@ -35670,10 +32443,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, @@ -35684,6 +32455,12 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "neutral" @@ -35700,6 +32477,12 @@ d2 = 4; icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "neutral" @@ -35712,14 +32495,18 @@ icon_state = "2-8" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" }, /area/hallway/primary/port) "brF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" @@ -35737,9 +32524,7 @@ dir = 8 }, /turf/simulated/floor/plating, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "brH" = ( /obj/machinery/door/window/eastleft{ base_state = "right"; @@ -35749,12 +32534,10 @@ }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "brI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/hologram/holopad, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -35766,26 +32549,20 @@ /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "brK" = ( /obj/machinery/conveyor_switch/oneway{ id = "packageExternal"; pixel_y = 18 }, /obj/effect/decal/warning_stripes/yellow/partial{ - dir = 4; - icon_state = "3" + dir = 4 }, /obj/effect/decal/warning_stripes/arrow{ - dir = 4; - icon_state = "4" + dir = 4 }, /turf/simulated/floor/plasteel, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "brL" = ( /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ @@ -35795,14 +32572,12 @@ /area/hallway/primary/port) "brM" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "brown" @@ -35826,11 +32601,9 @@ }, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/hallway/primary/central) @@ -35848,12 +32621,6 @@ pixel_x = -23 }, /obj/structure/table/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellow" @@ -35892,12 +32659,10 @@ name = "Central Maintenance" }) "brU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/west, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry{ name = "Arrivals" @@ -35929,22 +32694,17 @@ }, /area/hallway/primary/port) "brY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/bridge) "brZ" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 4; @@ -36032,40 +32792,20 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/construction/hallway{ name = "\improper MiniSat Exterior" }) -"bsg" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/bridge) "bsh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -36083,9 +32823,9 @@ req_access = null; req_access_txt = "20" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/carpet, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" @@ -36108,31 +32848,21 @@ dir = 8; icon_state = "brown" }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "bsl" = ( /obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "yellowcorner" }, /area/hallway/primary/central) "bsm" = ( /turf/simulated/wall, /area/civilian/barber) -"bsn" = ( -/obj/machinery/atmospherics/pipe/simple/visible, -/turf/simulated/floor/plating/airless, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) "bso" = ( /obj/machinery/door/firedoor, /obj/structure/cable/yellow{ @@ -36143,8 +32873,6 @@ /obj/machinery/door/airlock/public/glass{ name = "Barber Shop" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/civilian/barber) "bsp" = ( @@ -36172,22 +32900,7 @@ dir = 4; icon_state = "brown" }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) -"bst" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/maintenance/starboard) +/area/quartermaster/office) "bsv" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -36203,8 +32916,9 @@ d2 = 4; icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/hallway/primary/starboard) @@ -36219,26 +32933,11 @@ icon_state = "pipe-j2s"; sortType = 6 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "cautioncorner" }, /area/hallway/primary/starboard) -"bsx" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/entry{ - name = "Arrivals" - }) "bsy" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -36248,25 +32947,13 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel, /area/engine/break_room) "bsz" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /turf/simulated/floor/plasteel, /area/engine/break_room) "bsC" = ( @@ -36282,17 +32969,12 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/landmark/start{ name = "Station Engineer" }, /turf/simulated/floor/plasteel, /area/engine/break_room) "bsE" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, /obj/machinery/light/small, /obj/item/radio/intercom{ dir = 0; @@ -36304,13 +32986,12 @@ /area/janitor) "bsF" = ( /obj/structure/disposalpipe/sortjunction, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel, /area/engine/engineering) "bsG" = ( @@ -36335,13 +33016,13 @@ pixel_y = 2 }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/item/bikehorn/rubberducky, /obj/machinery/light_switch{ pixel_x = -28 }, /obj/item/card/id/captains_spare, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/wood, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" @@ -36415,9 +33096,7 @@ }, /obj/machinery/door/window/northleft{ dir = 2; - icon_state = "left"; - name = "Reception Window"; - req_access_txt = "0" + name = "Reception Window" }, /turf/simulated/floor/plasteel, /area/crew_quarters/heads) @@ -36457,13 +33136,6 @@ dir = 8 }, /turf/space, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) -"bsU" = ( -/obj/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/visible/universal, -/turf/simulated/floor/plating/airless, /area/construction/hallway{ name = "\improper MiniSat Exterior" }) @@ -36509,8 +33181,6 @@ /obj/machinery/light_switch{ pixel_x = -22 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/engine/break_room) "bsZ" = ( @@ -36525,13 +33195,6 @@ pixel_y = -24; req_access_txt = "70" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 - }, /obj/structure/table, /obj/item/pod_parts/core, /obj/item/circuitboard/mecha/pod, @@ -36544,13 +33207,11 @@ }, /area/engine/mechanic_workshop) "bta" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/cable/yellow{ d2 = 8; icon_state = "0-8" }, /obj/machinery/power/apc{ - dir = 2; name = "Mechanic Workshop APC"; pixel_y = -25 }, @@ -36574,8 +33235,10 @@ }, /area/engine/mechanic_workshop) "btb" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -36583,10 +33246,6 @@ name = "\improper MiniSat Central Foyer" }) "btc" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 - }, /obj/machinery/door_control{ desc = "A remote control-switch for the pod doors."; id = "mechpodbay"; @@ -36606,7 +33265,6 @@ name = "AI Chamber Entrance Shutters"; opacity = 0 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/flasher{ id = "AI"; pixel_x = -25 @@ -36617,6 +33275,7 @@ name = "AI Chamber"; req_access_txt = "16" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -36734,9 +33393,10 @@ }, /obj/structure/disposalpipe/junction{ dir = 1; - icon_state = "pipe-j1"; tag = "icon-pipe-j1 (EAST)" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutral" @@ -36747,81 +33407,32 @@ dir = 2; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11; - level = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" }, /area/hallway/primary/port) "btu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/firealarm{ pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" }, /area/hallway/primary/port) "btv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutralcorner" - }, -/area/hallway/primary/port) -"btw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutralcorner" - }, -/area/hallway/primary/port) -"btx" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" }, /area/hallway/primary/port) "btz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/light{ dir = 1 }, /obj/machinery/camera{ - c_tag = "Port Primary Hallway - Middle"; - dir = 2; - network = list("SS13") - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 + c_tag = "Port Primary Hallway - Middle" }, /turf/simulated/floor/plasteel{ dir = 1; @@ -36829,13 +33440,7 @@ }, /area/hallway/primary/port) "btA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -36852,43 +33457,27 @@ d2 = 2; icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" }, /area/hallway/primary/port) "btC" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" }, /area/hallway/primary/port) "btD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_y = 21 }, /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, /turf/simulated/floor/plasteel{ @@ -36896,25 +33485,7 @@ icon_state = "neutral" }, /area/hallway/primary/port) -"btE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "browncorner" - }, -/area/hallway/primary/port) "btF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "browncorner" @@ -36927,43 +33498,21 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "browncorner" }, /area/hallway/primary/port) "btI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ name = "Port Primary Hallway" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" }, /area/hallway/primary/port) -"btJ" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutralcorner" - }, -/area/hallway/primary/central) "btK" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -36975,25 +33524,19 @@ location = "3-Central-Port" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/hallway/primary/central) "btL" = ( /obj/structure/extinguisher_cabinet{ pixel_x = 30 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/structure/sign/double/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/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10; - initialize_directions = 10; - level = 1 - }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "neutral" @@ -37027,15 +33570,11 @@ "btO" = ( /obj/structure/table, /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_x = -29 }, -/obj/item/storage/firstaid/regular{ - pixel_y = 0 - }, +/obj/item/storage/firstaid/regular, /obj/machinery/power/apc{ - dir = 2; name = "Cargo Office APC"; pixel_x = 1; pixel_y = -24 @@ -37045,9 +33584,7 @@ dir = 10; icon_state = "brown" }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "btP" = ( /obj/structure/reagent_dispensers/fueltank, /obj/machinery/atmospherics/pipe/simple/hidden/universal, @@ -37056,7 +33593,9 @@ name = "Central Maintenance" }) "btQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -37070,17 +33609,12 @@ dir = 6; icon_state = "brown" }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "btS" = ( /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; @@ -37107,7 +33641,6 @@ }, /obj/item/hand_labeler, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "brown" }, /area/hallway/primary/port) @@ -37122,6 +33655,9 @@ icon_state = "1-2" }, /obj/structure/table/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -37139,6 +33675,8 @@ /area/bridge) "btV" = ( /obj/machinery/computer/communications, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -37175,6 +33713,9 @@ pixel_y = 29 }, /obj/machinery/computer/teleporter, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -37192,6 +33733,9 @@ pixel_y = 3 }, /obj/structure/table/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -37251,6 +33795,12 @@ icon_state = "map-left-MS"; pixel_y = 32 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/wood, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" @@ -37261,14 +33811,24 @@ icon_state = "map-right-MS"; pixel_y = 32 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/wood, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" }) "bug" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/wood, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" @@ -37306,26 +33866,15 @@ }, /obj/machinery/camera{ c_tag = "Central Primary Hallway - Starboard - Art Storage"; - dir = 4; - network = list("SS13") + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" }, /area/hallway/primary/central) -"buk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutralcorner" - }, -/area/hallway/primary/central) "bul" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/visible, /obj/machinery/door_control{ id = "turbinevent"; name = "Turbine Vent Control"; @@ -37354,6 +33903,9 @@ /obj/machinery/keycard_auth{ pixel_y = 24 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -37364,10 +33916,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "barber" @@ -37380,6 +33928,10 @@ /obj/machinery/light/small{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "barber" @@ -37419,12 +33971,9 @@ /area/crew_quarters/bar) "but" = ( /obj/effect/decal/warning_stripes/yellow/hollow, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1; - level = 1 + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -37432,7 +33981,6 @@ }, /area/hallway/primary/port) "buu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, /obj/structure/table/reinforced, /obj/machinery/door/window/westleft{ @@ -37442,11 +33990,8 @@ }, /obj/effect/spawner/lootdrop/maintenance, /obj/effect/decal/warning_stripes/yellow/hollow, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "buv" = ( /obj/item/storage/box/lights/mixed, /obj/effect/spawner/lootdrop/maintenance, @@ -37494,16 +34039,13 @@ dir = 8; pixel_x = -24 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/machinery/camera{ c_tag = "Arrivals - Station Entrance"; - dir = 4; - network = list("SS13") + dir = 4 }, /obj/effect/decal/warning_stripes/west, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry{ name = "Arrivals" @@ -37536,8 +34078,13 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/hallway/primary/starboard) @@ -37546,8 +34093,12 @@ dir = 8; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "cautioncorner" @@ -37559,13 +34110,13 @@ /turf/simulated/floor/plating, /area/maintenance/starboard) "buI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/north, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/starboard) "buJ" = ( /obj/effect/decal/warning_stripes/southwestcorner, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel, /area/engine/break_room) "buK" = ( @@ -37574,13 +34125,17 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ d1 = 1; d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/engine/break_room) "buL" = ( @@ -37644,7 +34199,6 @@ }, /obj/machinery/camera{ c_tag = "Mini Satellite Entrance"; - dir = 2; network = list("SS13","MiniSat") }, /obj/machinery/light/small{ @@ -37658,12 +34212,13 @@ name = "\improper MiniSat Exterior" }) "buS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/window/eastright{ dir = 1; name = "MiniSat Walkway Access"; req_access_txt = "13;75" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -37690,7 +34245,6 @@ pixel_x = 9; pixel_y = 2 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkbluecorners" @@ -37700,10 +34254,7 @@ }) "buU" = ( /obj/machinery/bluespace_beacon, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkbluecorners" @@ -37722,7 +34273,6 @@ /area/hallway/primary/starboard) "buW" = ( /obj/machinery/status_display{ - density = 0; layer = 4; pixel_y = 32 }, @@ -37736,9 +34286,6 @@ name = "\improper MiniSat Teleporter Foyer" }) "buX" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkbluecorners" @@ -37749,7 +34296,6 @@ "buY" = ( /obj/machinery/light/small{ dir = 8; - icon_state = "bulb1"; tag = "icon-bulb1 (WEST)" }, /obj/machinery/light_switch{ @@ -37760,9 +34306,6 @@ dir = 4; network = list("SS13","MiniSat") }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkbluecorners" @@ -37771,7 +34314,6 @@ name = "\improper MiniSat Central Foyer" }) "buZ" = ( -/obj/machinery/atmospherics/unary/vent_pump, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkbluecorners" @@ -37781,25 +34323,14 @@ }) "bva" = ( /obj/machinery/hologram/holopad, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/turret_protected/aisat_interior{ name = "\improper MiniSat Central Foyer" }) -"bvb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/wall/r_wall, -/area/turret_protected/tcomeast{ - name = "\improper MiniSat East Wing" - }) "bvc" = ( /obj/machinery/power/apc{ dir = 4; @@ -37808,7 +34339,6 @@ }, /obj/machinery/light/small{ dir = 4; - icon_state = "bulb1"; tag = "icon-bulb1 (EAST)" }, /obj/structure/cable/yellow{ @@ -37826,7 +34356,6 @@ /obj/structure/showcase{ density = 0; desc = "An old, deactivated cyborg. Whilst once actively used to guard against intruders, it now simply intimidates them with its cold, steely gaze."; - dir = 2; icon = 'icons/mob/robots.dmi'; icon_state = "robot_old"; name = "Cyborg Statue"; @@ -37846,8 +34375,7 @@ }, /obj/effect/decal/warning_stripes/north, /obj/machinery/power/terminal{ - dir = 1; - icon_state = "term" + dir = 1 }, /obj/machinery/camera/motion{ c_tag = "Mini Satellite Maintenance"; @@ -37860,9 +34388,6 @@ /obj/machinery/ai_slipper{ icon_state = "motion0" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -37888,20 +34413,20 @@ }) "bvg" = ( /obj/item/radio/intercom{ - broadcasting = 0; - listening = 1; name = "Station Intercom (General)"; pixel_y = 20 }, /obj/structure/showcase{ density = 0; desc = "An old, deactivated cyborg. Whilst once actively used to guard against intruders, it now simply intimidates them with its cold, steely gaze."; - dir = 2; icon = 'icons/mob/robots.dmi'; icon_state = "robot_old"; name = "Cyborg Statue"; pixel_y = 20 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkbluecorners" @@ -37930,11 +34455,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/effect/decal/warning_stripes/north, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/starboard) "bvk" = ( @@ -37946,7 +34467,10 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -38001,7 +34525,6 @@ }) "bvo" = ( /obj/machinery/status_display{ - density = 0; layer = 4; pixel_y = 32 }, @@ -38045,9 +34568,6 @@ /turf/simulated/floor/wood, /area/crew_quarters/heads) "bvr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/structure/chair/office/dark{ dir = 1 }, @@ -38056,8 +34576,7 @@ }, /obj/machinery/camera{ c_tag = "Bridge - Starboard"; - dir = 8; - network = list("SS13") + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -38065,10 +34584,12 @@ /area/bridge) "bvs" = ( /obj/machinery/status_display{ - density = 0; layer = 4; pixel_x = -32 }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -38080,8 +34601,7 @@ }, /obj/machinery/camera{ c_tag = "Engineering - Foyer - Starboard"; - dir = 8; - network = list("SS13") + dir = 8 }, /turf/simulated/floor/plasteel, /area/engine/break_room) @@ -38111,9 +34631,7 @@ }, /obj/structure/table, /obj/machinery/camera{ - c_tag = "Engineering - Transit Tube Access"; - dir = 2; - network = list("SS13") + c_tag = "Engineering - Transit Tube Access" }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -38134,9 +34652,6 @@ pixel_x = -9; pixel_y = 2 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkbluecorners" @@ -38188,8 +34703,7 @@ }, /obj/machinery/camera{ c_tag = "Arrivals - Lounge"; - dir = 4; - network = list("SS13") + dir = 4 }, /obj/effect/landmark/start{ name = "Civilian" @@ -38242,6 +34756,12 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutral" @@ -38257,8 +34777,12 @@ dir = 1; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, /turf/simulated/floor/plasteel, /area/hallway/primary/port) "bvH" = ( @@ -38270,6 +34794,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hallway/primary/port) "bvK" = ( @@ -38283,10 +34813,15 @@ d2 = 4; icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hallway/primary/port) "bvL" = ( @@ -38299,6 +34834,12 @@ dir = 4 }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hallway/primary/port) "bvM" = ( @@ -38315,6 +34856,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hallway/primary/port) "bvN" = ( @@ -38326,9 +34873,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, /turf/simulated/floor/plasteel, /area/hallway/primary/port) @@ -38338,15 +34885,16 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/structure/disposalpipe/sortjunction{ dir = 8; - icon_state = "pipe-j1s"; sortType = 3 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, /turf/simulated/floor/plasteel, /area/hallway/primary/port) "bvQ" = ( @@ -38364,8 +34912,11 @@ dir = 8; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/hallway/primary/port) @@ -38375,6 +34926,12 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hallway/primary/port) "bvS" = ( @@ -38387,21 +34944,14 @@ /obj/machinery/door/airlock/public/glass{ name = "Port Primary Hallway" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hallway/primary/port) -"bvT" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel, -/area/hallway/primary/central) "bvU" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -38414,8 +34964,11 @@ icon_state = "1-8" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/hallway/primary/central) @@ -38442,9 +34995,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -38459,9 +35010,6 @@ /turf/simulated/floor/wood, /area/crew_quarters/heads) "bvZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -38491,7 +35039,7 @@ icon_state = "4-8" }, /obj/effect/decal/warning_stripes/north, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -38499,17 +35047,10 @@ name = "\improper MiniSat East Wing" }) "bwb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_y = 21 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -38537,6 +35078,8 @@ d2 = 4; icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -38566,8 +35109,7 @@ /obj/structure/cable/yellow, /obj/machinery/camera{ c_tag = "Bridge - Port"; - dir = 4; - network = list("SS13") + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -38596,6 +35138,8 @@ /obj/structure/chair/comfy/black{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/carpet, /area/bridge) "bwk" = ( @@ -38623,11 +35167,16 @@ /area/storage/tools) "bwm" = ( /obj/machinery/status_display{ - density = 0; layer = 4; pixel_y = 32 }, /obj/structure/displaycase/captain, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/wood, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" @@ -38657,17 +35206,12 @@ /obj/item/stack/packageWrap, /obj/item/gun/projectile/revolver/doublebarrel, /obj/machinery/camera{ - c_tag = "Maltese Falcon - Backroom"; - dir = 2; - network = list("SS13") + c_tag = "Maltese Falcon - Backroom" }, /obj/item/eftpos, /turf/simulated/floor/wood, /area/crew_quarters/bar) "bwq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 4; @@ -38689,6 +35233,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating/airless, /area/space/nearstation) "bws" = ( @@ -38714,9 +35261,7 @@ name = "Captain" }, /obj/structure/chair/comfy/brown, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" @@ -38725,31 +35270,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) -"bww" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel, -/area/hallway/primary/central) -"bwx" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutralcorner" - }, -/area/hallway/primary/central) +/turf/simulated/floor/plating/airless, +/area/space/nearstation) "bwy" = ( /obj/structure/transit_tube{ icon_state = "D-SE"; @@ -38762,13 +35287,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating/airless, /area/space/nearstation) "bwz" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; @@ -38787,6 +35311,7 @@ /obj/effect/landmark/start{ name = "Barber" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "barber" @@ -38823,10 +35348,13 @@ icon_state = "E-SW-NW"; tag = "icon-E-SW-NW" }, +/obj/machinery/atmospherics/pipe/simple/visible/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating/airless, /area/space/nearstation) "bwG" = ( @@ -38837,36 +35365,20 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plating, /area/crew_quarters/bar) "bwH" = ( /obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/engine/break_room) "bwI" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/starboard) -"bwK" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plating, /area/maintenance/starboard) "bwL" = ( @@ -38874,6 +35386,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating/airless, /area/space/nearstation) "bwM" = ( @@ -38884,6 +35399,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating/airless, /area/space/nearstation) "bwN" = ( @@ -38893,9 +35411,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plating, /area/maintenance/starboard) "bwO" = ( @@ -38905,11 +35420,6 @@ icon_state = "4-8" }, /obj/item/storage/box/lights/mixed, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 - }, /turf/simulated/floor/plating, /area/maintenance/starboard) "bwP" = ( @@ -38917,9 +35427,6 @@ dir = 4 }, /obj/effect/decal/warning_stripes/west, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plating, /area/maintenance/starboard) "bwR" = ( @@ -38930,13 +35437,9 @@ }, /obj/structure/disposalpipe/sortjunction{ dir = 2; - icon_state = "pipe-j1s"; sortType = 19 }, /obj/effect/decal/warning_stripes/east, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plating, /area/maintenance/starboard) "bwS" = ( @@ -38945,18 +35448,11 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 8; icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, /turf/simulated/floor/plating, /area/maintenance/starboard) "bwT" = ( @@ -38966,18 +35462,12 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/hallway/primary/starboard) -"bwU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/transit_tube, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) "bwV" = ( /obj/machinery/vending/coffee, /turf/simulated/floor/plasteel{ @@ -38990,11 +35480,13 @@ /obj/structure/transit_tube{ icon_state = "W-NE-SE" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 - }, /obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/space, /area/space/nearstation) "bwX" = ( @@ -39006,19 +35498,23 @@ icon_state = "D-NW"; tag = "icon-D-NE" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 - }, /obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/space, /area/space/nearstation) "bwY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 - }, /obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/space, /area/space/nearstation) "bwZ" = ( @@ -39028,20 +35524,19 @@ icon_state = "4-8" }, /obj/effect/decal/warning_stripes/west, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plating, /area/maintenance/starboard) "bxa" = ( /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 - }, /obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/space, /area/space/nearstation) "bxb" = ( @@ -39049,15 +35544,16 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 - }, /obj/structure/transit_tube/station{ dir = 4; - icon_state = "closed"; tag = "icon-closed (EAST)" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "vault" @@ -39071,13 +35567,6 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, /turf/simulated/floor/plasteel, /area/engine/break_room) "bxd" = ( @@ -39090,9 +35579,6 @@ /area/engine/break_room) "bxe" = ( /obj/machinery/door/window/southleft{ - base_state = "left"; - dir = 2; - icon_state = "left"; name = "Bar Delivery"; req_access_txt = "25" }, @@ -39113,20 +35599,18 @@ }, /area/engine/break_room) "bxg" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" }, /area/engine/break_room) "bxi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -39150,14 +35634,17 @@ /turf/space, /area/space/nearstation) "bxl" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - on = 1 - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -39165,11 +35652,7 @@ name = "\improper MiniSat Exterior" }) "bxm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/power/apc{ - dir = 2; name = "Engineering Foyer APC"; pixel_x = -1; pixel_y = -26 @@ -39179,15 +35662,9 @@ d2 = 4; icon_state = "0-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/engine/break_room) "bxn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/firealarm{ dir = 1; pixel_y = -24 @@ -39197,9 +35674,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/engine/break_room) "bxo" = ( @@ -39233,7 +35707,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/airlock/command{ name = "E.V.A. Storage"; req_access_txt = "18" @@ -39244,15 +35717,13 @@ name = "E.V.A. Storage" }) "bxr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/machinery/alarm{ dir = 4; pixel_x = -23 }, /obj/effect/decal/warning_stripes/west, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry{ name = "Arrivals" @@ -39264,28 +35735,16 @@ icon_state = "dark" }, /area/maintenance/starboard) -"bxt" = ( -/obj/structure/girder, -/obj/structure/grille, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +"bxu" = ( /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/turf/simulated/floor/plating, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) -"bxu" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -39293,13 +35752,14 @@ name = "\improper MiniSat Exterior" }) "bxv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/hologram/holopad, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -39317,10 +35777,10 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -39338,10 +35798,12 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -39355,10 +35817,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, /turf/simulated/floor/plasteel{ @@ -39376,7 +35836,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -39394,10 +35856,10 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -39417,10 +35879,10 @@ d2 = 4; icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -39429,27 +35891,6 @@ /area/turret_protected/tcomfoyer{ name = "\improper MiniSat Teleporter Foyer" }) -"bxC" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/landmark/start{ - name = "Cyborg" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/turret_protected/aisat_interior{ - name = "\improper MiniSat Central Foyer" - }) "bxD" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -39459,31 +35900,12 @@ /obj/effect/landmark/start{ name = "Cyborg" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/turret_protected/aisat_interior{ - name = "\improper MiniSat Central Foyer" - }) -"bxE" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/landmark/start{ - name = "Cyborg" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -39497,9 +35919,6 @@ icon_state = "4-8" }, /obj/effect/decal/warning_stripes/east, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plating, /area/maintenance/starboard) "bxH" = ( @@ -39567,8 +35986,7 @@ pixel_y = 1 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -39598,8 +36016,7 @@ dir = 8 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/effect/landmark/start{ name = "Civilian" @@ -39627,17 +36044,14 @@ }, /area/hallway/primary/port) "bxR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/hallway/primary/port) "bxS" = ( /obj/item/radio/intercom{ - broadcasting = 0; - listening = 1; name = "Station Intercom (General)"; pixel_y = -28 }, @@ -39681,7 +36095,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -39699,16 +36112,13 @@ req_access_txt = "57" }, /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_y = 21 }, /turf/simulated/floor/wood, /area/crew_quarters/heads) "byb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; @@ -39729,8 +36139,7 @@ "byd" = ( /obj/machinery/camera{ c_tag = "Port Primary Hallway - Starboard"; - dir = 1; - network = list("SS13") + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -39759,8 +36168,9 @@ }, /area/hallway/primary/port) "byg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -39777,6 +36187,8 @@ location = "6-Port-Central" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/hallway/primary/central) "byi" = ( @@ -39794,9 +36206,6 @@ /turf/simulated/floor/carpet, /area/crew_quarters/heads) "byj" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 2 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -39835,13 +36244,6 @@ "bym" = ( /turf/simulated/floor/carpet, /area/crew_quarters/heads) -"byn" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 2; - on = 1 - }, -/turf/simulated/floor/carpet, -/area/crew_quarters/heads) "byo" = ( /obj/structure/window/reinforced, /obj/structure/table/wood, @@ -39897,27 +36299,18 @@ }, /obj/machinery/camera{ c_tag = "Bridge - Command Chair"; - dir = 1; - network = list("SS13") - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 + dir = 1 }, /turf/simulated/floor/carpet, /area/bridge) "byt" = ( /obj/machinery/hologram/holopad, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/carpet, /area/bridge) "byu" = ( /obj/machinery/status_display{ - density = 0; layer = 4; pixel_y = 32 }, @@ -39928,7 +36321,6 @@ /obj/structure/closet/secure_closet/hop, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/computer/security/telescreen/entertainment{ @@ -39969,7 +36361,6 @@ /area/bridge) "byy" = ( /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_y = -29 }, @@ -40025,12 +36416,8 @@ name = "Captain's Desk"; req_access_txt = "20" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/structure/disposalpipe/segment, /obj/item/stamp/captain, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" @@ -40056,6 +36443,8 @@ }, /obj/item/coin/plasma, /obj/item/melee/chainofcommand, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" @@ -40070,26 +36459,18 @@ pixel_x = -3; pixel_y = 5 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 - }, /turf/simulated/floor/carpet, /area/security/detectives_office) "byE" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, /obj/machinery/door/airlock/maintenance{ - req_access_txt = "0"; req_one_access_txt = "20;12" }, /turf/simulated/floor/plating, @@ -40100,9 +36481,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -40123,17 +36501,19 @@ dir = 8; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/hallway/primary/central) "byH" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "barber" @@ -40143,6 +36523,9 @@ /obj/structure/chair/barber{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "barber" @@ -40166,13 +36549,13 @@ }) "byK" = ( /obj/structure/reagent_dispensers/beerkeg, +/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "byL" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 2; - on = 1 - }, /obj/effect/landmark{ name = "xeno_spawn"; pixel_x = -1 @@ -40181,6 +36564,9 @@ dir = 4; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "byM" = ( @@ -40188,15 +36574,20 @@ dir = 8; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "byN" = ( /obj/structure/closet/gmcloset{ desc = "It's a storage unit."; - icon_state = "black"; name = "spare gear" }, /obj/item/wrench, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "byO" = ( @@ -40213,7 +36604,6 @@ /area/maintenance/starboard) "byP" = ( /obj/machinery/power/apc{ - cell_type = 2500; dir = 8; name = "Barber APC"; pixel_x = -25 @@ -40222,9 +36612,6 @@ d2 = 4; icon_state = "0-4" }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "barber" @@ -40246,32 +36633,15 @@ icon_state = "caution" }, /area/hallway/primary/starboard) -"byU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "caution" - }, -/area/hallway/primary/starboard) "byV" = ( /obj/machinery/door/airlock/maintenance{ name = "Engineering Foyer Maintenance"; - req_access_txt = "0"; req_one_access_txt = "32;19" }, /turf/simulated/floor/plating, /area/engine/break_room) "byW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - level = 1 - }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "caution" }, /area/engine/break_room) @@ -40281,15 +36651,9 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1; - level = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "caution" }, /area/engine/break_room) @@ -40298,18 +36662,13 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_y = -30 }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "byZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/firealarm{ dir = 8; pixel_x = -24 @@ -40320,18 +36679,21 @@ }, /area/engine/break_room) "bza" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/engine/break_room) "bzb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/sign/securearea{ pixel_x = 32 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "blackcorner" }, /area/hallway/primary/starboard) @@ -40368,11 +36730,9 @@ d2 = 4; icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, /mob/living/simple_animal/bot/secbot/pingsky, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -40390,10 +36750,10 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -40416,10 +36776,10 @@ /obj/effect/landmark/start{ name = "Cyborg" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -40437,10 +36797,6 @@ name = "\improper MiniSat Exterior" }) "bzi" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; @@ -40449,6 +36805,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -40466,12 +36823,12 @@ d2 = 8; icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -40479,8 +36836,11 @@ name = "\improper MiniSat East Wing" }) "bzk" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -40489,9 +36849,10 @@ name = "\improper MiniSat East Wing" }) "bzl" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -40504,13 +36865,15 @@ dir = 1; layer = 2.9 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 - }, /obj/machinery/ai_slipper{ icon_state = "motion0" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -40519,14 +36882,16 @@ }) "bzn" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 - }, /obj/machinery/door/airlock/maintenance_hatch{ name = "MiniSat Maintenance"; req_access_txt = "75" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -40537,9 +36902,11 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -40553,9 +36920,11 @@ dir = 1; layer = 2.9 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -40568,13 +36937,6 @@ pixel_y = -30 }, /obj/machinery/vending/cigarette, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - level = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "cafeteria"; @@ -40615,12 +36977,6 @@ }) "bzv" = ( /obj/effect/decal/warning_stripes/west, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/engine/break_room) "bzw" = ( @@ -40638,15 +36994,6 @@ "bzy" = ( /obj/effect/decal/warning_stripes/northeast, /turf/simulated/floor/plasteel, -/area/hallway/secondary/entry{ - name = "Arrivals" - }) -"bzz" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 2 - }, -/obj/effect/decal/warning_stripes/north, -/turf/simulated/floor/plasteel, /area/hallway/secondary/entry{ name = "Arrivals" }) @@ -40686,8 +37033,7 @@ }, /obj/machinery/camera{ c_tag = "Port Primary Hallway - Port"; - dir = 4; - network = list("SS13") + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -40710,8 +37056,7 @@ /area/hallway/primary/port) "bzF" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -40736,7 +37081,6 @@ /area/hallway/primary/port) "bzJ" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "0"; req_one_access_txt = "12;27;37" }, /obj/structure/cable/yellow{ @@ -40744,7 +37088,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" @@ -40762,21 +37105,17 @@ name = "Library" }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "carpetsymbol" }, /area/library) "bzN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ name = "Library" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "carpetsymbol" }, /area/library) @@ -40790,17 +37129,6 @@ }, /turf/simulated/wall/r_wall, /area/hallway/primary/port) -"bzP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralcorner" - }, -/area/hallway/primary/central) "bzQ" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -40809,7 +37137,6 @@ }, /obj/structure/disposalpipe/sortjunction{ dir = 1; - icon_state = "pipe-j1s"; sortType = 15 }, /obj/structure/cable/yellow{ @@ -40817,8 +37144,11 @@ d2 = 4; icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 }, /turf/simulated/floor/plasteel, /area/hallway/primary/central) @@ -40831,11 +37161,13 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/hallway/primary/central) @@ -40851,10 +37183,13 @@ req_access = null; req_access_txt = "57" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /turf/simulated/floor/wood, @@ -40865,13 +37200,16 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/carpet, /area/crew_quarters/heads) "bzU" = ( @@ -40885,14 +37223,17 @@ d2 = 8; icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/carpet, /area/crew_quarters/heads) "bzV" = ( @@ -40915,6 +37256,9 @@ icon_state = "1-8" }, /obj/machinery/hologram/holopad, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/carpet, /area/crew_quarters/heads) "bzX" = ( @@ -40923,31 +37267,17 @@ d2 = 8; icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/turf/simulated/floor/carpet, -/area/crew_quarters/heads) -"bzY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/carpet, /area/crew_quarters/heads) "bzZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 8; @@ -40956,9 +37286,6 @@ /turf/simulated/floor/carpet, /area/crew_quarters/heads) "bAa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command{ name = "Head of Personnel"; @@ -40978,25 +37305,14 @@ icon_state = "dark" }, /area/bridge) -"bAe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/command/glass{ - name = "Bridge"; - req_access_txt = "19" - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/bridge) "bAg" = ( /obj/machinery/door/airlock/command{ name = "Command Desk"; req_access = null; req_access_txt = "19" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "vault"; tag = "icon-vault" @@ -41036,6 +37352,8 @@ pixel_x = 9; pixel_y = -9 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/carpet{ icon_state = "carpet6-2"; tag = "icon-carpet6-2" @@ -41065,11 +37383,7 @@ name = "\improper Captain's Quarters" }) "bAp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/carpet{ icon_state = "carpet14-10"; tag = "icon-carpet14-10" @@ -41080,8 +37394,7 @@ "bAq" = ( /obj/machinery/camera{ c_tag = "Captain's Office"; - dir = 8; - network = list("SS13") + dir = 8 }, /turf/simulated/floor/carpet{ icon_state = "carpet10-8"; @@ -41096,12 +37409,6 @@ }, /obj/item/storage/box/donkpockets, /obj/structure/table/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "cafeteria"; @@ -41114,16 +37421,9 @@ }, /obj/machinery/camera{ c_tag = "Engineering - Foyer - Port"; - dir = 1; - network = list("SS13") + dir = 1 }, /obj/structure/table/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "cafeteria"; @@ -41133,14 +37433,12 @@ "bAt" = ( /obj/structure/transit_tube/station{ dir = 8; - icon_state = "closed"; tag = "icon-closed (EAST)" }, /obj/structure/window/reinforced{ dir = 4 }, /obj/structure/transit_tube_pod, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" @@ -41148,6 +37446,8 @@ /area/engine/break_room) "bAu" = ( /obj/machinery/vending/boozeomat, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/wall, /area/crew_quarters/bar) "bAv" = ( @@ -41155,7 +37455,6 @@ name = "Bar Storage"; req_access_txt = "25" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "wood" @@ -41200,7 +37499,6 @@ }, /obj/machinery/light/small{ dir = 8; - icon_state = "bulb1"; tag = "icon-bulb1 (WEST)" }, /mob/living/simple_animal/bot/cleanbot{ @@ -41230,43 +37528,18 @@ }, /area/crew_quarters/sleep) "bAE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/effect/decal/warning_stripes/northwestcorner, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry{ name = "Arrivals" }) -"bAF" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/starboard) -"bAG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "caution" - }, -/area/hallway/primary/starboard) "bAL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel, /area/engine/engineering) "bAP" = ( @@ -41316,7 +37589,6 @@ pixel_y = -24 }, /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_x = 5; pixel_y = -26 @@ -41328,10 +37600,9 @@ pixel_x = 1; pixel_y = 5 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -41339,13 +37610,7 @@ "bAV" = ( /obj/structure/rack, /obj/item/clothing/mask/gas, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1; - level = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -41357,7 +37622,6 @@ }, /obj/machinery/power/apc{ cell_type = 5000; - dir = 2; name = "MiniSat Maintenance APC"; pixel_y = -24 }, @@ -41424,7 +37688,6 @@ /area/space/nearstation) "bBc" = ( /obj/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; @@ -41439,12 +37702,7 @@ }) "bBd" = ( /obj/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - level = 1 - }, /obj/machinery/power/apc{ - dir = 2; name = "AI Satellite Exterior APC"; pixel_y = -24 }, @@ -41453,6 +37711,9 @@ d2 = 4; icon_state = "0-4" }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkbluecorners" @@ -41462,9 +37723,6 @@ }) "bBf" = ( /obj/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkbluecorners" @@ -41473,12 +37731,13 @@ name = "\improper MiniSat Exterior" }) "bBg" = ( -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/machinery/door/window/eastright{ dir = 2; name = "MiniSat Walkway Access"; req_access_txt = "13;75" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -41502,9 +37761,6 @@ pixel_x = 9; pixel_y = 2 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkbluecorners" @@ -41520,7 +37776,6 @@ }, /obj/machinery/light, /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_x = 5; pixel_y = -26 @@ -41528,7 +37783,7 @@ /obj/effect/landmark{ name = "JoinLateCyborg" }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, /turf/simulated/floor/plasteel{ @@ -41542,13 +37797,13 @@ /obj/machinery/door/airlock/hatch{ name = "Telecoms Control Room" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" @@ -41558,18 +37813,14 @@ }) "bBl" = ( /turf/simulated/wall/r_wall, -/area/tcommsat/computer{ - name = "\improper Telecoms Control Room" - }) +/area/tcommsat/computer) "bBm" = ( /obj/structure/rack, /obj/item/storage/toolbox/electrical{ pixel_x = -3; pixel_y = 3 }, -/obj/item/storage/toolbox/mechanical{ - pixel_y = 0 - }, +/obj/item/storage/toolbox/mechanical, /obj/item/multitool, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -41608,12 +37859,6 @@ icon_state = "1-2" }, /obj/effect/decal/warning_stripes/east, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, /turf/simulated/floor/plating, /area/maintenance/starboard) "bBr" = ( @@ -41644,7 +37889,6 @@ }) "bBu" = ( /obj/machinery/status_display{ - density = 0; layer = 4; pixel_y = -32 }, @@ -41661,6 +37905,9 @@ }) "bBw" = ( /obj/effect/decal/warning_stripes/northeastcorner, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry{ name = "Arrivals" @@ -41671,6 +37918,12 @@ d2 = 4; icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry{ name = "Arrivals" @@ -41681,10 +37934,12 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry{ name = "Arrivals" @@ -41720,9 +37975,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 2 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" @@ -41779,9 +38031,7 @@ /turf/simulated/floor/carpet, /area/library) "bBR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/carpet, /area/library) @@ -41801,7 +38051,6 @@ pixel_y = 30 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "cult"; tag = "icon-cult" }, @@ -41819,10 +38068,6 @@ pixel_y = -34; req_access_txt = "19" }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 - }, /turf/simulated/floor/carpet, /area/bridge) "bBV" = ( @@ -41905,17 +38150,6 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/heads) -"bCc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/command/glass{ - name = "Bridge"; - req_access_txt = "19" - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/bridge) "bCd" = ( /obj/structure/table/wood, /obj/structure/window/reinforced, @@ -41926,9 +38160,9 @@ pixel_x = -2; pixel_y = 4 }, -/obj/item/storage/lockbox/medal{ - pixel_y = 0 - }, +/obj/item/storage/lockbox/medal, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" @@ -41939,14 +38173,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/universal, /turf/simulated/floor/plating, /area/maintenance/starboard) -"bCf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/bridge) "bCg" = ( /obj/structure/table/wood, /obj/item/hand_tele, @@ -41962,9 +38188,7 @@ }) "bCh" = ( /obj/machinery/camera{ - c_tag = "Council Chamber"; - dir = 2; - network = list("SS13") + c_tag = "Council Chamber" }, /obj/machinery/light{ dir = 1 @@ -41972,25 +38196,21 @@ /obj/machinery/ai_status_display{ pixel_y = 32 }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 2; - on = 1 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/bridge) "bCi" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/structure/disposalpipe/junction{ dir = 8; icon_state = "pipe-j2"; tag = "icon-pipe-j1 (WEST)" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -42001,6 +38221,12 @@ }) "bCj" = ( /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/engine/engineering) "bCk" = ( @@ -42011,6 +38237,9 @@ }, /obj/item/razor, /obj/item/eftpos, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "barber" @@ -42033,20 +38262,13 @@ pixel_y = 2; products = list(/obj/item/storage/fancy/cigarettes/cigpack_syndicate = 7, /obj/item/storage/fancy/cigarettes/cigpack_uplift = 3, /obj/item/storage/fancy/cigarettes/cigpack_robust = 2, /obj/item/storage/fancy/cigarettes/cigpack_carp = 3, /obj/item/storage/fancy/cigarettes/cigpack_midori = 1, /obj/item/storage/box/matches = 10, /obj/item/lighter/random = 4) }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, /turf/simulated/floor/wood, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" }) "bCn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/carpet{ icon_state = "carpet7-3"; tag = "icon-carpet7-3" @@ -42055,9 +38277,6 @@ name = "\improper Captain's Quarters" }) "bCo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 4; @@ -42065,38 +38284,25 @@ }, /obj/structure/chair/comfy/brown{ dir = 4; - icon_state = "comfychair"; tag = "icon-comfychair (EAST)" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/carpet, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" }) "bCp" = ( /obj/structure/table/wood, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, /obj/item/storage/fancy/donut_box, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/carpet, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" }) "bCq" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -42108,20 +38314,13 @@ }, /obj/structure/chair/comfy/brown{ dir = 8; - icon_state = "comfychair"; tag = "icon-comfychair (WEST)" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /turf/simulated/floor/carpet, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" }) "bCr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -42137,18 +38336,6 @@ /area/crew_quarters/captain{ name = "\improper Captain's Quarters" }) -"bCt" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/decal/warning_stripes/north, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) "bCu" = ( /obj/machinery/computer/security/telescreen{ dir = 8; @@ -42156,15 +38343,7 @@ network = list("MiniSat","tcomm"); pixel_x = 29 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - level = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "caution" }, /area/engine/break_room) @@ -42183,7 +38362,6 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -42207,7 +38385,6 @@ }, /area/crew_quarters/bar) "bCz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" @@ -42262,19 +38439,6 @@ /obj/structure/cable/yellow, /turf/simulated/floor/plating, /area/ntrep) -"bCE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, -/obj/structure/extinguisher_cabinet{ - pixel_x = 27 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutralcorner" - }, -/area/hallway/primary/central) "bCF" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -42285,9 +38449,6 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "bCG" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 2 - }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, /area/crew_quarters/bar) @@ -42297,23 +38458,10 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar) -"bCI" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/maintenance/starboard) "bCJ" = ( /obj/machinery/computer/arcade, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/computer/security/telescreen/entertainment{ @@ -42321,24 +38469,6 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar) -"bCK" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "neutralcorner" - }, -/area/hallway/primary/starboard) "bCL" = ( /obj/structure/rack, /obj/item/clothing/mask/breath{ @@ -42367,7 +38497,6 @@ /turf/simulated/wall, /area/atmos) "bCO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -42378,6 +38507,7 @@ name = "Atmospherics"; req_access_txt = "24" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/atmos) @@ -42393,7 +38523,6 @@ /area/atmos) "bCW" = ( /obj/machinery/power/apc{ - dir = 2; name = "AI Satellite Teleporter APC"; pixel_y = -24 }, @@ -42406,8 +38535,10 @@ name = "\improper MiniSat Teleporter Foyer" }) "bCX" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "darkbluecorners" }, /area/turret_protected/aisat_interior{ @@ -42423,9 +38554,6 @@ }, /obj/structure/rack, /obj/item/clothing/suit/storage/hazardvest, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -42436,7 +38564,9 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -42458,14 +38588,11 @@ /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/tcommsat/computer{ - name = "\improper Telecoms Control Room" - }) +/area/tcommsat/computer) "bDd" = ( /obj/structure/showcase{ density = 0; desc = "An old, deactivated cyborg. Whilst once actively used to guard against intruders, it now simply intimidates them with its cold, steely gaze."; - dir = 2; icon = 'icons/mob/robots.dmi'; icon_state = "robot_old"; name = "Cyborg Statue"; @@ -42474,28 +38601,23 @@ /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/tcommsat/computer{ - name = "\improper Telecoms Control Room" - }) +/area/tcommsat/computer) "bDe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/tcommsat/computer{ - name = "\improper Telecoms Control Room" - }) +/area/tcommsat/computer) "bDf" = ( /obj/structure/table/wood, /obj/item/folder/blue, /obj/machinery/status_display{ - density = 0; layer = 4; pixel_y = 31 }, @@ -42504,9 +38626,7 @@ /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/tcommsat/computer{ - name = "\improper Telecoms Control Room" - }) +/area/tcommsat/computer) "bDg" = ( /obj/machinery/light_switch{ pixel_y = 28 @@ -42514,7 +38634,6 @@ /obj/structure/showcase{ density = 0; desc = "An old, deactivated cyborg. Whilst once actively used to guard against intruders, it now simply intimidates them with its cold, steely gaze."; - dir = 2; icon = 'icons/mob/robots.dmi'; icon_state = "robot_old"; name = "Cyborg Statue"; @@ -42523,9 +38642,7 @@ /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/tcommsat/computer{ - name = "\improper Telecoms Control Room" - }) +/area/tcommsat/computer) "bDh" = ( /obj/machinery/light/small{ dir = 4 @@ -42547,20 +38664,16 @@ /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/tcommsat/computer{ - name = "\improper Telecoms Control Room" - }) +/area/tcommsat/computer) "bDi" = ( /obj/machinery/light/small{ dir = 4; - icon_state = "bulb1"; tag = "icon-bulb1 (EAST)" }, /mob/living/simple_animal/bot/floorbot{ on = 0 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "darkbluecorners" }, /area/turret_protected/aisat_interior{ @@ -42575,13 +38688,8 @@ /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/tcommsat/computer{ - name = "\improper Telecoms Control Room" - }) +/area/tcommsat/computer) "bDk" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" @@ -42607,9 +38715,6 @@ req_access = null; req_access_txt = "20" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -42626,16 +38731,6 @@ /obj/machinery/light, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, -/area/hallway/secondary/entry{ - name = "Arrivals" - }) -"bDn" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, -/obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plasteel, /area/hallway/secondary/entry{ name = "Arrivals" }) @@ -42650,15 +38745,6 @@ }, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, -/area/hallway/secondary/entry{ - name = "Arrivals" - }) -"bDp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plasteel, /area/hallway/secondary/entry{ name = "Arrivals" }) @@ -42674,15 +38760,13 @@ }, /area/hallway/primary/port) "bDr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/firealarm{ dir = 4; pixel_x = 24 }, /obj/machinery/camera{ c_tag = "Bridge - Port Access"; - dir = 8; - network = list("SS13") + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -42700,35 +38784,25 @@ /turf/simulated/floor/wood, /area/library) "bDt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "bluecorner" }, /area/hallway/secondary/entry{ name = "Arrivals" }) "bDu" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, /obj/machinery/firealarm{ dir = 1; pixel_y = -24 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "arrival" }, /area/hallway/secondary/entry{ @@ -42740,14 +38814,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "arrival" }, /area/hallway/secondary/entry{ @@ -42764,38 +38831,24 @@ pixel_x = 30 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "cult"; tag = "icon-cult" }, /area/library) "bDx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/alarm{ dir = 1; pixel_y = -22 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "neutral" }, /area/hallway/primary/port) "bDy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/firealarm{ - dir = 2; pixel_y = -24 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, @@ -42803,16 +38856,12 @@ "bDz" = ( /obj/machinery/hologram/holopad, /obj/machinery/status_display{ - density = 0; layer = 4; pixel_y = 32 }, /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -42823,13 +38872,9 @@ d2 = 8; icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1; - level = 1 + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "neutral" @@ -42838,16 +38883,11 @@ "bDB" = ( /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 - }, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "neutral" @@ -42863,13 +38903,6 @@ icon_state = "map-left-MS"; pixel_y = -32 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 - }, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "neutral" @@ -42886,13 +38919,6 @@ icon_state = "map-right-MS"; pixel_y = -32 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 - }, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, @@ -42903,30 +38929,32 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "neutral" }, /area/hallway/primary/port) "bDG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock{ - name = "Auxiliary Bathrooms"; - req_access_txt = "0" + name = "Auxiliary Bathrooms" }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" @@ -42935,9 +38963,6 @@ name = "\improper Auxiliary Restrooms" }) "bDH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 8; @@ -42949,8 +38974,10 @@ pixel_y = 28 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 + dir = 4 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" @@ -42979,26 +39006,12 @@ /obj/machinery/vending/cigarette, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/plating, /area/crew_quarters/toilet{ name = "\improper Auxiliary Restrooms" }) -"bDK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/light, -/obj/effect/decal/warning_stripes/south, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/entry{ - name = "Arrivals" - }) "bDL" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -43010,7 +39023,6 @@ d2 = 8; icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" @@ -43029,9 +39041,6 @@ /obj/structure/window/reinforced/tinted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -43047,7 +39056,6 @@ /area/library) "bDO" = ( /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "cult"; tag = "icon-cult" }, @@ -43057,7 +39065,6 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "cult"; tag = "icon-cult" }, @@ -43079,25 +39086,13 @@ icon_state = "dark" }, /area/bridge) -"bDR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/structure/chair/stool{ - pixel_y = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - level = 1 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) "bDS" = ( /obj/effect/spawner/lootdrop{ loot = list(/obj/item/gun/projectile/revolver/russian,/obj/item/clothing/mask/cigarette/cigar/cohiba,/obj/item/toy/cards/deck/syndicate); name = "gambling valuables spawner" }, /obj/structure/table/wood/poker, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/wood, /area/crew_quarters/bar) "bDT" = ( @@ -43152,9 +39147,6 @@ req_access = null; req_access_txt = "19" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -43165,47 +39157,10 @@ /area/bridge) "bDZ" = ( /obj/structure/chair/comfy/black, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/carpet, /area/bridge) -"bEa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/structure/chair/comfy/beige, -/turf/simulated/floor/carpet, -/area/bridge) -"bEb" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/turf/simulated/floor/carpet, -/area/bridge) -"bEc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/carpet, -/area/bridge) -"bEd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/bridge) -"bEe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/command{ - name = "Council Chamber"; - req_access = null; - req_access_txt = "19" - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/bridge) "bEf" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -43214,8 +39169,7 @@ }, /obj/machinery/camera{ c_tag = "Bridge - Starboard Access"; - dir = 4; - network = list("SS13") + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -43223,10 +39177,8 @@ /area/bridge) "bEg" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/firealarm{ dir = 4; pixel_x = 24 @@ -43249,6 +39201,9 @@ name = "\improper Captain's Quarters" }) "bEi" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, /turf/simulated/floor/carpet{ icon_state = "carpet6-2"; tag = "icon-carpet6-2" @@ -43257,8 +39212,12 @@ name = "\improper Captain's Quarters" }) "bEj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, /turf/simulated/floor/carpet{ icon_state = "carpet15-11"; tag = "icon-carpet15-11" @@ -43269,9 +39228,11 @@ "bEk" = ( /obj/structure/chair/comfy/brown{ dir = 4; - icon_state = "comfychair"; tag = "icon-comfychair (EAST)" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/carpet, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" @@ -43279,6 +39240,9 @@ "bEl" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/shaker, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/carpet, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" @@ -43286,9 +39250,11 @@ "bEm" = ( /obj/structure/chair/comfy/brown{ dir = 8; - icon_state = "comfychair"; tag = "icon-comfychair (WEST)" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/carpet, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" @@ -43296,12 +39262,13 @@ "bEn" = ( /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 }, /turf/simulated/floor/carpet{ icon_state = "carpet11-12"; @@ -43312,9 +39279,7 @@ }) "bEo" = ( /obj/machinery/camera{ - c_tag = "Bar"; - dir = 2; - network = list("SS13") + c_tag = "Bar" }, /obj/machinery/requests_console{ department = "Bar"; @@ -43358,6 +39323,7 @@ /obj/effect/landmark/start{ name = "Bartender" }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ icon_state = "bar" }, @@ -43369,10 +39335,12 @@ }, /area/crew_quarters/bar) "bEt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/landmark/start{ name = "Bartender" }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "bar" }, @@ -43429,7 +39397,6 @@ dir = 4; icon_state = "pipe-j2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/crew_quarters/bar) "bEA" = ( @@ -43488,44 +39455,18 @@ "bEG" = ( /turf/simulated/wall, /area/crew_quarters/theatre) -"bEH" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, -/obj/effect/spawner/lootdrop{ - loot = list(/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes); - name = "maint grille or trash spawner" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/maintenance/starboard) "bEI" = ( /obj/item/radio/beacon, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "caution" }, /area/hallway/primary/starboard) -"bEJ" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/effect/decal/warning_stripes/southwestcorner, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/entry{ - name = "Arrivals" - }) "bEK" = ( /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_x = -30 }, @@ -43560,8 +39501,7 @@ pixel_y = 32 }, /obj/machinery/camera{ - c_tag = "Atmospherics - Control Room"; - network = list("SS13") + c_tag = "Atmospherics - Control Room" }, /turf/simulated/floor/plasteel{ dir = 1; @@ -43598,7 +39538,6 @@ /area/crew_quarters/bar) "bEP" = ( /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_y = 21 }, @@ -43611,9 +39550,7 @@ dir = 1 }, /obj/machinery/camera{ - c_tag = "Club - Fore"; - dir = 2; - network = list("SS13") + c_tag = "Club - Fore" }, /turf/simulated/floor/wood, /area/crew_quarters/bar) @@ -43622,43 +39559,20 @@ dir = 4; pixel_x = -23 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "caution" }, /area/hallway/primary/starboard) -"bER" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel, -/area/atmos) "bES" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/camera{ c_tag = "Arrivals - Middle Arm"; - dir = 1; - network = list("SS13") + dir = 1 }, /obj/machinery/atm{ pixel_y = -32 }, /obj/effect/decal/warning_stripes/south, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry{ name = "Arrivals" @@ -43680,7 +39594,6 @@ /area/bridge) "bEU" = ( /obj/machinery/meter{ - frequency = 1443; id = "wloop_atm_meter"; name = "Waste Loop" }, @@ -43708,7 +39621,6 @@ /area/atmos) "bEW" = ( /obj/machinery/meter{ - frequency = 1443; id = "dloop_atm_meter"; name = "Distribution Loop" }, @@ -43721,7 +39633,6 @@ "bEX" = ( /obj/machinery/atmospherics/pipe/manifold/visible/purple{ dir = 1; - icon_state = "map"; tag = "icon-map (NORTH)" }, /turf/simulated/floor/plasteel{ @@ -43734,8 +39645,7 @@ pixel_y = 25 }, /obj/machinery/camera{ - c_tag = "Atmospherics - Distro Loop"; - network = list("SS13") + c_tag = "Atmospherics - Distro Loop" }, /obj/machinery/atmospherics/binary/volume_pump/on{ dir = 8; @@ -43760,15 +39670,8 @@ /obj/structure/extinguisher_cabinet{ pixel_x = 27 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -43800,19 +39703,15 @@ /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/tcommsat/computer{ - name = "\improper Telecoms Control Room" - }) +/area/tcommsat/computer) "bFe" = ( /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_y = -25 }, /obj/machinery/camera{ c_tag = "Arrivals - Middle Arm - Far"; - dir = 1; - network = list("SS13") + dir = 1 }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, @@ -43824,7 +39723,6 @@ name = "Grid Power Monitoring Computer" }, /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_x = 5; pixel_y = -26 @@ -43854,29 +39752,21 @@ }, /area/hallway/primary/starboard) "bFi" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, /obj/structure/chair/office/dark{ dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/tcommsat/computer{ - name = "\improper Telecoms Control Room" - }) +/area/tcommsat/computer) "bFj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/tcommsat/computer{ - name = "\improper Telecoms Control Room" - }) +/area/tcommsat/computer) "bFk" = ( /obj/structure/transit_tube{ icon_state = "E-W-Pass" @@ -43892,9 +39782,6 @@ }, /area/maintenance/starboard) "bFm" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -43906,38 +39793,15 @@ /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/tcommsat/computer{ - name = "\improper Telecoms Control Room" - }) -"bFn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; - icon_state = "space"; - layer = 4; - name = "EXTERNAL AIRLOCK"; - pixel_y = -32 - }, -/obj/effect/decal/warning_stripes/south, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/entry{ - name = "Arrivals" - }) +/area/tcommsat/computer) "bFo" = ( /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock{ - name = "Port Emergency Storage"; - req_access_txt = "0" + name = "Port Emergency Storage" }, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ @@ -43958,15 +39822,13 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "carpetsymbol" }, /area/security/vacantoffice) "bFs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -43996,6 +39858,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ @@ -44015,46 +39878,37 @@ dir = 4 }, /obj/machinery/camera/autoname{ - dir = 8; - network = list("SS13") - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 + dir = 8 }, /obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 27 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/carpet, /area/library) "bFy" = ( /obj/machinery/door/morgue{ - name = "Study #1"; - req_access_txt = "0" + name = "Study #1" }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "cult"; tag = "icon-cult" }, /area/library) "bFz" = ( /obj/machinery/door/morgue{ - name = "Study #2"; - req_access_txt = "0" + name = "Study #2" }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "cult"; tag = "icon-cult" }, /area/library) "bFA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_x = -30 }, @@ -44063,10 +39917,8 @@ }, /obj/machinery/camera{ c_tag = "Central Primary Hallway - Port"; - dir = 4; - network = list("SS13") + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -44115,18 +39967,11 @@ /turf/simulated/floor/plasteel, /area/engine/break_room) "bFG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/status_display{ - density = 0; layer = 4; pixel_y = -32 }, /obj/effect/decal/warning_stripes/south, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry{ name = "Arrivals" @@ -44143,17 +39988,10 @@ name = "\improper Command Hallway" }) "bFJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_y = -25 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "arrival" @@ -44165,9 +40003,6 @@ /obj/machinery/vending/coffee{ pixel_x = -3 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -44189,7 +40024,6 @@ "bFM" = ( /obj/structure/chair/comfy/teal{ dir = 4; - icon_state = "comfychair"; tag = "icon-comfychair (EAST)" }, /obj/structure/chair/comfy/black{ @@ -44206,6 +40040,8 @@ /obj/structure/table/wood, /obj/item/folder/blue, /obj/item/lighter/zippo, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/carpet, /area/bridge) "bFP" = ( @@ -44232,7 +40068,6 @@ "bFS" = ( /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/vending/cigarette{ @@ -44259,19 +40094,7 @@ icon_state = "dark" }, /area/bridge) -"bFU" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/bridge) "bFV" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, /obj/machinery/firealarm{ dir = 8; pixel_x = -24 @@ -44289,15 +40112,10 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/status_display{ - density = 0; layer = 4; pixel_y = -32 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, @@ -44317,22 +40135,10 @@ }, /turf/simulated/floor/wood, /area/library) -"bFZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/extinguisher_cabinet{ - pixel_x = -27 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralcorner" - }, -/area/hallway/primary/central) "bGa" = ( /obj/machinery/light{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/item/radio/intercom{ dir = 0; name = "Station Intercom (General)"; @@ -44346,7 +40152,6 @@ /obj/item/cigbutt, /obj/machinery/power/apc{ cell_type = 5000; - dir = 2; name = "Port Maintenance APC"; pixel_y = -24 }, @@ -44385,13 +40190,8 @@ /obj/item/storage/box/matches{ pixel_y = 5 }, -/turf/simulated/floor/plasteel{ - icon_state = "bar" - }, -/area/crew_quarters/bar) -"bGg" = ( -/obj/structure/table/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "bar" }, @@ -44435,6 +40235,8 @@ d2 = 4; icon_state = "0-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/bridge) "bGk" = ( @@ -44463,21 +40265,13 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar) -"bGo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/carpet, -/area/crew_quarters/theatre) "bGp" = ( /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/carpet, /area/crew_quarters/theatre) "bGq" = ( @@ -44487,7 +40281,6 @@ }, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/item/clothing/head/sombrero, @@ -44503,8 +40296,7 @@ }, /obj/machinery/camera{ c_tag = "Starboard Primary Hallway - Atmospherics"; - dir = 4; - network = list("SS13") + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -44518,9 +40310,9 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/purple, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/hallway/primary/starboard) @@ -44555,20 +40347,7 @@ }, /area/hallway/primary/starboard) "bGw" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, /turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "neutralcorner" - }, -/area/atmos) -"bGx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/atmos) @@ -44580,13 +40359,11 @@ name = "Life Support Specialist" }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/atmos) "bGz" = ( /obj/machinery/status_display{ - density = 0; layer = 4; pixel_y = 32 }, @@ -44610,8 +40387,7 @@ /area/atmos) "bGA" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/structure/table, /obj/item/stack/sheet/metal{ @@ -44641,19 +40417,22 @@ /turf/simulated/floor/plasteel, /area/atmos) "bGC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, /turf/simulated/floor/plasteel, /area/atmos) "bGD" = ( /obj/machinery/space_heater, /obj/machinery/firealarm{ - dir = 2; pixel_y = 24 }, /obj/effect/decal/warning_stripes/west, @@ -44661,11 +40440,17 @@ /area/atmos) "bGE" = ( /obj/machinery/atmospherics/pipe/simple/visible/purple, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/atmos) "bGF" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 + dir = 4 }, /turf/simulated/floor/plasteel, /area/atmos) @@ -44675,15 +40460,10 @@ "bGH" = ( /obj/machinery/atmospherics/binary/pump{ dir = 1; - name = "Mix to Distro"; - on = 0 + name = "Mix to Distro" }, -/turf/simulated/floor/plasteel, -/area/atmos) -"bGI" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/atmos) @@ -44756,7 +40536,6 @@ "bGQ" = ( /obj/machinery/camera{ c_tag = "Toxins - Launch Area"; - dir = 2; network = list("SS13","RD") }, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -44776,35 +40555,19 @@ icon_state = "caution" }, /area/hallway/primary/starboard) -"bGS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) "bGT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/tcommsat/computer{ - name = "\improper Telecoms Control Room" - }) +/area/tcommsat/computer) "bGU" = ( /obj/machinery/shieldwallgen{ req_access = list(55) @@ -44826,8 +40589,7 @@ icon_state = "0-2" }, /obj/machinery/camera{ - c_tag = "Atmospherics - Entrance"; - network = list("SS13") + c_tag = "Atmospherics - Entrance" }, /turf/simulated/floor/plasteel, /area/atmos) @@ -44882,9 +40644,7 @@ name = "Port Maintenance" }) "bHe" = ( -/obj/machinery/atmospherics/unary/thermomachine/heater/on{ - dir = 2 - }, +/obj/machinery/atmospherics/unary/thermomachine/heater/on, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "caution" @@ -44899,8 +40659,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, /area/security/vacantoffice) "bHh" = ( @@ -44917,9 +40677,7 @@ /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/tcommsat/computer{ - name = "\improper Telecoms Control Room" - }) +/area/tcommsat/computer) "bHj" = ( /obj/structure/table/wood, /obj/item/camera_film{ @@ -44940,7 +40698,6 @@ name = "\improper Auxiliary Restrooms" }) "bHl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -45001,7 +40758,6 @@ }) "bHq" = ( /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_y = 21 }, @@ -45041,7 +40797,6 @@ /area/library) "bHv" = ( /obj/machinery/status_display{ - density = 0; layer = 4; pixel_y = 32 }, @@ -45050,12 +40805,6 @@ /area/bridge/meeting_room{ name = "\improper Command Hallway" }) -"bHw" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 2 - }, -/turf/simulated/floor/wood, -/area/library) "bHx" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22"; @@ -45083,10 +40832,8 @@ /turf/simulated/floor/plating, /area/bridge) "bHz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/carpet{ icon_state = "carpetside"; tag = "icon-carpetside" @@ -45131,7 +40878,6 @@ pixel_y = -24; req_access_txt = "19" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -45166,6 +40912,12 @@ /obj/structure/disposalpipe/segment, /obj/item/clothing/mask/cigarette/cigar, /obj/structure/table/wood/poker, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "bHJ" = ( @@ -45178,14 +40930,12 @@ }, /area/crew_quarters/sleep) "bHK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, /obj/machinery/door/airlock/maintenance{ - req_access_txt = "0"; req_one_access_txt = "20;12" }, /turf/simulated/floor/plating, @@ -45211,6 +40961,8 @@ codes_txt = "patrol;next_patrol=12-Central-Starboard"; location = "11.1-Command-Starboard" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/hallway/primary/central) "bHN" = ( @@ -45230,7 +40982,6 @@ }, /area/crew_quarters/bar) "bHQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/landmark/start{ name = "Civilian" }, @@ -45256,15 +41007,6 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar) -"bHT" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) "bHU" = ( /obj/structure/window/reinforced{ dir = 8 @@ -45280,6 +41022,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/carpet, /area/crew_quarters/theatre) "bHY" = ( @@ -45302,7 +41045,7 @@ }, /area/hallway/primary/starboard) "bIa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/purple{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -45317,7 +41060,7 @@ /obj/effect/landmark/start{ name = "Life Support Specialist" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/purple{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -45326,30 +41069,31 @@ }, /area/atmos) "bId" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/atmos) "bIe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/binary/volume_pump/on{ dir = 4; name = "External to Filter" }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/atmos) "bIf" = ( /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 10; - icon_state = "intact"; tag = "icon-intact (SOUTHWEST)" }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/atmos) @@ -45394,17 +41138,11 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/atmos) "bIk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/atmos) "bIl" = ( @@ -45444,8 +41182,7 @@ "bIr" = ( /obj/machinery/atmospherics/binary/pump{ dir = 0; - name = "Air to Mix"; - on = 0 + name = "Air to Mix" }, /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 @@ -45529,9 +41266,7 @@ /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/tcommsat/computer{ - name = "\improper Telecoms Control Room" - }) +/area/tcommsat/computer) "bIA" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; @@ -45540,9 +41275,7 @@ /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/tcommsat/computer{ - name = "\improper Telecoms Control Room" - }) +/area/tcommsat/computer) "bIB" = ( /obj/structure/filingcabinet{ pixel_x = 3 @@ -45550,9 +41283,7 @@ /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/tcommsat/computer{ - name = "\improper Telecoms Control Room" - }) +/area/tcommsat/computer) "bID" = ( /obj/structure/table/reinforced, /obj/item/lighter/zippo, @@ -45602,15 +41333,6 @@ icon_state = "caution" }, /area/atmos) -"bIN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/carpet, -/area/crew_quarters/theatre) "bIO" = ( /obj/effect/spawner/window/reinforced, /obj/machinery/door/poddoor{ @@ -45623,7 +41345,6 @@ /turf/simulated/floor/plating, /area/toxins/explab) "bIP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/poddoor{ density = 0; icon_state = "open"; @@ -45631,7 +41352,6 @@ name = "test chamber blast door"; opacity = 0 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/engine, /area/toxins/explab) "bIR" = ( @@ -45648,7 +41368,6 @@ /obj/structure/table/wood, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/item/folder/red, @@ -45658,26 +41377,12 @@ "bIU" = ( /obj/machinery/light/small, /turf/simulated/floor/plating, -/area/crew_quarters/toilet{ - name = "\improper Auxiliary Restrooms" - }) -"bIV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/plasteel{ - icon_state = "floorgrime" - }, /area/crew_quarters/toilet{ name = "\improper Auxiliary Restrooms" }) "bIW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /obj/machinery/power/apc{ cell_type = 5000; - dir = 2; name = "Auxiliary Restrooms APC"; pixel_y = -24 }, @@ -45693,6 +41398,9 @@ dir = 4; pixel_x = 24 }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -45725,63 +41433,40 @@ }, /turf/simulated/floor/wood, /area/library) -"bJa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/carpet, -/area/library) -"bJb" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralcorner" - }, -/area/hallway/primary/central) "bJc" = ( /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/junction{ dir = 1; - icon_state = "pipe-j1"; tag = "icon-pipe-j1 (EAST)" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 }, /turf/simulated/floor/plasteel, /area/hallway/primary/central) "bJd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" }, /area/hallway/primary/central) "bJe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment{ dir = 4 @@ -45792,6 +41477,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -45800,15 +41488,15 @@ name = "\improper Command Hallway" }) "bJf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -45817,15 +41505,15 @@ name = "\improper Command Hallway" }) "bJg" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -45834,17 +41522,17 @@ name = "\improper Command Hallway" }) "bJh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/landmark{ name = "lightsout" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -45854,9 +41542,6 @@ name = "\improper Command Hallway" }) "bJi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -45868,6 +41553,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -45876,27 +41564,14 @@ name = "\improper Command Hallway" }) "bJj" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutralcorner" - }, -/area/bridge/meeting_room{ - name = "\improper Command Hallway" - }) -"bJk" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -45913,9 +41588,7 @@ /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/tcommsat/computer{ - name = "\improper Telecoms Control Room" - }) +/area/tcommsat/computer) "bJm" = ( /obj/machinery/requests_console{ announcementConsole = 1; @@ -45936,19 +41609,17 @@ /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/tcommsat/computer{ - name = "\improper Telecoms Control Room" - }) +/area/tcommsat/computer) "bJn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" @@ -45956,30 +41627,16 @@ /area/bridge/meeting_room{ name = "\improper Command Hallway" }) -"bJo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutralcorner" - }, -/area/bridge/meeting_room{ - name = "\improper Command Hallway" - }) "bJp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -45988,9 +41645,6 @@ name = "\improper Command Hallway" }) "bJq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -45999,9 +41653,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" @@ -46010,9 +41663,6 @@ name = "\improper Command Hallway" }) "bJr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" @@ -46020,6 +41670,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" @@ -46028,10 +41681,10 @@ name = "\improper Command Hallway" }) "bJs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -46042,15 +41695,15 @@ name = "\improper Command Hallway" }) "bJt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/ai_status_display{ pixel_y = 32 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -46067,40 +41720,14 @@ /turf/simulated/floor/wood, /area/security/vacantoffice) "bJv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutralcorner" - }, -/area/bridge/meeting_room{ - name = "\improper Command Hallway" - }) -"bJw" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutralcorner" - }, -/area/bridge/meeting_room{ - name = "\improper Command Hallway" - }) -"bJx" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, @@ -46111,14 +41738,26 @@ /area/bridge/meeting_room{ name = "\improper Command Hallway" }) -"bJy" = ( +"bJw" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "neutralcorner" + }, +/area/bridge/meeting_room{ + name = "\improper Command Hallway" + }) +"bJy" = ( /obj/effect/landmark{ name = "lightsout" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -46147,7 +41786,6 @@ name = "Lock Control"; normaldoorcontrol = 1; pixel_x = 25; - req_access_txt = "0"; specialfunctions = 4 }, /obj/machinery/newscaster{ @@ -46158,15 +41796,15 @@ name = "\improper Auxiliary Restrooms" }) "bJB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/alarm{ pixel_y = 32 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -46180,12 +41818,12 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -46194,9 +41832,6 @@ name = "\improper Command Hallway" }) "bJD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ name = "Command Hallway" @@ -46204,6 +41839,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -46217,12 +41855,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /turf/simulated/floor/plasteel, /area/hallway/primary/central) "bJG" = ( @@ -46230,11 +41864,18 @@ /obj/machinery/door/airlock/public/glass{ name = "Bar" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/crew_quarters/bar) "bJH" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 2 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "bar" @@ -46244,12 +41885,23 @@ /obj/effect/landmark{ name = "lightsout" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "bar" }, /area/crew_quarters/bar) "bJJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "bar" }, @@ -46260,22 +41912,16 @@ name = "Club"; opacity = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "bar" }, /area/crew_quarters/bar) -"bJL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/carpet, -/area/crew_quarters/theatre) "bJM" = ( /obj/structure/chair/stool{ pixel_y = 8 @@ -46283,18 +41929,28 @@ /obj/effect/landmark/start{ name = "Civilian" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "bJN" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, /turf/simulated/floor/carpet, /area/crew_quarters/theatre) "bJO" = ( /obj/machinery/hologram/holopad, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/carpet, /area/crew_quarters/theatre) "bJP" = ( @@ -46303,14 +41959,12 @@ pixel_y = 5 }, /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_x = 29 }, /obj/machinery/camera{ c_tag = "Theatre - Stage"; - dir = 8; - network = list("SS13") + dir = 8 }, /obj/machinery/light/small{ dir = 4 @@ -46338,11 +41992,11 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/purple{ dir = 10 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/hallway/primary/starboard) @@ -46357,24 +42011,26 @@ /area/atmos) "bJT" = ( /obj/machinery/hologram/holopad, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "neutralcorner" - }, -/area/atmos) -"bJU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralcorner" + }, +/area/atmos) +"bJU" = ( /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "caution" @@ -46385,15 +42041,15 @@ name = "Atmospherics Monitoring"; req_access_txt = "24" }, +/obj/machinery/atmospherics/pipe/simple/visible/purple{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/visible/purple{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/atmos) "bJW" = ( @@ -46408,22 +42064,21 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/visible/purple{ + dir = 10; + tag = "icon-intact (SOUTHWEST)" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/visible/purple{ - dir = 10; - icon_state = "intact"; - tag = "icon-intact (SOUTHWEST)" - }, /turf/simulated/floor/plasteel, /area/atmos) "bJY" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -46445,7 +42100,6 @@ dir = 8; name = "Mix to Filter" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/atmos) "bKc" = ( @@ -46467,7 +42121,6 @@ dir = 1; tag = "icon-manifold-g (NORTH)" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/atmos) "bKf" = ( @@ -46534,12 +42187,8 @@ /turf/simulated/wall/r_wall, /area/tcommsat/server) "bKm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/carpet, /area/crew_quarters/theatre) "bKn" = ( @@ -46563,14 +42212,15 @@ /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/tcommsat/computer{ - name = "\improper Telecoms Control Room" - }) +/area/tcommsat/computer) "bKo" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -46585,6 +42235,9 @@ dir = 8 }, /obj/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, @@ -46603,7 +42256,6 @@ }, /obj/machinery/light/small{ dir = 4; - icon_state = "bulb1"; tag = "icon-bulb1 (EAST)" }, /obj/machinery/camera/motion{ @@ -46613,6 +42265,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -46638,7 +42293,6 @@ /turf/simulated/floor/plating, /area/hallway/secondary/entry) "bKv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -46700,7 +42354,6 @@ id_tag = "AuxShower"; name = "Shower" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -46726,12 +42379,6 @@ }, /turf/simulated/floor/wood, /area/library) -"bKI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/carpet, -/area/library) "bKL" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -46748,6 +42395,8 @@ codes_txt = "patrol;next_patrol=11.1-Command-Starboard"; location = "11-Command-Port" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/hallway/primary/central) "bKM" = ( @@ -46757,7 +42406,6 @@ icon_state = "4-8" }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/hallway/primary/central) @@ -46784,39 +42432,6 @@ d2 = 8; icon_state = "4-8" }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralcorner" - }, -/area/bridge/meeting_room{ - name = "\improper Command Hallway" - }) -"bKP" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralcorner" - }, -/area/bridge/meeting_room{ - name = "\improper Command Hallway" - }) -"bKQ" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -46833,9 +42448,8 @@ /obj/structure/extinguisher_cabinet{ pixel_x = 27 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "arrival" @@ -46852,6 +42466,7 @@ /obj/machinery/newscaster{ pixel_x = -32 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/wood, /area/library) "bKT" = ( @@ -46900,9 +42515,7 @@ d2 = 4; icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -46919,6 +42532,9 @@ /obj/machinery/newscaster{ pixel_y = -29 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -46926,23 +42542,6 @@ /area/bridge/meeting_room{ name = "\improper Command Hallway" }) -"bKY" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutral" - }, -/area/bridge/meeting_room{ - name = "\improper Command Hallway" - }) "bKZ" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -46989,22 +42588,14 @@ "bLc" = ( /obj/machinery/space_heater, /obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/atmos) -"bLd" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, -/turf/simulated/floor/plasteel, -/area/bridge/meeting_room{ - name = "\improper Command Hallway" - }) "bLe" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -47017,7 +42608,6 @@ icon_state = "2-4" }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/bridge/meeting_room{ @@ -47036,7 +42626,6 @@ icon_state = "2-4" }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/bridge/meeting_room{ @@ -47054,7 +42643,6 @@ icon_state = "1-4" }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/bridge/meeting_room{ @@ -47074,8 +42662,10 @@ /obj/machinery/newscaster{ pixel_y = -29 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/bridge/meeting_room{ @@ -47088,40 +42678,13 @@ icon_state = "4-8" }, /turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "neutralcorner" - }, -/area/bridge/meeting_room{ - name = "\improper Command Hallway" - }) -"bLj" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/bridge/meeting_room{ name = "\improper Command Hallway" }) "bLl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/status_display{ - density = 0; layer = 4; pixel_y = 32 }, @@ -47133,6 +42696,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -47152,23 +42718,6 @@ pixel_y = -24 }, /turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "neutralcorner" - }, -/area/bridge/meeting_room{ - name = "\improper Command Hallway" - }) -"bLo" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/bridge/meeting_room{ @@ -47191,7 +42740,6 @@ icon_state = "2-4" }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/bridge/meeting_room{ @@ -47208,7 +42756,6 @@ name = "Command Hallway" }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/bridge/meeting_room{ @@ -47245,26 +42792,10 @@ codes_txt = "patrol;next_patrol=7.5-Starboard-Aft-Corner"; location = "7-Command-Starboard" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/hallway/primary/central) -"bLu" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "neutralcorner" - }, -/area/hallway/primary/central) "bLv" = ( /obj/machinery/door/firedoor, /obj/structure/cable/yellow{ @@ -47272,15 +42803,9 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/airlock/public/glass{ name = "Bar" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/crew_quarters/bar) "bLw" = ( @@ -47289,74 +42814,28 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "bar" }, /area/crew_quarters/bar) "bLx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "bar" - }, -/area/crew_quarters/bar) -"bLy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "bar" - }, -/area/crew_quarters/bar) -"bLz" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "bar" }, /area/crew_quarters/bar) "bLA" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "bar" }, @@ -47367,17 +42846,11 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/centcom{ name = "Club"; opacity = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "bar" }, @@ -47388,20 +42861,18 @@ d2 = 4; icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "arrival" }, /area/hallway/secondary/entry{ @@ -47409,7 +42880,6 @@ }) "bLD" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "0"; req_one_access_txt = "12;27" }, /obj/structure/cable/yellow{ @@ -47417,17 +42887,12 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" }) -"bLF" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 2; - on = 1 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) "bLH" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -47445,12 +42910,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/carpet, /area/crew_quarters/theatre) "bLK" = ( @@ -47469,19 +42930,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/wood, /area/crew_quarters/theatre) "bLM" = ( /obj/machinery/door/airlock{ icon = 'icons/obj/doors/airlocks/station/maintenance.dmi'; name = "Theatre Stage"; - req_access_txt = "0"; req_one_access_txt = "12;46" }, /obj/structure/cable/yellow{ @@ -47492,28 +42946,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plating, /area/crew_quarters/theatre) -"bLN" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/effect/decal/warning_stripes/north, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) "bLO" = ( /obj/machinery/atmospherics/unary/portables_connector{ dir = 4 @@ -47538,9 +42972,9 @@ dir = 1; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/cyan, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/hallway/primary/starboard) @@ -47548,7 +42982,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -47572,11 +43006,7 @@ name = "\improper Command Hallway" }) "bLS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_y = 21 }, @@ -47586,6 +43016,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -47597,11 +43030,13 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/visible/universal{ +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/atmos) @@ -47614,7 +43049,6 @@ name = "Air to External" }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/atmos) @@ -47622,15 +43056,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 4 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "blackcorner" }, /area/atmos) @@ -47675,37 +43104,11 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/manifold/visible/purple{ dir = 8 }, -/turf/simulated/floor/plasteel, -/area/atmos) -"bLZ" = ( -/obj/machinery/atmospherics/pipe/simple/visible/purple{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/atmos) -"bMa" = ( -/obj/machinery/atmospherics/pipe/simple/visible/purple{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/atmos) "bMb" = ( @@ -47716,12 +43119,6 @@ /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/atmos) "bMc" = ( @@ -47735,19 +43132,12 @@ dir = 9; tag = "icon-intact-y (NORTHWEST)" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/atmos) "bMe" = ( /obj/machinery/atmospherics/binary/pump{ dir = 1; - name = "Pure to Mix"; - on = 0 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + name = "Pure to Mix" }, /turf/simulated/floor/plasteel, /area/atmos) @@ -47757,10 +43147,6 @@ initialize_directions = 12; tag = "icon-intact-g (NORTHEAST)" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - level = 1 - }, /turf/simulated/floor/plasteel, /area/atmos) "bMg" = ( @@ -47819,9 +43205,6 @@ }, /area/atmos) "bMm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/power/apc{ cell_type = 10000; dir = 1; @@ -47835,6 +43218,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -47851,7 +43237,6 @@ /area/space/nearstation) "bMo" = ( /obj/machinery/door/window/southleft{ - dir = 2; name = "Maximum Security Test Chamber"; req_access_txt = "55" }, @@ -47954,9 +43339,7 @@ name = "\improper Secure Lab" }) "bMv" = ( -/obj/structure/disposaloutlet{ - dir = 2 - }, +/obj/structure/disposaloutlet, /turf/simulated/floor/engine, /area/toxins/xenobiology{ name = "\improper Secure Lab" @@ -47968,9 +43351,10 @@ icon_state = "1-2" }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "arrival" @@ -47980,13 +43364,14 @@ }) "bMC" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/fore) "bMD" = ( @@ -48003,22 +43388,19 @@ /turf/simulated/floor/wood, /area/security/vacantoffice) "bMF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_y = 21 }, /obj/machinery/camera{ - c_tag = "Command Hallway - Starboard"; - dir = 2; - network = list("SS13") + c_tag = "Command Hallway - Starboard" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -48027,16 +43409,15 @@ name = "\improper Command Hallway" }) "bMG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/status_display{ - density = 0; layer = 4; pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -48049,7 +43430,6 @@ /obj/machinery/shower{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -48057,39 +43437,15 @@ name = "\improper Auxiliary Restrooms" }) "bMI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/warning_stripes/northeastcorner, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/gateway) -"bMJ" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/spawner/lootdrop{ - loot = list(/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes); - name = "maint grille or trash spawner" - }, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) -"bMK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/entry{ - name = "Arrivals" - }) "bML" = ( /obj/machinery/door/airlock/maintenance{ name = "Library Maintenance"; - req_access_txt = "0"; req_one_access_txt = "12;37" }, /turf/simulated/floor/plating, @@ -48097,19 +43453,10 @@ name = "Port Maintenance" }) "bMM" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/carpet, /area/library) -"bMN" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 - }, -/turf/simulated/floor/wood, -/area/library) "bMP" = ( /obj/machinery/bookbinder, /turf/simulated/floor/wood, @@ -48148,12 +43495,10 @@ icon_state = "4-8" }, /obj/effect/decal/warning_stripes/arrow{ - dir = 1; - icon_state = "4" + dir = 1 }, /obj/effect/decal/warning_stripes/yellow/partial{ - dir = 1; - icon_state = "3" + dir = 1 }, /turf/simulated/floor/plasteel, /area/bridge/meeting_room{ @@ -48263,7 +43608,6 @@ }, /obj/machinery/door/window/northleft{ dir = 4; - icon_state = "left"; name = "Atmospherics Desk"; req_access_txt = "24" }, @@ -48282,7 +43626,7 @@ opacity = 0 }, /obj/effect/decal/warning_stripes/yellow, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/purple{ dir = 4 }, /turf/simulated/floor/plasteel, @@ -48303,10 +43647,11 @@ icon_state = "1-2" }, /obj/machinery/status_display{ - density = 0; layer = 4; pixel_x = 32 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "arrival" @@ -48335,7 +43680,6 @@ /area/crew_quarters/kitchen) "bNo" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "0"; req_one_access_txt = "12;17" }, /obj/structure/cable/yellow{ @@ -48353,16 +43697,6 @@ icon_state = "neutralcorner" }, /area/hallway/primary/central) -"bNr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "neutralcorner" - }, -/area/hallway/primary/central) "bNs" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable/yellow{ @@ -48373,15 +43707,6 @@ /area/teleporter{ name = "\improper Teleporter Room" }) -"bNw" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "bar" - }, -/area/crew_quarters/bar) "bNx" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ @@ -48400,6 +43725,12 @@ dir = 1; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "cafeteria"; @@ -48414,6 +43745,12 @@ name = "Station Intercom (General)"; pixel_y = -29 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -48427,6 +43764,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -48439,6 +43782,9 @@ pixel_y = -26 }, /obj/machinery/light, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -48453,8 +43799,13 @@ }, /obj/machinery/camera{ c_tag = "Kitchen - Coldroom"; - dir = 1; - network = list("SS13") + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" @@ -48475,10 +43826,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/starboard) "bNG" = ( @@ -48508,6 +43855,9 @@ dir = 4; pixel_x = 24 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "caution" @@ -48533,7 +43883,7 @@ opacity = 0 }, /obj/effect/decal/warning_stripes/yellow, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, /turf/simulated/floor/plasteel, @@ -48544,7 +43894,6 @@ }, /obj/machinery/door/window/northleft{ dir = 4; - icon_state = "left"; name = "Inner Pipe Access"; req_access_txt = "24" }, @@ -48554,21 +43903,18 @@ pixel_y = 1 }, /obj/effect/decal/warning_stripes/arrow{ - dir = 4; - icon_state = "4" + dir = 4 }, /obj/effect/decal/warning_stripes/yellow/partial{ - dir = 4; - icon_state = "3" + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, /turf/simulated/floor/plasteel, /area/atmos) "bNM" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/command{ name = "E.V.A. Storage"; req_access_txt = "18" @@ -48586,6 +43932,11 @@ tag = "icon-cafeteria (NORTHEAST)" }, /area/crew_quarters/hor) +"bNP" = ( +/obj/effect/spawner/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plating, +/area/crew_quarters/courtroom) "bNQ" = ( /obj/machinery/light{ dir = 8 @@ -48702,13 +44053,10 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command{ name = "Teleport Access"; - req_access_txt = "0"; req_one_access_txt = "17;19" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes/yellow, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/teleporter{ name = "\improper Teleporter Room" @@ -48721,9 +44069,10 @@ }, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "arrival" @@ -48738,7 +44087,6 @@ pixel_y = 10 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "brown" }, /area/quartermaster/miningdock{ @@ -48757,19 +44105,24 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, /turf/simulated/floor/carpet, /area/security/vacantoffice) "bOj" = ( /obj/item/folder/white, /obj/structure/table/wood, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/carpet, /area/security/vacantoffice) "bOk" = ( /obj/machinery/shower{ dir = 4; - icon_state = "shower"; tag = "icon-shower (EAST)" }, /obj/effect/decal/cleanable/blood, @@ -48785,9 +44138,6 @@ /obj/machinery/shower{ dir = 8 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, /turf/simulated/floor/plating, /area/crew_quarters/toilet{ name = "\improper Auxiliary Restrooms" @@ -48813,7 +44163,6 @@ name = "Lock Control"; normaldoorcontrol = 1; pixel_x = 25; - req_access_txt = "0"; specialfunctions = 4 }, /obj/machinery/newscaster{ @@ -48871,24 +44220,17 @@ /obj/structure/table/wood, /turf/simulated/floor/wood, /area/library) -"bOu" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 - }, -/turf/simulated/floor/plasteel, -/area/hallway/primary/central) "bOw" = ( /obj/structure/table/wood, /obj/machinery/computer/security/telescreen/entertainment{ pixel_x = -32 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/wood, /area/library) "bOx" = ( @@ -48909,14 +44251,7 @@ dir = 2; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/west, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, /turf/simulated/floor/plating, /area/maintenance/starboard) "bOz" = ( @@ -48955,11 +44290,7 @@ name = "Gateway Atrium"; req_access_txt = "62" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/effect/decal/warning_stripes/yellow, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/gateway) "bOD" = ( @@ -49008,7 +44339,6 @@ pixel_y = -3 }, /obj/machinery/status_display{ - density = 0; layer = 4; pixel_y = 32 }, @@ -49019,10 +44349,6 @@ /turf/simulated/floor/wood, /area/blueshield) "bOJ" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -49033,8 +44359,10 @@ }, /obj/machinery/camera{ c_tag = "Command Hallway - Port"; - dir = 1; - network = list("SS13") + dir = 1 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -49052,8 +44380,10 @@ /obj/structure/extinguisher_cabinet{ pixel_y = -30 }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/bridge/meeting_room{ @@ -49084,8 +44414,7 @@ "bOO" = ( /obj/machinery/camera{ c_tag = "Atmospherics Tank - Mix"; - dir = 8; - network = list("SS13") + dir = 8 }, /turf/simulated/floor/engine{ name = "vacuum floor"; @@ -49099,9 +44428,8 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, /area/security/vacantoffice) "bOQ" = ( @@ -49110,7 +44438,6 @@ /turf/simulated/floor/plasteel, /area/atmos) "bOR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plasteel, /area/ai_monitored/storage/eva{ @@ -49122,7 +44449,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/warning_stripes/northeast, /turf/simulated/floor/plasteel, /area/ai_monitored/storage/eva{ @@ -49146,13 +44472,7 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/effect/decal/warning_stripes/northwest, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /turf/simulated/floor/plasteel, /area/gateway) "bOV" = ( @@ -49161,28 +44481,17 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, /turf/simulated/floor/plasteel, /area/hallway/primary/central) -"bOW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "neutralcorner" - }, -/area/hallway/primary/central) "bOX" = ( /obj/machinery/shower{ dir = 4; - icon_state = "shower"; tag = "icon-shower (EAST)" }, /obj/machinery/door_control{ @@ -49190,7 +44499,6 @@ name = "Lock Control"; normaldoorcontrol = 1; pixel_y = 25; - req_access_txt = "0"; specialfunctions = 4 }, /obj/item/soap/nanotrasen, @@ -49212,12 +44520,28 @@ /area/bridge/meeting_room{ name = "\improper Command Hallway" }) +"bOZ" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whiteblue" + }, +/area/medical/medbay3) "bPa" = ( /obj/machinery/light, /obj/machinery/camera{ c_tag = "Kitchen Hatch"; - dir = 1; - network = list("SS13") + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "bar" @@ -49245,7 +44569,6 @@ name = "Lock Control"; normaldoorcontrol = 1; pixel_x = 25; - req_access_txt = "0"; specialfunctions = 4 }, /obj/machinery/newscaster{ @@ -49260,8 +44583,7 @@ base_state = "right"; dir = 8; icon_state = "right"; - name = "Theatre Stage"; - req_access_txt = "0" + name = "Theatre Stage" }, /turf/simulated/floor/carpet, /area/crew_quarters/theatre) @@ -49320,9 +44642,7 @@ name = "\improper Secure Lab" }) "bPl" = ( -/obj/machinery/light{ - dir = 2 - }, +/obj/machinery/light, /obj/machinery/camera{ c_tag = "Secure Lab - Test Chamber"; dir = 1; @@ -49332,12 +44652,6 @@ /area/toxins/xenobiology{ name = "\improper Secure Lab" }) -"bPm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/wall/r_wall, -/area/atmos) "bPn" = ( /obj/structure/ore_box, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -49346,10 +44660,6 @@ name = "\improper Teleporter Room" }) "bPo" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -49357,7 +44667,6 @@ }, /obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes/yellow, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/teleporter{ name = "\improper Teleporter Room" @@ -49375,7 +44684,6 @@ /obj/item/flashlight, /obj/structure/closet/crate, /obj/machinery/status_display{ - density = 0; layer = 4; pixel_y = 32 }, @@ -49420,11 +44728,11 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/visible/purple, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/atmos) "bPw" = ( @@ -49473,7 +44781,6 @@ dir = 1 }, /obj/machinery/status_display{ - density = 0; layer = 4; pixel_y = 32 }, @@ -49537,20 +44844,6 @@ /area/toxins/xenobiology{ name = "\improper Secure Lab" }) -"bPJ" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "grimy" - }, -/area/tcommsat/computer{ - name = "\improper Telecoms Control Room" - }) "bPK" = ( /obj/structure/table, /obj/item/assembly/igniter{ @@ -49579,78 +44872,28 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/security/podbay) -"bPM" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "arrival" - }, -/area/hallway/secondary/entry{ - name = "Arrivals" - }) -"bPN" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "0"; - req_one_access_txt = "12;27;37" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) "bPO" = ( /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/foodcart, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, /area/crew_quarters/kitchen) -"bPP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) -"bPQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) "bPR" = ( /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_x = -29 }, /turf/simulated/floor/wood, /area/security/vacantoffice) "bPS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/warning_stripes/southeast, /obj/structure/cable/yellow{ d1 = 1; @@ -49662,6 +44905,8 @@ d2 = 8; icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/teleporter{ name = "\improper Teleporter Room" @@ -49695,18 +44940,12 @@ /turf/simulated/floor/wood, /area/library) "bPX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; icon_state = "1-8" }, /obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "redcorner" @@ -49770,9 +45009,6 @@ icon_state = "4-8" }, /obj/effect/decal/warning_stripes/northeast, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /turf/simulated/floor/plasteel, /area/gateway) "bQf" = ( @@ -49784,6 +45020,9 @@ /obj/item/radio/off, /obj/item/radio/off, /obj/item/multitool, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/plasteel, /area/ai_monitored/storage/eva{ name = "E.V.A. Storage" @@ -49858,53 +45097,38 @@ d2 = 2; icon_state = "0-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/gateway) "bQn" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 2 - }, /turf/simulated/floor/wood, /area/blueshield) "bQp" = ( /obj/machinery/light_switch{ pixel_x = 27 }, -/obj/machinery/atmospherics/unary/vent_pump, /turf/simulated/floor/wood, /area/blueshield) "bQr" = ( -/obj/machinery/atmospherics/unary/vent_pump, /turf/simulated/floor/wood, /area/ntrep) "bQu" = ( /obj/machinery/light_switch{ pixel_x = 27 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 2 - }, /turf/simulated/floor/wood, /area/ntrep) -"bQx" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/entry{ - name = "Arrivals" - }) "bQy" = ( /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ @@ -49973,7 +45197,6 @@ /area/gateway) "bQE" = ( /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_y = -28 }, @@ -49995,18 +45218,9 @@ icon_state = "1-2" }, /obj/machinery/door/firedoor, -/turf/simulated/floor/plasteel, -/area/hallway/primary/central) -"bQH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, -/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "neutralcorner" - }, +/turf/simulated/floor/plasteel, /area/hallway/primary/central) "bQI" = ( /turf/simulated/wall, @@ -50072,6 +45286,7 @@ /obj/machinery/door/airlock/public/glass{ name = "Pod Bay" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/hallway/secondary/entry{ name = "Arrivals" @@ -50089,7 +45304,6 @@ req_access_txt = "28" }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "cafeteria" }, /area/crew_quarters/kitchen) @@ -50110,8 +45324,7 @@ }, /obj/machinery/atmospherics/binary/pump{ dir = 8; - name = "N2O to Pure"; - on = 0 + name = "N2O to Pure" }, /obj/machinery/atmospherics/pipe/simple/visible/green, /turf/simulated/floor/plasteel{ @@ -50134,6 +45347,8 @@ name = "Theatre Backstage"; req_access_txt = "46" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/crew_quarters/theatre) "bQV" = ( @@ -50204,29 +45419,38 @@ /area/atmos) "bRc" = ( /obj/item/radio/beacon, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/atmos) "bRd" = ( /obj/machinery/atmospherics/binary/pump{ dir = 0; - name = "Air to Port"; - on = 0 + name = "Air to Port" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/atmos) "bRe" = ( /obj/machinery/atmospherics/binary/pump{ dir = 0; - name = "Mix to Port"; - on = 0 + name = "Mix to Port" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/atmos) "bRf" = ( /obj/machinery/atmospherics/binary/pump{ dir = 0; - name = "Pure to Port"; - on = 0 + name = "Pure to Port" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/atmos) @@ -50275,8 +45499,6 @@ /area/space/nearstation) "bRn" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/medical{ name = "Coroner" }, @@ -50298,9 +45520,7 @@ /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/tcommsat/computer{ - name = "\improper Telecoms Control Room" - }) +/area/tcommsat/computer) "bRp" = ( /obj/structure/window/reinforced{ dir = 8 @@ -50319,28 +45539,22 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel/dark, /area/tcommsat/server) -"bRr" = ( -/obj/machinery/atmospherics/unary/vent_scrubber, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/medical/morgue) "bRs" = ( /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/plasteel/dark, /area/tcommsat/server) "bRt" = ( @@ -50353,16 +45567,16 @@ /obj/machinery/light/small{ dir = 1 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/medical/morgue) "bRu" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, /obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/ai_monitored/storage/eva{ name = "E.V.A. Storage" @@ -50373,7 +45587,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, /area/ai_monitored/storage/eva{ @@ -50396,14 +45609,9 @@ icon_state = "1-4" }, /obj/effect/decal/warning_stripes/west, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, /turf/simulated/floor/plasteel, /area/gateway) "bRx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -50424,9 +45632,10 @@ }, /obj/machinery/camera{ c_tag = "Arrivals - Aft Arm"; - dir = 8; - network = list("SS13") + dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "arrival" @@ -50533,13 +45742,11 @@ /turf/simulated/floor/wood, /area/library) "bRL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/effect/landmark{ name = "lightsout" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/carpet, /area/library) "bRM" = ( @@ -50571,7 +45778,6 @@ dir = 1 }, /obj/machinery/status_display{ - density = 0; layer = 4; pixel_y = 32 }, @@ -50639,20 +45845,11 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/ai_monitored/storage/eva{ name = "E.V.A. Storage" }) -"bRT" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 2; - on = 1 - }, -/obj/effect/decal/warning_stripes/north, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/entry{ - name = "Arrivals" - }) "bRU" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, @@ -50684,16 +45881,6 @@ }, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, -/area/hallway/secondary/entry{ - name = "Arrivals" - }) -"bRW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/decal/warning_stripes/northwestcorner, -/turf/simulated/floor/plasteel, /area/hallway/secondary/entry{ name = "Arrivals" }) @@ -50721,13 +45908,14 @@ }, /obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes/yellow, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/teleporter{ name = "\improper Teleporter Room" }) "bRZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/wood, /area/blueshield) "bSa" = ( @@ -50746,11 +45934,12 @@ pixel_x = 29; pixel_y = -1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, /area/blueshield) "bSd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/wood, /area/ntrep) "bSe" = ( @@ -50765,7 +45954,6 @@ pixel_x = 29; pixel_y = -1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/ntrep) "bSh" = ( @@ -50793,7 +45981,6 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, /area/ai_monitored/storage/eva{ @@ -50802,8 +45989,7 @@ "bSj" = ( /obj/machinery/camera{ c_tag = "Club - Aft"; - dir = 1; - network = list("SS13") + dir = 1 }, /obj/machinery/computer/security/telescreen/entertainment{ pixel_y = -29 @@ -50985,7 +46171,6 @@ "bSA" = ( /obj/structure/closet/emcloset, /obj/machinery/status_display{ - density = 0; layer = 4; pixel_x = -32 }, @@ -51004,14 +46189,10 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/effect/spawner/lootdrop{ loot = list(/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes); name = "maint grille or trash spawner" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/starboard) "bSD" = ( @@ -51031,7 +46212,6 @@ "bSE" = ( /obj/machinery/camera{ c_tag = "Morgue"; - dir = 2; network = list("SS13","Medbay") }, /obj/structure/window/reinforced{ @@ -51061,9 +46241,7 @@ pixel_x = -4; pixel_y = 3 }, -/obj/item/clothing/shoes/magboots{ - pixel_y = 0 - }, +/obj/item/clothing/shoes/magboots, /obj/item/clothing/shoes/magboots{ pixel_x = 4; pixel_y = -3 @@ -51080,18 +46258,6 @@ /obj/structure/closet/wardrobe/grey, /turf/simulated/floor/plating, /area/maintenance/starboard) -"bSH" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, -/obj/effect/landmark{ - name = "JoinLateCryo" - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/crew_quarters/sleep) "bSI" = ( /obj/item/storage/box/lights/mixed, /turf/simulated/floor/plating, @@ -51125,6 +46291,9 @@ pixel_x = -27 }, /obj/effect/decal/warning_stripes/northwest, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/teleporter{ name = "\improper Teleporter Room" @@ -51175,8 +46344,7 @@ /obj/machinery/door/window/northleft{ dir = 8; name = "Disposals Chute"; - pixel_x = -1; - req_access_txt = "0" + pixel_x = -1 }, /obj/machinery/disposal/deliveryChute{ dir = 8; @@ -51211,14 +46379,12 @@ /area/atmos) "bSW" = ( /obj/machinery/status_display{ - density = 0; layer = 4; pixel_x = -32 }, /obj/machinery/camera{ c_tag = "Central Primary Hallway - Starboard - Kitchen"; - dir = 4; - network = list("SS13") + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -51227,12 +46393,12 @@ /area/hallway/primary/central) "bSX" = ( /obj/machinery/firealarm{ - dir = 2; pixel_y = 24 }, /obj/machinery/light/small{ dir = 1 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -51242,15 +46408,14 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 +/obj/machinery/door/airlock/medical{ + name = "Morgue" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/airlock/medical{ - name = "Morgue" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -51258,12 +46423,12 @@ /area/medical/morgue) "bSZ" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/door/airlock/medical{ name = "Morgue" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -51305,6 +46470,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" @@ -51322,11 +46490,9 @@ /obj/machinery/power/apc{ dir = 8; name = "west bump"; - pixel_x = -24; - shock_proof = 0 + pixel_x = -24 }, /obj/structure/cable/yellow{ - d1 = 0; d2 = 2; icon_state = "0-2" }, @@ -51341,8 +46507,7 @@ /obj/item/radio, /obj/machinery/camera{ c_tag = "Engineering Equipment East"; - dir = 8; - network = list("SS13") + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -51354,9 +46519,6 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -51381,18 +46543,23 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" }, /obj/effect/decal/warning_stripes/northeast, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/plasteel, /area/teleporter{ name = "\improper Teleporter Room" }) "bTk" = ( /obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/teleporter{ name = "\improper Teleporter Room" @@ -51413,10 +46580,6 @@ /turf/simulated/floor/plasteel, /area/gateway) "bTm" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; @@ -51432,6 +46595,12 @@ layer = 4.1; tag = "icon-plant-03" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "arrival" @@ -51485,6 +46654,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -51530,15 +46702,13 @@ /turf/simulated/floor/carpet, /area/library) "bTv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 8; icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/carpet, /area/library) "bTw" = ( @@ -51553,8 +46723,7 @@ /obj/item/folder, /obj/item/folder, /obj/machinery/camera/autoname{ - dir = 1; - network = list("SS13") + dir = 1 }, /obj/structure/table/wood, /turf/simulated/floor/wood, @@ -51603,7 +46772,6 @@ }, /obj/machinery/kitchen_machine/microwave, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "cafeteria" }, /area/crew_quarters/kitchen) @@ -51622,21 +46790,20 @@ pixel_x = -1; pixel_y = 2 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/ai_monitored/storage/eva{ name = "E.V.A. Storage" }) "bTG" = ( /obj/structure/chair/stool, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, /area/gateway) "bTH" = ( /obj/machinery/camera{ c_tag = "Arrivals - Aft Arm - Far"; - dir = 1; - network = list("SS13") + dir = 1 }, /obj/structure/cable/yellow{ d1 = 4; @@ -51644,6 +46811,9 @@ icon_state = "4-8" }, /obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry{ name = "Arrivals" @@ -51676,30 +46846,34 @@ pixel_y = -22 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/hallway/primary/starboard) "bTL" = ( /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/wood, /area/blueshield) "bTN" = ( /obj/structure/chair/office/dark, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/carpet, /area/ntrep) "bTO" = ( /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/wood, /area/ntrep) "bTP" = ( @@ -51713,15 +46887,16 @@ /obj/machinery/light_switch{ pixel_x = -26 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/wood, /area/crew_quarters/theatre) "bTR" = ( -/obj/structure/closet/secure_closet/medical1{ - pixel_x = 0 - }, +/obj/structure/closet/secure_closet/medical1, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -51780,19 +46955,6 @@ icon_state = "neutralcorner" }, /area/hallway/primary/central) -"bTX" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "neutralcorner" - }, -/area/hallway/primary/central) "bTY" = ( /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, @@ -51804,30 +46966,6 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar) -"bUa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" - }, -/area/crew_quarters/kitchen) -"bUb" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 - }, -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" - }, -/area/crew_quarters/kitchen) "bUe" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -51848,16 +46986,9 @@ }, /obj/machinery/vending/dinnerware, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "cafeteria" }, /area/crew_quarters/kitchen) -"bUg" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/theatre) "bUh" = ( /obj/structure/sink/kitchen{ desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; @@ -51892,33 +47023,21 @@ "bUl" = ( /turf/simulated/floor/wood, /area/crew_quarters/theatre) -"bUm" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/theatre) "bUn" = ( /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /turf/simulated/floor/wood, /area/crew_quarters/theatre) "bUo" = ( /obj/structure/reagent_dispensers/fueltank, /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_y = -26 }, /obj/machinery/camera{ c_tag = "Atmospherics - Central"; - dir = 1; - network = list("SS13") + dir = 1 }, /turf/simulated/floor/plasteel, /area/atmos) @@ -51966,16 +47085,14 @@ "bUu" = ( /obj/machinery/camera{ c_tag = "Atmospherics Tank - N2O"; - dir = 8; - network = list("SS13") + dir = 8 }, /turf/simulated/floor/engine/n20, /area/atmos) "bUv" = ( /obj/machinery/atmospherics/binary/pump{ dir = 0; - name = "Mix to Port"; - on = 0 + name = "Mix to Port" }, /obj/item/crowbar, /turf/simulated/floor/plasteel, @@ -51984,7 +47101,6 @@ /obj/machinery/atmospherics/pipe/simple/visible/green, /obj/machinery/door/window/northleft{ dir = 8; - icon_state = "left"; name = "Inner Pipe Access"; req_access_txt = "24" }, @@ -51998,9 +47114,11 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -52014,12 +47132,6 @@ d2 = 8; icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -52040,7 +47152,6 @@ }, /obj/machinery/light/small{ dir = 4; - icon_state = "bulb1"; tag = "icon-bulb1 (EAST)" }, /obj/machinery/camera/motion{ @@ -52048,6 +47159,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -52064,6 +47176,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -52087,14 +47202,6 @@ /obj/structure/table, /obj/item/clothing/mask/cigarette/pipe, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) -"bUH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, -/turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" }) @@ -52105,7 +47212,6 @@ opacity = 1 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "carpetsymbol" }, /area/library) @@ -52120,12 +47226,9 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "carpetsymbol" }, /area/library) @@ -52135,20 +47238,10 @@ req_access_txt = "37" }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "cult"; tag = "icon-cult" }, /area/library) -"bUL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralcorner" - }, -/area/hallway/primary/central) "bUM" = ( /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ @@ -52175,7 +47268,6 @@ }, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /turf/simulated/floor/plasteel{ @@ -52187,29 +47279,26 @@ name = "E.V.A. Storage" }) "bUO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, /obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry{ name = "Arrivals" }) "bUP" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/ai_monitored/storage/eva{ name = "E.V.A. Storage" }) "bUQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -52219,6 +47308,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry{ name = "Arrivals" @@ -52236,30 +47328,29 @@ icon_state = "4-8" }, /obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry{ name = "Arrivals" }) "bUT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, /obj/effect/decal/warning_stripes/southwestcorner, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry{ name = "Arrivals" @@ -52277,11 +47368,7 @@ /turf/simulated/floor/plasteel, /area/gateway) "bUW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_y = -25 }, @@ -52291,6 +47378,12 @@ icon_state = "4-8" }, /obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry{ name = "Arrivals" @@ -52324,7 +47417,6 @@ /area/blueshield) "bVa" = ( /obj/machinery/photocopier, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, /area/blueshield) "bVb" = ( @@ -52371,10 +47463,8 @@ pixel_x = 32 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, /area/ai_monitored/storage/eva{ @@ -52391,15 +47481,16 @@ /obj/item/stack/packageWrap, /obj/item/hand_tele, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/machinery/camera{ c_tag = "Teleporter Room"; - dir = 8; - network = list("SS13") + dir = 8 }, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel, /area/teleporter{ name = "\improper Teleporter Room" @@ -52411,8 +47502,7 @@ }, /obj/machinery/camera{ c_tag = "Gateway - Atrium"; - dir = 4; - network = list("SS13") + dir = 4 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, @@ -52436,7 +47526,6 @@ "bVi" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/maintenance{ - req_access_txt = "0"; req_one_access_txt = "1;4;38;12" }, /turf/simulated/floor/plating, @@ -52452,11 +47541,6 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -52476,12 +47560,8 @@ }, /obj/machinery/camera{ c_tag = "Research Division - Airlock"; - dir = 2; network = list("SS13","RD") }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -52501,7 +47581,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/public/glass{ name = "Dormitories" }, @@ -52512,8 +47591,7 @@ /area/crew_quarters/sleep) "bVn" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -52522,7 +47600,6 @@ /area/hallway/primary/central) "bVo" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/airlock/public/glass{ name = "Dormitories" }, @@ -52559,9 +47636,6 @@ }, /obj/structure/disposalpipe/segment, /obj/item/cigbutt, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" @@ -52581,7 +47655,6 @@ }, /obj/machinery/kitchen_machine/microwave, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "cafeteria" }, /area/crew_quarters/kitchen) @@ -52595,6 +47668,12 @@ /area/crew_quarters/kitchen) "bVu" = ( /obj/machinery/hologram/holopad, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "cafeteria"; @@ -52663,6 +47742,7 @@ /obj/structure/chair/wood/wings{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/crew_quarters/theatre) "bVC" = ( @@ -52684,12 +47764,6 @@ dir = 4; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /turf/simulated/floor/wood, /area/crew_quarters/theatre) "bVE" = ( @@ -52701,12 +47775,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plating, /area/crew_quarters/theatre) "bVF" = ( @@ -52740,23 +47808,6 @@ /area/maintenance/aft{ name = "Aft Maintenance" }) -"bVJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/plating, -/area/maintenance/starboard) -"bVK" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 - }, -/obj/effect/landmark{ - name = "xeno_spawn"; - pixel_x = -1 - }, -/turf/simulated/floor/plating, -/area/maintenance/starboard) "bVL" = ( /obj/machinery/atmospherics/unary/portables_connector{ dir = 4 @@ -52793,13 +47844,16 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, /obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/plasteel, /area/teleporter{ name = "\improper Teleporter Room" @@ -52810,8 +47864,7 @@ }, /obj/machinery/atmospherics/binary/pump{ dir = 0; - name = "Air to Port"; - on = 0 + name = "Air to Port" }, /obj/machinery/light/small{ dir = 8 @@ -52846,9 +47899,7 @@ pixel_x = 4; pixel_y = -1 }, -/obj/item/tank/jetpack/carbondioxide{ - pixel_y = 0 - }, +/obj/item/tank/jetpack/carbondioxide, /obj/item/tank/jetpack/carbondioxide{ pixel_x = -4; pixel_y = 1 @@ -52950,11 +48001,9 @@ name = "Desk Door"; req_access_txt = "67" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/blueshield) "bWc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, /area/gateway) @@ -52970,25 +48019,14 @@ /turf/simulated/floor/plating, /area/toxins/lab) "bWf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, /area/ai_monitored/storage/eva{ name = "E.V.A. Storage" }) -"bWg" = ( -/obj/structure/grille, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) "bWh" = ( /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /obj/structure/cable/yellow{ @@ -53002,9 +48040,6 @@ name = "\improper Teleporter Room" }) "bWi" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, /obj/item/trash/candy, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ @@ -53013,8 +48048,7 @@ "bWj" = ( /obj/machinery/door/airlock/maintenance{ name = "Vacant Office Maintenance"; - req_access_txt = "32"; - req_one_access_txt = "0" + req_access_txt = "32" }, /turf/simulated/floor/plating, /area/security/vacantoffice) @@ -53045,12 +48079,6 @@ name = "Kitchen Maintenance"; req_access_txt = "28" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plating, /area/crew_quarters/kitchen) "bWo" = ( @@ -53063,6 +48091,8 @@ "bWp" = ( /obj/structure/disposalpipe/segment, /obj/effect/spawner/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/crew_quarters/sleep) "bWs" = ( @@ -53071,8 +48101,8 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, /area/library) "bWt" = ( @@ -53103,13 +48133,11 @@ /obj/machinery/keycard_auth{ pixel_x = 24 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/ntrep) "bWx" = ( /obj/structure/chair/comfy/brown, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "cult"; tag = "icon-cult" }, @@ -53130,7 +48158,6 @@ "bWz" = ( /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -53149,6 +48176,10 @@ charge = 100; maxcharge = 15000 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/plasteel, /area/ai_monitored/storage/eva{ name = "E.V.A. Storage" @@ -53185,9 +48216,6 @@ name = "\improper Teleporter Room" }) "bWE" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, /obj/machinery/door_control{ id = "teleshutter"; name = "Teleporter Shutter Control"; @@ -53195,6 +48223,8 @@ pixel_y = -26; req_access_txt = "19" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault"; @@ -53222,7 +48252,6 @@ name = "Blueshield Requests Console"; pixel_x = -30 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/blueshield) "bWH" = ( @@ -53246,24 +48275,26 @@ /obj/structure/chair/comfy/black{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "bcarpet05" }, /area/blueshield) "bWK" = ( /obj/item/flag/nt, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, /area/blueshield) "bWM" = ( /obj/item/flag/nt, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, /area/ntrep) "bWN" = ( /obj/structure/chair/comfy/black{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/carpet, /area/ntrep) "bWO" = ( @@ -53290,11 +48321,9 @@ announcementConsole = 1; department = "NT Representative"; departmentType = 5; - dir = 2; name = "NT Rep Requests Console"; pixel_x = 30 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/ntrep) "bWR" = ( @@ -53316,6 +48345,12 @@ }) "bWS" = ( /obj/effect/decal/warning_stripes/northeast, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/gateway) "bWT" = ( @@ -53326,17 +48361,9 @@ }, /obj/structure/disposalpipe/sortjunction{ dir = 2; - icon_state = "pipe-j1s"; sortType = 18 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/west, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, /turf/simulated/floor/plating, /area/maintenance/starboard) "bWU" = ( @@ -53345,9 +48372,6 @@ /turf/simulated/floor/plasteel, /area/atmos) "bWV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -53370,14 +48394,14 @@ /turf/simulated/floor/plasteel, /area/gateway) "bWW" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/gateway) "bWX" = ( @@ -53391,18 +48415,23 @@ d2 = 4; icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/gateway) "bWY" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel, /area/gateway) "bWZ" = ( @@ -53415,9 +48444,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plating, /area/gateway) "bXb" = ( @@ -53446,40 +48472,18 @@ tag = "icon-cafeteria (NORTHEAST)" }, /area/crew_quarters/kitchen) -"bXd" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" - }, -/area/crew_quarters/kitchen) "bXi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plating, /area/maintenance/starboard) "bXj" = ( /obj/machinery/atmospherics/pipe/simple/visible/green, /obj/machinery/atmospherics/binary/pump{ dir = 8; - name = "Plasma to Pure"; - on = 0 + name = "Plasma to Pure" }, /obj/structure/window/reinforced{ dir = 4 @@ -53516,10 +48520,6 @@ /obj/effect/landmark/start{ name = "Chef" }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, /obj/effect/landmark{ name = "xeno_spawn"; pixel_x = -1 @@ -53529,18 +48529,13 @@ }, /area/crew_quarters/kitchen) "bXm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, /area/crew_quarters/kitchen) "bXn" = ( /obj/machinery/icemachine, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/machinery/firealarm{ dir = 4; pixel_x = 28 @@ -53566,10 +48561,12 @@ }, /obj/machinery/camera{ c_tag = "Theatre - Backstage"; - dir = 1; - network = list("SS13") + dir = 1 }, /obj/structure/table/wood, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, /turf/simulated/floor/wood, /area/crew_quarters/theatre) "bXq" = ( @@ -53595,11 +48592,6 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/theatre) -"bXs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/item/wrench, -/turf/simulated/floor/plating, -/area/maintenance/starboard) "bXt" = ( /obj/machinery/atmospherics/unary/portables_connector{ dir = 1 @@ -53640,6 +48632,9 @@ pixel_y = 2 }, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/gateway) "bXy" = ( @@ -53649,7 +48644,6 @@ }, /obj/item/clothing/under/suit_jacket/red, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "cult"; tag = "icon-cult" }, @@ -53701,7 +48695,6 @@ tag = "icon-plant-14" }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whitepurple" }, /area/medical/research{ @@ -53723,6 +48716,12 @@ d2 = 4; icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" @@ -53751,9 +48750,6 @@ name = "Storage Room"; req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" @@ -53769,13 +48765,15 @@ pixel_x = 30 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "cult"; tag = "icon-cult" }, /area/library) "bXN" = ( /obj/structure/chair/office/dark, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/wood, /area/library) "bXO" = ( @@ -53809,16 +48807,13 @@ }, /area/crew_quarters/locker) "bXR" = ( -/obj/item/taperecorder{ - pixel_y = 0 - }, +/obj/item/taperecorder, /obj/item/camera, /obj/item/radio/intercom{ pixel_y = -25 }, /obj/structure/table/wood, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "cult"; tag = "icon-cult" }, @@ -53828,7 +48823,6 @@ name = "Forbidden Knowledge" }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "cult"; tag = "icon-cult" }, @@ -53844,28 +48838,16 @@ icon_state = "neutralcorner" }, /area/hallway/primary/central) -"bXU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, -/obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) "bXV" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, /obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel, /area/ai_monitored/storage/eva{ name = "E.V.A. Storage" }) "bXW" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 4; @@ -53882,16 +48864,11 @@ }, /obj/machinery/processor, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "cafeteria" }, /area/crew_quarters/kitchen) "bXY" = ( /obj/machinery/computer/teleporter, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 2; - on = 1 - }, /turf/simulated/floor/plating, /area/teleporter{ name = "\improper Teleporter Room" @@ -53903,9 +48880,6 @@ name = "\improper Teleporter Room" }) "bYa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -53920,9 +48894,6 @@ dir = 8; pixel_x = -24 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /turf/simulated/floor/wood, /area/blueshield) "bYc" = ( @@ -53946,24 +48917,16 @@ /obj/item/flashlight/lamp, /obj/machinery/camera{ c_tag = "Blueshield's Office"; - dir = 1; - network = list("SS13") + dir = 1 }, /obj/machinery/newscaster/security_unit{ pixel_y = -32 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, /turf/simulated/floor/wood, /area/blueshield) "bYe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/blueshield) "bYf" = ( @@ -53975,17 +48938,10 @@ /obj/item/reagent_containers/food/drinks/bottle/whiskey, /obj/item/reagent_containers/food/drinks/drinkingglass, /obj/item/reagent_containers/food/drinks/drinkingglass, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /turf/simulated/floor/wood, /area/blueshield) "bYg" = ( /obj/structure/filingcabinet, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - level = 1 - }, /turf/simulated/floor/wood, /area/ntrep) "bYh" = ( @@ -54006,9 +48962,6 @@ dir = 4; pixel_x = 24 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /turf/simulated/floor/wood, /area/ntrep) "bYk" = ( @@ -54047,8 +49000,7 @@ "bYn" = ( /obj/machinery/camera{ c_tag = "NT Representative's Office"; - dir = 1; - network = list("SS13") + dir = 1 }, /obj/structure/table/wood, /obj/machinery/newscaster/security_unit{ @@ -54057,9 +49009,6 @@ /obj/machinery/photocopier/faxmachine/longrange{ department = "NT Representative's Office" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, /turf/simulated/floor/wood, /area/ntrep) "bYo" = ( @@ -54068,10 +49017,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 - }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, /area/gateway) @@ -54086,9 +49031,6 @@ d2 = 8; icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plating, /area/maintenance/maintcentral{ @@ -54118,6 +49060,12 @@ }, /obj/item/stack/packageWrap, /obj/item/hand_labeler, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "cafeteria"; @@ -54128,6 +49076,12 @@ /obj/structure/table, /obj/item/storage/box/donkpockets, /obj/item/eftpos, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "cafeteria"; @@ -54151,6 +49105,9 @@ pixel_x = 30 }, /obj/machinery/photocopier, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/wood, /area/library) "bYw" = ( @@ -54187,15 +49144,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/starboard) -"bYz" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "green" - }, -/area/hydroponics) "bYA" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -54206,7 +49154,6 @@ icon_state = "2-8" }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "green" }, /area/hydroponics) @@ -54214,8 +49161,13 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "green" }, /area/hydroponics) @@ -54223,6 +49175,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "green" @@ -54237,7 +49195,6 @@ "bYE" = ( /obj/machinery/cooker/deepfryer, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "cafeteria" }, /area/crew_quarters/kitchen) @@ -54255,10 +49212,6 @@ /obj/machinery/portable_atmospherics/canister, /turf/simulated/floor/plating, /area/maintenance/starboard) -"bYH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plating, -/area/maintenance/starboard) "bYI" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable/yellow{ @@ -54286,9 +49239,6 @@ req_access_txt = "67" }, /obj/machinery/computer/crew, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, /turf/simulated/floor/wood, /area/blueshield) "bYK" = ( @@ -54324,9 +49274,6 @@ req_access_txt = "73" }, /obj/machinery/computer/secure_data, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, /turf/simulated/floor/wood, /area/ntrep) "bYO" = ( @@ -54365,36 +49312,28 @@ }) "bYR" = ( /obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/ai_monitored/storage/eva{ name = "E.V.A. Storage" }) -"bYS" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) "bYT" = ( /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/spawner/lootdrop{ loot = list(/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes); name = "maint grille or trash spawner" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" @@ -54405,33 +49344,23 @@ /area/ai_monitored/storage/eva{ name = "E.V.A. Storage" }) -"bYV" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) "bYW" = ( /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 8; icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" @@ -54494,7 +49423,6 @@ pixel_x = -23 }, /obj/machinery/power/apc{ - dir = 2; name = "Kitchen APC"; pixel_y = -24 }, @@ -54502,7 +49430,6 @@ /obj/structure/table, /obj/machinery/reagentgrinder, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "cafeteria" }, /area/crew_quarters/kitchen) @@ -54523,8 +49450,7 @@ /obj/item/kitchen/rollingpin, /obj/machinery/camera{ c_tag = "Kitchen"; - dir = 1; - network = list("SS13") + dir = 1 }, /obj/machinery/door_control{ id = "kitchenhydro"; @@ -54533,15 +49459,12 @@ req_access_txt = "28" }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "cafeteria" }, /area/crew_quarters/kitchen) "bZe" = ( /obj/item/toy/cards/deck, /obj/structure/table/wood, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/library) "bZf" = ( @@ -54563,12 +49486,13 @@ /turf/simulated/floor/wood, /area/library) "bZh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/firealarm{ dir = 8; pixel_x = -24 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -54609,11 +49533,11 @@ /turf/simulated/wall/r_wall, /area/blueshield) "bZm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/command{ name = "Blueshield's Office"; req_access_txt = "67" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/blueshield) @@ -54625,8 +49549,8 @@ name = "NT Representative's Office"; req_access_txt = "73" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/ntrep) "bZq" = ( @@ -54635,8 +49559,7 @@ }, /obj/machinery/camera{ c_tag = "Atmospherics - Port"; - dir = 4; - network = list("SS13") + dir = 4 }, /obj/machinery/light{ dir = 8 @@ -54653,21 +49576,14 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/maintenance{ - req_access_txt = "0"; req_one_access_txt = "12;17" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/maintenance/maintcentral{ name = "Central Maintenance" }) "bZt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "greencorner" }, /area/hallway/primary/central) @@ -54680,6 +49596,8 @@ "bZw" = ( /obj/machinery/teleport/hub, /obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/teleporter{ name = "\improper Teleporter Room" @@ -54711,6 +49629,8 @@ name = "Teleporter Access Shutter" }, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/teleporter{ name = "\improper Teleporter Room" @@ -54719,8 +49639,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "hydrofloor" }, @@ -54729,10 +49653,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -54742,29 +49666,15 @@ "bZD" = ( /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/camera{ c_tag = "Gateway - Access"; - dir = 8; - network = list("SS13") + dir = 8 }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, /area/gateway) -"bZE" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plating, -/area/maintenance/maintcentral{ - name = "Central Maintenance" - }) "bZF" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -54775,12 +49685,6 @@ d2 = 4; icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plating, /area/maintenance/starboard) "bZG" = ( @@ -54796,9 +49700,7 @@ /turf/simulated/floor/plasteel, /area/atmos) "bZH" = ( -/obj/machinery/atmospherics/pipe/manifold/visible{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/visible, /obj/machinery/meter, /turf/simulated/floor/plating, /area/maintenance/starboard) @@ -54829,16 +49731,14 @@ "bZL" = ( /obj/machinery/atmospherics/binary/pump{ dir = 0; - name = "Port to Filter"; - on = 0 + name = "Port to Filter" }, /obj/machinery/light/small{ dir = 8 }, /obj/machinery/camera{ c_tag = "Atmospherics - Starboard"; - dir = 4; - network = list("SS13") + dir = 4 }, /turf/simulated/floor/plasteel, /area/atmos) @@ -54852,8 +49752,7 @@ "bZN" = ( /obj/machinery/camera{ c_tag = "Atmospherics Tank - Toxins"; - dir = 8; - network = list("SS13") + dir = 8 }, /turf/simulated/floor/engine/plasma, /area/atmos) @@ -54876,7 +49775,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/maintenance/portsolar) "bZR" = ( @@ -54885,9 +49783,6 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" @@ -54895,16 +49790,6 @@ "bZS" = ( /turf/simulated/wall/r_wall, /area/maintenance/portsolar) -"bZT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/airlock/maintenance{ - name = "Storage Room"; - req_access_txt = "12" - }, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) "bZU" = ( /turf/simulated/wall, /area/maintenance/aft{ @@ -54926,12 +49811,6 @@ /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/gateway) -"bZY" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/library) "bZZ" = ( /obj/structure/chair/office/dark{ dir = 4 @@ -54940,9 +49819,6 @@ dir = 1; pixel_y = -22 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/wood, /area/library) "caa" = ( @@ -54951,32 +49827,18 @@ pixel_y = -24 }, /obj/machinery/camera/autoname{ - dir = 1; - network = list("SS13") + dir = 1 }, /obj/item/storage/pill_bottle/dice, /obj/structure/table/wood, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/wood, /area/library) "cab" = ( /obj/structure/table/wood, /obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /turf/simulated/floor/wood, /area/library) "cac" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 - }, /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" @@ -54991,7 +49853,6 @@ "cad" = ( /obj/machinery/door/airlock/maintenance{ name = "Library Maintenance"; - req_access_txt = "0"; req_one_access_txt = "12;37" }, /obj/structure/disposalpipe/segment{ @@ -55017,8 +49878,13 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" @@ -55037,7 +49903,6 @@ }, /obj/machinery/shower{ dir = 8; - icon_state = "shower"; name = "emergency shower"; tag = "icon-shower (WEST)" }, @@ -55062,9 +49927,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ @@ -55072,13 +49934,7 @@ }) "cal" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /obj/effect/decal/warning_stripes/north, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/crew_quarters/kitchen) "can" = ( @@ -55092,9 +49948,6 @@ /area/hallway/primary/central) "cao" = ( /obj/effect/decal/warning_stripes/north, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/crew_quarters/kitchen) "cap" = ( @@ -55102,16 +49955,10 @@ dir = 4; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/effect/landmark{ name = "blobstart" }, /obj/effect/decal/warning_stripes/west, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, /turf/simulated/floor/plating, /area/maintenance/starboard) "caq" = ( @@ -55195,15 +50042,6 @@ icon_state = "dark" }, /area/hallway/primary/central) -"caB" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel, -/area/hallway/primary/central) "caC" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -55215,6 +50053,8 @@ codes_txt = "patrol;next_patrol=11-Command-Port"; location = "10.2-Aft-Port-Corner" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/hallway/primary/central) "caD" = ( @@ -55228,14 +50068,10 @@ /turf/simulated/floor/plasteel, /area/hallway/primary/central) "caF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/structure/sign/botany{ pixel_x = 32; pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "green" @@ -55246,25 +50082,22 @@ /obj/machinery/door/window/eastleft{ dir = 1; name = "Kitchen Window"; - req_access_txt = "28"; - req_one_access_txt = "0" + req_access_txt = "28" }, /obj/machinery/door/firedoor, /obj/item/paper, /obj/machinery/door/window/eastleft{ dir = 2; name = "Hydroponics Window"; - req_access_txt = "0"; req_one_access_txt = "30;35" }, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/hydroponics) "caH" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -55273,16 +50106,12 @@ /obj/machinery/door/airlock/public/glass{ name = "Locker Room" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, /area/crew_quarters/locker) "caI" = ( /obj/machinery/power/apc{ - cell_type = 2500; dir = 1; name = "Starboard Maintenance APC"; pixel_x = -1; @@ -55293,22 +50122,17 @@ icon_state = "0-2" }, /obj/effect/decal/warning_stripes/north, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plating, /area/maintenance/starboard) "caJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, /obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" @@ -55330,7 +50154,6 @@ }) "caL" = ( /obj/machinery/firealarm{ - dir = 2; pixel_y = 24 }, /obj/effect/decal/warning_stripes/northeastcorner, @@ -55355,10 +50178,10 @@ dir = 1 }, /obj/machinery/status_display{ - density = 0; layer = 4; pixel_y = 32 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -55366,7 +50189,6 @@ /area/hallway/primary/central) "caP" = ( /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_y = 21 }, @@ -55386,7 +50208,6 @@ dir = 1 }, /obj/machinery/status_display{ - density = 0; layer = 4; pixel_y = 32 }, @@ -55442,14 +50263,7 @@ }, /obj/machinery/door/airlock/maintenance{ name = "Hydroponics Maintenance"; - req_access_txt = "35"; - req_one_access_txt = "0" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + req_access_txt = "35" }, /turf/simulated/floor/plating, /area/hydroponics) @@ -55505,18 +50319,15 @@ }, /obj/machinery/camera{ c_tag = "Kitchen"; - dir = 1; - network = list("SS13") + dir = 1 }, /obj/machinery/kitchen_machine/grill, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "cafeteria" }, /area/crew_quarters/kitchen) "cbb" = ( /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_y = 21 }, @@ -55540,9 +50351,6 @@ /turf/simulated/floor/plasteel, /area/hydroponics) "cbe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -55553,9 +50361,8 @@ d2 = 8; icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/crew_quarters/locker) "cbf" = ( @@ -55573,8 +50380,7 @@ "cbg" = ( /obj/machinery/atmospherics/binary/pump{ dir = 8; - name = "Port to Filter"; - on = 0 + name = "Port to Filter" }, /turf/simulated/floor/plasteel, /area/atmos) @@ -55618,18 +50424,6 @@ "cbl" = ( /turf/simulated/floor/engine/co2, /area/atmos) -"cbm" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel{ - icon_state = "floorgrime" - }, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) "cbn" = ( /obj/structure/table/glass, /obj/item/book/manual/sop_service{ @@ -55660,15 +50454,15 @@ }) "cbr" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "0"; req_one_access_txt = "12;5;39;25;28" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" @@ -55736,18 +50530,12 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, -/turf/simulated/floor/plasteel, -/area/hallway/primary/central) -"cbA" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 }, -/obj/machinery/atmospherics/unary/vent_pump, /turf/simulated/floor/plasteel, /area/hallway/primary/central) "cbC" = ( @@ -55761,6 +50549,12 @@ d2 = 4; icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hallway/primary/central) "cbD" = ( @@ -55786,6 +50580,12 @@ d2 = 8; icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, /turf/simulated/floor/plasteel, /area/hallway/primary/central) "cbF" = ( @@ -55813,29 +50613,12 @@ d2 = 8; icon_state = "1-8" }, -/turf/simulated/floor/plasteel, -/area/hallway/primary/central) -"cbH" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/machinery/atmospherics/unary/vent_scrubber, -/turf/simulated/floor/plasteel, -/area/hallway/primary/central) -"cbI" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/hallway/primary/central) "cbJ" = ( @@ -55844,7 +50627,6 @@ pixel_y = -5 }, /obj/machinery/status_display{ - density = 0; layer = 4; pixel_y = 32 }, @@ -55855,15 +50637,17 @@ }, /area/medical/cmo) "cbK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 8; icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "green" @@ -55880,9 +50664,14 @@ /obj/machinery/door/window/westleft{ dir = 4; name = "Hydroponics Desk"; - req_access_txt = "0"; req_one_access_txt = "30;35" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "greenfull"; @@ -55907,18 +50696,6 @@ icon_state = "green" }, /area/hydroponics) -"cbR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "green" - }, -/area/hydroponics) "cbS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -55937,18 +50714,6 @@ }, /turf/simulated/floor/plasteel, /area/atmos) -"cbU" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plating, -/area/maintenance/starboard) "cbW" = ( /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, @@ -55964,7 +50729,6 @@ "cca" = ( /obj/machinery/camera{ c_tag = "Security Post - Medbay"; - dir = 2; network = list("SS13","Medbay") }, /turf/simulated/floor/plasteel{ @@ -55980,6 +50744,7 @@ pixel_y = 24; req_access_txt = "66" }, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -56021,8 +50786,7 @@ "ccg" = ( /obj/machinery/atmospherics/binary/pump{ dir = 8; - name = "CO2 to Pure"; - on = 0 + name = "CO2 to Pure" }, /obj/machinery/atmospherics/pipe/simple/visible/green, /obj/structure/window/reinforced{ @@ -56065,6 +50829,12 @@ /obj/effect/landmark{ name = "JoinLateGateway" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "vault"; tag = "icon-vault" @@ -56072,8 +50842,7 @@ /area/gateway) "ccm" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/effect/landmark{ name = "JoinLateGateway" @@ -56093,6 +50862,12 @@ codes_txt = "patrol;next_patrol=10.2-Aft-Port-Corner"; location = "10.1-Central-from-Aft" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hallway/primary/central) "cco" = ( @@ -56105,12 +50880,17 @@ codes_txt = "patrol;next_patrol=8.1-Aft-to-Escape"; location = "8-Central-to-Aft" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hallway/primary/central) "ccp" = ( /obj/machinery/power/terminal{ - dir = 1; - icon_state = "term" + dir = 1 }, /obj/structure/cable{ d2 = 8; @@ -56126,19 +50906,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/portsolar) -"ccq" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, -/obj/effect/landmark{ - name = "xeno_spawn"; - pixel_x = -1 - }, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) "ccr" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -56154,6 +50921,8 @@ codes_txt = "patrol;next_patrol=8-Central-to-Aft"; location = "7.5-Starboard-Aft-Corner" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/hallway/primary/central) "ccs" = ( @@ -56189,6 +50958,12 @@ /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/engine, /area/engine/engineering) "ccv" = ( @@ -56201,22 +50976,6 @@ /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, /area/hydroponics) -"ccw" = ( -/obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 3; - name = "3maintenance loot spawner" - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - icon_state = "floorgrime" - }, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) "ccx" = ( /obj/effect/landmark{ name = "blobstart" @@ -56237,8 +50996,12 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/engine/engineering) "ccA" = ( @@ -56247,9 +51010,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -56268,9 +51028,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 4; @@ -56289,11 +51046,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/airlock/maintenance{ - req_access_txt = "0"; req_one_access_txt = "12;5;39;37;25;28" }, /turf/simulated/floor/plating, @@ -56306,9 +51059,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/junction{ dir = 4; icon_state = "pipe-j2" @@ -56327,13 +51077,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - level = 1 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -56345,32 +51088,13 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" }, /obj/machinery/camera{ c_tag = "Central Primary Hallway - Aft-Port Corner"; - dir = 1; - network = list("SS13") - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralcorner" - }, -/area/hallway/primary/central) -"ccG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -56381,16 +51105,10 @@ /turf/simulated/floor/plasteel, /area/engine/engineering) "ccI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/alarm{ dir = 1; pixel_y = -22 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -56399,134 +51117,31 @@ "ccJ" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; pixel_x = 11 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/hydroponics) -"ccK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralcorner" - }, -/area/hallway/primary/central) -"ccL" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/turf/simulated/floor/plasteel, -/area/hallway/primary/central) -"ccM" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel, -/area/hallway/primary/central) -"ccN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/hallway/primary/central) -"ccO" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "neutralcorner" - }, -/area/hallway/primary/central) "ccP" = ( /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "neutralcorner" - }, -/area/hallway/primary/central) -"ccQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "neutralcorner" - }, -/area/hallway/primary/central) -"ccR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/hallway/primary/central) "ccS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/hallway/primary/central) @@ -56548,76 +51163,35 @@ }, /area/atmos) "ccU" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, /obj/machinery/alarm{ dir = 1; pixel_y = -22 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/hallway/primary/central) -"ccV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "greencorner" - }, -/area/hallway/primary/central) "ccW" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "green" }, /area/hallway/primary/central) -"ccX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "greenfull" - }, -/area/hallway/primary/central) "ccY" = ( /obj/structure/table/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/window/westright{ dir = 4; name = "Hydroponics Desk"; - req_access_txt = "0"; req_one_access_txt = "30;35" }, /obj/item/folder/white, /obj/item/folder/white, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "greenfull"; @@ -56625,90 +51199,38 @@ }, /area/hydroponics) "ccZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/chair/office/dark{ dir = 8 }, /obj/effect/landmark/start{ name = "Botanist" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "green" }, /area/hydroponics) "cda" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "green" }, /area/hydroponics) "cdb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "green" }, /area/hydroponics) -"cdc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/hydroponics/constructable, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/hydroponics) -"cdd" = ( -/obj/machinery/hydroponics/constructable, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/turf/simulated/floor/plasteel, -/area/hydroponics) "cde" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "green" }, /area/hydroponics) -"cdf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "green" - }, -/area/hydroponics) "cdh" = ( /obj/machinery/hydroponics/constructable, /turf/simulated/floor/plasteel, @@ -56718,16 +51240,12 @@ dir = 2; sortType = 20 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; icon_state = "2-4" }, /obj/effect/decal/warning_stripes/west, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/starboard) "cdj" = ( @@ -56739,37 +51257,25 @@ }, /obj/machinery/camera{ c_tag = "Aft Port Solar Maintenance"; - dir = 4; - network = list("SS13") + dir = 4 }, /turf/simulated/floor/plating, /area/maintenance/portsolar) "cdk" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 2; - on = 1 - }, /obj/machinery/firealarm{ pixel_y = 29 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ icon_state = "hydrofloor" }, /area/hydroponics) "cdl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/yellow/partial{ - dir = 1; - icon_state = "3" + dir = 1 }, /obj/effect/decal/warning_stripes/arrow{ - dir = 1; - icon_state = "4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -56777,9 +51283,6 @@ }, /area/hallway/primary/central) "cdm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; @@ -56789,9 +51292,6 @@ dir = 4; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /turf/simulated/floor/plating, /area/maintenance/starboard) "cdn" = ( @@ -56801,20 +51301,6 @@ /area/maintenance/fpmaint2{ name = "Port Maintenance" }) -"cdo" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/starboard) "cdp" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -56824,30 +51310,17 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, /turf/simulated/floor/plating, /area/maintenance/starboard) "cdq" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6; - level = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; @@ -56870,7 +51343,6 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plating, /area/maintenance/portsolar) @@ -56884,15 +51356,9 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plating, /area/atmos) "cdt" = ( @@ -56901,16 +51367,10 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/visible/purple, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "caution" @@ -56922,15 +51382,9 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/atmos) "cdv" = ( @@ -56939,16 +51393,10 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/atmos) "cdw" = ( @@ -56957,12 +51405,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, /turf/simulated/floor/plasteel, /area/atmos) "cdx" = ( @@ -56971,10 +51413,8 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/atmos) "cdy" = ( @@ -56987,10 +51427,6 @@ name = "xeno_spawn"; pixel_x = -1 }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, /turf/simulated/floor/plating, /area/maintenance/portsolar) "cdz" = ( @@ -57002,21 +51438,6 @@ }, /turf/simulated/floor/engine/co2, /area/atmos) -"cdA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/extinguisher_cabinet{ - pixel_y = -30 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralcorner" - }, -/area/hallway/primary/central) "cdB" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -57026,6 +51447,12 @@ /obj/effect/landmark{ name = "JoinLateGateway" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/plasteel{ icon_state = "vault"; tag = "icon-vault" @@ -57034,8 +51461,7 @@ "cdC" = ( /obj/machinery/power/solar_control{ id = "aftport"; - name = "Aft Port Solar Control"; - track = 0 + name = "Aft Port Solar Control" }, /obj/structure/cable{ d2 = 4; @@ -57046,9 +51472,6 @@ /area/maintenance/portsolar) "cdD" = ( /obj/item/cigbutt, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ @@ -57056,22 +51479,14 @@ }) "cdE" = ( /obj/machinery/light, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, /obj/structure/extinguisher_cabinet{ pixel_y = -30 }, /obj/machinery/camera{ c_tag = "Central Primary Hallway - Aft-Starboard Corner"; - dir = 1; - network = list("SS13") - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 1 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/hallway/primary/central) @@ -57118,15 +51533,6 @@ "cdK" = ( /obj/structure/chair/stool, /turf/simulated/floor/plating, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) -"cdL" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, -/turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" }) @@ -57193,8 +51599,7 @@ "cdS" = ( /obj/machinery/camera{ c_tag = "Atmospherics Tank - CO2"; - dir = 8; - network = list("SS13") + dir = 8 }, /turf/simulated/floor/engine/co2, /area/atmos) @@ -57208,13 +51613,6 @@ dir = 8; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -57232,8 +51630,7 @@ id_tag = "escapepodbay" }, /obj/structure/spacepoddoor{ - dir = 4; - icon_state = "n_beam" + dir = 4 }, /turf/simulated/floor/engine, /area/hallway/secondary/entry{ @@ -57251,10 +51648,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "bluecorner" @@ -57263,8 +51656,7 @@ "cdZ" = ( /obj/machinery/camera{ c_tag = "Central Primary Hallway - Aft-Port"; - dir = 1; - network = list("SS13") + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -57281,32 +51673,20 @@ "ced" = ( /obj/machinery/light/small, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "purplecorner" }, /area/hallway/primary/central) "cee" = ( /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "purplecorner" }, /area/hallway/primary/central) "cef" = ( /obj/machinery/camera{ c_tag = "Central Primary Hallway - Aft-Starboard"; - dir = 1; - network = list("SS13") + dir = 1 }, /turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "purplecorner" - }, -/area/hallway/primary/central) -"ceg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 2; icon_state = "purplecorner" }, /area/hallway/primary/central) @@ -57318,7 +51698,6 @@ }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "purplecorner" }, /area/hallway/primary/central) @@ -57333,7 +51712,6 @@ tag = "icon-plant-10" }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "purplecorner" }, /area/hallway/primary/central) @@ -57352,12 +51730,8 @@ /area/hallway/primary/central) "cek" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "0"; req_one_access_txt = "12;7;35;8;47" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" @@ -57367,13 +51741,6 @@ name = "Paramedic" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -57391,8 +51758,7 @@ }) "cen" = ( /obj/machinery/camera/autoname{ - dir = 4; - network = list("SS13") + dir = 4 }, /obj/item/book/manual/hydroponics_pod_people, /obj/item/paper/hydroponics, @@ -57441,6 +51807,8 @@ }) "ces" = ( /obj/machinery/hologram/holopad, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "green" @@ -57450,8 +51818,7 @@ /obj/effect/landmark/start{ name = "Botanist" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "green" @@ -57474,15 +51841,14 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/effect/landmark/start{ name = "Botanist" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "hydrofloor" }, @@ -57493,9 +51859,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 4; @@ -57506,10 +51869,6 @@ icon_state = "pipe-j2"; tag = "icon-pipe-j2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, /turf/simulated/floor/plating, /area/maintenance/starboard) "cez" = ( @@ -57518,9 +51877,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -57528,15 +51884,9 @@ loot = list(/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes); name = "maint grille or trash spawner" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plating, /area/maintenance/starboard) "ceA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; @@ -57546,19 +51896,17 @@ dir = 8; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /turf/simulated/floor/plating, /area/maintenance/starboard) "ceD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, /obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" @@ -57591,6 +51939,9 @@ dir = 10; initialize_directions = 10 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/atmos) "ceK" = ( @@ -57603,13 +51954,6 @@ }, /area/atmos) "ceL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; @@ -57622,20 +51966,20 @@ /area/medical/paramedic) "ceM" = ( /obj/structure/spacepoddoor{ - dir = 4; - icon_state = "n_beam" + dir = 4 }, /turf/simulated/floor/engine, /area/hallway/secondary/entry{ name = "Arrivals" }) "ceN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" @@ -57684,26 +52028,14 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/decal/warning_stripes/east, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plating, /area/maintenance/starboard) "ceS" = ( /obj/structure/bed/amb_trolley, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -57758,9 +52090,7 @@ dir = 5; icon_state = "brown" }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/office) "ceY" = ( /obj/machinery/alarm{ pixel_y = 23 @@ -57782,11 +52112,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/machinery/door/airlock/maintenance{ - req_access_txt = "0"; req_one_access_txt = "12;5;39;25;28" }, /turf/simulated/floor/plating, @@ -57816,9 +52142,6 @@ name = "Aft Maintenance" }) "cfc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /obj/item/cigbutt, /turf/simulated/floor/plating, /area/maintenance/aft{ @@ -57848,8 +52171,7 @@ }, /obj/effect/decal/warning_stripes/south, /obj/machinery/atmospherics/pipe/simple/visible{ - dir = 6; - level = 2 + dir = 6 }, /turf/simulated/floor/plating, /area/maintenance/portsolar) @@ -57938,12 +52260,10 @@ pixel_x = 27 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/machinery/camera/autoname{ - dir = 8; - network = list("SS13") + dir = 8 }, /obj/structure/table/glass, /obj/effect/decal/warning_stripes/west, @@ -58004,15 +52324,14 @@ }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) "cfq" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "purplecorner" }, /area/hallway/primary/aft) @@ -58044,10 +52363,7 @@ }) "cfu" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whitehall"; tag = "icon-whitehall (WEST)" }, @@ -58063,7 +52379,6 @@ /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whitehall"; tag = "icon-whitehall (WEST)" }, @@ -58092,13 +52407,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, /obj/effect/decal/warning_stripes/north, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plating, /area/maintenance/starboard) "cfz" = ( @@ -58140,7 +52449,6 @@ "cfC" = ( /obj/structure/sink{ dir = 8; - icon_state = "sink"; pixel_x = -12; pixel_y = 2 }, @@ -58165,10 +52473,6 @@ name = "Aft Maintenance" }) "cfF" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, /obj/structure/extinguisher_cabinet{ pixel_x = -27 }, @@ -58195,6 +52499,26 @@ /area/toxins/mixing{ name = "\improper Toxins Lab" }) +"cfI" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "browncorner" + }, +/area/hallway/primary/central) +"cfJ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/plasteel{ + icon_state = "bcarpet05" + }, +/area/blueshield) "cfK" = ( /turf/simulated/wall, /area/maintenance/incinerator) @@ -58203,13 +52527,11 @@ name = "Incinerator Access"; req_access_txt = "12;24" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/incinerator) "cfM" = ( @@ -58248,13 +52570,11 @@ /turf/simulated/floor/plasteel, /area/atmos) "cfR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/sink{ dir = 4; - icon_state = "sink"; pixel_x = 11 }, -/obj/machinery/atmospherics/unary/vent_scrubber, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "hydrofloor" }, @@ -58279,8 +52599,7 @@ }, /obj/machinery/camera{ c_tag = "Atmospherics - Port-Aft"; - dir = 4; - network = list("SS13") + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/visible/purple, /turf/simulated/floor/plasteel{ @@ -58293,7 +52612,6 @@ name = "Storage Room"; req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" @@ -58319,9 +52637,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plating, @@ -58360,7 +52675,6 @@ }) "cgc" = ( /obj/machinery/atmospherics/trinary/mixer{ - dir = 2; node1_concentration = 0.8; node2_concentration = 0.2; on = 1; @@ -58375,14 +52689,13 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock{ name = "Hydroponics Backroom"; - req_access_txt = "35"; - req_one_access_txt = "0" + req_access_txt = "35" }, /obj/effect/decal/warning_stripes/yellow/hollow, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /turf/simulated/floor/plasteel, @@ -58399,20 +52712,6 @@ name = "Medbay Storage" }) "cgf" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/medbay2{ - name = "Medbay Storage" - }) -"cgg" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 2; - on = 1 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -58427,9 +52726,6 @@ dir = 4; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; @@ -58456,17 +52752,6 @@ icon_state = "caution" }, /area/atmos) -"cgj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/maintenance/maintcentral{ - name = "Central Maintenance" - }) "cgk" = ( /obj/structure/cable{ d1 = 1; @@ -58480,10 +52765,10 @@ dir = 4 }, /obj/effect/decal/warning_stripes/yellow/hollow, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /turf/simulated/floor/plasteel, @@ -58517,16 +52802,14 @@ pixel_x = -32 }, /obj/machinery/photocopier, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, /area/ntrep) "cgr" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, /obj/machinery/light, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whiteblue" }, /area/medical/paramedic) @@ -58550,7 +52833,6 @@ }, /obj/item/pen/invisible, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "cult"; tag = "icon-cult" }, @@ -58566,7 +52848,6 @@ pixel_y = 5 }, /obj/machinery/status_display{ - density = 0; layer = 4; pixel_y = 32 }, @@ -58579,7 +52860,6 @@ }, /obj/machinery/camera{ c_tag = "Research Division - Lobby"; - dir = 2; network = list("SS13","RD") }, /turf/simulated/floor/plasteel{ @@ -58617,7 +52897,6 @@ /area/hallway/primary/aft) "cgy" = ( /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "purplecorner" }, /area/hallway/primary/aft) @@ -58654,15 +52933,6 @@ /area/medical/research{ name = "Research Division" }) -"cgC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/research{ - name = "Research Division" - }) "cgE" = ( /obj/structure/chair, /turf/simulated/floor/plasteel{ @@ -58742,7 +53012,6 @@ /area/hallway/primary/central) "cgL" = ( /obj/machinery/sparker{ - dir = 2; id = "mixingsparker"; pixel_x = 25 }, @@ -58766,7 +53035,6 @@ }, /obj/structure/sink{ dir = 8; - icon_state = "sink"; pixel_x = -12; pixel_y = 2 }, @@ -58862,7 +53130,6 @@ icon_state = "4-8" }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "green" }, /area/hydroponics) @@ -58915,9 +53182,6 @@ }, /area/atmos) "cgY" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 8; @@ -58926,6 +53190,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -58937,41 +53204,14 @@ /area/toxins/explab) "chb" = ( /obj/item/cigbutt, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, /obj/effect/decal/warning_stripes/south, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/starboard) -"chc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plating, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) -"chd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, -/obj/effect/decal/warning_stripes/north, -/turf/simulated/floor/plating, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) -"che" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/effect/decal/warning_stripes/north, -/turf/simulated/floor/plating, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) "chf" = ( /obj/machinery/power/smes{ capacity = 9e+006; @@ -58985,7 +53225,6 @@ /area/maintenance/incinerator) "chg" = ( /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_x = -30 }, @@ -59000,7 +53239,6 @@ "chh" = ( /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 10; - icon_state = "intact"; tag = "icon-intact (SOUTHWEST)" }, /turf/simulated/floor/plasteel, @@ -59034,7 +53272,6 @@ "chm" = ( /obj/machinery/light, /obj/machinery/power/apc{ - dir = 2; name = "Hydroponics APC"; pixel_y = -28 }, @@ -59064,9 +53301,6 @@ dir = 4; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" @@ -59077,9 +53311,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -59088,14 +53319,6 @@ /area/maintenance/fpmaint2{ name = "Port Maintenance" }) -"chq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/plating, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) "chr" = ( /obj/item/reagent_containers/spray/plantbgone{ pixel_y = 3 @@ -59129,9 +53352,6 @@ }, /area/maintenance/incinerator) "cht" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/light, /obj/machinery/door_control{ id = "paramedic"; @@ -59140,9 +53360,6 @@ pixel_y = -24; req_access_txt = "66" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -59153,14 +53370,6 @@ /area/toxins/mixing{ name = "\improper Toxins Lab" }) -"chv" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - on = 1 - }, -/turf/simulated/floor/plating, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) "chw" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -59168,9 +53377,6 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plating, /area/maintenance/aft{ @@ -59207,12 +53413,8 @@ }, /obj/structure/disposalpipe/sortjunction{ dir = 1; - icon_state = "pipe-j1s"; sortType = 9 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" @@ -59233,7 +53435,6 @@ dir = 4 }, /obj/machinery/door/airlock/maintenance{ - req_access_txt = "0"; req_one_access_txt = "12;5" }, /turf/simulated/floor/plating, @@ -59249,13 +53450,7 @@ /obj/structure/disposalpipe/sortjunction{ sortType = 21 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/west, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /turf/simulated/floor/plating, /area/maintenance/starboard) "chE" = ( @@ -59272,35 +53467,16 @@ /area/toxins/mixing{ name = "\improper Toxins Lab" }) -"chF" = ( -/obj/item/cigbutt, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/plating, -/area/maintenance/starboard) -"chG" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/maintenance/starboard) "chH" = ( /obj/machinery/door/airlock{ name = "Medbay Emergency Storage"; req_access_txt = "5" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plating, /area/medical/medbay2{ name = "Medbay Storage" }) "chI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whiteblue" @@ -59308,23 +53484,10 @@ /area/medical/medbay2{ name = "Medbay Storage" }) -"chJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/medbay2{ - name = "Medbay Storage" - }) "chK" = ( /obj/effect/landmark{ name = "lightsout" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -59336,15 +53499,11 @@ /obj/effect/landmark/start{ name = "Medical Doctor" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -59378,13 +53537,14 @@ }, /area/hallway/primary/central) "chP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" @@ -59453,8 +53613,7 @@ dir = 1 }, /obj/machinery/camera{ - c_tag = "Medbay Surgery 1 North"; - network = list("SS13") + c_tag = "Medbay Surgery 1 North" }, /turf/simulated/floor/plasteel{ dir = 1; @@ -59465,16 +53624,7 @@ }) "chV" = ( /obj/machinery/hologram/holopad, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - level = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - level = 1 - }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whiteblue" }, /area/medical/paramedic) @@ -59483,7 +53633,6 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whiteblue" }, /area/medical/paramedic) @@ -59500,8 +53649,6 @@ /area/maintenance/incinerator) "chY" = ( /obj/machinery/door/window/northleft{ - dir = 1; - icon_state = "left"; name = "Inner Pipe Access"; req_access_txt = "24" }, @@ -59538,17 +53685,6 @@ name = "Research Division" }) "cic" = ( -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/research{ - name = "Research Division" - }) -"cid" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -59559,17 +53695,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/research{ - name = "Research Division" - }) -"cif" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -59584,14 +53709,6 @@ }, /obj/machinery/hologram/holopad, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/research{ - name = "Research Division" - }) -"cii" = ( -/obj/machinery/atmospherics/unary/vent_scrubber, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -59604,27 +53721,11 @@ /turf/simulated/floor/plating, /area/atmos) "cik" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/medbay2{ - name = "Medbay Storage" - }) -"cil" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -59654,9 +53755,6 @@ name = "Medbay Storage" }) "cin" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/effect/spawner/lootdrop{ loot = list(/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes); name = "maint grille or trash spawner" @@ -59681,8 +53779,7 @@ /obj/item/paper/hydroponics, /obj/machinery/camera{ c_tag = "Hydroponics - Foyer"; - dir = 1; - network = list("SS13") + dir = 1 }, /obj/item/radio/intercom{ pixel_y = -25 @@ -59728,8 +53825,6 @@ pixel_x = -1 }, /obj/effect/decal/warning_stripes/north, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/incinerator) "civ" = ( @@ -59740,8 +53835,6 @@ dir = 8 }, /obj/machinery/door/window/northleft{ - dir = 1; - icon_state = "left"; name = "Inner Pipe Access"; req_access_txt = "24" }, @@ -59763,9 +53856,6 @@ }) "ciy" = ( /obj/item/stack/sheet/cardboard, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" @@ -59826,8 +53916,6 @@ dir = 4 }, /obj/machinery/door/window/northleft{ - dir = 1; - icon_state = "left"; name = "Inner Pipe Access"; req_access_txt = "24" }, @@ -59882,8 +53970,6 @@ /obj/machinery/atmospherics/pipe/simple/visible{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -59900,13 +53986,11 @@ icon_state = "0-8" }, /obj/machinery/power/terminal{ - dir = 1; - icon_state = "term" + dir = 1 }, /obj/machinery/alarm{ desc = "This particular atmos control unit appears to have no access restrictions."; dir = 8; - icon_state = "alarm0"; locked = 0; name = "all-access air alarm"; pixel_x = 24; @@ -60143,13 +54227,11 @@ "cjb" = ( /obj/machinery/door/window/northleft{ dir = 8; - icon_state = "left"; name = "glass door"; req_access_txt = "24" }, /obj/machinery/door/window/northleft{ dir = 4; - icon_state = "left"; name = "glass door"; req_access_txt = "24" }, @@ -60159,19 +54241,6 @@ /obj/structure/lattice/catwalk, /turf/space, /area/solar/port) -"cje" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) "cjf" = ( /obj/machinery/hydroponics/constructable, /obj/effect/decal/warning_stripes/north, @@ -60182,9 +54251,6 @@ name = "Storage Room"; req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -60197,7 +54263,6 @@ "cjh" = ( /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whitehall"; tag = "icon-whitehall (WEST)" }, @@ -60216,13 +54281,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whitehall"; tag = "icon-whitehall (WEST)" }, @@ -60244,9 +54304,6 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" @@ -60348,9 +54405,6 @@ name = "Aft Maintenance" }) "cjv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/landmark/start{ name = "Cargo Technician" }, @@ -60365,9 +54419,6 @@ /obj/machinery/alarm{ pixel_y = 24 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /obj/structure/bed/roller, /turf/simulated/floor/plasteel{ dir = 1; @@ -60379,15 +54430,8 @@ "cjx" = ( /obj/machinery/camera{ c_tag = "Security Post - Medbay"; - dir = 2; network = list("SS13","Medbay") }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - external_pressure_bound = 101.325; - on = 1; - pressure_checks = 1 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -60413,15 +54457,12 @@ d2 = 8; icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whiteblue" }, /area/medical/medbay2{ @@ -60505,12 +54546,6 @@ icon_state = "whiteblue" }, /area/medical/reception) -"cjG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/reception) "cjH" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -60526,36 +54561,14 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) -"cjJ" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "purplecorner" - }, -/area/hallway/primary/aft) -"cjK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/research{ - name = "Research Division" - }) "cjL" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -60566,9 +54579,6 @@ dir = 1; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -60588,9 +54598,6 @@ dir = 2; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -60606,10 +54613,10 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -60619,24 +54626,7 @@ name = "Research Division" }) "cjO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6; - level = 1 - }, /turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "whiteblue" - }, -/area/medical/medbay2{ - name = "Medbay Storage" - }) -"cjP" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whiteblue" }, /area/medical/medbay2{ @@ -60664,19 +54654,10 @@ /area/medical/medbay2{ name = "Medbay Storage" }) -"cjU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, -/turf/simulated/floor/plating, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) "cjV" = ( /obj/machinery/door/airlock/maintenance{ name = "Hydroponics Maintenance"; - req_access_txt = "35"; - req_one_access_txt = "0" + req_access_txt = "35" }, /turf/simulated/floor/plating, /area/hydroponics) @@ -60741,17 +54722,12 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/reception) "cke" = ( /obj/machinery/sparker{ - dir = 2; id = "mixingsparker"; pixel_x = 25 }, @@ -60767,17 +54743,11 @@ "ckf" = ( /obj/structure/bed/roller, /obj/item/radio/intercom{ - broadcasting = 0; frequency = 1485; - listening = 1; name = "Station Intercom (Medbay)"; pixel_y = -30 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whiteblue" }, /area/medical/reception) @@ -60830,8 +54800,7 @@ }, /obj/machinery/camera{ c_tag = "Atmospherics - Starboard Aft"; - dir = 1; - network = list("SS13") + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -60883,6 +54852,8 @@ opacity = 0 }, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitepurplefull"; @@ -60898,7 +54869,6 @@ network = list("SS13","Medbay") }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whiteblue" }, /area/medical/reception) @@ -60917,14 +54887,13 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 4; icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" @@ -60932,9 +54901,6 @@ "ckw" = ( /obj/structure/girder, /obj/structure/grille, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -60997,9 +54963,6 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/effect/spawner/lootdrop{ loot = list(/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes); name = "maint grille or trash spawner" @@ -61019,13 +54982,11 @@ dir = 4 }, /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_y = -30 }, /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whitepurple" }, /area/medical/research{ @@ -61053,21 +55014,6 @@ /area/medical/medbay2{ name = "Medbay Storage" }) -"ckG" = ( -/obj/machinery/door/airlock/medical/glass{ - id_tag = null; - name = "Medbay Storage"; - req_access_txt = "5" - }, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/medbay2{ - name = "Medbay Storage" - }) "ckH" = ( /obj/structure/rack, /obj/item/screwdriver{ @@ -61106,8 +55052,7 @@ name = "Aft Maintenance" }) "ckK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -61127,6 +55072,9 @@ }, /obj/item/reagent_containers/spray/cleaner, /obj/structure/table/glass, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -61157,11 +55105,12 @@ /obj/effect/landmark/start{ name = "Medical Doctor" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -61177,11 +55126,11 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -61198,7 +55147,6 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whiteblue" }, /area/medical/medbay3) @@ -61208,12 +55156,6 @@ d2 = 4; icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -61224,22 +55166,6 @@ /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, /area/hydroponics) -"ckT" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/reception) "ckU" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -61256,19 +55182,6 @@ icon_state = "white" }, /area/medical/reception) -"ckV" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel, -/area/hallway/primary/aft) "ckX" = ( /obj/structure/table, /obj/machinery/cell_charger, @@ -61277,7 +55190,6 @@ maxcharge = 15000 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whitepurple" }, /area/medical/research{ @@ -61291,7 +55203,6 @@ pixel_y = -29 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whitepurple" }, /area/medical/research{ @@ -61302,7 +55213,6 @@ /obj/item/stock_parts/cell/potato, /obj/machinery/light, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whitepurple" }, /area/medical/research{ @@ -61314,7 +55224,6 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whitepurple" }, /area/medical/research{ @@ -61326,7 +55235,6 @@ icon_state = "pipe-j2" }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whitepurple" }, /area/medical/research{ @@ -61338,20 +55246,15 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/structure/sink{ dir = 4; - icon_state = "sink"; pixel_x = 11 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whitepurple" }, /area/medical/research{ @@ -61362,8 +55265,9 @@ dir = 2; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whitepurple" }, /area/medical/research{ @@ -61384,7 +55288,6 @@ /obj/structure/table, /obj/item/soap/nanotrasen, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whiteblue" }, /area/medical/medbay3) @@ -61393,7 +55296,6 @@ dir = 8 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whiteblue" }, /area/medical/medbay3) @@ -61416,10 +55318,6 @@ pixel_x = -23; pixel_y = 8 }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "whiteblue" @@ -61449,9 +55347,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -61473,7 +55368,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/poddoor{ density = 0; icon_state = "open"; @@ -61482,7 +55376,6 @@ opacity = 0 }, /obj/effect/decal/warning_stripes/yellow, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitepurplefull"; @@ -61505,9 +55398,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -61530,9 +55420,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plating, @@ -61543,9 +55430,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -61569,7 +55453,6 @@ pixel_y = -3 }, /obj/machinery/power/apc{ - dir = 2; name = "Medbay Storage APC"; pixel_y = -24 }, @@ -61589,25 +55472,7 @@ /area/medical/medbay2{ name = "Medbay Storage" }) -"clt" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, -/turf/simulated/floor/plating, -/area/maintenance/starboard) "clu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -61615,30 +55480,6 @@ }, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plating, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) -"clv" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Storage Room"; - req_access_txt = "12" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/starboard) -"clw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" }) @@ -61663,9 +55504,7 @@ /turf/simulated/wall/r_wall, /area/maintenance/incinerator) "clB" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/simple/visible, /turf/simulated/wall/r_wall, /area/maintenance/incinerator) "clC" = ( @@ -61684,13 +55523,7 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, /obj/machinery/hologram/holopad, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -61712,7 +55545,6 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" @@ -61727,7 +55559,6 @@ "clI" = ( /obj/item/radio/intercom{ dir = 8; - name = "station intercom (General)"; pixel_x = -28 }, /obj/machinery/optable, @@ -61757,7 +55588,7 @@ }, /area/medical/reception) "clL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -61794,10 +55625,6 @@ /obj/effect/landmark/start{ name = "Coroner" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -61810,21 +55637,14 @@ /turf/simulated/floor/plating, /area/maintenance/starboard) "clS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/toxins/explab) "clT" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; @@ -61881,7 +55701,6 @@ "clX" = ( /obj/structure/closet/secure_closet/medical3, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whiteblue" }, /area/medical/medbay2{ @@ -61894,15 +55713,14 @@ }, /obj/structure/closet/secure_closet/medical3, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whiteblue" }, /area/medical/medbay2{ name = "Medbay Storage" }) "clZ" = ( +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whiteblue" }, /area/medical/medbay2{ @@ -61911,7 +55729,6 @@ "cma" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; pixel_x = 11 }, /turf/simulated/floor/plasteel{ @@ -61947,7 +55764,6 @@ pixel_x = 26 }, /obj/structure/cable/yellow{ - d1 = 0; d2 = 2; icon_state = "0-2" }, @@ -61961,21 +55777,15 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/machinery/shower{ dir = 4; - icon_state = "shower"; name = "emergency shower"; tag = "icon-shower (WEST)" }, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -62004,7 +55814,6 @@ /area/medical/chemistry) "cmm" = ( /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/hallway/primary/aft) @@ -62015,15 +55824,6 @@ "cmo" = ( /turf/simulated/wall/r_wall, /area/toxins/lab) -"cmp" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/reception) "cmq" = ( /turf/simulated/floor/plasteel{ icon_state = "white" @@ -62047,9 +55847,7 @@ }, /area/medical/reception) "cmt" = ( -/obj/machinery/ai_status_display{ - pixel_y = 0 - }, +/obj/machinery/ai_status_display, /turf/simulated/wall, /area/medical/reception) "cmu" = ( @@ -62057,12 +55855,7 @@ name = "Coroner Office"; req_access_txt = "5" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -62079,6 +55872,12 @@ pixel_y = -7 }, /obj/structure/filingcabinet/filingcabinet, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "barber" @@ -62090,13 +55889,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -62114,9 +55907,6 @@ name = "old sink"; pixel_y = 28 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" @@ -62129,11 +55919,7 @@ "cmA" = ( /obj/machinery/door/airlock/maintenance{ name = "Research Maintenance"; - req_access_txt = "7"; - req_one_access_txt = "0" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 + req_access_txt = "7" }, /turf/simulated/floor/plating, /area/medical/research{ @@ -62142,22 +55928,8 @@ "cmB" = ( /turf/simulated/wall/r_wall, /area/toxins/explab) -"cmC" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, -/turf/simulated/floor/plating, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) "cmD" = ( /obj/machinery/alarm{ - frequency = 1439; pixel_y = 23 }, /obj/structure/table/glass, @@ -62231,8 +56003,7 @@ "cmI" = ( /obj/machinery/vending/wallmed{ name = "Emergency NanoMed"; - pixel_x = 25; - req_access_txt = "0" + pixel_x = 25 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -62304,10 +56075,11 @@ /obj/machinery/door/airlock/research{ id_tag = "ResearchFoyer"; name = "Research Division"; - req_access_txt = "0"; req_one_access_txt = "47" }, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurple" @@ -62321,9 +56093,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -62346,42 +56115,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/maintenance/fore) -"cmV" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) -"cmW" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/spawner/lootdrop{ - loot = list(/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes); - name = "maint grille or trash spawner" - }, -/turf/simulated/floor/plating, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) "cmX" = ( /turf/simulated/wall, /area/medical/exam_room) @@ -62407,9 +56140,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plating, /area/maintenance/aft{ @@ -62421,12 +56151,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -62440,12 +56164,6 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -62458,6 +56176,12 @@ name = "Coroner" }, /obj/structure/chair/office/dark, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -62478,19 +56202,12 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whiteblue" }, /area/medical/reception) "cng" = ( /obj/structure/noticeboard{ - desc = "A board for pinning important notices upon."; - name = "notice board"; pixel_y = 31 }, /turf/simulated/floor/plasteel{ @@ -62551,8 +56268,10 @@ }) "cnl" = ( /obj/structure/bed/roller, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whiteblue" }, /area/medical/reception) @@ -62569,13 +56288,11 @@ pixel_y = -28 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whiteblue" }, /area/medical/reception) "cnn" = ( /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whiteblue" }, /area/medical/reception) @@ -62585,7 +56302,6 @@ tag = "icon-plant-11" }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whiteblue" }, /area/medical/reception) @@ -62651,7 +56367,6 @@ icon_state = "4-8" }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/hallway/primary/aft) @@ -62708,7 +56423,6 @@ pixel_y = 3 }, /obj/machinery/door_control{ - dir = 2; id = "rndshuttersup"; name = "Shutters Control Button"; pixel_x = 26; @@ -62726,16 +56440,13 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/research{ id_tag = ""; name = "Research Division"; - req_access_txt = "0"; req_one_access_txt = "47" }, /obj/effect/decal/warning_stripes/yellow, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurple" @@ -62751,7 +56462,12 @@ }, /area/toxins/lab) "cnC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -62767,7 +56483,6 @@ "cnF" = ( /obj/machinery/vending/cigarette, /obj/machinery/status_display{ - density = 0; layer = 4; pixel_y = 32 }, @@ -62788,6 +56503,7 @@ pixel_y = 7 }, /obj/structure/table/glass, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "cafeteria"; @@ -62836,7 +56552,6 @@ }, /obj/machinery/camera{ c_tag = "Telescience - Test Chamber"; - dir = 2; network = list("SS13","RD") }, /obj/machinery/light{ @@ -62870,9 +56585,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plating, /area/maintenance/aft{ @@ -62884,9 +56596,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -62894,16 +56603,10 @@ /turf/simulated/floor/plating, /area/maintenance/starboard) "cnQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plating, /area/maintenance/starboard) "cnR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plating, /area/maintenance/starboard) @@ -62914,6 +56617,9 @@ pixel_y = 5 }, /obj/item/pen, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "barber" @@ -62933,7 +56639,6 @@ name = "\improper Secure Lab" }) "cnU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/universal, /obj/structure/table/glass, /obj/item/extinguisher{ pixel_x = -5; @@ -62967,7 +56672,6 @@ "cnW" = ( /obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whitepurple" }, /area/toxins/xenobiology{ @@ -62982,7 +56686,6 @@ "cnZ" = ( /obj/machinery/atmospherics/pipe/simple, /obj/machinery/meter{ - frequency = 1443; id = "mair_in_meter"; name = "Mixed Air Tank In" }, @@ -62992,7 +56695,6 @@ "coa" = ( /obj/machinery/atmospherics/pipe/simple, /obj/machinery/meter{ - frequency = 1443; id = "mair_out_meter"; name = "Mixed Air Tank Out" }, @@ -63019,10 +56721,9 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" @@ -63033,24 +56734,30 @@ d2 = 8; icon_state = "4-8" }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" }) "cof" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 4; icon_state = "1-4" }, /obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" @@ -63059,9 +56766,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -63081,11 +56785,6 @@ dir = 8; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11; - level = 1 - }, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" @@ -63109,8 +56808,7 @@ dir = 1 }, /obj/machinery/camera{ - c_tag = "Medbay Surgery 1 North"; - network = list("SS13") + c_tag = "Medbay Surgery 1 North" }, /turf/simulated/floor/plasteel{ dir = 1; @@ -63122,6 +56820,9 @@ dir = 4 }, /obj/machinery/photocopier, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -63177,14 +56878,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - external_pressure_bound = 0; - initialize_directions = 1; - internal_pressure_bound = 4000; - on = 0; - pressure_checks = 2; - pump_direction = 0 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -63207,7 +56902,6 @@ }, /obj/structure/morgue{ dir = 8; - icon_state = "morgue1"; tag = "icon-morgue1 (WEST)" }, /turf/simulated/floor/plasteel{ @@ -63238,7 +56932,6 @@ name = "Turbine Access Console"; pixel_x = 6; pixel_y = -26; - req_access_txt = "0"; tag_exterior_door = "gas_turbine_exterior"; tag_interior_door = "gas_turbine_interior" }, @@ -63255,10 +56948,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" }, @@ -63299,6 +56988,8 @@ }, /obj/item/folder/white, /obj/item/pen, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -63319,8 +57010,7 @@ /area/medical/surgery1) "coz" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -63425,10 +57115,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 2; - on = 1 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -63436,8 +57122,7 @@ "coL" = ( /obj/machinery/vending/wallmed{ name = "Emergency NanoMed"; - pixel_x = -25; - req_access_txt = "0" + pixel_x = -25 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -63472,6 +57157,7 @@ "coP" = ( /obj/machinery/r_n_d/protolathe, /obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -63492,9 +57178,7 @@ /area/medical/reception) "coS" = ( /obj/structure/chair/stool, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "cafeteria"; @@ -63516,7 +57200,6 @@ "coV" = ( /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/vending/cola, @@ -63528,10 +57211,6 @@ name = "Research Division" }) "coW" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, /mob/living/simple_animal/pet/dog/pug{ name = "Pugley IV"; real_name = "Pugley IV" @@ -63548,22 +57227,7 @@ /obj/machinery/r_n_d/experimentor, /turf/simulated/floor/engine, /area/toxins/explab) -"coZ" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor/engine, -/area/toxins/explab) -"cpa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/turf/simulated/floor/engine, -/area/toxins/explab) "cpb" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 2 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -63727,9 +57391,7 @@ /turf/simulated/floor/engine/air, /area/atmos) "cpq" = ( -/obj/machinery/atmospherics/binary/pump{ - dir = 2 - }, +/obj/machinery/atmospherics/binary/pump, /turf/simulated/wall/r_wall, /area/atmos) "cpr" = ( @@ -63855,13 +57517,11 @@ name = "Medbay Storage"; req_access_txt = "5" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" }, @@ -63933,9 +57593,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical/glass{ id_tag = "MedbayFoyer"; @@ -63943,7 +57600,6 @@ req_access_txt = "5" }, /obj/effect/mapping_helpers/airlock/unres, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" }, @@ -63982,8 +57638,7 @@ /obj/structure/table, /obj/machinery/computer/guestpass, /obj/machinery/camera{ - c_tag = "Medbay Surgery 1 North"; - network = list("SS13") + c_tag = "Medbay Surgery 1 North" }, /turf/simulated/floor/plasteel{ dir = 9; @@ -64003,6 +57658,8 @@ dir = 1; pixel_y = 3 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -64046,12 +57703,6 @@ /obj/machinery/newscaster{ pixel_x = -30 }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - external_pressure_bound = 101.325; - on = 1; - pressure_checks = 1 - }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "cafeteria"; @@ -64135,6 +57786,7 @@ /turf/simulated/floor/engine, /area/maintenance/incinerator) "cqb" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteblue" @@ -64181,7 +57833,6 @@ name = "Scientist" }, /obj/effect/decal/warning_stripes/east, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -64192,6 +57843,7 @@ }, /obj/item/reagent_containers/glass/beaker/sulphuric, /obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -64200,9 +57852,10 @@ /obj/structure/disposalpipe/segment, /obj/machinery/shower{ dir = 4; - icon_state = "shower"; tag = "icon-shower (EAST)" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -64236,7 +57889,6 @@ pixel_x = 32 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/hallway/primary/aft) @@ -64279,7 +57931,6 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/item/flashlight, /turf/simulated/floor/plating, /area/maintenance/aft{ @@ -64312,23 +57963,10 @@ }, /obj/structure/sink{ dir = 8; - icon_state = "sink"; pixel_x = -12; pixel_y = 2 }, /obj/item/cigbutt, -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" - }, -/area/medical/research{ - name = "Research Division" - }) -"cqt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "cafeteria"; @@ -64349,7 +57987,6 @@ "cqw" = ( /obj/machinery/vending/coffee, /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_x = 29 }, @@ -64360,28 +57997,13 @@ /area/medical/research{ name = "Research Division" }) -"cqx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor/engine, -/area/toxins/explab) -"cqz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/engine, -/area/toxins/explab) "cqB" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/structure/closet/firecloset, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/effect/decal/warning_stripes/yellow, @@ -64505,8 +58127,8 @@ name = "Test Chamber Blast Doors"; pixel_y = -25 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/engine, /area/toxins/explab) @@ -64539,8 +58161,7 @@ "cqS" = ( /obj/machinery/camera{ c_tag = "Atmospherics Tank - N2"; - dir = 8; - network = list("SS13") + dir = 8 }, /turf/simulated/floor/engine/n2, /area/atmos) @@ -64564,7 +58185,12 @@ "cqV" = ( /obj/machinery/atmospherics/unary/vent_pump{ dir = 1; - on = 1 + external_pressure_bound = 0; + initialize_directions = 1; + internal_pressure_bound = 4000; + on = 1; + pressure_checks = 2; + pump_direction = 0 }, /turf/simulated/floor/plasteel{ name = "vacuum floor"; @@ -64639,10 +58265,7 @@ name = "Aft Maintenance" }) "crd" = ( -/obj/machinery/sleeper{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/sleeper, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -64650,7 +58273,6 @@ "crf" = ( /obj/machinery/door/poddoor/shutters{ density = 0; - dir = 4; icon_state = "open"; id_tag = "acutesep"; name = "Acute Separation Privacy Shutters"; @@ -64689,8 +58311,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -64699,8 +58319,7 @@ "crl" = ( /obj/machinery/camera{ c_tag = "Atmospherics Tank - O2"; - dir = 8; - network = list("SS13") + dir = 8 }, /turf/simulated/floor/engine/o2, /area/atmos) @@ -64717,8 +58336,7 @@ "crq" = ( /obj/machinery/camera{ c_tag = "Atmospherics Tank - Air"; - dir = 8; - network = list("SS13") + dir = 8 }, /turf/simulated/floor/engine/air, /area/atmos) @@ -64748,15 +58366,6 @@ /area/toxins/xenobiology{ name = "\improper Secure Lab" }) -"crv" = ( -/obj/structure/closet/firecloset, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/plating, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) "crx" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -64768,8 +58377,6 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -64786,6 +58393,18 @@ /area/maintenance/aft{ name = "Aft Maintenance" }) +"crz" = ( +/obj/machinery/recharger/wallcharger{ + pixel_x = -22 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "redcorner" + }, +/area/security/brig) "crA" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -64810,6 +58429,9 @@ }, /area/medical/reception) "crC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" }, @@ -64865,15 +58487,13 @@ "crI" = ( /obj/machinery/camera{ c_tag = "Aft Primary Hallway - Fore"; - dir = 8; - network = list("SS13") + dir = 8 }, /obj/machinery/firealarm{ dir = 4; pixel_x = 24 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/hallway/primary/aft) @@ -64881,10 +58501,11 @@ /obj/structure/disposalpipe/segment, /obj/structure/sink{ dir = 8; - icon_state = "sink"; pixel_x = -12; pixel_y = 2 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -64894,13 +58515,13 @@ "crK" = ( /obj/machinery/hologram/holopad, /obj/effect/decal/warning_stripes/east, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/toxins/lab) "crL" = ( /obj/structure/chair/stool, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -64914,7 +58535,6 @@ /area/toxins/lab) "crN" = ( /obj/effect/decal/warning_stripes/east, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -64937,7 +58557,6 @@ pixel_y = -32 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whiteblue" }, /area/medical/reception) @@ -64955,10 +58574,6 @@ }) "crR" = ( /obj/structure/closet/crate, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 2; - on = 1 - }, /obj/item/assembly/infra, /obj/effect/spawner/lootdrop/maintenance, /obj/effect/decal/warning_stripes/south, @@ -64972,7 +58587,6 @@ }, /obj/machinery/navbeacon{ codes_txt = "delivery"; - dir = 2; location = "Research Division" }, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -65023,8 +58637,10 @@ name = "Station Intercom (Medbay)"; pixel_y = -30 }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whiteblue" }, /area/medical/reception) @@ -65048,7 +58664,9 @@ icon_state = "pipe-c" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "cafeteria"; @@ -65061,6 +58679,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "cafeteria"; @@ -65082,6 +58703,9 @@ dir = 1; network = list("SS13","RD") }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "cafeteria"; @@ -65179,8 +58803,11 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, /turf/simulated/floor/plating, /area/maintenance/aft{ @@ -65189,13 +58816,15 @@ "csh" = ( /obj/machinery/door/airlock/maintenance{ icon_state = "door_closed"; - locked = 0; name = "Storage Room"; req_access_txt = "12" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" @@ -65220,8 +58849,11 @@ name = "xeno_spawn"; pixel_x = -1 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 }, /turf/simulated/floor/plating, /area/maintenance/aft{ @@ -65332,11 +58964,7 @@ normaldoorcontrol = 1; pixel_y = -26 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whiteblue" }, /area/medical/reception) @@ -65346,14 +58974,13 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/structure/disposalpipe/segment, /obj/effect/spawner/lootdrop{ loot = list(/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes); name = "maint grille or trash spawner" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" @@ -65363,9 +58990,6 @@ name = "Experimentation Lab Maintenance"; req_access_txt = "8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plating, /area/toxins/explab) "csA" = ( @@ -65413,8 +59037,7 @@ /obj/machinery/power/apc{ dir = 8; name = "west bump"; - pixel_x = -24; - shock_proof = 0 + pixel_x = -24 }, /obj/structure/cable/yellow{ d2 = 4; @@ -65446,17 +59069,15 @@ name = "\improper Secure Lab" }) "csE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteblue" @@ -65487,10 +59108,6 @@ name = "\improper Secure Lab" }) "csG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - level = 1 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -65499,6 +59116,9 @@ /obj/effect/landmark/start{ name = "Medical Doctor" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, @@ -65507,9 +59127,6 @@ }, /area/medical/exam_room) "csH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -65518,6 +59135,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whiteblue" @@ -65526,16 +59146,12 @@ "csI" = ( /obj/machinery/door/poddoor/shutters{ density = 0; - dir = 4; icon_state = "open"; id_tag = "acutesep"; name = "Acute Separation Privacy Shutters"; opacity = 0 }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -65544,6 +59160,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull"; tag = "icon-whitebluefull" @@ -65611,10 +59230,6 @@ name = "\improper Secure Lab" }) "csN" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -65626,14 +59241,14 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/exam_room) "csO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -65642,6 +59257,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whiteblue" @@ -65657,9 +59275,6 @@ name = "Acute 1 Privacy Shutters"; opacity = 0 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -65668,6 +59283,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull"; tag = "icon-whitebluefull" @@ -65689,22 +59307,10 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/reception) -"csS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -65713,14 +59319,12 @@ /area/medical/reception) "csT" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/structure/sign/science{ pixel_x = 32 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "purplecorner" }, /area/hallway/primary/aft) @@ -65731,8 +59335,7 @@ pixel_x = -28 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -65745,6 +59348,10 @@ pixel_y = 6 }, /obj/structure/table, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -65756,8 +59363,7 @@ /obj/item/stock_parts/scanning_module, /obj/item/stock_parts/scanning_module, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/structure/sign/nosmoking_2{ pixel_x = 30 @@ -65780,12 +59386,12 @@ /obj/machinery/door/airlock/research{ id_tag = ""; name = "Research Division"; - req_access_txt = "0"; req_one_access_txt = "47" }, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whitepurple" }, /area/medical/research{ @@ -65797,18 +59403,14 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/research{ id_tag = ""; name = "Research Division"; - req_access_txt = "0"; req_one_access_txt = "47" }, /obj/effect/decal/warning_stripes/yellow, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whitepurple" }, /area/medical/research{ @@ -65828,7 +59430,6 @@ "ctb" = ( /obj/machinery/door/airlock{ name = "Research Emergency Storage"; - req_access_txt = "0"; req_one_access_txt = "47" }, /obj/structure/cable/yellow{ @@ -65837,7 +59438,6 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/medical/research{ name = "Research Division" @@ -65848,11 +59448,10 @@ /obj/machinery/door/airlock/research{ id_tag = ""; name = "Research Break Room"; - req_access_txt = "0"; req_one_access_txt = "47" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "cafeteria"; @@ -65869,10 +59468,8 @@ /obj/machinery/shower{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -65880,9 +59477,6 @@ name = "Research Division" }) "ctg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -65892,26 +59486,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/reception) -"cti" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "white" }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/reception) "ctj" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -65920,17 +59501,19 @@ }, /obj/structure/disposalpipe/segment, /obj/item/storage/box/lights/mixed, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" }) "ctl" = ( +/obj/effect/decal/warning_stripes/west, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" @@ -65941,13 +59524,12 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/effect/spawner/lootdrop{ loot = list(/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes); name = "maint grille or trash spawner" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" @@ -65976,10 +59558,9 @@ /obj/item/stack/packageWrap, /obj/item/stack/packageWrap, /obj/item/stack/packageWrap, -/obj/item/taperecorder{ - pixel_y = 0 - }, +/obj/item/taperecorder, /obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/toxins/explab) "ctp" = ( @@ -65994,22 +59575,6 @@ /area/maintenance/aft{ name = "Aft Maintenance" }) -"ctq" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/reception) "ctr" = ( /obj/machinery/chem_heater, /turf/simulated/floor/plating, @@ -66025,9 +59590,7 @@ /turf/space, /area/space/nearstation) "ctt" = ( -/obj/structure/disposaloutlet{ - dir = 2 - }, +/obj/structure/disposaloutlet, /obj/structure/disposalpipe/trunk{ dir = 8 }, @@ -66084,24 +59647,11 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "white" +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, -/area/medical/reception) -"ctI" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -66170,6 +59720,12 @@ }, /obj/item/folder/white, /obj/item/pen, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -66178,6 +59734,12 @@ /obj/structure/chair/office/light{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteblue" @@ -66187,27 +59749,17 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -27 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "bluecorner" }, /area/hallway/primary/aft) -"ctR" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 2 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/surgery1) "ctS" = ( /obj/structure/table/reinforced, /obj/item/clipboard, /obj/item/book/manual/experimentor, /obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/toxins/explab) "ctT" = ( @@ -66217,8 +59769,6 @@ /obj/item/reagent_containers/iv_bag, /obj/item/reagent_containers/iv_bag, /obj/item/radio/intercom{ - frequency = 1459; - name = "station intercom (General)"; pixel_x = -28 }, /turf/simulated/floor/plasteel{ @@ -66227,6 +59777,7 @@ /area/medical/surgery1) "ctV" = ( /obj/machinery/optable, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -66268,35 +59819,21 @@ "ctZ" = ( /obj/structure/bed, /obj/machinery/iv_drip, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "whiteblue" }, /area/medical/exam_room) "cua" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whiteblue" }, /area/medical/exam_room) -"cub" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel, -/area/hallway/primary/aft) "cuc" = ( /turf/simulated/floor/plasteel{ dir = 4; @@ -66335,8 +59872,10 @@ pixel_y = 4 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 6; @@ -66348,6 +59887,8 @@ dir = 1; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "whitepurple" @@ -66364,8 +59905,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurple" @@ -66391,7 +59930,6 @@ }, /obj/machinery/camera{ c_tag = "Research Division Hallway - Central"; - dir = 2; network = list("SS13","RD") }, /turf/simulated/floor/plasteel{ @@ -66414,14 +59952,13 @@ /obj/structure/table, /obj/structure/disposalpipe/segment, /obj/item/folder/white, -/obj/item/disk/tech_disk{ - pixel_y = 0 - }, -/obj/item/disk/tech_disk{ - pixel_y = 0 - }, +/obj/item/disk/tech_disk, +/obj/item/disk/tech_disk, /obj/item/disk/design_disk, /obj/item/disk/design_disk, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -66433,9 +59970,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whitehall" }, /area/medical/research{ @@ -66451,8 +59986,6 @@ }) "cut" = ( /obj/item/radio/intercom{ - broadcasting = 0; - listening = 1; name = "Station Intercom (General)"; pixel_y = 20 }, @@ -66465,8 +59998,8 @@ }) "cuu" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurple" @@ -66489,7 +60022,6 @@ tag = "icon-plant-10" }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whitepurplecorner" }, /area/medical/research{ @@ -66514,6 +60046,9 @@ /obj/structure/chair/office/light{ dir = 4 }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -66522,6 +60057,9 @@ /obj/structure/table/reinforced, /obj/item/folder/white, /obj/item/folder/white, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -66548,6 +60086,7 @@ /obj/item/multitool{ pixel_x = 3 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -66560,14 +60099,13 @@ /area/toxins/explab) "cuD" = ( /obj/effect/decal/warning_stripes/south, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/toxins/explab) "cuE" = ( /obj/structure/girder, /obj/structure/grille, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" @@ -66619,18 +60157,6 @@ /area/maintenance/aft{ name = "Aft Maintenance" }) -"cuK" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/reception) "cuL" = ( /turf/simulated/floor/plasteel{ dir = 8; @@ -66671,7 +60197,6 @@ external_pressure_bound = 0; initialize_directions = 1; internal_pressure_bound = 4000; - on = 0; pressure_checks = 2; pump_direction = 0 }, @@ -66685,12 +60210,9 @@ /turf/simulated/floor/engine/vacuum, /area/maintenance/incinerator) "cuP" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whiteblue" }, /area/medical/reception) @@ -66726,38 +60248,15 @@ /area/maintenance/aft{ name = "Aft Maintenance" }) -"cuW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - level = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/surgery1) "cuX" = ( /obj/machinery/iv_drip, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/surgery1) -"cuZ" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/surgery1) "cva" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; pixel_x = 12; pixel_y = 2 }, @@ -66779,7 +60278,6 @@ /obj/machinery/door/firedoor, /obj/machinery/door/poddoor/shutters{ density = 0; - dir = 4; icon_state = "open"; id_tag = "acute2"; name = "Acute 2 Privacy Shutters"; @@ -66831,24 +60329,10 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/medbay3) -"cvi" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whiteblue" - }, -/area/medical/medbay3) "cvj" = ( /turf/simulated/wall, /area/medical/chemistry) @@ -66886,9 +60370,7 @@ name = "Medbay"; req_access_txt = "5" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" @@ -66903,6 +60385,12 @@ d2 = 4; icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurple" @@ -66914,6 +60402,8 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -66928,6 +60418,12 @@ dir = 1; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -66942,10 +60438,10 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -67001,12 +60497,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurple" @@ -67025,8 +60517,12 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -67039,12 +60535,12 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -67066,8 +60562,8 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -67099,14 +60595,14 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 8; icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -67132,8 +60628,8 @@ icon_state = "pipe-j2"; tag = "icon-pipe-j2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -67174,12 +60670,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/landmark{ name = "lightsout" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -67197,38 +60693,10 @@ }, /obj/structure/disposalpipe/junction{ dir = 8; - icon_state = "pipe-j1"; tag = "icon-pipe-j1 (EAST)" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/research{ - name = "Research Division" - }) -"cvG" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -67236,9 +60704,6 @@ name = "Research Division" }) "cvH" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 2 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -67250,6 +60715,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -67271,8 +60739,8 @@ dir = 8; icon_state = "pipe-j2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -67294,13 +60762,13 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/airlock/research{ name = "Experimentation Lab"; req_access_txt = "8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -67311,9 +60779,6 @@ }, /area/toxins/explab) "cvK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" @@ -67326,6 +60791,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurple" @@ -67346,7 +60814,6 @@ /obj/structure/table, /obj/machinery/computer/crew, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whiteblue" }, /area/medical/reception) @@ -67364,7 +60831,6 @@ pixel_y = -4 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whiteblue" }, /area/medical/reception) @@ -67398,7 +60864,6 @@ "cvR" = ( /obj/structure/chair/office/light, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whiteblue" }, /area/medical/reception) @@ -67439,6 +60904,7 @@ /obj/structure/extinguisher_cabinet{ pixel_y = 29 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "whitehall" @@ -67527,10 +60993,6 @@ dir = 2; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -67540,8 +61002,6 @@ pixel_x = 27 }, /obj/effect/decal/warning_stripes/west, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/toxins/explab) "cwi" = ( @@ -67556,20 +61016,9 @@ icon_state = "whiteblue" }, /area/medical/medbay3) -"cwk" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 2 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whiteblue" - }, -/area/medical/medbay3) "cwl" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 2; - on = 1 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -67578,7 +61027,6 @@ "cwm" = ( /obj/machinery/camera{ c_tag = "Medbay Hallway Fore"; - dir = 2; network = list("SS13","Medbay") }, /turf/simulated/floor/plasteel{ @@ -67586,32 +61034,6 @@ icon_state = "whiteblue" }, /area/medical/medbay3) -"cwn" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - external_pressure_bound = 101.325; - on = 1; - pressure_checks = 1 - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/medbay3) -"cwo" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitebluecorner" - }, -/area/medical/medbay3) "cwp" = ( /obj/machinery/vending/coffee, /turf/simulated/floor/plasteel{ @@ -67635,37 +61057,17 @@ tag = "icon-whitehall (WEST)" }, /area/medical/chemistry) -"cws" = ( -/obj/machinery/atmospherics/unary/vent_scrubber, -/obj/effect/decal/warning_stripes/east, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/toxins/lab) "cwt" = ( /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" }) -"cwu" = ( -/obj/structure/reagent_dispensers/watertank, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/effect/decal/cleanable/fungus, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) "cwv" = ( /obj/structure/sign/chemistry{ pixel_x = -32 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" @@ -67690,7 +61092,6 @@ /obj/item/pen, /obj/machinery/door/window/northleft{ dir = 2; - icon_state = "left"; name = "Medbay Reception"; req_access_txt = "5" }, @@ -67702,15 +61103,6 @@ /obj/machinery/status_display, /turf/simulated/wall, /area/medical/reception) -"cwz" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "bluecorner" - }, -/area/hallway/primary/aft) "cwA" = ( /turf/simulated/wall/r_wall, /area/engine/equipmentstorage) @@ -67741,8 +61133,7 @@ /obj/machinery/light, /obj/machinery/camera{ c_tag = "Locker Room Port"; - dir = 1; - network = list("SS13") + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -67780,25 +61171,31 @@ }, /area/hallway/primary/aft) "cwF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" }) "cwG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" }) "cwH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -67806,9 +61203,7 @@ "cwI" = ( /obj/effect/decal/cleanable/blood/gibs/limb, /obj/structure/rack, -/obj/item/storage/firstaid/regular{ - pixel_y = 0 - }, +/obj/item/storage/firstaid/regular, /obj/item/stack/medical/bruise_pack, /obj/item/stack/medical/bruise_pack, /obj/item/stack/medical/ointment, @@ -67819,12 +61214,6 @@ }) "cwJ" = ( /obj/effect/decal/warning_stripes/west, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, /turf/simulated/floor/plasteel, /area/toxins/explab) "cwK" = ( @@ -67834,7 +61223,6 @@ }, /obj/structure/sink{ dir = 8; - icon_state = "sink"; pixel_x = -12; pixel_y = 2 }, @@ -67857,25 +61245,7 @@ name = "Research Division" }) "cwM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/research{ - name = "Research Division" - }) -"cwN" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -67912,6 +61282,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -67943,20 +61316,6 @@ }) "cwT" = ( /obj/machinery/light, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/research{ - name = "Research Division" - }) -"cwU" = ( -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -67964,12 +61323,7 @@ name = "Research Division" }) "cwV" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 - }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whitepurplecorner" }, /area/medical/research{ @@ -67982,11 +61336,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "whitepurple" @@ -68007,12 +61358,7 @@ }, /area/medical/medbay3) "cwZ" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, /obj/machinery/power/apc{ - dir = 2; name = "Experimentation Lab APC"; pixel_y = -24 }, @@ -68036,24 +61382,15 @@ icon_state = "white" }, /area/toxins/explab) -"cxd" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/toxins/explab) "cxe" = ( /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" @@ -68062,37 +61399,6 @@ /obj/structure/bed/roller, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plating, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) -"cxg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor/plating, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) -"cxh" = ( -/obj/structure/barricade/wooden, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/girder, -/turf/simulated/floor/plating, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) -"cxi" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 - }, -/obj/effect/landmark{ - name = "xeno_spawn"; - pixel_x = -1 - }, -/turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" }) @@ -68126,8 +61432,6 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -68145,90 +61449,34 @@ }, /area/medical/medbay3) "cxr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6; - level = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 3; icon_state = "whitebluecorner" }, /area/medical/medbay3) -"cxs" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "whiteblue" - }, -/area/medical/medbay3) "cxt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whiteblue" }, /area/medical/medbay3) "cxu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 - }, /obj/machinery/light, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "whiteblue" - }, -/area/medical/medbay3) -"cxv" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 + dir = 9 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/medbay3) -"cxw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 + dir = 5 }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitebluecorner" + icon_state = "whiteblue" }, /area/medical/medbay3) "cxx" = ( /obj/machinery/vending/cola, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull"; @@ -68236,10 +61484,8 @@ }, /area/medical/medbay3) "cxy" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteblue" @@ -68267,26 +61513,28 @@ /obj/structure/reagent_dispensers/fueltank/chem{ pixel_x = -30 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whiteyellow" }, /area/medical/chemistry) "cxB" = ( -/obj/machinery/disposal{ - pixel_x = 0 - }, +/obj/machinery/disposal, /obj/structure/disposalpipe/trunk, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/chemistry) "cxC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -68308,11 +61556,12 @@ "cxE" = ( /obj/structure/bed/roller, /obj/item/radio/intercom{ - broadcasting = 0; - listening = 1; name = "Station Intercom (General)"; pixel_y = 20 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -68320,7 +61569,7 @@ /area/medical/reception) "cxF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -68329,6 +61578,9 @@ /area/medical/reception) "cxG" = ( /obj/structure/bed/roller, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -68337,8 +61589,10 @@ "cxH" = ( /obj/structure/bed/roller, /obj/machinery/camera{ - c_tag = "Medbay Surgery 1 North"; - network = list("SS13") + c_tag = "Medbay Surgery 1 North" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -68356,6 +61610,9 @@ icon_state = "plant-11"; tag = "icon-plant-11" }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -68373,13 +61630,8 @@ icon_state = "1-4" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) "cxL" = ( @@ -68397,7 +61649,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment, /obj/machinery/door/poddoor/shutters/preopen{ @@ -68411,6 +61662,7 @@ }, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/toxins/storage) "cxN" = ( @@ -68420,13 +61672,11 @@ maxcharge = 15000 }, /obj/machinery/power/apc{ - dir = 2; name = "Research Lab APC"; pixel_y = -26 }, /obj/structure/cable/yellow, /obj/machinery/door_control{ - dir = 2; id = "rndshutters"; name = "Shutters Control Button"; pixel_x = -24; @@ -68439,8 +61689,6 @@ "cxO" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "whitehall" @@ -68455,6 +61703,8 @@ icon_state = "1-2" }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -68485,26 +61735,27 @@ name = "research and development lab shutters" }, /obj/machinery/door/window/eastright{ - dir = 4; name = "Research and Development Desk"; req_access_txt = "7" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/toxins/lab) "cxS" = ( /obj/effect/spawner/window/reinforced, /obj/machinery/door/poddoor/preopen{ - id_tag = "researchrangeshutters"; - name = "blast door" + id_tag = "researchrangeshutters" }, /turf/simulated/floor/plating, /area/toxins/misc_lab{ name = "\improper Research Testing Range" }) "cxT" = ( -/obj/machinery/atmospherics/unary/outlet_injector/on{ - dir = 8 - }, /turf/simulated/floor/plating/airless, /area/toxins/xenobiology{ name = "\improper Secure Lab" @@ -68575,7 +61826,6 @@ "cyb" = ( /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/effect/decal/warning_stripes/west, @@ -68642,9 +61892,6 @@ /obj/item/dice/d20, /obj/item/dice, /obj/structure/table/wood, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plating, /area/maintenance/aft{ @@ -68659,25 +61906,16 @@ /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plating, /area/toxins/lab) -"cyl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/wall, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) "cym" = ( /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" @@ -68715,21 +61953,10 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/surgery1) -"cyq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - level = 1 - }, -/turf/simulated/floor/carpet/arcade, -/area/crew_quarters/fitness{ - name = "\improper Arcade" - }) "cyr" = ( /obj/machinery/light_switch{ pixel_x = -23 @@ -68765,33 +61992,18 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/medbay3) "cyu" = ( -/obj/structure/sign/fire{ - pixel_y = 0 - }, +/obj/structure/sign/fire, /turf/simulated/wall/r_wall, /area/maintenance/incinerator) "cyv" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -68806,18 +62018,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteblue" @@ -68828,13 +62033,6 @@ dir = 2; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 8; @@ -68854,13 +62052,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -68872,27 +62063,11 @@ /area/medical/chemistry) "cyz" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 - }, /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/chemistry) -"cyA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/chemistry) "cyB" = ( /obj/machinery/chem_master{ pixel_x = -2 @@ -68903,30 +62078,10 @@ tag = "icon-whitehall (WEST)" }, /area/medical/chemistry) -"cyC" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/chemistry) -"cyD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/reception) "cyE" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" @@ -68937,10 +62092,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 - }, /turf/simulated/floor/carpet/arcade, /area/crew_quarters/fitness{ name = "\improper Arcade" @@ -68950,29 +62101,12 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/medical/chemistry) -"cyH" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/reception) "cyI" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/reception) -"cyJ" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 2; - on = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/reception) "cyK" = ( /obj/machinery/door/firedoor, /obj/machinery/door/poddoor/shutters/preopen{ @@ -68991,24 +62125,17 @@ }, /obj/structure/disposalpipe/junction{ dir = 8; - icon_state = "pipe-j1"; tag = "icon-pipe-j1 (EAST)" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) "cyM" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/hallway/primary/aft) @@ -69017,11 +62144,7 @@ dir = 4 }, /obj/machinery/door/airlock{ - name = "Aft Emergency Storage"; - req_access_txt = "0" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + name = "Aft Emergency Storage" }, /turf/simulated/floor/plating, /area/maintenance/aft{ @@ -69042,12 +62165,8 @@ dir = 4 }, /obj/machinery/door/airlock/maintenance{ - req_access_txt = "0"; req_one_access_txt = "7;47;29;12" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" @@ -69085,12 +62204,8 @@ }, /obj/machinery/door/airlock/maintenance{ name = "Research Maintenance"; - req_access_txt = "0"; req_one_access_txt = "7;47;29" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plating, /area/medical/research{ name = "Research Division" @@ -69098,13 +62213,8 @@ "cyW" = ( /obj/structure/disposalpipe/junction{ dir = 8; - icon_state = "pipe-j1"; tag = "icon-pipe-j1 (EAST)" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitehall" @@ -69123,27 +62233,14 @@ icon_state = "pipe-j2s"; sortType = 13 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/research{ name = "Research Division" }) -"cyZ" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) "czc" = ( /obj/machinery/computer/aifixer, /obj/machinery/requests_console{ @@ -69192,6 +62289,9 @@ dir = 4 }, /obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" @@ -69205,8 +62305,7 @@ pixel_y = 30 }, /obj/machinery/camera{ - c_tag = "Medbay Surgery 1 North"; - network = list("SS13") + c_tag = "Medbay Surgery 1 North" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -69222,13 +62321,13 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, /obj/structure/chair{ dir = 1 }, /obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -69243,6 +62342,9 @@ dir = 4 }, /obj/effect/decal/warning_stripes/southeastcorner, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -69256,7 +62358,6 @@ /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -69268,14 +62369,9 @@ icon_state = "0-4" }, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -24 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 - }, /turf/simulated/floor/carpet/arcade, /area/crew_quarters/fitness{ name = "\improper Arcade" @@ -69297,10 +62393,10 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -69326,10 +62422,12 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -69340,7 +62438,6 @@ "czq" = ( /obj/machinery/camera{ c_tag = "Medbay Hallway Fore"; - dir = 2; network = list("SS13","Medbay") }, /turf/simulated/floor/plasteel{ @@ -69369,8 +62466,6 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -69385,9 +62480,6 @@ }, /area/medical/surgeryobs) "czv" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, /obj/machinery/light{ dir = 8 }, @@ -69452,9 +62544,7 @@ d2 = 8; icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/carpet/arcade, /area/crew_quarters/fitness{ @@ -69486,7 +62576,6 @@ "czB" = ( /obj/structure/closet/secure_closet/CMO, /obj/machinery/firealarm{ - dir = 2; pixel_y = 24 }, /turf/simulated/floor/plasteel{ @@ -69508,8 +62597,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -69521,28 +62608,14 @@ icon_state = "bluecorner" }, /area/hallway/primary/aft) -"czG" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel, -/area/hallway/primary/aft) "czH" = ( /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/hallway/primary/aft) "czI" = ( -/obj/structure/sign/directions/evac{ - pixel_y = 0 - }, +/obj/structure/sign/directions/evac, /turf/simulated/wall, /area/maintenance/aft{ name = "Aft Maintenance" @@ -69584,7 +62657,6 @@ "czN" = ( /obj/machinery/door/airlock/maintenance{ name = "Research Testing Range Maintenance"; - req_access_txt = "0"; req_one_access_txt = "7;47;29" }, /turf/simulated/floor/plating, @@ -69593,11 +62665,8 @@ }) "czO" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "whitehall" @@ -69685,12 +62754,6 @@ d2 = 8; icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -69701,23 +62764,8 @@ icon_state = "pipe-j2s"; sortType = 14 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plating, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) -"czW" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" }) @@ -69734,12 +62782,8 @@ "czY" = ( /obj/structure/disposalpipe/sortjunction{ dir = 8; - icon_state = "pipe-j1s"; sortType = 12 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plating, /area/maintenance/aft{ @@ -69749,9 +62793,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plating, /area/maintenance/aft{ @@ -69761,7 +62802,6 @@ /obj/machinery/portable_atmospherics/canister/oxygen, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -69784,6 +62824,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" @@ -69794,8 +62837,11 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, /turf/simulated/floor/plating, /area/maintenance/aft{ @@ -69870,7 +62916,6 @@ }, /obj/structure/disposalpipe/sortjunction{ dir = 8; - icon_state = "pipe-j1s"; sortType = 23 }, /turf/simulated/floor/plasteel{ @@ -69879,18 +62924,6 @@ tag = "icon-whitehall (WEST)" }, /area/medical/chemistry) -"cAk" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/chemistry) "cAl" = ( /obj/structure/chair/office/light{ dir = 4 @@ -69920,10 +62953,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - level = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, /turf/simulated/floor/plasteel{ @@ -69957,12 +62986,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -69975,7 +63000,6 @@ }, /obj/item/storage/box/bodybags, /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_x = -29 }, @@ -69985,52 +63009,15 @@ tag = "icon-vault" }, /area/medical/genetics) -"cAr" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/reception) "cAs" = ( /obj/structure/disposalpipe/junction{ dir = 8; icon_state = "pipe-j2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/reception) -"cAt" = ( -/obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitehall"; - tag = "icon-whitehall (WEST)" - }, -/area/medical/reception) "cAu" = ( /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/glass/beaker{ @@ -70055,13 +63042,6 @@ dir = 2; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "bluecorner" @@ -70073,9 +63053,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 4; @@ -70083,9 +63060,12 @@ }, /obj/structure/disposalpipe/junction{ dir = 1; - icon_state = "pipe-j1"; tag = "icon-pipe-j1 (EAST)" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" @@ -70110,15 +63090,15 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plating, /area/medical/surgeryobs) "cAy" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/spawner/lootdrop{ loot = list(/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes); name = "maint grille or trash spawner" @@ -70129,9 +63109,6 @@ name = "Aft Maintenance" }) "cAz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -70143,11 +63120,9 @@ "cAA" = ( /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/hallway/primary/aft) @@ -70214,17 +63189,13 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes/northwest, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/toxins/storage) "cAI" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "whitehall" @@ -70232,26 +63203,8 @@ /area/medical/research{ name = "Research Division" }) -"cAJ" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/research{ - name = "Research Division" - }) "cAK" = ( /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whitebluecorner" }, /area/medical/research{ @@ -70341,12 +63294,11 @@ d2 = 4; icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -70379,47 +63331,20 @@ tag = "icon-whitehall (WEST)" }, /area/medical/chemistry) -"cAX" = ( -/obj/effect/landmark{ - name = "xeno_spawn"; - pixel_x = -1 - }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, -/turf/simulated/floor/plating, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) "cAY" = ( /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/crew_quarters/hor) -"cAZ" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Storage Room"; - req_access_txt = "12" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) "cBa" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 2 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -70510,31 +63435,19 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" }, /obj/effect/decal/warning_stripes/west, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/plasteel, /area/toxins/storage) -"cBk" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plating, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) "cBl" = ( /turf/simulated/floor/plasteel{ dir = 4; @@ -70547,16 +63460,13 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /obj/structure/chair/stool, /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" }, /obj/effect/decal/warning_stripes/east, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, /turf/simulated/floor/plasteel, @@ -70565,8 +63475,7 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical/glass{ id_tag = null; - name = "Recovery Ward"; - req_access_txt = "0" + name = "Recovery Ward" }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -70576,8 +63485,7 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command{ name = "Chief Medical Officer's Office"; - req_access_txt = "40"; - req_one_access_txt = "0" + req_access_txt = "40" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -70592,25 +63500,13 @@ dir = 4; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteblue" }, /area/medical/medbay3) -"cBr" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "barber" - }, -/area/medical/cmo) "cBs" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -70624,10 +63520,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 - }, /obj/effect/landmark/start{ name = "Chief Medical Officer" }, @@ -70640,10 +63532,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 - }, /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ dir = 8; @@ -70656,11 +63544,9 @@ "cBw" = ( /obj/machinery/shower{ dir = 4; - icon_state = "shower"; tag = "icon-shower (EAST)" }, /obj/machinery/door/window/southleft{ - dir = 2; name = "Cloning Shower" }, /obj/structure/mirror{ @@ -70674,7 +63560,6 @@ "cBx" = ( /obj/machinery/door/window/southleft{ base_state = "right"; - dir = 2; icon_state = "right"; name = "Cloning Shower" }, @@ -70693,7 +63578,6 @@ pixel_y = 2 }, /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_x = 29 }, @@ -70806,7 +63690,6 @@ /area/toxins/storage) "cBM" = ( /obj/machinery/status_display{ - density = 0; layer = 4 }, /turf/simulated/wall, @@ -70818,12 +63701,6 @@ name = "\improper Toxins Lab" }) "cBO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitehall" @@ -70846,11 +63723,11 @@ dir = 1; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -70867,10 +63744,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -70889,14 +63766,13 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command{ name = "Research Director's Office"; - req_access_txt = "30"; - req_one_access_txt = "0" + req_access_txt = "30" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -70929,16 +63805,15 @@ }, /area/crew_quarters/hor) "cBT" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "cafeteria"; @@ -70959,13 +63834,13 @@ }, /area/crew_quarters/hor) "cBV" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "cafeteria"; @@ -70990,6 +63865,9 @@ dir = 4 }, /obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" @@ -70997,7 +63875,6 @@ "cBY" = ( /obj/machinery/portable_atmospherics/canister/toxins, /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_x = 29 }, @@ -71030,12 +63907,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, /obj/structure/chair, /obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -71112,14 +63988,11 @@ }, /obj/structure/table/glass, /obj/structure/noticeboard{ - desc = "A board for pinning important notices upon."; - name = "notice board"; pixel_x = -32; pixel_y = 32 }, /obj/machinery/requests_console{ department = "Genetics"; - departmentType = 0; name = "Genetics Requests Console"; pixel_y = 30 }, @@ -71145,7 +64018,6 @@ "cCk" = ( /obj/structure/table, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whiteblue" }, /area/medical/reception) @@ -71154,7 +64026,6 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whiteblue" }, /area/medical/reception) @@ -71163,7 +64034,6 @@ /obj/item/reagent_containers/spray/cleaner, /obj/machinery/light/small, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whiteblue" }, /area/medical/reception) @@ -71173,7 +64043,6 @@ }, /obj/machinery/light, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whiteblue" }, /area/medical/reception) @@ -71187,13 +64056,11 @@ pixel_y = -24 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whiteblue" }, /area/medical/reception) "cCp" = ( /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_x = -29 }, @@ -71227,6 +64094,9 @@ dir = 4 }, /obj/effect/decal/warning_stripes/northeastcorner, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -71240,6 +64110,12 @@ dir = 5; max_integrity = 1e+007 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, /turf/simulated/floor/grass, /area/medical/surgeryobs) "cCt" = ( @@ -71258,10 +64134,10 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -71279,10 +64155,10 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -71300,10 +64176,10 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -71314,18 +64190,17 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical/glass{ id_tag = null; - name = "Recovery Ward"; - req_access_txt = "0" + name = "Recovery Ward" }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -71346,15 +64221,6 @@ icon_state = "whiteblue" }, /area/medical/genetics) -"cCB" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 2; - on = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/genetics) "cCC" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -71379,12 +64245,8 @@ d2 = 8; icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteblue" @@ -71397,6 +64259,9 @@ /obj/structure/chair/office/light{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "barber" @@ -71438,9 +64303,8 @@ /obj/structure/chair{ dir = 8 }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -71464,11 +64328,11 @@ dir = 2; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -71481,12 +64345,6 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -71494,7 +64352,6 @@ "cCN" = ( /obj/structure/sink{ dir = 8; - icon_state = "sink"; pixel_x = -12; pixel_y = 2 }, @@ -71512,8 +64369,12 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -71525,6 +64386,9 @@ dir = 4; pixel_x = 24 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitebluecorner" @@ -71537,7 +64401,6 @@ pixel_x = 27 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/hallway/primary/aft) @@ -71576,7 +64439,6 @@ /obj/structure/filingcabinet/chestdrawer, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/item/radio/intercom{ @@ -71604,8 +64466,7 @@ pixel_x = -3 }, /obj/machinery/camera{ - c_tag = "Medbay Surgery 1 North"; - network = list("SS13") + c_tag = "Medbay Surgery 1 North" }, /obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plasteel, @@ -71652,7 +64513,6 @@ "cDa" = ( /obj/machinery/door/airlock/maintenance{ name = "airlock access"; - req_access_txt = "0"; req_one_access_txt = "8;12" }, /turf/simulated/floor/plating, @@ -71674,6 +64534,9 @@ layer = 4; pixel_x = -32 }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whiteblue" @@ -71730,7 +64593,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; @@ -71738,9 +64600,11 @@ }, /obj/structure/disposalpipe/junction{ dir = 1; - icon_state = "pipe-j1"; tag = "icon-pipe-j1 (EAST)" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" @@ -71767,9 +64631,7 @@ /turf/simulated/floor/plasteel, /area/medical/cryo) "cDm" = ( -/obj/machinery/atmospherics/unary/cryo_cell{ - layer = 3.3 - }, +/obj/machinery/atmospherics/unary/cryo_cell, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, /area/medical/cryo) @@ -71780,8 +64642,7 @@ "cDo" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5; - icon_state = "intact" + dir = 5 }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plating, @@ -71801,12 +64662,10 @@ /obj/machinery/disposal, /obj/structure/disposalpipe/trunk, /obj/machinery/status_display{ - density = 0; layer = 4; pixel_y = 32 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whitehall" }, /area/medical/medbreak) @@ -71831,17 +64690,18 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/hallway/primary/fore) "cDu" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, /turf/simulated/floor/plasteel{ @@ -71862,8 +64722,10 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteblue" @@ -71875,10 +64737,12 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) "cDA" = ( @@ -71937,7 +64801,6 @@ }, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/plating, @@ -71957,14 +64820,12 @@ /turf/simulated/floor/plasteel, /area/assembly/chargebay) "cDI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/research{ name = "Toxins Storage"; req_access_txt = "8" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/toxins/storage) "cDJ" = ( @@ -71977,6 +64838,9 @@ dir = 4; pixel_x = -23 }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "whitehall" @@ -71986,7 +64850,6 @@ }) "cDK" = ( /obj/machinery/power/apc{ - dir = 2; name = "RD Office APC"; pixel_y = -27 }, @@ -72005,7 +64868,6 @@ /obj/machinery/hologram/holopad, /obj/machinery/light, /obj/machinery/status_display{ - density = 0; layer = 4; pixel_y = -32 }, @@ -72025,9 +64887,6 @@ }) "cDN" = ( /obj/effect/decal/warning_stripes/west, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/toxins/storage) "cDO" = ( @@ -72058,11 +64917,7 @@ }, /obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes/east, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/toxins/storage) "cDR" = ( @@ -72092,9 +64947,6 @@ d2 = 8; icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" @@ -72110,9 +64962,6 @@ /turf/simulated/floor/plating, /area/medical/cryo) "cDX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/landmark{ name = "blobstart" }, @@ -72131,19 +64980,17 @@ /obj/machinery/door/airlock/medical/glass{ id_tag = "CloningDoor"; name = "Cloning Lab"; - req_access_txt = "0"; req_one_access_txt = "5" }, /obj/effect/mapping_helpers/airlock/unres{ - dir = 4; - icon_state = "airlock_unres_helper" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" }, @@ -72157,42 +65004,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whiteblue" }, /area/medical/genetics_cloning) -"cEa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plating, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) -"cEb" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 - }, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plating, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) "cEc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 - }, /obj/effect/decal/warning_stripes/west, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/medical/cryo) "cEd" = ( @@ -72263,12 +65082,12 @@ /area/medical/surgeryobs) "cEk" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; @@ -72291,12 +65110,8 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -72306,83 +65121,37 @@ codes_txt = "patrol;next_patrol=10.1-Central-from-Aft"; location = "10-Aft-To-Central" }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "yellowcorner" }, /area/hallway/primary/aft) -"cEn" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whiteblue" - }, -/area/medical/cryo) -"cEo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "neutralcorner" - }, -/area/hallway/primary/aft) -"cEq" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/plasteel, -/area/assembly/chargebay) "cEr" = ( /turf/simulated/floor/bluegrid, /area/assembly/chargebay) "cEs" = ( /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/effect/landmark/start{ name = "Roboticist" }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /turf/simulated/floor/bluegrid, /area/assembly/chargebay) "cEt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; icon_state = "1-8" }, /obj/effect/decal/warning_stripes/east, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -72392,55 +65161,20 @@ dir = 9 }, /obj/effect/decal/warning_stripes/east, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, /turf/simulated/floor/plasteel, /area/medical/cryo) "cEv" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=9.1-Escape-1"; location = "8.1-Aft-to-Escape" }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/hallway/primary/aft) -"cEw" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/research{ - name = "Research Division" - }) -"cEx" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/research{ - name = "Research Division" - }) "cEy" = ( /obj/structure/sign/biohazard, /turf/simulated/wall, @@ -72449,20 +65183,14 @@ }) "cEz" = ( /obj/effect/decal/warning_stripes/west, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/cryo) "cEA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes/east, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/toxins/storage) "cEB" = ( @@ -72480,6 +65208,7 @@ /area/maintenance/incinerator) "cED" = ( /obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -72489,10 +65218,6 @@ dir = 10 }, /obj/effect/decal/warning_stripes/east, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /turf/simulated/floor/plasteel, /area/medical/cryo) "cEF" = ( @@ -72516,19 +65241,18 @@ /turf/simulated/floor/plasteel, /area/toxins/storage) "cEI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes/yellow, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/toxins/mixing{ name = "\improper Toxins Lab" }) "cEJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes/southeast, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, /turf/simulated/floor/plasteel, /area/toxins/storage) "cEK" = ( @@ -72563,24 +65287,6 @@ /area/toxins/mixing{ name = "\improper Toxins Lab" }) -"cEO" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whiteblue" - }, -/area/medical/medbay3) "cEP" = ( /obj/machinery/atmospherics/pipe/simple/visible, /obj/structure/cable/yellow{ @@ -72589,22 +65295,14 @@ icon_state = "4-8" }, /obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/medical/cryo) -"cEQ" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) "cER" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -72612,6 +65310,10 @@ icon_state = "4-8" }, /obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -72625,7 +65327,10 @@ }, /obj/effect/decal/warning_stripes/east, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/medical/cryo) @@ -72633,16 +65338,9 @@ /obj/effect/landmark/start{ name = "Medical Doctor" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 - }, /obj/machinery/atmospherics/pipe/manifold/visible{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/medical/cryo) "cEU" = ( @@ -72655,9 +65353,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -72719,26 +65415,19 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/surgery2) "cFb" = ( /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_x = 29 }, /obj/structure/sink{ dir = 4; - icon_state = "sink"; pixel_x = 11 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -72751,10 +65440,13 @@ d2 = 8; icon_state = "1-8" }, +/mob/living/simple_animal/mouse, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/mob/living/simple_animal/mouse, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" @@ -72784,7 +65476,6 @@ }, /obj/structure/table/glass, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whitehall" }, /area/medical/medbreak) @@ -72799,7 +65490,6 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whitehall" }, /area/medical/medbreak) @@ -72811,7 +65501,6 @@ pixel_y = 32 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whitehall" }, /area/medical/medbreak) @@ -72821,7 +65510,6 @@ pixel_y = 32 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whitehall" }, /area/medical/medbreak) @@ -72839,7 +65527,6 @@ /area/medical/medbay3) "cFl" = ( /obj/machinery/door_control{ - dir = 2; id = "Skynet_launch"; name = "Mech Bay Door Control"; pixel_x = 26; @@ -72847,13 +65534,11 @@ req_one_access_txt = "29" }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/hallway/primary/aft) "cFm" = ( /obj/machinery/door_control{ - dir = 2; id = "Skynet_launch"; name = "Mech Bay Door Control"; pixel_x = -26; @@ -72874,17 +65559,15 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/assembly/chargebay) "cFn" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/mech_bay_recharge_floor, /area/assembly/chargebay) "cFo" = ( /obj/machinery/computer/mech_bay_power_console, /obj/item/radio/intercom{ - broadcasting = 0; - listening = 1; name = "Station Intercom (General)"; pixel_y = 20 }, @@ -72897,10 +65580,8 @@ base_state = "right"; dir = 1; icon_state = "right"; - name = "door"; - req_access_txt = "0" + name = "door" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/toxins/misc_lab{ name = "\improper Research Testing Range" @@ -72920,34 +65601,6 @@ /area/medical/research{ name = "Research Division" }) -"cFt" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6; - level = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/research{ - name = "Research Division" - }) -"cFu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "whitepurplecorner" - }, -/area/medical/research{ - name = "Research Division" - }) "cFv" = ( /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, @@ -72963,22 +65616,7 @@ }, /area/medical/surgery2) "cFx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) -"cFy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 5 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -73024,20 +65662,9 @@ }) "cFD" = ( /obj/machinery/atmospherics/trinary/filter{ - density = 0; dir = 8; req_access = "0" }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) -"cFE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -73053,16 +65680,16 @@ /turf/simulated/floor/plasteel, /area/medical/cryo) "cFG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, /obj/machinery/door/airlock/maintenance{ - req_access_txt = "0"; req_one_access_txt = "8;12" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" @@ -73135,10 +65762,10 @@ req_access_txt = "8" }, /obj/effect/decal/warning_stripes/yellow, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -73163,19 +65790,6 @@ /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/assembly/chargebay) -"cFP" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 2 - }, -/obj/machinery/light{ - dir = 8; - icon_state = "tube1" - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whiteblue" - }, -/area/medical/medbay3) "cFQ" = ( /obj/structure/rack, /obj/item/clothing/mask/gas, @@ -73199,9 +65813,7 @@ "cFT" = ( /obj/structure/rack, /obj/item/clothing/glasses/sunglasses, -/obj/item/flashlight/pen{ - pixel_x = 0 - }, +/obj/item/flashlight/pen, /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plating, /area/maintenance/aft{ @@ -73219,23 +65831,10 @@ /obj/item/roller, /obj/item/reagent_containers/spray/cleaner, /obj/effect/decal/warning_stripes/west, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/cryo) -"cFX" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plating, -/area/toxins/misc_lab{ - name = "\improper Research Testing Range" - }) "cFY" = ( /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plating, @@ -73252,14 +65851,12 @@ /turf/simulated/floor/plating, /area/medical/genetics_cloning) "cGb" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 2 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/genetics_cloning) "cGc" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whiteblue" @@ -73274,13 +65871,11 @@ /area/medical/genetics_cloning) "cGe" = ( /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_x = -26 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -73309,7 +65904,6 @@ icon_state = "1-8" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -73323,7 +65917,6 @@ /obj/structure/closet/secure_closet/personal/patient, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/plasteel{ @@ -73347,8 +65940,7 @@ in_use = 1 }, /obj/machinery/camera{ - c_tag = "Medbay Surgery 1 North"; - network = list("SS13") + c_tag = "Medbay Surgery 1 North" }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -73399,16 +65991,10 @@ "cGm" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; pixel_x = 11 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - level = 1 - }, /obj/item/radio/intercom{ dir = 4; - name = "station intercom (General)"; pixel_x = 28 }, /turf/simulated/floor/plasteel{ @@ -73450,50 +66036,15 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/surgery2) -"cGq" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/hallway/primary/aft) -"cGr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "neutralcorner" - }, -/area/hallway/primary/aft) "cGs" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/research{ name = "Mech Bay"; - req_access_txt = "29"; - req_one_access_txt = "0" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + req_access_txt = "29" }, /turf/simulated/floor/plasteel, /area/assembly/chargebay) @@ -73507,10 +66058,6 @@ dir = 1; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/assembly/chargebay) "cGu" = ( @@ -73519,15 +66066,9 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/assembly/chargebay) "cGv" = ( @@ -73545,12 +66086,7 @@ dir = 2; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/assembly/chargebay) "cGw" = ( @@ -73581,7 +66117,6 @@ }) "cGy" = ( /obj/machinery/firealarm{ - dir = 2; pixel_y = 24 }, /obj/machinery/atmospherics/unary/thermomachine/freezer, @@ -73604,20 +66139,13 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/research{ name = "Research Testing Range"; - req_access_txt = "0"; req_one_access_txt = "7;47;29" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "purplefull" }, @@ -73640,8 +66168,12 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -73654,10 +66186,10 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -73675,17 +66207,14 @@ name = "\improper Toxins Lab" }) "cGG" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -73699,48 +66228,12 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) -"cGI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) -"cGJ" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -73757,10 +66250,10 @@ dir = 4; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -73778,11 +66271,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -73798,6 +66291,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -73809,8 +66308,6 @@ dir = 8; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -73846,9 +66343,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -73861,19 +66357,10 @@ dir = 8 }, /obj/machinery/alarm{ - frequency = 1439; pixel_y = 23 }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) -"cGT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/wall, /area/toxins/mixing{ name = "\improper Toxins Lab" }) @@ -73883,7 +66370,6 @@ }, /obj/machinery/camera{ c_tag = "Toxins - Lab"; - dir = 2; network = list("SS13","RD") }, /obj/machinery/atmospherics/unary/portables_connector, @@ -73939,9 +66425,6 @@ /area/medical/cryo) "cGZ" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -73968,8 +66451,13 @@ /obj/machinery/door/airlock/medical/glass{ id_tag = ""; name = "Staff Room"; - req_access_txt = "5"; - req_one_access_txt = "0" + req_access_txt = "5" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -73981,13 +66469,17 @@ icon_state = "pipe-j2"; tag = "icon-pipe-j2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ d1 = 1; d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteblue" @@ -74003,6 +66495,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "cafeteria"; @@ -74023,21 +66518,12 @@ d2 = 4; icon_state = "2-4" }, -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 }, -/area/medical/medbreak) -"cHe" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "cafeteria"; @@ -74054,6 +66540,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "cafeteria"; @@ -74061,13 +66550,6 @@ }, /area/medical/medbreak) "cHh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -74077,21 +66559,14 @@ /obj/machinery/door/airlock/medical/glass{ id_tag = ""; name = "Staff Room"; - req_access_txt = "5"; - req_one_access_txt = "0" + req_access_txt = "5" }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/medbreak) "cHi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/item/cigbutt, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -74100,6 +66575,9 @@ /obj/effect/landmark/start{ name = "Medical Doctor" }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "cafeteria"; @@ -74130,27 +66608,22 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/medbay3) "cHl" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whiteblue" @@ -74169,9 +66642,7 @@ }, /area/medical/cryo) "cHn" = ( -/obj/structure/sign/directions/evac{ - pixel_y = 0 - }, +/obj/structure/sign/directions/evac, /turf/simulated/wall, /area/assembly/chargebay) "cHo" = ( @@ -74197,7 +66668,7 @@ /obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel, /area/assembly/chargebay) "cHr" = ( @@ -74228,6 +66699,9 @@ dir = 8; network = list("SS13","Medbay") }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "whiteblue" @@ -74243,8 +66717,7 @@ dir = 1 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/item/clothing/ears/earmuffs, /obj/effect/decal/warning_stripes/east, @@ -74271,17 +66744,6 @@ icon_state = "whiteblue" }, /area/medical/medbay3) -"cHz" = ( -/obj/effect/decal/warning_stripes/west, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) "cHA" = ( /turf/simulated/floor/plasteel{ icon_state = "white" @@ -74315,18 +66777,12 @@ name = "\improper Research Testing Range" }) "cHD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; icon_state = "2-4" }, /obj/effect/decal/warning_stripes/northeast, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/toxins/misc_lab{ name = "\improper Research Testing Range" @@ -74345,8 +66801,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -74354,7 +66808,12 @@ name = "\improper Toxins Lab" }) "cHH" = ( -/obj/machinery/atmospherics/unary/vent_scrubber, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -74362,11 +66821,11 @@ name = "\improper Toxins Lab" }) "cHI" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -74375,10 +66834,10 @@ name = "\improper Toxins Lab" }) "cHJ" = ( +/obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -74387,14 +66846,7 @@ name = "\improper Toxins Lab" }) "cHK" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, /obj/effect/decal/warning_stripes/north, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /turf/simulated/floor/plasteel, /area/toxins/misc_lab{ name = "\improper Research Testing Range" @@ -74406,12 +66858,12 @@ icon_state = "4-8" }, /obj/effect/decal/warning_stripes/west, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -74419,14 +66871,12 @@ name = "\improper Toxins Lab" }) "cHM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" @@ -74443,9 +66893,6 @@ name = "\improper Toxins Lab" }) "cHO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/door/poddoor{ density = 0; icon_state = "open"; @@ -74458,6 +66905,9 @@ req_access_txt = "8" }, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -74490,7 +66940,6 @@ }, /obj/structure/sink{ dir = 8; - icon_state = "sink"; pixel_x = -12; pixel_y = 2 }, @@ -74545,10 +66994,10 @@ name = "Toxins Launch Room"; req_access_txt = "8" }, +/obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -74578,6 +67027,12 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/medical/cryo) "cIe" = ( @@ -74599,10 +67054,12 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -74618,10 +67075,10 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -74642,8 +67099,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -74668,7 +67125,6 @@ name = "Port Maintenance" }) "cIj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; @@ -74750,12 +67206,10 @@ /area/medical/surgery2) "cIt" = ( /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_x = 29 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "purplecorner" }, /area/hallway/primary/aft) @@ -74772,10 +67226,6 @@ dir = 8; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -74826,10 +67276,6 @@ }, /area/medical/medbreak) "cIB" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, /obj/structure/extinguisher_cabinet{ pixel_y = -29 }, @@ -74888,9 +67334,11 @@ pixel_x = -32 }, /obj/machinery/firealarm{ - dir = 2; pixel_y = 24 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -74901,11 +67349,8 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -74919,8 +67364,12 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -74933,11 +67382,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -74968,12 +67414,13 @@ name = "\improper Toxins Lab" }) "cIL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -74981,10 +67428,10 @@ name = "\improper Toxins Lab" }) "cIM" = ( +/obj/effect/decal/warning_stripes/west, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/decal/warning_stripes/west, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -75023,18 +67470,20 @@ }, /area/medical/virology) "cIS" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, /area/medical/virology) "cIT" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - on = 1 - }, /obj/machinery/light/small{ dir = 1 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -75042,17 +67491,16 @@ "cIU" = ( /obj/structure/bed, /obj/item/bedsheet/medical, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 2 - }, /obj/machinery/status_display{ dir = 4; layer = 4; pixel_x = -32 }, /obj/machinery/camera{ - c_tag = "Medbay Surgery 1 North"; - network = list("SS13") + c_tag = "Medbay Surgery 1 North" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -75069,8 +67517,8 @@ /area/medical/medbay3) "cIW" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteblue" @@ -75092,8 +67540,7 @@ /obj/machinery/power/apc{ dir = 8; name = "west bump"; - pixel_x = -24; - shock_proof = 0 + pixel_x = -24 }, /obj/structure/cable/yellow, /turf/simulated/floor/plasteel{ @@ -75103,9 +67550,6 @@ }, /area/medical/medbreak) "cIZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "cafeteria"; @@ -75131,10 +67575,6 @@ d2 = 8; icon_state = "0-8" }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 - }, /turf/simulated/floor/plasteel, /area/assembly/chargebay) "cJc" = ( @@ -75142,10 +67582,10 @@ /turf/simulated/wall/r_wall, /area/atmos) "cJd" = ( +/obj/effect/decal/warning_stripes/east, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/decal/warning_stripes/east, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -75154,19 +67594,13 @@ name = "\improper Toxins Lab" }) "cJe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/warning_stripes/southwest, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/turf/simulated/floor/plasteel, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) -"cJf" = ( -/obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/toxins/mixing{ name = "\improper Toxins Lab" @@ -75177,6 +67611,12 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -75184,12 +67624,7 @@ name = "\improper Secure Lab" }) "cJh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whiteblue" }, /area/medical/genetics_cloning) @@ -75210,7 +67645,6 @@ pixel_y = 2 }, /obj/machinery/door_control{ - dir = 2; id = "robotics"; name = "Shutter Control"; pixel_x = -26; @@ -75220,12 +67654,8 @@ /turf/simulated/floor/plasteel, /area/assembly/robotics) "cJk" = ( -/obj/machinery/mecha_part_fabricator{ - dir = 2 - }, +/obj/machinery/mecha_part_fabricator, /obj/item/radio/intercom{ - broadcasting = 0; - listening = 1; name = "Station Intercom (General)"; pixel_y = 20 }, @@ -75248,12 +67678,9 @@ /turf/simulated/floor/plasteel, /area/assembly/robotics) "cJm" = ( -/obj/machinery/mecha_part_fabricator{ - dir = 2 - }, +/obj/machinery/mecha_part_fabricator, /obj/machinery/camera{ c_tag = "Robotics - Fore"; - dir = 2; network = list("SS13","RD") }, /obj/effect/decal/warning_stripes/yellow, @@ -75275,8 +67702,6 @@ /area/assembly/robotics) "cJo" = ( /obj/item/radio/intercom{ - broadcasting = 0; - listening = 1; name = "Station Intercom (General)"; pixel_y = 22 }, @@ -75287,9 +67712,7 @@ pixel_x = -23 }, /obj/effect/decal/warning_stripes/northwest, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel, /area/toxins/mixing{ name = "\improper Toxins Lab" @@ -75299,8 +67722,7 @@ /area/assembly/robotics) "cJq" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -75308,12 +67730,6 @@ /area/medical/research{ name = "Research Division" }) -"cJr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/wall/r_wall, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) "cJs" = ( /obj/structure/sign/securearea, /turf/simulated/wall/r_wall, @@ -75323,11 +67739,9 @@ "cJt" = ( /obj/machinery/shower{ dir = 4; - icon_state = "shower"; name = "emergency shower"; tag = "icon-shower (EAST)" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -75335,10 +67749,10 @@ name = "\improper Toxins Lab" }) "cJu" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, /obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/toxins/mixing{ name = "\improper Toxins Lab" @@ -75367,6 +67781,9 @@ pixel_y = -22 }, /obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/plasteel, /area/toxins/mixing{ name = "\improper Toxins Lab" @@ -75386,12 +67803,8 @@ pixel_x = 8; pixel_y = 2 }, -/obj/item/reagent_containers/iv_bag{ - pixel_y = 0 - }, -/obj/item/reagent_containers/iv_bag{ - pixel_y = 0 - }, +/obj/item/reagent_containers/iv_bag, +/obj/item/reagent_containers/iv_bag, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/dropper, /obj/structure/sign/biohazard{ @@ -75422,7 +67835,6 @@ name = "\improper Toxins Lab" }) "cJB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/item/radio/intercom{ broadcasting = 1; frequency = 1485; @@ -75430,9 +67842,7 @@ name = "Station Intercom (Medbay)"; pixel_x = 30 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -75474,34 +67884,12 @@ icon_state = "freezerfloor" }, /area/medical/virology) -"cJI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/mob/living/carbon/human/monkey, -/turf/simulated/floor/plasteel{ - icon_state = "freezerfloor" - }, -/area/medical/virology) "cJJ" = ( /obj/effect/landmark{ name = "blobstart" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/plasteel{ - icon_state = "freezerfloor" - }, -/area/medical/virology) -"cJK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/mob/living/carbon/human/monkey, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -75521,12 +67909,7 @@ /obj/structure/chair/office/light, /obj/machinery/vending/wallmed{ name = "Emergency NanoMed"; - pixel_x = -25; - req_access_txt = "0" - }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 + pixel_x = -25 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -75549,7 +67932,6 @@ /area/medical/virology) "cJO" = ( /obj/machinery/alarm{ - frequency = 1439; pixel_y = 23 }, /obj/machinery/smartfridge/secure/chemistry/virology, @@ -75571,12 +67953,7 @@ /obj/structure/chair/office/light, /obj/machinery/vending/wallmed{ name = "Emergency NanoMed"; - pixel_x = 25; - req_access_txt = "0" - }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 + pixel_x = 25 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -75587,9 +67964,6 @@ dir = 1; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 4; @@ -75618,20 +67992,6 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) -"cJV" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" }) @@ -75641,38 +68001,15 @@ icon_state = "yellow" }, /area/hallway/primary/aft) -"cJX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6; - level = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/surgery2) "cJY" = ( /obj/machinery/iv_drip, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/surgery2) -"cKa" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/surgery2) "cKb" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; pixel_x = 12; pixel_y = 2 }, @@ -75690,35 +68027,13 @@ icon_state = "white" }, /area/medical/surgery2) -"cKd" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whiteblue" - }, -/area/medical/medbay3) "cKe" = ( /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/medical/medbreak) -"cKf" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whiteblue" - }, -/area/medical/medbay3) "cKh" = ( /obj/structure/table, /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_y = -25 }, @@ -75731,7 +68046,6 @@ "cKi" = ( /obj/item/gun/energy/laser/practice, /obj/machinery/power/apc{ - dir = 2; name = "Research Firing Range APC"; pixel_y = -28 }, @@ -75778,8 +68092,6 @@ name = "\improper Arcade" }) "cKn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "vault"; tag = "icon-vault" @@ -75798,7 +68110,6 @@ /area/assembly/robotics) "cKq" = ( /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_x = -26 }, @@ -75809,8 +68120,6 @@ /area/hallway/primary/aft) "cKr" = ( /obj/item/radio/intercom{ - broadcasting = 0; - listening = 1; name = "Station Intercom (General)"; pixel_y = -28 }, @@ -75828,8 +68137,7 @@ /obj/machinery/door_control{ id = "researchrangeshutters"; name = "Blast Door Control"; - pixel_y = -24; - req_access_txt = "0" + pixel_y = -24 }, /obj/machinery/light, /obj/effect/decal/warning_stripes/south, @@ -75876,7 +68184,6 @@ dir = 4 }, /obj/machinery/driver_button{ - dir = 2; id_tag = "toxinsdriver"; pixel_x = 24; pixel_y = -24 @@ -75900,14 +68207,6 @@ /area/toxins/mixing{ name = "\improper Toxins Lab" }) -"cKy" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/surgery2) "cKz" = ( /obj/structure/closet/crate/freezer, /obj/item/reagent_containers/iv_bag, @@ -75915,8 +68214,6 @@ /obj/item/reagent_containers/iv_bag, /obj/item/reagent_containers/iv_bag, /obj/item/radio/intercom{ - frequency = 1459; - name = "station intercom (General)"; pixel_x = -28 }, /turf/simulated/floor/plasteel{ @@ -75925,6 +68222,7 @@ /area/medical/surgery2) "cKA" = ( /obj/machinery/optable, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -75938,9 +68236,6 @@ name = "\improper Toxins Lab" }) "cKC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/cleanable/generic, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plating, @@ -76020,8 +68315,7 @@ /obj/item/stack/medical/bruise_pack/advanced, /obj/machinery/camera{ c_tag = "Medbay Surgery 1 South"; - dir = 1; - network = list("SS13") + dir = 1 }, /obj/machinery/light, /obj/structure/table/tray, @@ -76045,8 +68339,8 @@ name = "Test Subject Cell"; req_access_txt = "39" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -76057,10 +68351,6 @@ dir = 8; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4; - level = 1 - }, /turf/simulated/floor/plating, /area/medical/virology) "cKQ" = ( @@ -76068,8 +68358,13 @@ layer = 4; pixel_y = -32 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whiteblue" }, /area/medical/medbay3) @@ -76083,14 +68378,20 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitegreencorner" }, /area/medical/virology) "cKS" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - on = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -76104,13 +68405,15 @@ /obj/effect/landmark/start{ name = "Virologist" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitegreencorner" }, /area/medical/virology) "cKU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/power/apc{ dir = 4; name = "CMO's Office APC"; @@ -76120,14 +68423,16 @@ d2 = 2; icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/patient_a) "cKV" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "0"; req_one_access_txt = "12;5;39;6" }, /obj/structure/disposalpipe/segment, @@ -76136,9 +68441,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" @@ -76153,8 +68455,8 @@ "cKX" = ( /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteblue" @@ -76163,7 +68465,6 @@ "cKY" = ( /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /turf/simulated/floor/plasteel{ @@ -76177,12 +68478,11 @@ "cLa" = ( /obj/structure/bed, /obj/item/bedsheet/medical, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 2 - }, /obj/machinery/camera{ - c_tag = "Medbay Surgery 1 North"; - network = list("SS13") + c_tag = "Medbay Surgery 1 North" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -76200,9 +68500,11 @@ }, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -76221,6 +68523,9 @@ dir = 8; pixel_x = 25 }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -76235,6 +68540,9 @@ pixel_x = 28; pixel_y = 5 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -76242,13 +68550,11 @@ "cLg" = ( /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /obj/machinery/camera{ c_tag = "Aft Primary Hallway - Middle"; - dir = 4; - network = list("SS13") + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -76283,12 +68589,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -76306,6 +68606,9 @@ }) "cLm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel, /area/assembly/robotics) "cLn" = ( @@ -76351,14 +68654,14 @@ /turf/simulated/floor/plasteel, /area/assembly/robotics) "cLs" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, /obj/machinery/camera{ c_tag = "Research Division Hallway - Robotics"; dir = 4; network = list("SS13","RD") }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -76366,16 +68669,17 @@ name = "Research Division" }) "cLt" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -76383,6 +68687,9 @@ name = "Research Division" }) "cLu" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitehall" @@ -76395,13 +68702,8 @@ dir = 1; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - level = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitebluecorner" @@ -76411,13 +68713,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -76447,9 +68743,6 @@ name = "Mixing Room Interior Airlock"; req_access_txt = "8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/toxins/mixing{ name = "\improper Toxins Lab" @@ -76458,9 +68751,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -76535,9 +68825,7 @@ pixel_x = 6; pixel_y = -4 }, -/obj/item/assembly/timer{ - pixel_y = 0 - }, +/obj/item/assembly/timer, /obj/structure/table/reinforced, /obj/effect/decal/warning_stripes/northeastcorner, /turf/simulated/floor/plasteel, @@ -76550,34 +68838,26 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitegreen" }, /area/medical/virology) "cLI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitegreen" }, /area/medical/virology) -"cLK" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whiteblue" - }, -/area/medical/medbay3) "cLL" = ( /obj/structure/window/reinforced{ dir = 1 @@ -76608,6 +68888,7 @@ /area/medical/virology) "cLO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -76624,12 +68905,8 @@ /obj/item/transfer_valve{ pixel_x = -5 }, -/obj/item/transfer_valve{ - pixel_x = 0 - }, -/obj/item/transfer_valve{ - pixel_x = 0 - }, +/obj/item/transfer_valve, +/obj/item/transfer_valve, /obj/item/transfer_valve{ pixel_x = 5 }, @@ -76654,6 +68931,12 @@ d2 = 4; icon_state = "0-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/hallway/secondary/exit{ name = "\improper Departure Lounge" @@ -76669,7 +68952,6 @@ on = 0 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whiteblue" }, /area/medical/medbay2{ @@ -76689,22 +68971,6 @@ /area/maintenance/aft{ name = "Aft Maintenance" }) -"cLW" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whiteblue" - }, -/area/medical/medbay3) "cLX" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -76718,13 +68984,8 @@ /obj/effect/landmark/start{ name = "Medical Doctor" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -76733,13 +68994,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitebluecorner" @@ -76781,15 +69035,12 @@ name = "\improper Toxins Lab" }) "cMb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -28 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -76827,16 +69078,9 @@ /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/assembly/robotics) -"cMd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/medical/morgue) "cMh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -76850,8 +69094,7 @@ pixel_y = 5 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/structure/table, /obj/item/wrench, @@ -76865,37 +69108,6 @@ /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/assembly/robotics) -"cMj" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/decal/warning_stripes/north, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/assembly/robotics) -"cMk" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, -/turf/simulated/floor/plasteel, -/area/assembly/robotics) -"cMl" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 2 - }, -/turf/simulated/floor/plasteel, -/area/assembly/robotics) "cMm" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -76907,12 +69119,8 @@ icon_state = "1-4" }, /obj/effect/decal/warning_stripes/north, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/assembly/robotics) "cMn" = ( @@ -76938,10 +69146,8 @@ /obj/effect/landmark{ name = "lightsout" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -77075,10 +69281,10 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, /turf/simulated/floor/plasteel{ @@ -77094,6 +69300,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -77109,10 +69318,10 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, /turf/simulated/floor/plasteel{ @@ -77130,10 +69339,10 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -77152,10 +69361,10 @@ name = "Containment Cells"; req_access_txt = "39" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -77169,10 +69378,10 @@ icon_state = "4-8" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -77191,10 +69400,10 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -77211,51 +69420,14 @@ name = "lightsout" }, /obj/machinery/hologram/holopad, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/virology) -"cMI" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/virology) -"cMJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitegreen" - }, -/area/medical/virology) "cMK" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -77268,14 +69440,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "whitegreenfull" }, /area/medical/virology) "cMM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -77287,14 +69459,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/virology) "cMN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -77303,15 +69475,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitegreen" }, /area/medical/virology) "cMO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -77338,7 +69510,6 @@ }, /obj/machinery/access_button{ command = "cycle_interior"; - frequency = 1449; master_tag = "virology_airlock_control"; pixel_x = 10; pixel_y = 25; @@ -77347,6 +69518,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "whitegreenfull" }, @@ -77355,19 +69529,11 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command{ name = "Chief Medical Officer's Office"; - req_access_txt = "40"; - req_one_access_txt = "0" + req_access_txt = "40" }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -77384,13 +69550,6 @@ icon_state = "pipe-j2s"; sortType = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; @@ -77419,27 +69578,19 @@ }, /obj/machinery/access_button{ command = "cycle_exterior"; - frequency = 1449; master_tag = "virology_airlock_control"; pixel_x = 10; pixel_y = 25; req_access = null; req_access_txt = "39" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "whitegreenfull" }, /area/medical/virology) -"cMS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralcorner" - }, -/area/hallway/primary/central) "cMT" = ( /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ @@ -77447,23 +69598,8 @@ icon_state = "yellowcorner" }, /area/hallway/primary/aft) -"cMU" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, -/turf/simulated/floor/plating, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) "cMV" = ( /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -24 }, @@ -77598,12 +69734,10 @@ "cNf" = ( /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/machinery/r_n_d/circuit_imprinter, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -77619,14 +69753,6 @@ /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, /area/assembly/robotics) -"cNh" = ( -/obj/effect/landmark/start{ - name = "Roboticist" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, -/area/assembly/robotics) "cNi" = ( /obj/item/hemostat, /obj/structure/table/glass, @@ -77658,8 +69784,8 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -77670,23 +69796,6 @@ /obj/machinery/atmospherics/pipe/simple/insulated, /turf/simulated/wall/r_wall, /area/maintenance/incinerator) -"cNn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/wall/r_wall, -/area/toxins/server{ - name = "\improper Research Division Server Room" - }) -"cNo" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 - }, -/turf/simulated/wall/r_wall, -/area/toxins/server{ - name = "\improper Research Division Server Room" - }) "cNq" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 @@ -77697,7 +69806,6 @@ id_tag = "tox_airlock_control"; name = "Toxin Mixing Console"; pixel_x = -24; - req_access_txt = "0"; tag_airpump = "tox_airlock_apump"; tag_chamber_sensor = "tox_airlock_sensor"; tag_exterior_door = "tox_airlock_exterior"; @@ -77705,7 +69813,6 @@ tag_interior_door = "tox_airlock_interior" }, /obj/effect/decal/warning_stripes/southwestcorner, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -77739,8 +69846,8 @@ /turf/simulated/floor/plasteel, /area/assembly/robotics) "cNv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "whitegreen" }, @@ -77788,28 +69895,6 @@ icon_state = "whitegreen" }, /area/medical/virology) -"cNC" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - icon_state = "whitegreen" - }, -/area/medical/virology) -"cND" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "whitegreen" - }, -/area/medical/virology) "cNF" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -77825,13 +69910,6 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -77840,35 +69918,16 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whiteblue" }, /area/medical/medbay3) -"cNH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/decal/warning_stripes/southwest, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/exit{ - name = "\improper Departure Lounge" - }) "cNI" = ( /turf/simulated/floor/plasteel{ dir = 10; @@ -77881,47 +69940,51 @@ dir = 1; network = list("SS13","Medbay") }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whiteblue" }, /area/medical/medbay3) "cNK" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whiteblue" }, /area/medical/medbay3) "cNL" = ( /obj/machinery/light, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whiteblue" }, /area/medical/medbay3) "cNM" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "whiteblue" - }, -/area/medical/medbay3) -"cNN" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, -/turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whiteblue" }, /area/medical/medbay3) "cNO" = ( /obj/structure/sink{ dir = 8; - icon_state = "sink"; pixel_x = -12; pixel_y = 2 }, @@ -77960,9 +70023,6 @@ d2 = 4; icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" @@ -77976,22 +70036,6 @@ icon_state = "neutralcorner" }, /area/hallway/primary/aft) -"cNT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) "cNU" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ @@ -77999,8 +70043,12 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -78011,11 +70059,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/airlock/maintenance{ - req_access_txt = "0"; req_one_access_txt = "12;5;39;6" }, /turf/simulated/floor/plating, @@ -78028,9 +70072,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -78047,10 +70088,8 @@ d2 = 8; icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) "cNY" = ( @@ -78087,9 +70126,6 @@ /turf/simulated/floor/plasteel, /area/assembly/robotics) "cNZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; @@ -78134,8 +70170,7 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/research{ name = "Robotics Lab"; - req_access_txt = "29"; - req_one_access_txt = "0" + req_access_txt = "29" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -78148,10 +70183,10 @@ }, /area/assembly/robotics) "cOf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -78172,8 +70207,12 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -78186,12 +70225,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteblue" @@ -78211,12 +70244,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -78232,12 +70259,6 @@ /obj/machinery/light_switch{ pixel_y = 28 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -78245,9 +70266,6 @@ name = "\improper Research Division Server Room" }) "cOk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/sign/securearea{ desc = "A warning sign which reads 'SERVER ROOM'."; name = "SERVER ROOM" @@ -78257,9 +70275,7 @@ name = "\improper Research Division Server Room" }) "cOl" = ( -/obj/machinery/atmospherics/unary/thermomachine/freezer/on/server{ - dir = 2 - }, +/obj/machinery/atmospherics/unary/thermomachine/freezer/on/server, /obj/effect/decal/cleanable/cobweb2, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -78286,7 +70302,6 @@ }) "cOo" = ( /obj/machinery/atmospherics/unary/vent_pump{ - dir = 2; external_pressure_bound = 140; on = 1; pressure_checks = 0 @@ -78339,12 +70354,12 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/sign/biohazard{ pixel_y = 32 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" @@ -78355,13 +70370,13 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/spawner/lootdrop{ loot = list(/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes); name = "maint grille or trash spawner" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" @@ -78377,21 +70392,11 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, -/turf/simulated/floor/plating, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) -"cOv" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 }, /turf/simulated/floor/plating, /area/maintenance/aft{ @@ -78403,8 +70408,8 @@ d2 = 8; icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 }, /turf/simulated/floor/plating, /area/maintenance/aft{ @@ -78422,25 +70427,25 @@ /turf/simulated/floor/plating, /area/maintenance/starboardsolar) "cOz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical{ name = "Isolation B"; req_access_txt = "39" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, /area/medical/virology) "cOA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical{ name = "Isolation A"; req_access_txt = "39" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -78539,7 +70544,6 @@ /obj/item/healthanalyzer, /obj/item/clothing/glasses/hud/health, /obj/structure/reagent_dispensers/virusfood{ - density = 0; pixel_y = 30 }, /obj/structure/table/glass, @@ -78568,31 +70572,23 @@ /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) -"cOK" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 2; - on = 1 - }, -/turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" }) "cOL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/power/apc{ dir = 8; name = "west bump"; - pixel_x = -24; - shock_proof = 0 + pixel_x = -24 }, /obj/structure/cable/yellow{ d2 = 2; icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -78604,14 +70600,12 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" }) "cON" = ( /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "escape" }, /area/hallway/primary/aft) @@ -78621,21 +70615,18 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "escape" }, /area/hallway/primary/aft) "cOP" = ( /obj/machinery/camera{ c_tag = "Aft Primary Hallway - Aft"; - dir = 8; - network = list("SS13") + dir = 8 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "escape" }, /area/hallway/primary/aft) @@ -78664,7 +70655,6 @@ }, /obj/structure/sink{ dir = 8; - icon_state = "sink"; pixel_x = -12; pixel_y = 2 }, @@ -78684,19 +70674,13 @@ name = "Privacy Shutters Control"; pixel_y = 25 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/wood, /area/medical/psych) "cOV" = ( +/obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -78726,16 +70710,11 @@ }) "cPb" = ( /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_x = 29 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -78753,10 +70732,6 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -78765,9 +70740,6 @@ }) "cPe" = ( /obj/structure/chair/office/light, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -78816,7 +70788,6 @@ "cPi" = ( /obj/machinery/camera{ c_tag = "Research Division - Server Room"; - dir = 2; network = list("SS13","RD"); pixel_x = 22 }, @@ -78829,9 +70800,6 @@ d2 = 8; icon_state = "0-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -78844,7 +70812,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" @@ -78890,16 +70858,16 @@ "cPp" = ( /obj/item/bedsheet/medical, /obj/structure/bed, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, /area/medical/virology) "cPq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, /turf/simulated/floor/plasteel{ @@ -78909,8 +70877,8 @@ "cPr" = ( /obj/structure/bed, /obj/item/bedsheet/medical, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" @@ -78922,11 +70890,11 @@ /area/medical/virology) "cPt" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/medical{ name = "Break Room"; req_access_txt = "39" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "whitegreenfull" @@ -78934,7 +70902,6 @@ /area/medical/virology) "cPv" = ( /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_x = 29 }, @@ -78942,22 +70909,6 @@ icon_state = "dark" }, /area/medical/morgue) -"cPx" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11; - level = 1 - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) "cPy" = ( /turf/simulated/wall, /area/medical/medbay3) @@ -78976,6 +70927,9 @@ /obj/structure/sign/deathsposal{ pixel_x = -30 }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitegreen" @@ -78989,8 +70943,8 @@ icon_state = "1-2" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -79021,13 +70975,9 @@ /turf/simulated/floor/plasteel, /area/assembly/robotics) "cPF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/airlock/maintenance{ name = "Medical Surplus Storeroom"; - req_access_txt = "12"; - req_one_access_txt = "0" + req_access_txt = "12" }, /turf/simulated/floor/plating, /area/maintenance/aft{ @@ -79095,6 +71045,9 @@ layer = 2.9 }, /obj/structure/table/glass, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitegreen" @@ -79150,8 +71103,8 @@ /obj/machinery/door/airlock/public/glass{ name = "Departure Lounge" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit{ name = "\improper Departure Lounge" @@ -79162,7 +71115,6 @@ name = "Departure Lounge" }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/hallway/secondary/exit{ @@ -79173,7 +71125,6 @@ /obj/item/retractor, /obj/item/hemostat, /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_x = -29 }, @@ -79258,7 +71209,6 @@ "cPX" = ( /obj/structure/sink{ dir = 8; - icon_state = "sink"; pixel_x = -12; pixel_y = 2 }, @@ -79269,19 +71219,6 @@ /area/medical/research{ name = "Research Division" }) -"cPY" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/research{ - name = "Research Division" - }) "cPZ" = ( /obj/machinery/firealarm{ dir = 1; @@ -79296,8 +71233,6 @@ }) "cQa" = ( /obj/item/radio/intercom{ - broadcasting = 0; - listening = 1; name = "Station Intercom (General)"; pixel_y = -28 }, @@ -79309,8 +71244,6 @@ name = "\improper Research Division Server Room" }) "cQb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -79321,6 +71254,8 @@ name = "Isolation A"; req_access_txt = "5" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -79336,8 +71271,8 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -79376,8 +71311,6 @@ name = "\improper Research Division Server Room" }) "cQf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -79388,6 +71321,8 @@ name = "Isolation B"; req_access_txt = "5" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -79417,9 +71352,6 @@ dir = 8; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; @@ -79427,28 +71359,6 @@ }, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plating, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) -"cQi" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plating, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) -"cQj" = ( -/obj/machinery/atmospherics/unary/portables_connector{ - dir = 1 - }, -/turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" }) @@ -79470,21 +71380,12 @@ /area/maintenance/aft{ name = "Aft Maintenance" }) -"cQm" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "freezerfloor" - }, -/area/medical/virology) "cQn" = ( /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" @@ -79494,8 +71395,8 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 }, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" @@ -79506,9 +71407,8 @@ name = "xeno_spawn"; pixel_x = -1 }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" @@ -79541,7 +71441,9 @@ }) "cQs" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitegreen" @@ -79555,7 +71457,6 @@ /obj/item/hand_labeler, /obj/item/radio/headset/headset_med, /obj/machinery/alarm{ - frequency = 1439; pixel_y = 23 }, /obj/machinery/camera{ @@ -79570,7 +71471,6 @@ /area/medical/virology) "cQu" = ( /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_x = 29 }, @@ -79586,17 +71486,18 @@ /area/medical/virology) "cQv" = ( /obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plasteel, -/area/assembly/robotics) -"cQw" = ( -/obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/assembly/robotics) "cQx" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -79605,13 +71506,16 @@ name = "Aft Maintenance" }) "cQy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" @@ -79620,8 +71524,7 @@ /obj/machinery/power/apc{ dir = 8; name = "west bump"; - pixel_x = -24; - shock_proof = 0 + pixel_x = -24 }, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel{ @@ -79631,7 +71534,6 @@ "cQA" = ( /obj/structure/morgue{ dir = 8; - icon_state = "morgue1"; tag = "icon-morgue1 (WEST)" }, /turf/simulated/floor/plasteel{ @@ -79639,10 +71541,10 @@ }, /area/medical/morgue) "cQD" = ( +/obj/effect/decal/warning_stripes/southeast, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/decal/warning_stripes/southeast, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -79654,10 +71556,10 @@ d2 = 4; icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" @@ -79733,7 +71635,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plating, /area/maintenance/aft{ @@ -79750,8 +71651,7 @@ pixel_x = 26 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/machinery/computer/pandemic, /turf/simulated/floor/plasteel{ @@ -79799,11 +71699,12 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/research{ name = "Research Shuttle and Xenobiology"; req_access_txt = "47" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -79822,12 +71723,6 @@ icon_state = "0-2" }, /obj/effect/decal/warning_stripes/north, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit{ name = "\improper Departure Lounge" @@ -79838,20 +71733,20 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/effect/decal/warning_stripes/south, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" }) "cQU" = ( /obj/item/storage/box/lights/mixed, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" @@ -79860,9 +71755,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -79886,7 +71778,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/maintenance/starboardsolar) "cQZ" = ( @@ -79914,26 +71805,24 @@ pixel_x = -2; pixel_y = 9 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitegreen" }, /area/medical/virology) "cRd" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/virology) "cRe" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -79944,6 +71833,9 @@ pixel_x = -28 }, /obj/effect/decal/warning_stripes/southwest, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -79960,6 +71852,7 @@ req_access_txt = "27" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" @@ -79972,7 +71865,6 @@ overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi'; req_access_txt = "27" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; @@ -79980,30 +71872,16 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" }) -"cRk" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/effect/decal/warning_stripes/north, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/exit{ - name = "\improper Departure Lounge" - }) "cRl" = ( /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 8; @@ -80026,19 +71904,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" }) "cRn" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/north, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit{ name = "\improper Departure Lounge" @@ -80056,8 +71931,7 @@ tag = "icon-plant-11" }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -80065,41 +71939,28 @@ }, /area/medical/medbay3) "cRq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/atm{ pixel_y = 32 }, /obj/effect/decal/warning_stripes/north, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit{ name = "\improper Departure Lounge" }) "cRr" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "0"; req_one_access_txt = "12;5;39;6" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" }) -"cRs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/warning_stripes/north, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/exit{ - name = "\improper Departure Lounge" - }) "cRt" = ( /turf/simulated/floor/plasteel, /area/hallway/secondary/exit{ @@ -80128,8 +71989,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit{ name = "\improper Departure Lounge" @@ -80144,29 +72009,27 @@ dir = 8; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit{ name = "\improper Departure Lounge" }) "cRx" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/exit{ - name = "\improper Departure Lounge" - }) -"cRy" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit{ @@ -80178,15 +72041,13 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit{ name = "\improper Departure Lounge" @@ -80203,21 +72064,14 @@ icon_state = "1-2" }, /obj/effect/decal/warning_stripes/north, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit{ name = "\improper Departure Lounge" }) "cRC" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "0"; req_one_access_txt = "12;7;47;29" }, /obj/structure/cable/yellow{ @@ -80225,6 +72079,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -80232,22 +72089,9 @@ /area/maintenance/aft{ name = "Aft Maintenance" }) -"cRD" = ( -/obj/effect/decal/warning_stripes/north, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/exit{ - name = "\improper Departure Lounge" - }) "cRE" = ( /obj/machinery/camera{ - c_tag = "Medbay Surgery 1 North"; - network = list("SS13") + c_tag = "Medbay Surgery 1 North" }, /turf/simulated/floor/plasteel{ dir = 1; @@ -80276,9 +72120,11 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/maintenance{ - req_access_txt = "0"; req_one_access_txt = "7;12;47" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -80292,6 +72138,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -80319,7 +72168,10 @@ icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -80334,12 +72186,6 @@ d2 = 4; icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -80354,31 +72200,18 @@ }, /area/medical/medbay3) "cRM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" }, /area/medical/medbay3) -"cRN" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/turf/simulated/floor/plating, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) "cRO" = ( /obj/structure/cable/yellow{ d1 = 2; @@ -80400,10 +72233,10 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, /obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" @@ -80423,9 +72256,6 @@ /area/maintenance/starboardsolar) "cRR" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plating, /area/maintenance/aft{ @@ -80450,9 +72280,7 @@ pixel_x = 3; pixel_y = 4 }, -/obj/item/storage/box/masks{ - pixel_y = 0 - }, +/obj/item/storage/box/masks, /obj/structure/table/glass, /turf/simulated/floor/plasteel{ dir = 1; @@ -80460,9 +72288,7 @@ }, /area/medical/medbay3) "cRW" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "whitegreen" }, @@ -80484,15 +72310,6 @@ }, /turf/simulated/floor/wood, /area/medical/psych) -"cRY" = ( -/obj/structure/chair/stool, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/turf/simulated/floor/plasteel{ - icon_state = "whitegreen" - }, -/area/medical/virology) "cRZ" = ( /obj/structure/chair/stool, /obj/machinery/firealarm{ @@ -80512,6 +72329,9 @@ }, /area/chapel/office) "cSb" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -80540,15 +72360,14 @@ dir = 4; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/chapel/office) "cSe" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" @@ -80558,7 +72377,10 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -80577,7 +72399,6 @@ req_access_txt = "22" }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "cult"; tag = "icon-cult" }, @@ -80588,7 +72409,6 @@ name = "mysterious old book of " }, /obj/item/reagent_containers/food/drinks/bottle/holywater{ - name = "flask of holy water"; pixel_x = -2; pixel_y = 2 }, @@ -80598,7 +72418,6 @@ /obj/item/organ/internal/heart, /obj/structure/closet/secure_closet/chaplain, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "cult"; tag = "icon-cult" }, @@ -80606,7 +72425,6 @@ "cSi" = ( /obj/machinery/door/airlock/maintenance{ name = "Chapel Maintenance Access "; - req_access_txt = "0"; req_one_access_txt = "12;27" }, /obj/structure/cable/yellow{ @@ -80615,22 +72433,26 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" }) "cSj" = ( +/obj/effect/decal/warning_stripes/south, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" }) "cSk" = ( /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit{ name = "\improper Departure Lounge" @@ -80648,11 +72470,10 @@ }, /obj/effect/decal/warning_stripes/south, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 + dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 + dir = 1 }, /turf/simulated/floor/plating, /area/maintenance/aft{ @@ -80674,8 +72495,11 @@ icon_state = "pipe-j2" }, /obj/effect/decal/warning_stripes/south, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plating, /area/maintenance/aft{ @@ -80697,16 +72521,25 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" }) "cSr" = ( /obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit{ name = "\improper Departure Lounge" @@ -80729,11 +72562,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/airlock/maintenance{ - req_access_txt = "0"; req_one_access_txt = "7;12;47" }, /turf/simulated/floor/plating, @@ -80778,8 +72607,7 @@ /area/assembly/robotics) "cSy" = ( /obj/machinery/power/terminal{ - dir = 1; - icon_state = "term" + dir = 1 }, /obj/structure/cable{ d2 = 8; @@ -80789,7 +72617,6 @@ dir = 4 }, /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_x = 29 }, @@ -80818,10 +72645,6 @@ /obj/machinery/atmospherics/unary/tank/air{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4; - level = 1 - }, /turf/simulated/floor/plasteel{ icon_state = "vault"; tag = "icon-vault" @@ -80833,10 +72656,6 @@ name = "virology air connector port" }, /obj/machinery/portable_atmospherics/canister/air, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4; - level = 1 - }, /turf/simulated/floor/plasteel{ icon_state = "vault"; tag = "icon-vault" @@ -80845,9 +72664,6 @@ "cSF" = ( /obj/item/trash/popcorn, /obj/structure/table/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/universal{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "vault"; tag = "icon-vault" @@ -80856,9 +72672,6 @@ "cSG" = ( /obj/item/reagent_containers/food/snacks/sosjerky, /obj/structure/table/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /turf/simulated/floor/plasteel{ icon_state = "vault"; tag = "icon-vault" @@ -80875,9 +72688,6 @@ }, /area/medical/virology) "cSI" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, /obj/machinery/crema_switch{ pixel_x = -25 }, @@ -80892,9 +72702,7 @@ /obj/effect/landmark/start{ name = "Chaplain" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -80938,12 +72746,6 @@ d2 = 4; icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -80970,7 +72772,6 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "vault"; tag = "icon-vault" @@ -81005,8 +72806,7 @@ id = "chapelescapeshutters"; name = "Side Windows Shutter Control"; pixel_x = -6; - pixel_y = 25; - req_access_txt = "0" + pixel_y = 25 }, /turf/simulated/floor/plasteel{ icon_state = "vault"; @@ -81026,7 +72826,6 @@ }) "cSW" = ( /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_x = 29 }, @@ -81047,10 +72846,13 @@ d2 = 4; icon_state = "1-4" }, +/obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit{ name = "\improper Departure Lounge" @@ -81061,10 +72863,13 @@ d2 = 8; icon_state = "4-8" }, +/obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" @@ -81096,20 +72901,21 @@ name = "Aft Maintenance" }) "cTc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit{ name = "\improper Departure Lounge" }) "cTd" = ( /obj/structure/reagent_dispensers/fueltank, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plating, /area/maintenance/aft{ @@ -81123,7 +72929,6 @@ }, /obj/structure/sink{ dir = 4; - icon_state = "sink"; pixel_x = 11 }, /turf/simulated/floor/plasteel{ @@ -81136,9 +72941,6 @@ dir = 4; pixel_x = 24 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /obj/machinery/camera{ c_tag = "Virology - Lab"; dir = 8; @@ -81146,12 +72948,8 @@ }, /obj/structure/sink{ dir = 4; - icon_state = "sink"; pixel_x = 11 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "whitegreen" @@ -81166,6 +72964,12 @@ codes_txt = "patrol;next_patrol=10-Aft-To-Central"; location = "9.4-Escape-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit{ name = "\improper Departure Lounge" @@ -81191,7 +72995,6 @@ }, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/structure/sign/double/map/right{ @@ -81223,6 +73026,8 @@ name = "Secure Lab"; req_access_txt = "47" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -81255,19 +73060,16 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plating, /area/maintenance/starboardsolar) "cTq" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/machinery/camera{ c_tag = "Departure Lounge - Port Fore"; - dir = 4; - network = list("SS13") + dir = 4 }, /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-24"; @@ -81331,7 +73133,6 @@ name = "robotics lab shutters" }, /obj/machinery/door/window/eastright{ - dir = 4; name = "Robotics Desk"; req_access_txt = "29" }, @@ -81353,14 +73154,14 @@ "cTz" = ( /obj/machinery/camera{ c_tag = "Chapel Office - Backroom"; - dir = 8; - network = list("SS13") + dir = 8 }, /obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 27 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -81383,7 +73184,6 @@ }, /area/chapel/office) "cTC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -81393,6 +73193,7 @@ codes_txt = "patrol;next_patrol=9.2-Escape-2"; location = "9.1-Escape-1" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit{ @@ -81425,12 +73226,6 @@ /area/maintenance/aft{ name = "Aft Maintenance" }) -"cTG" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor/carpet, -/area/chapel/main) "cTH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -81447,9 +73242,11 @@ dir = 1; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 }, /turf/simulated/floor/carpet, /area/chapel/main) @@ -81457,6 +73254,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/carpet, /area/chapel/main) "cTM" = ( @@ -81468,6 +73271,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -81497,6 +73306,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit{ name = "\improper Departure Lounge" @@ -81506,6 +73321,12 @@ dir = 8; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit{ name = "\improper Departure Lounge" @@ -81540,6 +73361,12 @@ d2 = 8; icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "red" @@ -81561,8 +73388,7 @@ }, /obj/machinery/camera{ c_tag = "Departure Lounge - Starboard Fore"; - dir = 8; - network = list("SS13") + dir = 8 }, /obj/structure/extinguisher_cabinet{ pixel_x = 27 @@ -81598,31 +73424,15 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/toxins/xenobiology{ name = "\improper Secure Lab" }) -"cTZ" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) "cUa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/airlock/maintenance{ name = "Medbay Maintenance"; req_access_txt = "5" @@ -81635,24 +73445,18 @@ d2 = 8; icon_state = "4-8" }, +/obj/item/trash/cheesie, +/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/item/trash/cheesie, -/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" }) -"cUc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/grille, -/turf/simulated/floor/plating, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) "cUd" = ( /obj/structure/cable{ d1 = 2; @@ -81661,8 +73465,7 @@ }, /obj/machinery/camera{ c_tag = "Aft Starboard Solar Maintenance"; - dir = 4; - network = list("SS13") + dir = 4 }, /turf/simulated/floor/plating, /area/maintenance/starboardsolar) @@ -81682,10 +73485,12 @@ icon_state = "1-4" }, /obj/machinery/hologram/holopad, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -81700,10 +73505,6 @@ name = "xeno_spawn"; pixel_x = -1 }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, /turf/simulated/floor/plating, /area/maintenance/starboardsolar) "cUg" = ( @@ -81714,7 +73515,6 @@ }, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /turf/simulated/floor/plasteel{ @@ -81722,16 +73522,11 @@ }, /area/chapel/office) "cUh" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - external_pressure_bound = 101.325; - on = 1; - pressure_checks = 1 - }, /obj/effect/landmark{ name = "xeno_spawn"; pixel_x = -1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -81742,25 +73537,11 @@ opacity = 1; req_access_txt = "27" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/chapel/office) -"cUj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "grimy" - }, -/area/chapel/office) "cUk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -81772,10 +73553,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -81804,31 +73582,19 @@ icon_state = "dark" }, /area/chapel/office) -"cUo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whiteblue" - }, -/area/medical/medbay3) "cUp" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -81842,11 +73608,11 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -81856,10 +73622,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; @@ -81870,16 +73632,15 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/medbay3) "cUs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, /turf/simulated/floor/carpet, /area/chapel/main) @@ -81889,24 +73650,12 @@ name = "Chapel"; opacity = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/chapel/main) "cUu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/northeastcorner, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit{ name = "\improper Departure Lounge" @@ -81917,17 +73666,6 @@ }, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, -/area/hallway/secondary/exit{ - name = "\improper Departure Lounge" - }) -"cUw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel, /area/hallway/secondary/exit{ name = "\improper Departure Lounge" }) @@ -81940,9 +73678,7 @@ pixel_y = 32 }, /obj/machinery/camera{ - c_tag = "Chapel - Fore"; - dir = 2; - network = list("SS13") + c_tag = "Chapel - Fore" }, /obj/structure/table/wood, /turf/simulated/floor/plasteel{ @@ -81950,22 +73686,8 @@ tag = "icon-vault" }, /area/chapel/main) -"cUy" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/exit{ - name = "\improper Departure Lounge" - }) "cUz" = ( /obj/machinery/status_display{ - density = 0; layer = 4 }, /turf/simulated/wall, @@ -81978,11 +73700,7 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit{ name = "\improper Departure Lounge" @@ -82004,12 +73722,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "redfull" }, @@ -82031,12 +73743,6 @@ dir = 1; pixel_y = -24 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "red" @@ -82051,10 +73757,7 @@ icon_state = "2-8" }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "red" @@ -82066,24 +73769,22 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/medbay3) "cUG" = ( -/obj/machinery/atmospherics/unary/vent_pump, /obj/structure/reagent_dispensers/peppertank{ pixel_y = 28 }, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -82093,25 +73794,15 @@ }) "cUI" = ( /obj/structure/chair, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/construction/hallway{ name = "\improper MiniSat Exterior" }) -"cUJ" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, -/obj/effect/landmark{ - name = "xeno_spawn"; - pixel_x = -1 - }, -/turf/simulated/floor/plating, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) "cUK" = ( /obj/item/seeds/berry, /turf/simulated/floor/plating, @@ -82125,22 +73816,14 @@ /area/maintenance/aft{ name = "Aft Maintenance" }) -"cUM" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) "cUN" = ( /obj/machinery/alarm{ dir = 1; pixel_y = -22 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -82176,15 +73859,6 @@ /obj/machinery/atmospherics/unary/portables_connector, /turf/simulated/floor/plating, /area/maintenance/starboardsolar) -"cUR" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "grimy" - }, -/area/chapel/office) "cUS" = ( /obj/machinery/door/morgue{ name = "Confession Booth (Chaplain)"; @@ -82215,13 +73889,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteblue" @@ -82256,11 +73929,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -82271,16 +73944,6 @@ dir = 4 }, /turf/simulated/floor/plasteel, -/area/hallway/secondary/exit{ - name = "\improper Departure Lounge" - }) -"cVd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel, /area/hallway/secondary/exit{ name = "\improper Departure Lounge" }) @@ -82308,9 +73971,7 @@ /obj/item/plant_analyzer, /obj/item/cultivator, /obj/item/reagent_containers/glass/bucket, -/obj/structure/rack{ - layer = 2.8 - }, +/obj/structure/rack, /obj/item/seeds/corn, /obj/item/seeds/cabbage, /obj/item/seeds/ambrosia, @@ -82320,28 +73981,14 @@ /area/maintenance/aft{ name = "Aft Maintenance" }) -"cVh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/exit{ - name = "\improper Departure Lounge" - }) "cVi" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit{ name = "\improper Departure Lounge" }) "cVj" = ( -/obj/structure/rack{ - layer = 2.8 - }, +/obj/structure/rack, /obj/item/seeds/wheat, /obj/item/seeds/watermelon, /obj/item/seeds/watermelon, @@ -82362,6 +74009,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -82373,6 +74026,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -82386,6 +74043,8 @@ /obj/machinery/light{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -82393,9 +74052,7 @@ name = "\improper Secure Lab" }) "cVo" = ( -/obj/machinery/hydroponics/soil{ - pixel_y = 8 - }, +/obj/machinery/hydroponics/soil, /obj/item/seeds/carrot, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plating, @@ -82403,9 +74060,7 @@ name = "Aft Maintenance" }) "cVp" = ( -/obj/machinery/hydroponics/soil{ - pixel_y = 8 - }, +/obj/machinery/hydroponics/soil, /obj/item/plant_analyzer, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plating, @@ -82413,9 +74068,7 @@ name = "Aft Maintenance" }) "cVq" = ( -/obj/machinery/hydroponics/soil{ - pixel_y = 8 - }, +/obj/machinery/hydroponics/soil, /obj/item/seeds/glowshroom, /obj/item/seeds/corn, /obj/effect/decal/warning_stripes/south, @@ -82431,6 +74084,12 @@ dir = 4 }, /obj/effect/decal/warning_stripes/northwest, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit{ name = "\improper Departure Lounge" @@ -82445,17 +74104,22 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/medical/morgue) "cVv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -82476,8 +74140,7 @@ /area/chapel/main) "cVA" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -82485,8 +74148,8 @@ }, /area/chapel/main) "cVC" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit{ @@ -82497,6 +74160,12 @@ dir = 4 }, /obj/effect/decal/warning_stripes/northwestcorner, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit{ name = "\improper Departure Lounge" @@ -82529,6 +74198,8 @@ name = "biohazard containment door" }, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -82575,6 +74246,9 @@ /obj/machinery/computer/security/telescreen/entertainment{ pixel_y = 29 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitegreen" @@ -82591,7 +74265,7 @@ /turf/simulated/floor/carpet, /area/chapel/main) "cVR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -82639,33 +74313,8 @@ icon_state = "chapel" }, /area/chapel/main) -"cVZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/exit{ - name = "\improper Departure Lounge" - }) -"cWa" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/exit{ - name = "\improper Departure Lounge" - }) "cWb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/northwestcorner, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit{ name = "\improper Departure Lounge" @@ -82686,6 +74335,9 @@ /obj/structure/extinguisher_cabinet{ pixel_y = 30 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "whitegreen" @@ -82702,7 +74354,6 @@ }, /obj/machinery/camera{ c_tag = "Virology - Break Room"; - dir = 2; network = list("SS13","Medbay") }, /turf/simulated/floor/plasteel{ @@ -82710,18 +74361,6 @@ icon_state = "whitegreen" }, /area/medical/virology) -"cWf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/decal/warning_stripes/southwestcorner, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/exit{ - name = "\improper Departure Lounge" - }) "cWg" = ( /obj/structure/closet/emcloset, /obj/effect/decal/warning_stripes/northeast, @@ -82732,15 +74371,14 @@ name = "\improper Secure Lab" }) "cWh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, /obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -82768,13 +74406,11 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) @@ -82804,8 +74440,7 @@ }, /obj/item/restraints/handcuffs, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/item/radio/off, /obj/machinery/requests_console{ @@ -82821,7 +74456,7 @@ name = "\improper Departure Lounge" }) "cWp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -82829,23 +74464,11 @@ }, /area/chapel/main) "cWq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /obj/structure/chair, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" }) -"cWr" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/chapel/main) "cWs" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -82859,13 +74482,13 @@ /area/chapel/main) "cWt" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/airlock/centcom{ name = "Funeral Parlour"; opacity = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -82873,43 +74496,6 @@ icon_state = "dark" }, /area/chapel/main) -"cWu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "chapel" - }, -/area/chapel/main) -"cWv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/plasteel{ - icon_state = "chapel" - }, -/area/chapel/main) -"cWw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "chapel" - }, -/area/chapel/main) -"cWy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "chapel" - }, -/area/chapel/main) "cWz" = ( /turf/simulated/floor/plasteel{ icon_state = "chapel" @@ -82918,10 +74504,12 @@ "cWA" = ( /obj/machinery/shower{ dir = 4; - icon_state = "shower"; tag = "icon-shower (EAST)" }, /obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -82934,13 +74522,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/warning_stripes/east, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit{ name = "\improper Departure Lounge" @@ -82949,22 +74531,20 @@ /obj/structure/closet/l3closet/scientist, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/machinery/camera{ c_tag = "Secure Lab - Airlock"; dir = 8; network = list("SS13","RD") }, -/obj/machinery/atmospherics/pipe/simple/hidden/universal{ - dir = 4 - }, /obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -82978,8 +74558,10 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -82991,9 +74573,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/hallway/primary/aft) @@ -83038,9 +74621,11 @@ "cWL" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; pixel_x = 11 }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitegreen" @@ -83048,7 +74633,6 @@ /area/medical/virology) "cWM" = ( /obj/machinery/door/window/eastleft{ - dir = 4; name = "Coffin Storage"; req_access_txt = "22" }, @@ -83075,16 +74659,7 @@ tag = "icon-vault" }, /area/chapel/main) -"cWP" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/chapel/main) "cWR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -83094,7 +74669,7 @@ pixel_y = 5 }, /obj/structure/table/wood, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -83105,14 +74680,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -83134,6 +74701,12 @@ }) "cWV" = ( /obj/structure/table/wood, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -83141,25 +74714,21 @@ "cWW" = ( /obj/item/storage/bible, /obj/structure/table/wood, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/chapel/main) -"cWX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "chapel" - }, -/area/chapel/main) "cWY" = ( /obj/structure/chair/comfy/black{ dir = 8 }, /obj/machinery/camera{ c_tag = "Chapel - Starboard"; - dir = 8; - network = list("SS13") + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -83197,16 +74766,6 @@ }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, -/area/hallway/secondary/exit{ - name = "\improper Departure Lounge" - }) -"cXd" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, /area/hallway/secondary/exit{ name = "\improper Departure Lounge" }) @@ -83214,30 +74773,15 @@ /obj/machinery/hologram/holopad, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, -/area/hallway/secondary/exit{ - name = "\improper Departure Lounge" - }) -"cXf" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 - }, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, /area/hallway/secondary/exit{ name = "\improper Departure Lounge" }) "cXg" = ( /obj/structure/sink{ dir = 8; - icon_state = "sink"; pixel_x = -12; pixel_y = 2 }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, /obj/effect/decal/warning_stripes/southwest, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -83248,7 +74792,6 @@ "cXh" = ( /obj/structure/closet/l3closet/scientist, /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_x = 29 }, @@ -83265,11 +74808,9 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/warning_stripes/south, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -83287,13 +74828,11 @@ }, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/camera{ c_tag = "Chapel - Funeral Parlour"; - dir = 8; - network = list("SS13") + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -83304,6 +74843,9 @@ pixel_y = 7 }, /obj/structure/table/wood, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -83323,20 +74865,11 @@ icon_state = "4-8" }, /obj/machinery/camera{ - c_tag = "Fitness Room - Fore"; - dir = 2 + c_tag = "Fitness Room - Fore" }, /obj/machinery/alarm{ pixel_y = 24 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -83344,15 +74877,6 @@ /area/crew_quarters/fitness{ name = "\improper Recreation Area" }) -"cXp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/exit{ - name = "\improper Departure Lounge" - }) "cXq" = ( /obj/structure/table/glass, /obj/item/storage/box/beakers{ @@ -83371,17 +74895,13 @@ name = "\improper Secure Lab" }) "cXr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 3; icon_state = "whitebluecorner" }, /area/medical/medbay3) "cXs" = ( -/obj/machinery/ai_status_display{ - pixel_y = 0 - }, +/obj/machinery/ai_status_display, /turf/simulated/wall, /area/hallway/secondary/exit{ name = "\improper Departure Lounge" @@ -83411,7 +74931,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/research{ autoclose = 0; @@ -83437,6 +74956,7 @@ pixel_x = -25; req_access_txt = "55" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 4; @@ -83449,7 +74969,6 @@ "cXw" = ( /obj/machinery/vending/medical, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whiteblue" }, /area/medical/medbay3) @@ -83459,10 +74978,13 @@ d2 = 8; icon_state = "4-8" }, +/obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" @@ -83482,7 +75004,6 @@ /obj/item/reagent_containers/spray/cleaner, /obj/machinery/light, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whiteblue" }, /area/medical/medbay3) @@ -83494,8 +75015,7 @@ }, /obj/machinery/camera{ c_tag = "Departure Lounge - Security Post"; - dir = 1; - network = list("SS13") + dir = 1 }, /obj/item/book/manual/security_space_law{ pixel_x = -4; @@ -83505,8 +75025,6 @@ pixel_x = 4 }, /obj/item/radio/intercom{ - broadcasting = 0; - listening = 1; name = "Station Intercom (General)"; pixel_y = -32 }, @@ -83523,6 +75041,12 @@ name = "Civilian" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, /turf/simulated/floor/plasteel, /area/crew_quarters/fitness{ name = "\improper Recreation Area" @@ -83530,17 +75054,17 @@ "cXE" = ( /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/chapel/main) "cXF" = ( /obj/machinery/door/window{ - dir = 4; name = "Mass Driver"; req_access_txt = "22" }, @@ -83558,8 +75082,6 @@ dir = 8; pixel_x = -24 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -83593,8 +75115,7 @@ id = "chapelspaceshutters"; name = "Space Window Shutter Control"; pixel_x = -6; - pixel_y = -25; - req_access_txt = "0" + pixel_y = -25 }, /obj/machinery/light_switch{ pixel_x = 6; @@ -83620,9 +75141,6 @@ /turf/simulated/floor/plating, /area/solar/starboard) "cXO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /obj/machinery/chem_heater{ pixel_x = -4; pixel_y = 4 @@ -83634,17 +75152,6 @@ /area/toxins/xenobiology{ name = "\improper Secure Lab" }) -"cXP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitepurple" - }, -/area/toxins/xenobiology{ - name = "\improper Secure Lab" - }) "cXQ" = ( /obj/structure/chair/office/light{ dir = 1 @@ -83652,9 +75159,6 @@ /obj/effect/landmark/start{ name = "Scientist" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurple" @@ -83688,12 +75192,12 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ d1 = 1; d2 = 4; icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 1; @@ -83705,11 +75209,9 @@ "cXU" = ( /obj/machinery/camera{ c_tag = "Secure Lab - Fore"; - dir = 2; network = list("SS13","RD") }, /obj/machinery/firealarm{ - dir = 2; pixel_y = 26 }, /obj/structure/cable/yellow{ @@ -83782,6 +75284,8 @@ dir = 1 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -83790,15 +75294,14 @@ }) "cYa" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - level = 1 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "barber" @@ -83806,6 +75309,8 @@ /area/medical/cmo) "cYb" = ( /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "vault" @@ -83824,6 +75329,8 @@ "cYe" = ( /obj/structure/window/reinforced, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -83842,25 +75349,20 @@ name = "\improper Departure Lounge" }) "cYg" = ( -/obj/machinery/hydroponics/soil{ - pixel_y = 8 - }, +/obj/machinery/hydroponics/soil, /obj/machinery/light/small{ dir = 1 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "cult"; tag = "icon-cult" }, /area/chapel/main) "cYh" = ( /obj/machinery/door/morgue{ - name = "Chapel Garden"; - req_access_txt = "0" + name = "Chapel Garden" }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "cult"; tag = "icon-cult" }, @@ -83908,34 +75410,13 @@ }, /area/chapel/main) "cYm" = ( -/obj/machinery/hydroponics/soil{ - pixel_y = 8 - }, +/obj/machinery/hydroponics/soil, /obj/item/seeds/glowshroom, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" }) -"cYp" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/toxins/xenobiology{ - name = "\improper Secure Lab" - }) -"cYq" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/toxins/xenobiology{ - name = "\improper Secure Lab" - }) "cYr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -83976,9 +75457,7 @@ name = "\improper Secure Lab" }) "cYw" = ( -/obj/machinery/hydroponics/soil{ - pixel_y = 8 - }, +/obj/machinery/hydroponics/soil, /obj/item/seeds/ambrosia, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plating, @@ -83990,6 +75469,10 @@ dir = 1 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/crew_quarters/fitness{ name = "\improper Recreation Area" @@ -84005,7 +75488,10 @@ location = "14.5-Recreation" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, /turf/simulated/floor/plasteel, @@ -84055,12 +75541,13 @@ /obj/structure/disposalpipe/junction{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/crew_quarters/fitness{ name = "\improper Recreation Area" }) "cYI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/junction{ dir = 2; icon_state = "pipe-j2"; @@ -84076,11 +75563,6 @@ }, /area/medical/morgue) "cYK" = ( -/obj/machinery/atmospherics/unary/portables_connector{ - dir = 1; - name = "xenobiology air connector port" - }, -/obj/machinery/portable_atmospherics/canister/air, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "whitepurple"; @@ -84094,9 +75576,7 @@ dir = 4; pixel_x = -23 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "whitegreen" @@ -84104,12 +75584,6 @@ /area/medical/virology) "cYM" = ( /obj/structure/chair/stool, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /turf/simulated/floor/plasteel{ icon_state = "whitegreen" }, @@ -84180,7 +75654,6 @@ "cYU" = ( /obj/machinery/monkey_recycler, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whitepurple" }, /area/toxins/xenobiology{ @@ -84196,7 +75669,6 @@ pixel_y = -29 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whitepurple" }, /area/toxins/xenobiology{ @@ -84208,7 +75680,6 @@ req_access_txt = "6" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -84241,16 +75712,9 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/machinery/camera{ c_tag = "Chapel Office"; - dir = 8; - network = list("SS13") - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -84333,12 +75797,6 @@ /obj/structure/lattice/catwalk, /turf/space, /area/solar/starboard) -"cZk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/wall, -/area/chapel/main) "cZl" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-24"; @@ -84355,12 +75813,12 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/carpet/arcade, /area/crew_quarters/fitness{ name = "\improper Arcade" @@ -84378,9 +75836,6 @@ /area/space) "cZq" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -84411,16 +75866,13 @@ /area/chapel/office) "cZt" = ( /obj/machinery/power/apc{ - dir = 2; - lighting = 3; name = "Chapel Office APC"; pixel_y = -25 }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, /obj/structure/cable/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -84448,13 +75900,11 @@ dir = 4 }, /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_x = 29 }, /obj/machinery/iv_drip, /obj/machinery/firealarm{ - dir = 2; pixel_y = 24 }, /turf/simulated/floor/plasteel{ @@ -84464,16 +75914,6 @@ /area/maintenance/aft{ name = "Aft Maintenance" }) -"cZx" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "chapel" - }, -/area/chapel/main) "cZy" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -84483,9 +75923,10 @@ /obj/effect/landmark/start{ name = "Medical Doctor" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -84496,13 +75937,13 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ name = "Arcade" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/carpet/arcade, /area/crew_quarters/fitness{ name = "\improper Arcade" @@ -84514,7 +75955,6 @@ /area/solar/starboard) "cZC" = ( /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_x = 29 }, @@ -84524,8 +75964,7 @@ /area/chapel/main) "cZD" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, @@ -84560,18 +75999,13 @@ pixel_y = 3; tag = "icon-plant-21" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitegreencorner" }, /area/medical/medbay3) "cZJ" = ( -/obj/machinery/hydroponics/soil{ - pixel_y = 8 - }, +/obj/machinery/hydroponics/soil, /obj/item/cultivator, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plating, @@ -84588,8 +76022,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -84607,9 +76041,7 @@ name = "\improper Secure Lab" }) "cZN" = ( -/obj/machinery/hydroponics/soil{ - pixel_y = 8 - }, +/obj/machinery/hydroponics/soil, /obj/item/seeds/watermelon, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plating, @@ -84621,26 +76053,8 @@ name = "Psych Office"; req_access_txt = "64" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/wood, /area/medical/psych) -"cZQ" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/medbay3) "cZR" = ( /obj/structure/chair/comfy/black{ dir = 8 @@ -84650,6 +76064,22 @@ icon_state = "chapel" }, /area/chapel/main) +"cZS" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/hatch{ + name = "MiniSat Transit Tube"; + req_one_access_txt = "32;19" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/engine/break_room) "cZT" = ( /obj/structure/lattice, /obj/effect/spawner/window/reinforced, @@ -84664,9 +76094,9 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -84684,8 +76114,7 @@ /area/solar/starboard) "cZX" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/machinery/alarm{ dir = 4; @@ -84696,9 +76125,7 @@ }, /area/chapel/main) "cZY" = ( -/obj/machinery/hydroponics/soil{ - pixel_y = 8 - }, +/obj/machinery/hydroponics/soil, /obj/item/seeds/berry, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plating, @@ -84752,8 +76179,7 @@ "dae" = ( /obj/machinery/camera{ c_tag = "Head of Personnel's Office"; - dir = 1; - network = list("SS13") + dir = 1 }, /obj/structure/table/wood, /obj/item/storage/box/PDAs{ @@ -84766,16 +76192,10 @@ /area/crew_quarters/heads) "daf" = ( /obj/machinery/firealarm{ - dir = 2; pixel_y = 24 }, /obj/machinery/camera{ - c_tag = "Medbay Surgery 1 North"; - network = list("SS13") - }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 + c_tag = "Medbay Surgery 1 North" }, /turf/simulated/floor/wood, /area/medical/psych) @@ -84791,14 +76211,12 @@ "dak" = ( /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/structure/closet/secure_closet/psychiatrist, /turf/simulated/floor/wood, /area/medical/psych) "dan" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -84806,19 +76224,15 @@ }, /obj/effect/decal/warning_stripes/north, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" }) "dap" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/item/radio/beacon, /obj/effect/decal/warning_stripes/north, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit{ name = "\improper Departure Lounge" @@ -84848,9 +76262,7 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -84865,8 +76277,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -84877,14 +76289,12 @@ "dat" = ( /obj/machinery/camera{ c_tag = "Departure Lounge - Starboard Aft"; - dir = 8; - network = list("SS13") + dir = 8 }, /obj/machinery/light{ dir = 4 }, /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_x = 29 }, @@ -84901,12 +76311,10 @@ "dau" = ( /obj/machinery/camera{ c_tag = "Departure Lounge - Port Aft"; - dir = 4; - network = list("SS13") + dir = 4 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/structure/extinguisher_cabinet{ pixel_x = -27 @@ -84928,17 +76336,6 @@ /area/toxins/xenobiology{ name = "\improper Secure Lab" }) -"daw" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/exit{ - name = "\improper Departure Lounge" - }) "dax" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -84946,9 +76343,6 @@ icon_state = "4-8" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; @@ -84960,7 +76354,7 @@ icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -84976,6 +76370,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitegreen"; @@ -85001,19 +76398,6 @@ icon_state = "4-8" }, /obj/effect/decal/warning_stripes/southwestcorner, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/toxins/xenobiology{ - name = "\improper Secure Lab" - }) -"daH" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -85060,8 +76444,8 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -85074,7 +76458,7 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -85093,18 +76477,17 @@ d2 = 4; icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/medical/psych) "daR" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -85141,9 +76524,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, /turf/simulated/floor/carpet, /area/medical/psych) "dbb" = ( @@ -85153,9 +76533,6 @@ icon_state = "4-8" }, /obj/machinery/hologram/holopad, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/carpet, /area/medical/psych) "dbc" = ( @@ -85172,6 +76549,7 @@ /obj/effect/landmark{ name = "lightsout" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -85203,7 +76581,6 @@ /turf/simulated/floor/carpet, /area/medical/psych) "dbj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/south, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=9.4-Escape-4"; @@ -85219,7 +76596,6 @@ /obj/item/crowbar, /obj/machinery/camera{ c_tag = "Medbay Cryo"; - dir = 2; network = list("SS13","Medbay") }, /obj/item/screwdriver{ @@ -85240,7 +76616,6 @@ }, /area/medical/cryo) "dbm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/south, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=9.3-Escape-3"; @@ -85250,30 +76625,6 @@ /area/hallway/secondary/exit{ name = "\improper Departure Lounge" }) -"dbn" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/toxins/xenobiology{ - name = "\improper Secure Lab" - }) "dbo" = ( /obj/effect/decal/warning_stripes/northwestcorner, /turf/simulated/floor/plasteel{ @@ -85289,7 +76640,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, /turf/simulated/floor/plasteel{ @@ -85326,15 +76677,11 @@ pixel_x = -32 }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitegreen"; @@ -85345,18 +76692,17 @@ }) "dbw" = ( /obj/item/radio/intercom{ - frequency = 1459; name = "Station Intercom (General)"; pixel_y = 21 }, /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -85366,10 +76712,10 @@ /obj/structure/chair/comfy/black{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -85396,14 +76742,10 @@ "dbz" = ( /obj/structure/sink{ dir = 8; - icon_state = "sink"; pixel_x = -12; pixel_y = 2 }, /obj/effect/decal/warning_stripes/west, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -85435,7 +76777,6 @@ dir = 1 }, /obj/machinery/status_display{ - density = 0; layer = 4; pixel_y = 32 }, @@ -85527,12 +76868,15 @@ }, /area/medical/medbay3) "dbH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/wood, /area/medical/psych) "dbI" = ( @@ -85559,6 +76903,8 @@ name = "Scientist" }, /obj/machinery/hologram/holopad, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -85586,7 +76932,6 @@ }) "dbL" = ( /obj/machinery/mass_driver{ - dir = 2; id_tag = "chapelgun" }, /obj/structure/sign/securearea{ @@ -85691,6 +77036,8 @@ /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -85734,15 +77081,10 @@ }) "dbX" = ( /obj/machinery/light/small, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, /obj/machinery/door_control{ id = "chapelparlourshutters"; name = "Window Shutter Control"; - pixel_y = -25; - req_access_txt = "0" + pixel_y = -25 }, /turf/simulated/floor/plasteel{ icon_state = "vault"; @@ -85784,18 +77126,6 @@ }, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, -/area/toxins/xenobiology{ - name = "\improper Secure Lab" - }) -"dcg" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, -/obj/effect/decal/warning_stripes/northwestcorner, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, /area/toxins/xenobiology{ name = "\improper Secure Lab" }) @@ -85832,6 +77162,9 @@ pixel_y = -29 }, /obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -85902,7 +77235,6 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whitepurple" }, /area/toxins/xenobiology{ @@ -85970,7 +77302,6 @@ }, /obj/machinery/disposal, /obj/machinery/alarm{ - frequency = 1439; pixel_y = 23 }, /obj/effect/decal/warning_stripes/southwest, @@ -86092,8 +77423,7 @@ }) "dcK" = ( /obj/machinery/atmospherics/pipe/simple/visible{ - dir = 6; - level = 2 + dir = 6 }, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, @@ -86238,8 +77568,7 @@ /area/space) "ddR" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/structure/cable/yellow{ d1 = 2; @@ -86342,22 +77671,17 @@ /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable{ d1 = 1; d2 = 8; icon_state = "1-8" }, /obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/engine, /area/engine/engineering) "ded" = ( /obj/machinery/dye_generator, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "barber" @@ -86370,23 +77694,18 @@ name = "Medbay Aft" }) "deg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, /obj/machinery/door/airlock/maintenance{ - req_access_txt = "0"; req_one_access_txt = "12;5;39;6" }, /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" @@ -86401,12 +77720,7 @@ name = "Aft Maintenance" }) "dei" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/wood, /area/medical/psych) "dej" = ( @@ -86424,12 +77738,13 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/cable/yellow{ d1 = 1; d2 = 4; icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" @@ -86450,23 +77765,14 @@ tag = "icon-vault" }, /area/chapel/main) -"den" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/universal, -/turf/simulated/floor/plating, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) "deo" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/westleft{ base_state = "right"; - dir = 8; icon_state = "right"; - name = "Outer Window"; - req_access_txt = "0" + name = "Outer Window" }, /obj/machinery/door/window/brigdoor{ - dir = 4; name = "Security Desk"; req_access_txt = "1" }, @@ -86482,6 +77788,9 @@ "dep" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp/green, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, /turf/simulated/floor/carpet, /area/medical/psych) "deq" = ( @@ -86493,12 +77802,13 @@ name = "Medbay Maintenance"; req_access_txt = "5" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/medical/psych) "des" = ( @@ -86528,39 +77838,21 @@ /obj/structure/disposalpipe/segment, /turf/simulated/wall/r_wall, /area/medical/virology) -"dew" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 6 - }, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) -"dey" = ( -/obj/machinery/atmospherics/unary/outlet_injector/on{ - dir = 1 - }, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) "dez" = ( /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" }, /obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, -/area/toxins/xenobiology{ - name = "\improper Secure Lab" - }) -"deA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4; - level = 1 - }, -/turf/simulated/wall/r_wall, /area/toxins/xenobiology{ name = "\improper Secure Lab" }) @@ -86651,14 +77943,13 @@ pixel_x = -3; pixel_y = 5 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, /obj/structure/table/wood, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -86692,12 +77983,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/carpet, /area/chapel/main) "deQ" = ( @@ -86805,12 +78092,6 @@ icon_state = "chapel" }, /area/chapel/main) -"deZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/turf/simulated/floor/engine, -/area/engine/mechanic_workshop) "dfa" = ( /obj/machinery/computer/rdconsole/mechanics, /turf/simulated/floor/plasteel{ @@ -86825,9 +78106,6 @@ }, /area/engine/mechanic_workshop) "dfh" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 2 - }, /obj/structure/chair/office/light{ dir = 1; pixel_y = 3 @@ -86897,16 +78175,11 @@ }, /area/chapel/main) "dfq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 - }, /obj/effect/landmark/start{ name = "Mechanic" }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 7; - on = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 5; @@ -86919,28 +78192,12 @@ opacity = 1; req_access_txt = "27" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/chapel/main) -"dft" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "vault" - }, -/area/engine/mechanic_workshop) "dfu" = ( /obj/effect/decal/warning_stripes/west, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 - }, /obj/machinery/door/poddoor{ density = 0; icon_state = "open"; @@ -86969,21 +78226,13 @@ /area/chapel/main) "dfx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 + dir = 10 }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "vault" }, /area/engine/mechanic_workshop) -"dfy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 - }, -/turf/simulated/floor/engine, -/area/engine/mechanic_workshop) "dfz" = ( /obj/structure/cable/yellow{ d1 = 2; @@ -86995,27 +78244,17 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/engine/break_room) "dfA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/door/airlock/engineering/glass{ name = "Mechanic Workshop"; req_access_txt = "70" @@ -87035,17 +78274,16 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/engine/break_room) "dfD" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; pixel_x = 11 }, /obj/machinery/camera{ @@ -87054,6 +78292,9 @@ network = list("SS13","RD") }, /obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -87061,11 +78302,11 @@ name = "\improper Secure Lab" }) "dfG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -87087,18 +78328,11 @@ name = "\improper Secure Lab" }) "dfI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /obj/machinery/vending/cola, /turf/simulated/floor/plasteel{ dir = 5; @@ -87107,10 +78341,6 @@ /area/engine/mechanic_workshop) "dfJ" = ( /obj/effect/decal/warning_stripes/west, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 - }, /obj/machinery/firealarm{ dir = 1; pixel_y = -24 @@ -87125,14 +78355,13 @@ /turf/simulated/floor/engine, /area/engine/mechanic_workshop) "dfK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 - }, /obj/machinery/alarm{ dir = 1; pixel_y = -22 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "vault" @@ -87157,7 +78386,6 @@ }, /obj/machinery/shower{ dir = 4; - icon_state = "shower"; tag = "icon-shower (EAST)" }, /obj/effect/decal/warning_stripes/northwest, @@ -87166,10 +78394,6 @@ }, /area/medical/virology) "dfT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6; - level = 1 - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; @@ -87178,6 +78402,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitegreen"; @@ -87185,9 +78412,6 @@ }, /area/medical/virology) "dfU" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, /obj/effect/decal/warning_stripes/west, /obj/structure/cable/yellow{ d1 = 4; @@ -87197,21 +78421,26 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/virology) "dfV" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, /obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -87238,13 +78467,13 @@ name = "\improper Secure Lab" }) "dfX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitegreen"; @@ -87269,29 +78498,24 @@ }, /area/medical/virology) "dfZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "bluecorner" }, /area/hallway/secondary/entry{ name = "Arrivals" }) "dgb" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -87302,11 +78526,13 @@ icon_state = "map-left-MS"; pixel_y = -32 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 + dir = 4 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "arrival" }, /area/hallway/secondary/entry{ @@ -87315,8 +78541,7 @@ "dgg" = ( /obj/machinery/camera{ c_tag = "Chapel - Port"; - dir = 4; - network = list("SS13") + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -87354,18 +78579,6 @@ /obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas, /turf/simulated/floor/plasteel, -/area/hallway/secondary/entry{ - name = "Arrivals" - }) -"dgl" = ( -/obj/machinery/light{ - dir = 1; - on = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/plasteel, /area/hallway/secondary/entry{ name = "Arrivals" }) @@ -87402,15 +78615,6 @@ }) "dgr" = ( /turf/simulated/wall/r_wall, -/area/hallway/secondary/entry{ - name = "Arrivals" - }) -"dgs" = ( -/obj/effect/decal/warning_stripes/south, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor/plasteel, /area/hallway/secondary/entry{ name = "Arrivals" }) @@ -87429,18 +78633,14 @@ "dgu" = ( /obj/effect/decal/warning_stripes/south, /obj/structure/reagent_dispensers/watertank, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry{ name = "Arrivals" }) "dgv" = ( /obj/effect/decal/warning_stripes/south, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry{ @@ -87517,11 +78717,14 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/light/small{ + dir = 1 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/light/small{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plating, /area/maintenance/starboard) @@ -87543,6 +78746,9 @@ "dgH" = ( /obj/structure/closet/l3closet, /obj/effect/decal/warning_stripes/southeast, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -87553,12 +78759,10 @@ /area/maintenance/starboard) "dgJ" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /turf/simulated/floor/engine, @@ -87571,9 +78775,10 @@ /area/engine/mechanic_workshop) "dgL" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/engine/break_room) "dgO" = ( @@ -87583,21 +78788,11 @@ "dgW" = ( /obj/machinery/computer/camera_advanced/xenobio, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whitepurplecorner" }, /area/toxins/xenobiology{ name = "\improper Secure Lab" }) -"dhd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) "dhf" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -87626,9 +78821,6 @@ }, /area/chapel/main) "dhk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -87637,6 +78829,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitegreen"; @@ -87655,9 +78850,6 @@ /turf/simulated/floor/plating, /area/chapel/main) "dhm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; @@ -87666,6 +78858,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitegreen"; @@ -87685,9 +78880,6 @@ d2 = 4; icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/maintenance/aft{ @@ -87703,29 +78895,18 @@ dir = 4; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) -"dht" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" @@ -87746,66 +78927,59 @@ name = "Aft Maintenance" }) "dhx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitebluecorner" }, /area/medical/genetics) "dhy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "whiteblue" }, /area/medical/genetics) "dhz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitebluecorner" }, /area/medical/genetics) "dhA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - level = 1 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -87829,19 +79003,15 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/effect/decal/warning_stripes/south, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" }) "dhF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/airlock/maintenance{ name = "storage room"; req_access = "12" @@ -87852,58 +79022,95 @@ }) "dhG" = ( /obj/item/seeds/watermelon, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" }) "dhI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /mob/living/simple_animal/bot/cleanbot{ name = "Mopfficer Sweepsky"; on = 0 }, /turf/simulated/floor/plating, /area/maintenance/fore) +"dio" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whiteblue" + }, +/area/medical/medbay3) +"diT" = ( +/obj/structure/morgue, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/medical/morgue) +"djx" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters{ + density = 0; + dir = 2; + icon_state = "open"; + id_tag = "acute2"; + name = "Acute 2 Privacy Shutters"; + opacity = 0 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "whitebluefull"; + tag = "icon-whitebluefull" + }, +/area/medical/exam_room) "djL" = ( /obj/machinery/atmospherics/unary/portables_connector, /obj/machinery/portable_atmospherics/canister/air, /turf/simulated/floor/plating, /area/security/permabrig) "dmU" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/surgery2) -"dnk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, +"dnu" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "yellowcorner" + icon_state = "showroomfloor" }, -/area/hallway/primary/starboard) +/area/security/main) "dom" = ( /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, /area/engine/equipmentstorage) +"doV" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/toxins/mixing{ + name = "\improper Toxins Lab" + }) "dqh" = ( /obj/effect/decal/warning_stripes/south, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/engine/break_room) "dqm" = ( @@ -87922,38 +79129,28 @@ }, /turf/simulated/floor/engine, /area/engine/supermatter) -"dvV" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 6 +"dtM" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/bluegrid{ + icon_state = "gcircuit"; + luminosity = 2 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/atmos) +/area/security/nuke_storage) "dwC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 }, /turf/simulated/floor/plasteel/dark, /area/tcommsat/server) -"dxy" = ( -/obj/effect/decal/warning_stripes/yellow/hollow, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - level = 1 +"dxa" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutral" + icon_state = "white" }, -/area/hallway/primary/port) +/area/medical/surgery2) "dAs" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -87964,8 +79161,7 @@ id_tag = "sol_inner"; locked = 1; name = "Arrivals External Access"; - req_access = null; - req_access_txt = "0" + req_access = null }, /turf/simulated/floor/plating, /area/hallway/secondary/entry) @@ -87975,13 +79171,78 @@ }, /turf/simulated/floor/plating, /area/maintenance/starboard) -"dHm" = ( -/obj/machinery/atmospherics/unary/vent_pump, +"dCV" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/construction/hallway{ + name = "\improper MiniSat Exterior" + }) +"dDw" = ( +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/library) +"dDT" = ( +/obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel, +/area/hallway/primary/central) +"dDV" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "green" + icon_state = "whitepurple" }, -/area/hydroponics) +/area/medical/research{ + name = "Research Division" + }) +"dFD" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/fore) +"dGT" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/exit{ + name = "\improper Departure Lounge" + }) "dHr" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -87999,26 +79260,29 @@ }, /turf/simulated/floor/plating, /area/maintenance/starboard) -"dJz" = ( +"dKL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10; - initialize_directions = 10; - level = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "redcorner" }, -/turf/simulated/floor/plasteel, -/area/construction) -"dMG" = ( -/obj/machinery/door/airlock/engineering/glass{ - name = "Supermatter Engine Room"; - req_access_txt = "10"; - req_one_access_txt = "0" +/area/security/brig) +"dKR" = ( +/obj/structure/grille, +/obj/structure/cable/yellow{ + d2 = 2; + icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/window/reinforced/tinted{ + dir = 5; + max_integrity = 120; + reinf = 0 }, -/turf/simulated/floor/engine, -/area/engine/engineering) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plating, +/area/security/detectives_office) "dMV" = ( /obj/machinery/atmospherics/pipe/manifold/visible/cyan{ dir = 8; @@ -88028,32 +79292,17 @@ icon_state = "dark" }, /area/atmos) -"dOL" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +"dOQ" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "redcorner" + icon_state = "whiteblue" }, -/area/security/permabrig) -"dPn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6; - level = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/bridge) +/area/medical/medbay3) "dRN" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /turf/simulated/floor/plasteel/dark, /area/tcommsat/server) @@ -88064,23 +79313,12 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel, -/area/hallway/primary/aft) -"dSJ" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) "dTK" = ( @@ -88090,52 +79328,105 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/crew_quarters/bar) -"dUP" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 +"dVK" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/aft{ + name = "Aft Maintenance" + }) +"dWX" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; - icon_state = "neutralcorner" + icon_state = "bluecorner" }, -/area/hallway/primary/central) +/area/hallway/primary/aft) "dXb" = ( /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ - level = 2 - }, -/obj/machinery/light{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/visible/cyan, +/obj/machinery/light, /obj/effect/decal/warning_stripes/south, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /turf/simulated/floor/engine, /area/engine/engineering) +"dYi" = ( +/obj/effect/spawner/window/reinforced, +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" + }, +/obj/structure/cable{ + d2 = 8; + icon_state = "0-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/engine/gravitygenerator) "dZe" = ( /obj/effect/decal/warning_stripes/west, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/cryo) -"ebM" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green{ +"dZM" = ( +/obj/effect/spawner/window/reinforced, +/obj/machinery/door/poddoor{ + density = 0; + icon_state = "open"; + id_tag = "cmoprivacy"; + name = "privacy shutters"; + opacity = 0 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/turf/simulated/floor/plating, +/area/medical/cmo) +"ebA" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/aft{ + name = "Aft Maintenance" + }) +"ebM" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8" }, /obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/engine, /area/engine/engineering) "ebV" = ( @@ -88161,6 +79452,15 @@ icon_state = "green" }, /area/hydroponics) +"edB" = ( +/obj/effect/landmark/start{ + name = "Life Support Specialist" + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/plasteel, +/area/atmos) "edK" = ( /obj/machinery/atmospherics/binary/pump{ dir = 1; @@ -88172,55 +79472,85 @@ icon_state = "4-8" }, /obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 + dir = 4 }, /turf/simulated/floor/engine, /area/engine/engineering) -"ehr" = ( -/obj/structure/chair/office/dark, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/wood, -/area/library) -"elv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +"egZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /turf/simulated/floor/plasteel{ - dir = 2; + dir = 4; icon_state = "redcorner" }, -/area/hallway/primary/fore) -"elA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 +/area/security/brig) +"ehr" = ( +/obj/structure/chair/office/dark, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, -/turf/simulated/floor/plasteel, -/area/storage/primary) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/turf/simulated/floor/wood, +/area/library) +"eiF" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/toxins/explab) +"ekd" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whiteblue" + }, +/area/medical/medbay3) "elK" = ( /obj/effect/spawner/airlock/w_to_e, /turf/simulated/wall/r_wall, /area/security/permabrig) -"erQ" = ( -/obj/structure/window/reinforced{ +"eoq" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/security/vacantoffice) +"erv" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) -"esj" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 2 +/area/crew_quarters/courtroom) +"esf" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 4; + icon_state = "1-4" }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/area/engine/break_room) +/turf/simulated/floor/wood, +/area/library) "evR" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 @@ -88234,17 +79564,13 @@ id_tag = "sol_pump" }, /obj/machinery/airlock_sensor{ - frequency = 1379; id_tag = "sol_sensor"; pixel_x = 12; pixel_y = -25 }, /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - frequency = 1379; id_tag = "sol_airlock"; - pixel_x = 0; pixel_y = -25; - req_access_txt = "0"; tag_airpump = "sol_pump"; tag_chamber_sensor = "sol_sensor"; tag_exterior_door = "sol_outer"; @@ -88252,34 +79578,81 @@ }, /turf/simulated/floor/plating, /area/hallway/secondary/entry) -"eIn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +"eGG" = ( +/obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 +/turf/simulated/floor/plasteel, +/area/hallway/secondary/entry{ + name = "Arrivals" + }) +"eIg" = ( +/obj/effect/spawner/window/reinforced, +/obj/machinery/door/poddoor/shutters{ + density = 0; + dir = 2; + icon_state = "open"; + id_tag = "surgeryobs2"; + name = "Privacy Shutters"; + opacity = 0 }, -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" - }, -/area/crew_quarters/kitchen) -"eKN" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/medical/surgery1) +"eKV" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/plasteel, -/area/quartermaster/storage) -"eKV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" }, /area/medical/reception) +"eNd" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "vault" + }, +/area/engine/mechanic_workshop) +"ePy" = ( +/obj/structure/chair/comfy/beige, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel{ + icon_state = "grimy" + }, +/area/hallway/primary/port) +"eQf" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "bcarpet05" + }, +/area/blueshield) +"eQt" = ( +/obj/structure/chair/stool{ + pixel_y = 8 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/plasteel, +/area/crew_quarters/locker) +"eRU" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "floorgrime" + }, +/area/crew_quarters/locker) "eSt" = ( /obj/structure/window/reinforced{ dir = 1 @@ -88287,62 +79660,109 @@ /obj/effect/spawner/airlock/e_to_w/long/square, /turf/space, /area/space/nearstation) -"eSB" = ( +"eSE" = ( +/obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 + dir = 4 }, /turf/simulated/floor/plasteel, -/area/crew_quarters/courtroom) +/area/hallway/secondary/entry{ + name = "Arrivals" + }) "eTd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/security/brig) -"faY" = ( +"eUz" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "neutralcorner" + }, +/area/crew_quarters/locker) +"eYE" = ( /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel, -/area/hallway/primary/central) +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/fpmaint2{ + name = "Port Maintenance" + }) "fga" = ( /obj/machinery/atmospherics/pipe/simple/visible/green, /obj/machinery/door/window/northleft{ dir = 8; - icon_state = "left"; name = "Inner Pipe Access"; req_access_txt = "24" }, /obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 4; - level = 2 + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/atmos) -"fgw" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 +"fhF" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "cautioncorner" + }, +/area/hallway/primary/starboard) +"fhH" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, /turf/simulated/floor/plasteel, -/area/storage/primary) +/area/security/brig) "fhW" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ name = "Pod Bay" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/hallway/secondary/entry{ name = "Arrivals" }) +"fla" = ( +/obj/structure/chair/office/dark{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/library) "flr" = ( /obj/structure/window/plasmareinforced{ dir = 1 @@ -88372,10 +79792,12 @@ icon_state = "dark" }, /area/engine/engineering) +"foM" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel, +/area/engine/break_room) "frX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -88392,18 +79814,40 @@ icon_state = "white" }, /area/medical/reception) +"ftd" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "neutralcorner" + }, +/area/hallway/primary/central) "fts" = ( /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/virology) +"fvO" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitepurple" + }, +/area/medical/research{ + name = "Research Division" + }) "fwO" = ( /obj/machinery/door/airlock/external{ id_tag = "specops_home"; @@ -88411,41 +79855,77 @@ }, /turf/simulated/floor/plating, /area/hallway/secondary/entry) +"fxB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/engine/break_room) "fyS" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/virology) -"fDi" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, +"fBO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/bluegrid, -/area/turret_protected/ai_upload) -"fFk" = ( +/turf/simulated/floor/plasteel{ + icon_state = "showroomfloor" + }, +/area/security/warden) +"fCO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "floorgrime" + }, +/area/security/permabrig) +"fEr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "brown" + dir = 4; + icon_state = "neutralcorner" }, -/area/storage/primary) -"fFl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/area/hallway/primary/central) +"fES" = ( +/obj/structure/window/reinforced{ + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/plating, -/area/maintenance/starboard) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/construction/hallway{ + name = "\improper MiniSat Exterior" + }) +"fGt" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/bridge) "fHC" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 5 @@ -88453,12 +79933,13 @@ /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/engine, /area/engine/engineering) -"fNU" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 +"fOf" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "neutralcorner" }, -/turf/simulated/floor/wood, -/area/security/vacantoffice) +/area/crew_quarters/locker) "fPa" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -88466,47 +79947,58 @@ icon_state = "dark" }, /area/chapel/main) -"fTe" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ +"fUI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 + dir = 4 }, /turf/simulated/floor/plasteel, -/area/security/brig) +/area/crew_quarters/sleep) +"fWW" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/bluegrid, +/area/turret_protected/ai) "fZa" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6; - level = 1 + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 + dir = 9 }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, /area/security/permabrig) -"fZu" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +"fZo" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/maintenance/fpmaint2{ + name = "Port Maintenance" + }) +"fZC" = ( +/obj/effect/spawner/window/reinforced, +/obj/structure/cable/yellow{ + d2 = 4; + icon_state = "0-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plating, +/area/security/brig) +"fZG" = ( +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/bluegrid{ + icon_state = "gcircuit" }, -/turf/simulated/floor/plasteel, -/area/hallway/primary/port) +/area/assembly/chargebay) "fZV" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -88516,6 +80008,19 @@ /obj/machinery/tcomms/core/station, /turf/simulated/floor/bluegrid, /area/tcommsat/server) +"gaa" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "green" + }, +/area/hydroponics) "gbT" = ( /obj/machinery/door/airlock/external{ id_tag = "admin_home"; @@ -88530,26 +80035,29 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 10 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/hallway/primary/starboard) -"gdk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +"gdd" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "chapel" + icon_state = "neutralcorner" }, -/area/chapel/main) +/area/hallway/primary/starboard) "gdM" = ( /obj/effect/spawner/window/reinforced/plasma, /obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction, @@ -88558,13 +80066,9 @@ "ged" = ( /obj/structure/sink{ dir = 8; - icon_state = "sink"; pixel_x = -12; pixel_y = 2 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, /obj/machinery/firealarm{ dir = 8; pixel_x = -26 @@ -88581,19 +80085,79 @@ /obj/machinery/power/rad_collector{ anchored = 1 }, +/obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/visible/supply{ dir = 10 }, -/obj/structure/cable, /turf/simulated/floor/engine, /area/engine/supermatter) -"gog" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "redfull" +"gid" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 }, -/area/security/main) +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/engine, +/area/engine/engineering) +"gip" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/starboard) +"gkU" = ( +/obj/structure/chair/stool{ + pixel_y = 8 + }, +/obj/effect/landmark/start{ + name = "Station Engineer" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/engine/break_room) +"gnJ" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/medical/research{ + name = "Research Division" + }) +"gnZ" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/exit{ + name = "\improper Departure Lounge" + }) "gpj" = ( /obj/machinery/status_display, /turf/simulated/wall/r_wall, @@ -88601,8 +80165,7 @@ "gqj" = ( /obj/machinery/atmospherics/pipe/manifold/visible/cyan{ dir = 8; - initialize_directions = 11; - level = 2 + initialize_directions = 11 }, /obj/machinery/light{ dir = 8 @@ -88610,30 +80173,18 @@ /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/engine, /area/engine/engineering) -"gsn" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +"gqF" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/turf/simulated/floor/plasteel, -/area/hallway/primary/aft) -"gsr" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/decal/warning_stripes/north, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/engine, -/area/engine/engineering) +/turf/simulated/floor/plating, +/area/maintenance/fpmaint2{ + name = "Port Maintenance" + }) +"gwJ" = ( +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/plating, +/area/construction) "gyy" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 9 @@ -88648,7 +80199,6 @@ icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; - pixel_x = 0; pixel_y = -32 }, /obj/machinery/atmospherics/unary/portables_connector{ @@ -88658,32 +80208,62 @@ /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) -"gGG" = ( +"gDB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - level = 1 + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/crew_quarters/courtroom) -"gHt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 +/area/bridge) +"gEi" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "redcorner" - }, -/area/security/brig) +/turf/simulated/floor/carpet, +/area/ntrep) "gIN" = ( /obj/structure/chair/wood/wings{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, /turf/simulated/floor/carpet, /area/crew_quarters/theatre) +"gKb" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/plasteel{ + icon_state = "floorgrime" + }, +/area/security/brig) +"gMS" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "cafeteria"; + tag = "icon-cafeteria (NORTHEAST)" + }, +/area/crew_quarters/kitchen) "gOD" = ( /obj/structure/cable/yellow{ d1 = 2; @@ -88695,12 +80275,18 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hallway/primary/fore) "gQu" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -88712,6 +80298,21 @@ /obj/effect/spawner/airlock/s_to_n, /turf/simulated/floor/plating, /area/maintenance/auxsolarstarboard) +"gSK" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whiteblue" + }, +/area/medical/medbay3) +"gTp" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/exit{ + name = "\improper Departure Lounge" + }) "gYM" = ( /obj/machinery/light{ dir = 8 @@ -88721,9 +80322,6 @@ }, /area/engine/engineering) "gZY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -88731,6 +80329,12 @@ }, /turf/simulated/floor/plating, /area/engine/engineering) +"har" = ( +/obj/effect/spawner/window, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plating, +/area/civilian/barber) "hdL" = ( /obj/structure/cable/yellow{ d2 = 8; @@ -88738,13 +80342,19 @@ }, /turf/simulated/floor/plating, /area/engine/engineering) -"hfb" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 +"het" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/plasteel{ + icon_state = "floorgrime" }, +/area/security/permabrig) +"hfb" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -88753,10 +80363,61 @@ /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/engine/engineering) +"hht" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/bridge) +"hio" = ( +/obj/structure/chair, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "floorgrime" + }, +/area/security/brig) +"hiO" = ( +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/turf/simulated/floor/carpet, +/area/library) +"hjH" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/engine, +/area/toxins/explab) +"hka" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/fpmaint2{ + name = "Port Maintenance" + }) "hlZ" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -88766,24 +80427,39 @@ /obj/machinery/light{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/toxins/xenobiology{ name = "\improper Secure Lab" }) -"hnt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +"hmM" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/plasteel, -/area/crew_quarters/courtroom) +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "cafeteria"; + tag = "icon-cafeteria (NORTHEAST)" + }, +/area/crew_quarters/kitchen) "hnC" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 5 }, /turf/simulated/floor/plasteel, /area/atmos) +"hnI" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/plasteel, +/area/storage/primary) "hnL" = ( /obj/structure/chair{ dir = 8 @@ -88791,7 +80467,7 @@ /obj/effect/landmark/start{ name = "Civilian" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/crew_quarters/fitness{ name = "\improper Recreation Area" @@ -88799,11 +80475,7 @@ "hqN" = ( /obj/machinery/door/airlock/engineering/glass{ name = "Supermatter Engine Room"; - req_access_txt = "10"; - req_one_access_txt = "0" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + req_access_txt = "10" }, /obj/structure/cable/yellow{ d1 = 2; @@ -88819,6 +80491,17 @@ }, /turf/simulated/wall/r_wall, /area/engine/supermatter) +"hwe" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "bar" + }, +/area/crew_quarters/bar) "hxv" = ( /obj/machinery/camera{ c_tag = "Telecoms - Server Room - Aft"; @@ -88827,7 +80510,6 @@ }, /obj/structure/cable/yellow, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -24 }, @@ -88840,38 +80522,48 @@ icon_state = "4-8" }, /obj/effect/decal/warning_stripes/northwest, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/engine, /area/engine/engineering) -"hBn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, -/obj/effect/decal/warning_stripes/west, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/entry{ - name = "Arrivals" - }) "hBM" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - external_pressure_bound = 0; - frequency = 1441; - id_tag = "n2_out"; - initialize_directions = 1; - internal_pressure_bound = 4000; - on = 1; - pressure_checks = 2; - pump_direction = 0 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/storage/primary) +"hCM" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/medical/chemistry) +"hDK" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/mining{ + name = "Cargo Bay"; + req_one_access_txt = "48;50" + }, +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/construction/Storage{ + name = "Storage Wing" + }) "hEA" = ( /obj/machinery/camera/autoname{ - dir = 4; - network = list("SS13") + dir = 4 }, /obj/machinery/door_control{ desc = "A remote control-switch for the engineering security doors."; @@ -88893,43 +80585,21 @@ d2 = 4; icon_state = "2-4" }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "yellow" }, /area/engine/engineering) -"hEP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "chapel" - }, -/area/chapel/main) "hHE" = ( /obj/effect/decal/warning_stripes/southwest, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/plasteel, /area/engine/equipmentstorage) -"hHX" = ( -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -24 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralcorner" - }, -/area/hallway/primary/aft) "hIG" = ( /obj/machinery/firealarm{ dir = 4; @@ -88946,17 +80616,37 @@ }, /area/engine/engineering) "hIT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/security/armoury) +"hKu" = ( +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/plasteel{ + icon_state = "showroomfloor" + }, +/area/crew_quarters/kitchen) +"hLt" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/spawner/lootdrop{ + loot = list(/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes); + name = "maint grille or trash spawner" + }, +/turf/simulated/floor/plating, +/area/maintenance/aft{ + name = "Aft Maintenance" + }) "hLH" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/bluegrid, /area/turret_protected/ai) @@ -88964,10 +80654,59 @@ /obj/structure/lattice, /turf/simulated/wall, /area/space/nearstation) -"hNq" = ( +"hLW" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/door/airlock/maintenance{ + req_one_access_txt = "8;12" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/bluegrid, -/area/turret_protected/ai_upload) +/turf/simulated/floor/plating, +/area/maintenance/aft{ + name = "Aft Maintenance" + }) +"hNy" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "redcorner" + }, +/area/security/brig) +"hRw" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "redcorner" + }, +/area/security/brig) +"hVe" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/plasteel, +/area/quartermaster/miningdock{ + name = "\improper Mining Office" + }) "hWr" = ( /obj/structure/sign/securearea{ desc = "A warning sign which reads 'HIGH VOLTAGE'"; @@ -88976,12 +80715,19 @@ }, /turf/simulated/wall/r_wall, /area/engine/supermatter) +"hYq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "redcorner" + }, +/area/security/brig) "hYZ" = ( -/obj/machinery/atmospherics/pipe/simple/visible/universal{ +/obj/machinery/atmospherics/pipe/simple/hidden/purple{ dir = 4 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/atmos) @@ -88993,22 +80739,6 @@ }, /turf/simulated/floor/wood, /area/security/vacantoffice) -"iae" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/effect/decal/warning_stripes/southeastcorner, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/toxins/xenobiology{ - name = "\improper Secure Lab" - }) "ibi" = ( /obj/effect/spawner/window/reinforced/plasma, /obj/structure/cable/yellow{ @@ -89019,6 +80749,12 @@ /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/engine, /area/engine/engineering) "ibR" = ( @@ -89046,14 +80782,26 @@ /turf/simulated/floor/plasteel, /area/atmos) "ihM" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/surgery1) +"iip" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/fore) "iiB" = ( /obj/docking_port/stationary{ dir = 8; @@ -89065,37 +80813,134 @@ }, /turf/space, /area/space) +"ijf" = ( +/obj/structure/table/wood, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/chapel/main) +"ijt" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/construction/hallway{ + name = "\improper MiniSat Exterior" + }) +"ijy" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/plating, +/area/maintenance/fpmaint2{ + name = "Port Maintenance" + }) +"ilf" = ( +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/turf/simulated/floor/plasteel, +/area/crew_quarters/locker) +"imC" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/crew_quarters/locker) "imQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "green" }, /area/hydroponics) +"imZ" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters{ + density = 0; + dir = 2; + icon_state = "open"; + id_tag = "acute1"; + name = "Acute 1 Privacy Shutters"; + opacity = 0 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel{ + icon_state = "whitebluefull"; + tag = "icon-whitebluefull" + }, +/area/medical/exam_room) +"inj" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "neutral" + }, +/area/hallway/primary/port) "iof" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/decal/warning_stripes/south, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, /area/engine/engineering) -"izL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel, -/area/storage/primary) +"iuh" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "green" + }, +/area/hydroponics) +"ivn" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "neutralcorner" + }, +/area/crew_quarters/fitness{ + name = "\improper Recreation Area" + }) +"iyv" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/toxins/explab) "iAT" = ( /obj/machinery/atmospherics/pipe/manifold/visible/cyan{ dir = 8; - initialize_directions = 11; - level = 2 + initialize_directions = 11 }, /obj/machinery/camera{ c_tag = "Engineering Supermatter Starboard"; @@ -89112,31 +80957,34 @@ /area/maintenance/aft{ name = "Aft Maintenance" }) -"iHk" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, +"iEd" = ( /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 +/obj/machinery/atmospherics/pipe/simple/visible/purple, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/plasteel, +/area/atmos) +"iHk" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellowcorner" }, /area/hallway/primary/starboard) -"iHq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 - }, -/turf/simulated/floor/bluegrid, -/area/turret_protected/ai_upload) "iIk" = ( /obj/effect/decal/warning_stripes/east, /obj/structure/cable/yellow{ @@ -89149,28 +80997,12 @@ "iMC" = ( /obj/effect/decal/warning_stripes/west, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry{ name = "Arrivals" }) -"iNq" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/research{ - name = "Research Division" - }) "iNu" = ( /turf/simulated/floor/plasteel{ dir = 8; @@ -89181,6 +81013,22 @@ /obj/machinery/atmospherics/pipe/manifold4w/visible, /turf/simulated/floor/plasteel, /area/atmos) +"iNL" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "browncorner" + }, +/area/hallway/primary/port) +"iRu" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/plasteel, +/area/engine/break_room) "iSH" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -89192,31 +81040,42 @@ dir = 8; name = "Atmos to Loop" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/engine, /area/engine/engineering) +"iTo" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralcorner" + }, +/area/hallway/primary/starboard) "iTR" = ( /obj/effect/decal/warning_stripes/south, /obj/machinery/atmospherics/pipe/simple/visible{ - dir = 6; - level = 2 + dir = 6 }, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" }) -"iWi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/research{ - name = "Research Division" - }) +"iUs" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/plasteel, +/area/crew_quarters/courtroom) "iWv" = ( /obj/machinery/alarm{ dir = 4; @@ -89224,17 +81083,17 @@ }, /turf/simulated/floor/plasteel/dark, /area/tcommsat/server) -"iYb" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, +"iXL" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "dark" + icon_state = "floorgrime" }, -/area/chapel/main) +/area/security/permabrig) +"iZz" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/plasteel, +/area/quartermaster/storage) "iZY" = ( /obj/structure/sign/pods, /turf/simulated/wall, @@ -89245,6 +81104,19 @@ /area/maintenance/fpmaint2{ name = "Port Maintenance" }) +"jaV" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/aft{ + name = "Aft Maintenance" + }) "jbk" = ( /obj/structure/reflector/double{ anchored = 1; @@ -89254,108 +81126,186 @@ icon_state = "dark" }, /area/engine/engineering) -"jdi" = ( -/obj/effect/landmark/start{ - name = "Life Support Specialist" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel, -/area/atmos) -"jdX" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/hatch{ - name = "MiniSat Transit Tube"; - req_one_access_txt = "32;19" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/engine/break_room) -"jeK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/medical/morgue) "jeY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, /area/medical/virology) +"jgD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/medical/surgery2) "jhQ" = ( /obj/structure/cable/yellow{ d1 = 2; d2 = 8; icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/toxins/xenobiology{ name = "\improper Secure Lab" }) -"jmm" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 2 +"jlB" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whiteblue" + }, +/area/medical/medbay3) +"jrE" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/library) +"jwh" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "bluecorner" + }, +/area/hallway/primary/aft) +"jzm" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whiteblue" + }, +/area/medical/medbay3) +"jCi" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, -/area/maintenance/incinerator) -"jsQ" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/simulated/floor/plasteel/dark, -/area/tcommsat/server) +/area/crew_quarters/locker) "jCT" = ( +/obj/effect/decal/warning_stripes/north, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/decal/warning_stripes/north, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry{ name = "Arrivals" }) +"jGr" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralcorner" + }, +/area/hallway/primary/central) "jGE" = ( /obj/effect/decal/warning_stripes/southeast, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) +"jGU" = ( +/obj/structure/table/reinforced, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "bar" + }, +/area/crew_quarters/bar) +"jKJ" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/effect/landmark/start{ + name = "Security Officer" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel{ + icon_state = "red" + }, +/area/security/main) "jLP" = ( -/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel, /area/atmos) +"jNa" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "whiteblue" + }, +/area/medical/medbay3) +"jNj" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "vault" + }, +/area/turret_protected/ai) "jPv" = ( /obj/effect/decal/warning_stripes/north, /obj/structure/disposalpipe/segment{ dir = 4; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/plasteel, /area/engine/engineering) +"jQZ" = ( +/obj/structure/table/wood, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/chapel/main) "jUV" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -89371,14 +81321,36 @@ "kez" = ( /turf/simulated/wall/r_wall, /area/engine/supermatter) -"kkt" = ( -/obj/effect/spawner/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 4; - level = 2 +"keY" = ( +/obj/effect/landmark/start{ + name = "Cook" }, -/turf/simulated/floor/plating, -/area/atmos) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" + }, +/area/crew_quarters/kitchen) +"kfI" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel, +/area/quartermaster/storage) +"kgV" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/bluegrid, +/area/turret_protected/ai) "kmF" = ( /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, @@ -89396,30 +81368,44 @@ /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/engine, /area/engine/engineering) -"koz" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +"kry" = ( +/obj/structure/chair/stool{ + pixel_y = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 + dir = 4 }, /turf/simulated/floor/wood, -/area/security/vacantoffice) -"ksa" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, +/area/crew_quarters/bar) +"krK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 + dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/crew_quarters/courtroom) +"ksa" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" }, /area/hallway/primary/port) +"ksz" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/maintenance/fpmaint2{ + name = "Port Maintenance" + }) "kto" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/visible/green{ @@ -89436,18 +81422,12 @@ }, /turf/space, /area/space/nearstation) -"ktI" = ( +"ktX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 + dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "green" - }, -/area/hydroponics) +/turf/simulated/floor/carpet, +/area/chapel/main) "kuf" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -89458,30 +81438,77 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/hallway/primary/central) -"kwJ" = ( -/obj/machinery/message_server, -/turf/simulated/floor/bluegrid, -/area/tcommsat/server) -"kxc" = ( +"kvG" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/turf/simulated/floor/bluegrid, -/area/assembly/chargebay) -"kxf" = ( +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "cafeteria"; + tag = "icon-cafeteria (NORTHEAST)" + }, +/area/crew_quarters/hor) +"kwD" = ( +/obj/machinery/door/poddoor{ + density = 0; + icon_state = "open"; + id_tag = "Biohazard_medi"; + name = "Quarantine Lockdown"; + opacity = 0 + }, +/obj/machinery/door/airlock/maintenance{ + name = "Surgery Maintenance"; + req_access_txt = "45" + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 +/turf/simulated/floor/plating, +/area/medical/surgeryobs) +"kwJ" = ( +/obj/machinery/message_server, +/turf/simulated/floor/bluegrid, +/area/tcommsat/server) +"kxf" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 }, /obj/effect/decal/warning_stripes/northwestcorner, /obj/effect/decal/warning_stripes/southeastcorner, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/engine/engineering) +"kzH" = ( +/obj/machinery/door/firedoor, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whiteblue" + }, +/area/medical/cryo) "kBa" = ( /obj/machinery/atmospherics/binary/pump/on{ name = "Gas to Cooling Loop" @@ -89495,6 +81522,12 @@ /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/engine, /area/engine/engineering) "kBq" = ( @@ -89512,10 +81545,7 @@ /obj/machinery/door/airlock/public/glass{ name = "Primary Tool Storage" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "brown" }, /area/storage/primary) @@ -89532,24 +81562,36 @@ }, /turf/simulated/floor/plating, /area/engine/supermatter) -"kHS" = ( -/obj/structure/chair/office/dark{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +"kIc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/wood, -/area/library) +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/medical/reception) "kKa" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 5; - icon_state = "intact"; tag = "icon-intact (NORTHEAST)" }, /obj/structure/lattice, /turf/space, /area/space/nearstation) +"kKz" = ( +/obj/machinery/computer/cryopod{ + pixel_y = -25 + }, +/obj/effect/landmark{ + name = "JoinLateCryo" + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/crew_quarters/sleep) "kLs" = ( /obj/machinery/atmospherics/unary/portables_connector{ layer = 2 @@ -89558,17 +81600,16 @@ icon_state = "dark" }, /area/engine/engineering) -"kNc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 +"kNr" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "dark" + icon_state = "white" }, -/area/engine/gravitygenerator) +/area/toxins/xenobiology{ + name = "\improper Secure Lab" + }) "kNJ" = ( /turf/simulated/floor/plasteel{ dir = 1; @@ -89582,11 +81623,11 @@ /obj/machinery/power/rad_collector{ anchored = 1 }, -/obj/machinery/atmospherics/pipe/manifold/visible/scrubbers, /obj/structure/cable{ d2 = 2; icon_state = "0-2" }, +/obj/machinery/atmospherics/pipe/manifold/visible/scrubbers, /turf/simulated/floor/engine, /area/engine/supermatter) "kSC" = ( @@ -89617,6 +81658,50 @@ icon_state = "dark" }, /area/engine/supermatter) +"kWi" = ( +/obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/entry{ + name = "Arrivals" + }) +"kXs" = ( +/obj/structure/chair, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/construction/hallway{ + name = "\improper MiniSat Exterior" + }) +"kZl" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/carpet, +/area/crew_quarters/theatre) +"law" = ( +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/crew_quarters/sleep) "lcc" = ( /obj/machinery/atmospherics/pipe/manifold4w/visible, /turf/simulated/floor/plasteel{ @@ -89636,14 +81721,36 @@ /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/engine, /area/engine/engineering) -"lfz" = ( -/obj/effect/decal/warning_stripes/west, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 +"leu" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/turf/simulated/floor/plasteel, -/area/toxins/storage) +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "neutralcorner" + }, +/area/crew_quarters/locker) +"lfV" = ( +/obj/structure/chair/stool/bar, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "bar" + }, +/area/crew_quarters/bar) +"lgr" = ( +/obj/effect/spawner/window/reinforced, +/obj/machinery/door/poddoor{ + density = 0; + icon_state = "open"; + id_tag = "telelab"; + name = "test chamber blast door"; + opacity = 0 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plating, +/area/toxins/explab) "lgv" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -89653,24 +81760,28 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel, -/area/security/brig) -"lhK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/plasteel{ - icon_state = "redfull" +/turf/simulated/floor/plasteel, +/area/security/brig) +"lid" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 }, -/area/security/main) +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/plasteel, +/area/quartermaster/storage) +"ljZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "lmi" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/simple/visible/yellow{ @@ -89678,37 +81789,77 @@ }, /turf/space, /area/space/nearstation) -"lpU" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 2 +"lpc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "green" + }, +/area/hydroponics) +"lpU" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red, /obj/effect/decal/warning_stripes/southeast, /turf/simulated/floor/engine, /area/engine/engineering) -"lwo" = ( -/obj/effect/decal/warning_stripes/east, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +"lwN" = ( +/obj/effect/spawner/lootdrop{ + loot = list(/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes); + name = "maint grille or trash spawner" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plating, +/area/maintenance/fpmaint2{ + name = "Port Maintenance" + }) +"lBy" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /turf/simulated/floor/plasteel, -/area/engine/engineering) +/area/quartermaster/storage) "lCt" = ( /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 10 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/construction/hallway{ name = "\improper MiniSat Exterior" }) +"lDa" = ( +/obj/effect/spawner/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plating, +/area/crew_quarters/locker) +"lDm" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/plasteel, +/area/hallway/primary/central) +"lFH" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "bar" + }, +/area/crew_quarters/bar) "lFT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, /turf/simulated/floor/engine, /area/toxins/explab) @@ -89718,10 +81869,12 @@ d2 = 8; icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 4 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, /turf/simulated/floor/plating, /area/engine/engineering) "lGr" = ( @@ -89735,6 +81888,14 @@ }, /turf/simulated/floor/engine, /area/engine/supermatter) +"lHZ" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralcorner" + }, +/area/hallway/primary/aft) "lIR" = ( /turf/simulated/floor/plasteel{ dir = 4; @@ -89746,10 +81907,10 @@ /obj/machinery/power/rad_collector{ anchored = 1 }, +/obj/structure/cable, /obj/machinery/atmospherics/pipe/manifold/visible/supply{ dir = 1 }, -/obj/structure/cable, /turf/simulated/floor/engine, /area/engine/supermatter) "lOU" = ( @@ -89758,51 +81919,57 @@ /turf/simulated/floor/engine, /area/engine/engineering) "lPA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry{ name = "Arrivals" }) -"lUY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/exit{ - name = "\improper Departure Lounge" - }) -"lWo" = ( +"lSh" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/tinted{ + dir = 5; + max_integrity = 120; + reinf = 0 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 + dir = 4 }, -/turf/simulated/floor/plasteel, -/area/security/brig) -"lYf" = ( +/turf/simulated/floor/plating, +/area/hallway/secondary/construction{ + name = "\improper Garden" + }) +"lUc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "bar" + }, +/area/crew_quarters/bar) +"lUv" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +/turf/simulated/floor/carpet, +/area/chapel/main) +"lWo" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/area/turret_protected/ai) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/security/brig) "mcn" = ( /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/starboard) "mcP" = ( @@ -89810,9 +81977,6 @@ dir = 8 }, /obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /turf/space, /area/construction/hallway{ name = "\improper MiniSat Exterior" @@ -89836,21 +82000,45 @@ id_tag = "sol_outer"; locked = 1; name = "Arrivals External Access"; - req_access = null; - req_access_txt = "0" + req_access = null }, /obj/machinery/access_button{ command = "cycle_exterior"; frequency = 1379; - layer = 3.3; master_tag = "sol_airlock"; name = "exterior access button"; pixel_x = -13; - pixel_y = -23; - req_access_txt = "0" + pixel_y = -23 }, /turf/simulated/floor/plating, /area/hallway/secondary/entry) +"mfz" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/medical/surgery1) +"mhq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "bar" + }, +/area/crew_quarters/bar) +"mhx" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "greenfull" + }, +/area/hallway/primary/central) "miB" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -89862,8 +82050,28 @@ dir = 5; tag = "icon-intact-y (NORTHWEST)" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/engine, /area/engine/engineering) +"mmk" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/plasteel, +/area/hallway/primary/central) "moi" = ( /obj/machinery/atmospherics/trinary/filter/flipped{ dir = 1; @@ -89885,21 +82093,28 @@ req_access_txt = "13;75" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/construction/hallway{ name = "\improper MiniSat Exterior" }) -"mpt" = ( +"msg" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 + dir = 9 }, /turf/simulated/floor/plasteel{ - icon_state = "white" + icon_state = "dark" }, -/area/medical/research{ - name = "Research Division" +/area/security/podbay) +"myY" = ( +/obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/entry{ + name = "Arrivals" }) "mzf" = ( /obj/structure/window/plasmareinforced{ @@ -89908,16 +82123,26 @@ /obj/machinery/power/rad_collector{ anchored = 1 }, -/obj/machinery/atmospherics/pipe/manifold/visible/scrubbers{ - dir = 8; - initialize_directions = 11 - }, /obj/structure/cable{ d2 = 2; icon_state = "0-2" }, +/obj/machinery/atmospherics/pipe/manifold/visible/scrubbers{ + dir = 8 + }, /turf/simulated/floor/engine, /area/engine/supermatter) +"mAa" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/bridge) "mAt" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -89930,15 +82155,37 @@ tag = "icon-cafeteria (NORTHEAST)" }, /area/crew_quarters/kitchen) +"mDj" = ( +/obj/structure/chair/stool{ + pixel_y = 8 + }, +/obj/effect/landmark/start{ + name = "Station Engineer" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel, +/area/engine/break_room) +"mFx" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitebluecorner" + }, +/area/medical/medbay3) "mGz" = ( /obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes/northeastcorner, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) @@ -89948,16 +82195,57 @@ d2 = 4; icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/toxins/xenobiology{ name = "\improper Secure Lab" }) -"mVG" = ( +"mKy" = ( +/turf/simulated/floor/plasteel{ + icon_state = "neutralcorner" + }, +/area/crew_quarters/fitness{ + name = "\improper Recreation Area" + }) +"mOc" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel, +/area/hallway/primary/central) +"mQu" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "green" + }, +/area/hydroponics) +"mRP" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitebluecorner" + }, +/area/medical/medbay3) +"mVG" = ( /obj/structure/cable{ d1 = 4; d2 = 8; @@ -89974,7 +82262,16 @@ }, /turf/simulated/floor/engine, /area/engine/engineering) +"mVW" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/plasteel, +/area/hallway/primary/central) "mWL" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -89985,6 +82282,17 @@ "mXy" = ( /turf/simulated/floor/mineral/titanium, /area/shuttle/arrival/station) +"mZH" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/crew_quarters/courtroom) "mZJ" = ( /obj/structure/reflector/single{ anchored = 1; @@ -89992,70 +82300,73 @@ }, /turf/simulated/floor/plating, /area/engine/engineering) -"naP" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 - }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/engine, -/area/engine/engineering) -"nbq" = ( +"naY" = ( /obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 1; + icon_state = "whitegreen" }, -/area/hallway/primary/fore) -"nbt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/area/medical/virology) +"nbG" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/turf/simulated/floor/plasteel, -/area/atmos) +/obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/maintenance/fpmaint2{ + name = "Port Maintenance" + }) "nbO" = ( /obj/effect/spawner/airlock/s_to_n, /turf/simulated/wall, /area/construction) +"nej" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/exit{ + name = "\improper Departure Lounge" + }) "neT" = ( /obj/effect/decal/warning_stripes/southwest, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) -"nhZ" = ( +"nhK" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/turf/simulated/floor/plasteel{ + icon_state = "purplefull" + }, +/area/hallway/primary/aft) +"nhP" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "neutralcorner" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/area/crew_quarters/sleep) +/turf/simulated/floor/carpet, +/area/crew_quarters/theatre) "nig" = ( /obj/effect/decal/warning_stripes/south, /obj/structure/disposalpipe/segment{ @@ -90063,17 +82374,31 @@ }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) -"npj" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - external_pressure_bound = 101.325; - on = 1; - pressure_checks = 1 +"niH" = ( +/obj/machinery/door/firedoor, +/obj/effect/decal/warning_stripes/west, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/entry{ + name = "Arrivals" + }) +"njo" = ( +/obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel, +/area/hydroponics) +"nnI" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/turf/simulated/floor/plasteel{ - icon_state = "redfull" +/obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, -/area/security/main) +/turf/simulated/floor/plasteel, +/area/engine/gravitygenerator) "nqA" = ( /obj/machinery/hologram/holopad, /obj/machinery/atmospherics/pipe/simple/visible{ @@ -90086,66 +82411,56 @@ dir = 4; name = "Cooling Loop Bypass" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/northwestcorner, /turf/simulated/floor/engine, /area/engine/engineering) -"ntG" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +"nuB" = ( +/obj/effect/spawner/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/mrchangs) +"nvN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/bluegrid, +/area/turret_protected/ai) +"nxh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/turf/simulated/floor/plasteel{ - icon_state = "white" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 }, -/area/toxins/xenobiology{ - name = "\improper Secure Lab" - }) -"nwx" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" +/turf/simulated/floor/plasteel, +/area/hallway/secondary/exit{ + name = "\improper Departure Lounge" }) +"nza" = ( +/obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/plasteel, +/area/hallway/primary/central) "nzK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/assembly/robotics) -"nEe" = ( -/obj/structure/window/reinforced{ +"nzX" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 4 }, -/obj/structure/window/reinforced{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/turf/simulated/floor/plasteel, +/area/atmos) "nEQ" = ( /obj/machinery/atmospherics/binary/pump/on{ dir = 1; @@ -90160,8 +82475,24 @@ /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/engine, /area/engine/engineering) +"nHB" = ( +/obj/machinery/conveyor{ + dir = 4; + id = "packageSort2" + }, +/obj/effect/spawner/lootdrop/maintenance, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plating, +/area/quartermaster/office) "nIZ" = ( /obj/docking_port/stationary{ dir = 8; @@ -90174,34 +82505,16 @@ /turf/space, /area/space) "nKy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6; - level = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/ntrep) -"nKW" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/turf/space, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) -"nLj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +"nLH" = ( +/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/crew_quarters/courtroom) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel, +/area/quartermaster/storage) "nMx" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/visible/yellow{ @@ -90213,6 +82526,13 @@ "nMC" = ( /turf/simulated/wall/r_wall, /area/storage/secure) +"nPe" = ( +/turf/simulated/floor/plasteel{ + icon_state = "darkbluecorners" + }, +/area/turret_protected/aisat_interior{ + name = "\improper MiniSat Central Foyer" + }) "nRh" = ( /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -90227,18 +82547,21 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1; - level = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 - }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/security/brig) -"nVz" = ( +"nVg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/medical/reception) +"nVz" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -90247,21 +82570,41 @@ /area/crew_quarters/locker/locker_toilet{ name = "\improper Restrooms" }) -"obL" = ( -/obj/effect/decal/warning_stripes/west, +"nXf" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/bluegrid, +/area/assembly/chargebay) +"nYP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 + dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/quartermaster/storage) +"odF" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "white" + icon_state = "bcarpet05" }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/blueshield) "odO" = ( /obj/machinery/blackbox_recorder, /turf/simulated/floor/bluegrid, /area/tcommsat/server) +"oeP" = ( +/obj/item/paper_bin{ + pixel_x = -2; + pixel_y = 6 + }, +/obj/structure/table/wood, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/carpet, +/area/security/vacantoffice) "ofz" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -90277,8 +82620,7 @@ "ogE" = ( /obj/machinery/door/airlock/engineering/glass{ name = "Supermatter Engine Room"; - req_access_txt = "10"; - req_one_access_txt = "0" + req_access_txt = "10" }, /obj/structure/cable/yellow{ d1 = 1; @@ -90290,14 +82632,6 @@ }, /turf/simulated/floor/engine, /area/engine/engineering) -"ogV" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/bridge) "oiv" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ @@ -90305,7 +82639,12 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -90320,99 +82659,81 @@ /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/engine, /area/engine/engineering) -"okl" = ( -/obj/effect/landmark/start{ - name = "Cook" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "cafeteria" - }, -/area/crew_quarters/kitchen) "onG" = ( /obj/effect/spawner/window/reinforced, /obj/effect/spawner/airlock/s_to_n, /turf/simulated/floor/plating, /area/maintenance/auxsolarport) -"oqV" = ( +"orm" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/bridge) -"oym" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "purplecorner" - }, -/area/hallway/primary/aft) -"oBY" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "green" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/area/hydroponics) -"oGg" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "neutralcorner" + }, +/area/crew_quarters/locker) +"oxC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11; - level = 1 + dir = 8 }, -/turf/simulated/floor/plasteel, -/area/quartermaster/storage) -"oJA" = ( +/turf/simulated/floor/plasteel{ + icon_state = "floorgrime" + }, +/area/security/permabrig) +"oCE" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/turf/simulated/floor/engine, +/area/engine/engineering) +"oJQ" = ( /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel, -/area/hallway/primary/aft) -"oMK" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/plating, -/area/maintenance/starboard) +/area/hallway/primary/central) "oOs" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/engine, /area/engine/engineering) -"oOT" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 +"oQz" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/turf/simulated/floor/plasteel/dark, -/area/tcommsat/server) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralcorner" + }, +/area/crew_quarters/sleep) "oRr" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -90427,18 +82748,34 @@ /obj/structure/sign/fire, /turf/simulated/wall/r_wall, /area/engine/supermatter) -"oUC" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +"oUk" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/medical/chemistry) +"oVK" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/crew_quarters/courtroom) +"oVM" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, -/area/hallway/primary/aft) +/area/crew_quarters/fitness{ + name = "\improper Recreation Area" + }) "oWm" = ( /obj/structure/cable/yellow{ d1 = 2; @@ -90447,6 +82784,15 @@ }, /turf/simulated/floor/plating, /area/engine/engineering) +"oWL" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "neutralcorner" + }, +/area/hallway/primary/central) "pad" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -90469,12 +82815,21 @@ pixel_x = -25; req_access_txt = "55" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/toxins/xenobiology{ name = "\improper Secure Lab" }) +"paZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/turf/simulated/floor/plasteel, +/area/crew_quarters/locker) "pcW" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -90482,35 +82837,22 @@ icon_state = "4-8" }, /obj/effect/decal/warning_stripes/southwest, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/engine, /area/engine/engineering) -"pdC" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel, -/area/hallway/primary/aft) -"pdV" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +"pef" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ - icon_state = "white" + icon_state = "red" }, -/area/medical/research{ - name = "Research Division" - }) +/area/security/processing) "peo" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/visible/yellow, @@ -90520,6 +82862,19 @@ /obj/effect/spawner/airlock/s_to_n, /turf/simulated/wall, /area/maintenance/starboard) +"pes" = ( +/obj/structure/barricade/wooden, +/obj/structure/girder, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/aft{ + name = "Aft Maintenance" + }) "peO" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow, /obj/machinery/atmospherics/binary/pump{ @@ -90528,6 +82883,12 @@ }, /turf/simulated/floor/plasteel, /area/atmos) +"pjn" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/engine/gravitygenerator) "pkf" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -90540,16 +82901,25 @@ /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, /area/assembly/robotics) -"pkJ" = ( -/obj/effect/decal/warning_stripes/north, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 +"pkq" = ( +/obj/structure/chair{ + dir = 1 }, -/turf/simulated/floor/plasteel, -/area/toxins/mixing{ - name = "\improper Toxins Lab" +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/construction/hallway{ + name = "\improper MiniSat Exterior" }) +"pkX" = ( +/obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "brown" + }, +/area/hallway/primary/port) "plu" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 6 @@ -90559,24 +82929,54 @@ }, /area/engine/engineering) "pmh" = ( -/obj/machinery/atmospherics/pipe/manifold/visible{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/visible, /obj/machinery/meter, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/engine/engineering) -"poN" = ( +"poJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/security/podbay) +"ppw" = ( +/mob/living/carbon/human/monkey, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/plasteel{ + icon_state = "freezerfloor" + }, +/area/medical/virology) "ptc" = ( /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whiteblue" }, /area/medical/paramedic) +"ptn" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/medical/research{ + name = "Research Division" + }) "pue" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -90588,11 +82988,23 @@ /area/hallway/secondary/exit{ name = "\improper Departure Lounge" }) +"pvu" = ( +/obj/effect/spawner/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/storage/primary) "pvv" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan, /obj/effect/decal/warning_stripes/southwest, /turf/simulated/floor/engine, /area/engine/engineering) +"pyX" = ( +/obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel, +/area/hallway/primary/central) "pzX" = ( /obj/effect/decal/warning_stripes/south, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -90603,25 +83015,45 @@ }, /turf/simulated/floor/plasteel, /area/assembly/robotics) -"pDi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 +"pAj" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "purplecorner" + dir = 4; + icon_state = "whiteblue" }, -/area/hallway/primary/aft) -"pFi" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ +/area/medical/medbay3) +"pAk" = ( +/obj/machinery/smartfridge/medbay, +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel, -/area/atmos) -"pJV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/medical/chemistry) +"pAO" = ( +/obj/structure/chair{ + dir = 1 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/crew_quarters/courtroom) +"pHQ" = ( +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/plating, +/area/maintenance/fpmaint2{ + name = "Port Maintenance" + }) +"pJV" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel, /area/security/armoury) "pKs" = ( @@ -90630,25 +83062,56 @@ }, /turf/simulated/floor/plating, /area/engine/engineering) +"pKv" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/plasteel, +/area/crew_quarters/fitness{ + name = "\improper Recreation Area" + }) "pMx" = ( /obj/effect/spawner/airlock/w_to_e, /turf/simulated/wall, /area/maintenance/aft{ name = "Aft Maintenance" }) +"pMS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "purple" + }, +/area/hallway/primary/aft) "pNG" = ( /obj/machinery/atmospherics/pipe/simple/visible, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/engine/engineering) +"pNK" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "floorgrime" + }, +/area/quartermaster/sorting{ + name = "\improper Warehouse" + }) "pOV" = ( /obj/effect/decal/warning_stripes/south, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry{ @@ -90670,15 +83133,18 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/east, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/aft{ name = "Aft Maintenance" @@ -90695,32 +83161,80 @@ icon_state = "vault" }, /area/engine/mechanic_workshop) -"pUc" = ( -/obj/machinery/atmospherics/pipe/simple/heat_exchanging, -/obj/structure/lattice, -/turf/space, -/area/space/nearstation) -"pUq" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ - dir = 8; - initialize_directions = 11; - level = 2 +"pSL" = ( +/obj/effect/decal/warning_stripes/northwestcorner, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/engine, -/area/engine/engineering) -"pXI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/entry{ + name = "Arrivals" + }) +"pTP" = ( /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/wood, +/area/lawoffice) +"pUc" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging, +/obj/structure/lattice, +/turf/space, +/area/space/nearstation) +"pUh" = ( +/obj/structure/morgue{ + dir = 8; + tag = "icon-morgue1 (WEST)" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/medical/morgue) +"pUq" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ + dir = 8; + initialize_directions = 11 + }, +/obj/effect/decal/warning_stripes/west, +/turf/simulated/floor/engine, +/area/engine/engineering) +"pXV" = ( +/obj/effect/spawner/window/reinforced, +/obj/machinery/door/poddoor{ + density = 0; + icon_state = "open"; + id_tag = "lawyer_blast"; + name = "privacy shutters"; + opacity = 0 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel, -/area/hallway/primary/aft) +/turf/simulated/floor/plating, +/area/lawoffice) +"qaB" = ( +/obj/effect/spawner/window/reinforced, +/obj/machinery/door/poddoor{ + density = 0; + icon_state = "open"; + id_tag = "telelab"; + name = "test chamber blast door"; + opacity = 0 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/toxins/explab) "qaM" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -90736,33 +83250,54 @@ /area/maintenance/aft{ name = "Aft Maintenance" }) +"qbE" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/construction/hallway{ + name = "\improper MiniSat Exterior" + }) "qcE" = ( /obj/machinery/atmospherics/pipe/simple/visible, /turf/simulated/floor/plating, /area/construction) -"qcX" = ( +"qee" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, -/area/medical/research{ - name = "Research Division" - }) -"qhv" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 +/area/medical/medbay3) +"qeW" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/turf/simulated/floor/plasteel, -/area/atmos) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/turf/simulated/floor/plasteel{ + icon_state = "neutralcorner" + }, +/area/hallway/primary/starboard) "qhx" = ( /obj/effect/spawner/airlock/w_to_e, /turf/simulated/wall/r_wall, @@ -90772,46 +83307,76 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/security/brig) +"qlH" = ( +/obj/effect/spawner/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plating, +/area/storage/primary) +"qnt" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/medical/research{ + name = "Research Division" + }) +"qob" = ( +/obj/structure/closet/emcloset, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/plating, +/area/maintenance/fpmaint2{ + name = "Port Maintenance" + }) "qpO" = ( /turf/simulated/wall, /area/engine/equipmentstorage) -"qsd" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/decal/warning_stripes/north, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, +"qts" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 + dir = 9 }, -/turf/simulated/floor/plasteel, -/area/assembly/robotics) +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "neutral" + }, +/area/hallway/secondary/construction{ + name = "\improper Garden" + }) "qtt" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 5; - icon_state = "intact"; tag = "icon-intact (NORTHEAST)" }, /obj/structure/lattice, /obj/structure/lattice/catwalk, /turf/space, /area/space/nearstation) -"qtw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/turf/simulated/floor/plasteel{ +"qwd" = ( +/obj/effect/spawner/window/reinforced, +/obj/machinery/door/poddoor/shutters{ + density = 0; dir = 2; - icon_state = "neutralcorner" + icon_state = "open"; + id_tag = "surgeryobs1"; + name = "Privacy Shutters"; + opacity = 0 }, -/area/hallway/primary/aft) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/medical/surgery2) "qxn" = ( /obj/machinery/alarm{ dir = 1; @@ -90820,22 +83385,16 @@ /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/engine/engineering) -"qAm" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/turf/space, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) "qAG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -90847,17 +83406,6 @@ /area/crew_quarters/fitness{ name = "\improper Recreation Area" }) -"qBH" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/library) "qBP" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -90867,31 +83415,14 @@ /obj/effect/landmark{ name = "lightsout" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/hallway/primary/central) -"qCG" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutralcorner" - }, -/area/hallway/primary/central) "qFg" = ( /obj/machinery/space_heater, /obj/machinery/power/apc{ cell_type = 5000; - dir = 2; name = "Aft Maintenance APC"; pixel_y = -24 }, @@ -90900,14 +83431,13 @@ /area/maintenance/aft{ name = "Aft Maintenance" }) -"qHr" = ( -/obj/effect/decal/warning_stripes/south, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 +"qHi" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 }, -/turf/simulated/floor/plating, -/area/toxins/misc_lab{ - name = "\improper Research Testing Range" +/turf/simulated/floor/plasteel, +/area/quartermaster/miningdock{ + name = "\improper Mining Office" }) "qHS" = ( /obj/structure/disposalpipe/trunk{ @@ -90922,6 +83452,33 @@ icon_state = "yellowcorner" }, /area/engine/break_room) +"qIg" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "cautioncorner" + }, +/area/hallway/primary/starboard) +"qME" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "red" + }, +/area/security/main) "qQy" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -90932,34 +83489,55 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/starboard) -"qWn" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 2 +"qSf" = ( +/obj/structure/window/reinforced{ + dir = 1 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "darkbluecorners" + }, +/area/construction/hallway{ + name = "\improper MiniSat Exterior" + }) +"qTK" = ( +/obj/structure/chair/stool{ + pixel_y = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/crew_quarters/sleep) +"qWn" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/engine, /area/engine/engineering) -"qYF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - level = 1 +"qWM" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/bluegrid, -/area/turret_protected/ai_upload) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/crew_quarters/fitness{ + name = "\improper Recreation Area" + }) "raV" = ( /obj/structure/cable/yellow{ d1 = 1; d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, /turf/simulated/floor/plating, /area/engine/engineering) "rdz" = ( @@ -90980,10 +83558,27 @@ /area/hallway/secondary/entry{ name = "Arrivals" }) +"rfg" = ( +/obj/structure/chair/stool/bar, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "bar" + }, +/area/crew_quarters/bar) "riM" = ( /obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plasteel, /area/engine/equipmentstorage) +"rjj" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "redcorner" + }, +/area/security/permabrig) "rjU" = ( /obj/structure/window/reinforced{ dir = 1; @@ -90993,6 +83588,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -91000,15 +83598,8 @@ name = "\improper MiniSat Exterior" }) "rlJ" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ - level = 2 - }, -/obj/machinery/light{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/manifold/visible/cyan, +/obj/machinery/light, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -91017,6 +83608,22 @@ /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/engine, /area/engine/engineering) +"rmz" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "arrival" + }, +/area/hallway/secondary/entry{ + name = "Arrivals" + }) "rpg" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -91026,24 +83633,20 @@ }, /turf/space, /area/solar/starboard) -"rrO" = ( -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; - id_tag = "transittube"; - name = "Transit Tube Blast Door"; - opacity = 0 - }, -/obj/effect/decal/warning_stripes/yellow, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 - }, +"rqY" = ( +/obj/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/plasteel, -/area/engine/break_room) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/construction/hallway{ + name = "\improper MiniSat Exterior" + }) "rsT" = ( /obj/machinery/atmospherics/binary/pump{ name = "Mix to Gas" @@ -91054,27 +83657,75 @@ icon_state = "4-8" }, /obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/engine, /area/engine/engineering) +"rvu" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/fpmaint2{ + name = "Port Maintenance" + }) "rwh" = ( /obj/machinery/power/supermatter_crystal/engine, /turf/simulated/floor/engine, /area/engine/supermatter) "rxV" = ( +/obj/machinery/atmospherics/pipe/simple/visible/purple{ + dir = 5 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/visible/purple{ - dir = 5 - }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/atmos) +"ryN" = ( +/obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/turf/simulated/floor/plasteel, +/area/assembly/robotics) +"rzT" = ( +/obj/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/construction/hallway{ + name = "\improper MiniSat Exterior" + }) +"rDe" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/carpet/arcade, +/area/crew_quarters/fitness{ + name = "\improper Arcade" + }) "rDg" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -91085,6 +83736,12 @@ dir = 1; on = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -91103,18 +83760,30 @@ /turf/space, /area/space) "rDF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellow" }, /area/engine/break_room) +"rDS" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel{ + icon_state = "neutralcorner" + }, +/area/security/brig) "rEw" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -91126,25 +83795,54 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) -"rHe" = ( +"rFa" = ( +/obj/effect/spawner/window/reinforced/plasma, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/engine, +/area/engine/engineering) +"rGT" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 + dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 + dir = 10 }, -/turf/simulated/floor/plasteel, -/area/security/brig) +/turf/simulated/floor/plating, +/area/maintenance/fpmaint2{ + name = "Port Maintenance" + }) +"rHl" = ( +/obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/maintenance/aft{ + name = "Aft Maintenance" + }) "rIq" = ( /obj/structure/table, /obj/item/clothing/mask/breath{ @@ -91155,6 +83853,17 @@ }, /turf/simulated/floor/plating, /area/maintenance/starboard) +"rID" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/construction) +"rJk" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel{ + icon_state = "whiteblue" + }, +/area/medical/exam_room) "rJJ" = ( /obj/machinery/door/airlock/titanium{ name = "Arrivals Shuttle Airlock" @@ -91168,6 +83877,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -91178,14 +83890,6 @@ /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, /area/engine/equipmentstorage) -"rOw" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/medical/morgue) "rOZ" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -91195,18 +83899,23 @@ }, /turf/space, /area/solar/starboard) -"rPA" = ( +"rPb" = ( +/obj/machinery/door/poddoor{ + density = 0; + icon_state = "open"; + id_tag = "transittube"; + name = "Transit Tube Blast Door"; + opacity = 0 + }, +/obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 + dir = 4 }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutralcorner" - }, -/area/hallway/primary/port) +/turf/simulated/floor/plasteel, +/area/engine/break_room) "rRM" = ( /obj/effect/spawner/window/reinforced/plasma, /obj/structure/cable/yellow{ @@ -91214,6 +83923,9 @@ d2 = 8; icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -91231,6 +83943,25 @@ }, /turf/space, /area/space) +"rUJ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/carpet, +/area/chapel/main) +"rVv" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "neutralcorner" + }, +/area/hallway/primary/central) "rYj" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 9 @@ -91246,52 +83977,68 @@ /obj/structure/lattice/catwalk, /turf/space, /area/space/nearstation) +"rZk" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/medical/research{ + name = "Research Division" + }) "say" = ( /obj/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/construction/hallway{ name = "\improper MiniSat Exterior" }) -"sdQ" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 +"saH" = ( +/obj/effect/landmark/start{ + name = "Botanist" }, -/turf/simulated/floor/plasteel{ - icon_state = "floorgrime" - }, -/area/maintenance/incinerator) -"sfr" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/starboard) -"siL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 8; - icon_state = "bluecorner" + icon_state = "green" }, -/area/hallway/primary/aft) +/area/hydroponics) +"sbG" = ( +/obj/machinery/hydroponics/soil, +/obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/construction{ + name = "\improper Garden" + }) +"sjx" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/crew_quarters/courtroom) "sjF" = ( /obj/structure/window/reinforced{ dir = 1 @@ -91305,125 +84052,177 @@ icon_state = "dark" }, /area/space/nearstation) -"skc" = ( +"soT" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 + dir = 1 }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) +"spg" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" + icon_state = "showroomfloor" + }, +/area/security/main) +"spj" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/area/medical/research{ - name = "Research Division" - }) -"ssZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/turf/simulated/floor/plasteel, +/area/crew_quarters/locker) +"spv" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/carpet, +/area/library) +"ssZ" = ( /obj/structure/cable/yellow{ d1 = 1; d2 = 8; icon_state = "1-8" }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plating, /area/engine/engineering) +"svF" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/aft{ + name = "Aft Maintenance" + }) +"svR" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/carpet, +/area/library) "swl" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/plating, /area/engine/engineering) -"szt" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - external_pressure_bound = 0; - frequency = 1441; - id_tag = "tox_out"; - initialize_directions = 1; - internal_pressure_bound = 4000; - on = 1; - pressure_checks = 2; - pump_direction = 0 - }, -/turf/simulated/floor/wood, -/area/security/vacantoffice) +"sxA" = ( +/obj/effect/spawner/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/security/brig) "sBY" = ( /turf/simulated/floor/plating, /area/storage/secure) "sDC" = ( /obj/docking_port/stationary/whiteship{ dir = 8; - icon_state = "pinonfar"; id = "whiteship_cerebron"; name = "North of Cerebron" }, /turf/space, /area/space) -"sEe" = ( +"sFz" = ( +/obj/effect/spawner/window/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/turf/simulated/floor/plating, +/area/engine/mechanic_workshop) +"sHl" = ( +/obj/structure/chair/comfy/black{ + dir = 4 + }, +/turf/simulated/floor/carpet, +/area/security/vacantoffice) +"sJe" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/medical/morgue) -"sGi" = ( +/area/construction/hallway{ + name = "\improper MiniSat Exterior" + }) +"sLs" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/bridge) +"sLS" = ( /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/bluegrid, -/area/turret_protected/ai_upload) -"sJe" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 9 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) -"sJj" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) -"sQp" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "cafeteria"; + tag = "icon-cafeteria (NORTHEAST)" + }, +/area/crew_quarters/kitchen) +"sOB" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "redcorner" + }, +/area/security/brig) +"sOJ" = ( +/obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "neutralcorner" + icon_state = "white" }, -/area/hallway/primary/central) +/area/toxins/xenobiology{ + name = "\improper Secure Lab" + }) "sRB" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 10 @@ -91432,53 +84231,71 @@ /area/maintenance/aft{ name = "Aft Maintenance" }) -"tay" = ( +"sVC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/atmos) +"sYp" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/crew_quarters/courtroom) +"tbK" = ( +/obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/plasteel, +/area/engine/equipmentstorage) +"tca" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/quartermaster/storage) +"teE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/bridge) +"teW" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/carpet, +/area/library) +"tfV" = ( /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 - }, -/turf/simulated/floor/plasteel, -/area/security/brig) -"tbK" = ( -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel, -/area/engine/equipmentstorage) -"tca" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 - }, -/turf/simulated/floor/plasteel, -/area/quartermaster/storage) -"tdP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/quartermaster/storage) -"teY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/chapel/main) +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plating, +/area/maintenance/aft{ + name = "Aft Maintenance" + }) "tgE" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 10 @@ -91486,14 +84303,25 @@ /obj/structure/lattice, /turf/space, /area/space/nearstation) -"thz" = ( -/obj/effect/decal/warning_stripes/north, +"thC" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/carpet, +/area/crew_quarters/heads) +"tjR" = ( +/obj/effect/decal/warning_stripes/northwestcorner, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/plasteel, -/area/toxins/mixing{ - name = "\improper Toxins Lab" +/area/hallway/secondary/entry{ + name = "Arrivals" }) "tlh" = ( /obj/machinery/atmospherics/pipe/simple/visible{ @@ -91505,6 +84333,9 @@ /obj/machinery/firealarm{ pixel_y = 29 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, @@ -91516,9 +84347,6 @@ /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -91533,9 +84361,8 @@ /turf/simulated/floor/engine, /area/engine/engineering) "tvn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -91545,8 +84372,25 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/plating, /area/engine/engineering) +"tvw" = ( +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whitepurple" + }, +/area/toxins/lab) +"tvx" = ( +/obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/disposal) "twD" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -91556,6 +84400,15 @@ /area/maintenance/fpmaint2{ name = "Port Maintenance" }) +"tAk" = ( +/obj/structure/closet/secure_closet/security, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "showroomfloor" + }, +/area/security/main) "tAn" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 @@ -91564,9 +84417,6 @@ dir = 1; on = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -91575,6 +84425,21 @@ /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/engine, /area/engine/engineering) +"tBw" = ( +/obj/structure/closet/secure_closet/security, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel{ + icon_state = "vault"; + tag = "icon-vault" + }, +/area/security/main) +"tCC" = ( +/obj/effect/spawner/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/security/main) "tEL" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -91585,6 +84450,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) +"tFb" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "neutralcorner" + }, +/area/hallway/primary/central) "tNG" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -91594,7 +84469,7 @@ /turf/simulated/floor/wood, /area/library) "tOU" = ( -/obj/machinery/atmospherics/unary/vent_scrubber, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -91610,6 +84485,18 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) +"tSj" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/medical/surgery1) +"tST" = ( +/obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel, +/area/gateway) "tSX" = ( /obj/structure/lattice, /obj/structure/lattice, @@ -91618,6 +84505,18 @@ }, /turf/space, /area/space/nearstation) +"tTh" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "green" + }, +/area/hydroponics) "tVw" = ( /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ dir = 5 @@ -91631,6 +84530,33 @@ /area/maintenance/aft{ name = "Aft Maintenance" }) +"tYS" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/maintenance/aft{ + name = "Aft Maintenance" + }) +"tYX" = ( +/obj/machinery/door/poddoor{ + density = 0; + icon_state = "open"; + id_tag = "Prison Gate"; + name = "Security Blast Door"; + opacity = 0 + }, +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "redfull" + }, +/area/security/permabrig) "tZI" = ( /obj/machinery/atmospherics/unary/outlet_injector{ frequency = 1441; @@ -91642,9 +84568,22 @@ }, /turf/simulated/floor/plating, /area/engine/engineering) +"tZW" = ( +/obj/effect/spawner/window/reinforced, +/obj/structure/cable/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plating, +/area/security/checkpoint2{ + name = "Customs" + }) "uaQ" = ( /turf/simulated/wall, /area/engine/mechanic_workshop) +"udB" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/plasteel, +/area/crew_quarters/locker) "ueD" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -91661,23 +84600,25 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/security/hos) -"ulS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "redcorner" +"uhY" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/area/security/brig) +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/turf/simulated/floor/plasteel, +/area/hallway/primary/central) "umD" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -91700,16 +84641,19 @@ /area/medical/medbay2{ name = "Medbay Storage" }) -"upv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +"uov" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "white" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 - }, -/turf/simulated/floor/plasteel, -/area/quartermaster/storage) +/area/medical/surgery1) +"uqy" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plating, +/area/maintenance/fpmaint2{ + name = "Port Maintenance" + }) "uuE" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command{ @@ -91718,18 +84662,70 @@ req_access_txt = "20" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" }) +"uvM" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/carpet, +/area/crew_quarters/heads) "uzt" = ( /turf/simulated/floor/plasteel{ dir = 8; icon_state = "green" }, /area/hydroponics) +"uAA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel, +/area/construction) +"uBl" = ( +/obj/effect/landmark{ + name = "xeno_spawn"; + pixel_x = -1 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/maintenance/aft{ + name = "Aft Maintenance" + }) +"uBN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/wood, +/area/crew_quarters/theatre) +"uDi" = ( +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "vault" + }, +/area/engine/mechanic_workshop) +"uEN" = ( +/obj/effect/landmark/start{ + name = "Roboticist" + }, +/obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/plasteel, +/area/assembly/robotics) "uJn" = ( /obj/effect/spawner/airlock/w_to_e, /turf/simulated/wall/r_wall, @@ -91747,52 +84743,89 @@ }, /turf/simulated/floor/plating, /area/engine/engineering) +"uMj" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/gateway) "uMx" = ( /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/medbay3) -"uQl" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 +"uOL" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 }, +/turf/simulated/floor/plasteel, +/area/atmos) +"uQj" = ( /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/plasteel{ - icon_state = "white" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, -/area/medical/medbay3) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/plasteel, +/area/crew_quarters/locker) "uQo" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteblue" }, /area/medical/medbay3) "uRT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/bridge) "uTZ" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 2 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/atmos) +"uUE" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 }, /turf/simulated/floor/plasteel, /area/atmos) @@ -91802,22 +84835,43 @@ /area/hallway/secondary/entry{ name = "Arrivals" }) +"uYO" = ( +/obj/effect/spawner/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/atmos) +"vaE" = ( +/obj/structure/chair/comfy/beige{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel{ + icon_state = "grimy" + }, +/area/hallway/primary/port) "vaO" = ( /turf/simulated/wall, /area/hallway/secondary/entry) -"veh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10; - initialize_directions = 10; - level = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 +"vfe" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 5; + icon_state = "cafeteria"; + tag = "icon-cafeteria (NORTHEAST)" }, -/area/crew_quarters/courtroom) +/area/crew_quarters/kitchen) "vfv" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 4 @@ -91827,10 +84881,14 @@ /obj/structure/lattice/catwalk, /turf/space, /area/space/nearstation) +"vge" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/plasteel, +/area/crew_quarters/locker) "vgP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "redfull" }, @@ -91843,6 +84901,13 @@ }, /turf/space, /area/space) +"vjp" = ( +/obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/quartermaster/storage) "vjL" = ( /obj/effect/spawner/window/reinforced/plasma, /turf/simulated/floor/engine, @@ -91850,20 +84915,48 @@ "vmT" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 6; - icon_state = "intact"; tag = "icon-intact (SOUTHEAST)" }, /obj/structure/lattice, /obj/structure/lattice/catwalk, /turf/space, /area/space/nearstation) -"vny" = ( +"vmY" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "vault" + }, +/area/engine/mechanic_workshop) +"vrH" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/centcom{ + name = "Courtroom"; + opacity = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/engine, -/area/engine/engineering) +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/crew_quarters/courtroom) +"vss" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "redcorner" + }, +/area/security/brig) "vtP" = ( /obj/machinery/conveyor/west{ id = "garbage" @@ -91871,10 +84964,21 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/disposal) -"vuE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 +"vtR" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters{ + dir = 2; + id_tag = "gateshutter"; + name = "Gateway Access Shutter" }, +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel, +/area/gateway) +"vuE" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" }, @@ -91887,12 +84991,33 @@ /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/engine, /area/engine/engineering) -"vBA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 +"vyo" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +/turf/simulated/floor/wood, +/area/crew_quarters/bar) +"vBv" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters{ + dir = 2; + id_tag = "evashutter"; + name = "E.V.A. Storage Shutter" + }, +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel, +/area/ai_monitored/storage/eva{ + name = "E.V.A. Storage" + }) +"vBA" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -91900,60 +85025,69 @@ /area/bridge) "vCR" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/plating, /area/engine/engineering) -"vDW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 +"vDc" = ( +/turf/simulated/floor/plasteel{ + icon_state = "neutralcorner" }, +/area/security/brig) +"vDW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 + dir = 4 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/security/brig) "vEp" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellowcorner" }, /area/hallway/primary/starboard) -"vFn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/warning_stripes/south, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +"vHA" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, /turf/simulated/floor/plasteel, -/area/hallway/secondary/entry{ - name = "Arrivals" +/area/crew_quarters/sleep) +"vHW" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/maintenance/fpmaint2{ + name = "Port Maintenance" }) -"vJx" = ( +"vIz" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/decal/warning_stripes/north, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, -/turf/simulated/floor/plasteel, -/area/storage/primary) -"vLz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/bluegrid, -/area/turret_protected/ai_upload) +/turf/simulated/floor/engine, +/area/engine/engineering) "vLL" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -91965,6 +85099,37 @@ icon_state = "redcorner" }, /area/security/brig) +"vNb" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/plasteel, +/area/hallway/primary/central) +"vNe" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralcorner" + }, +/area/hallway/primary/port) +"vOx" = ( +/obj/structure/chair/stool, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/toxins/lab) +"vOE" = ( +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/plasteel, +/area/crew_quarters/courtroom) "vRY" = ( /obj/effect/spawner/window/reinforced/plasma, /obj/structure/cable/yellow{ @@ -91972,8 +85137,22 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/engine, /area/engine/engineering) +"vSx" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "red" + }, +/area/security/brig) "vUD" = ( /obj/machinery/power/emitter{ anchored = 1; @@ -91986,57 +85165,14 @@ }, /turf/simulated/floor/plating, /area/engine/engineering) -"vVo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel, -/area/crew_quarters/locker) -"vVE" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +"vZl" = ( +/obj/structure/chair/stool, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 1; + icon_state = "redcorner" }, -/area/medical/morgue) -"vXU" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - icon_state = "redfull" - }, -/area/security/main) -"vYK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) -"vZb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/warning_stripes/north, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/entry{ - name = "Arrivals" - }) +/area/hallway/primary/fore) "vZo" = ( /turf/simulated/floor/plating, /area/space/nearstation) @@ -92048,28 +85184,95 @@ icon_state = "dark" }, /area/engine/engineering) -"wgm" = ( +"waJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitebluecorner" +/turf/simulated/floor/plasteel, +/area/security/armoury) +"wfs" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/turret_protected/ai_upload) +"wma" = ( +/obj/effect/spawner/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/crew_quarters/courtroom) +"wri" = ( +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 1 }, -/area/medical/medbay3) -"wlG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "whiteblue" + icon_state = "dark" }, -/area/medical/reception) +/area/construction/hallway{ + name = "\improper MiniSat Exterior" + }) +"wsx" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/crew_quarters/locker) +"wtP" = ( +/obj/effect/landmark/start{ + name = "Cargo Technician" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel, +/area/quartermaster/storage) +"wul" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/bluegrid, +/area/turret_protected/ai) +"wuT" = ( +/obj/structure/chair{ + dir = 8 + }, +/obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/exit{ + name = "\improper Departure Lounge" + }) "wuZ" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plating, /area/engine/engineering) "wvK" = ( @@ -92081,22 +85284,17 @@ }, /obj/machinery/power/solar_control{ id = "aftstarboard"; - name = "Aft Starboard Solar Control"; - track = 0 + name = "Aft Starboard Solar Control" }, /obj/structure/cable, /turf/simulated/floor/plating, /area/maintenance/starboardsolar) -"wxw" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2; - initialize_directions = 11 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/medical/morgue) +"wvO" = ( +/obj/effect/spawner/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plating, +/area/quartermaster/office) "wxE" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 4 @@ -92105,11 +85303,15 @@ /obj/structure/lattice, /turf/space, /area/space/nearstation) +"wyc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/medical/surgery2) "wyX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "cafeteria"; @@ -92118,6 +85320,26 @@ /area/medical/research{ name = "Research Division" }) +"wzo" = ( +/obj/item/flashlight/lantern{ + pixel_y = 7 + }, +/obj/structure/table/wood, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/chapel/main) +"wzV" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/carpet/arcade, +/area/crew_quarters/fitness{ + name = "\improper Arcade" + }) "wAP" = ( /obj/structure/transit_tube{ icon_state = "D-SW"; @@ -92129,12 +85351,49 @@ }, /turf/space, /area/space/nearstation) +"wBj" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "cafeteria"; + tag = "icon-cafeteria (NORTHEAST)" + }, +/area/crew_quarters/kitchen) +"wEq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/security/permabrig) +"wEZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "whiteblue" + }, +/area/medical/medbay3) +"wFW" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/plasteel, +/area/hallway/primary/aft) "wHZ" = ( /obj/effect/spawner/window/reinforced, /obj/structure/sign/securearea{ desc = "A warning sign which reads 'KEEP CLEAR OF DOCKING AREA'."; - name = "KEEP CLEAR: DOCKING AREA"; - pixel_y = 0 + name = "KEEP CLEAR: DOCKING AREA" }, /turf/simulated/floor/plating, /area/hallway/secondary/entry) @@ -92153,26 +85412,58 @@ /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/engine, /area/engine/engineering) -"wRS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/bluegrid, -/area/turret_protected/ai_upload) -"wSU" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, +"wRy" = ( +/obj/effect/decal/warning_stripes/north, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - level = 1 + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, -/area/security/brig) +/area/hallway/secondary/entry{ + name = "Arrivals" + }) +"wSh" = ( +/obj/structure/chair/wood, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/mrchangs) +"wSP" = ( +/obj/machinery/hydroponics/soil, +/obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "floorgrime" + }, +/area/hallway/secondary/construction{ + name = "\improper Garden" + }) +"wUE" = ( +/obj/effect/spawner/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/crew_quarters/locker) +"wVS" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/plasteel{ + icon_state = "whiteblue" + }, +/area/medical/medbay2{ + name = "Medbay Storage" + }) "xbe" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -92180,35 +85471,7 @@ icon_state = "dark" }, /area/security/podbay) -"xca" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralcorner" - }, -/area/bridge/meeting_room{ - name = "\improper Command Hallway" - }) -"xhr" = ( -/obj/machinery/atmospherics/pipe/simple/visible/purple{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/atmos) -"xla" = ( +"xfn" = ( /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -92217,29 +85480,50 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 4; + icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "neutralcorner" }, /area/hallway/primary/starboard) +"xhx" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/entry{ + name = "Arrivals" + }) +"xkY" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/medical/reception) "xno" = ( +/obj/machinery/atmospherics/pipe/simple/visible/purple{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/visible/purple{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "caution" }, /area/atmos) +"xqz" = ( +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/plasteel, +/area/assembly/robotics) "xrG" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 5 @@ -92251,8 +85535,14 @@ }, /turf/simulated/floor/plating, /area/maintenance/starboardsolar) +"xtA" = ( +/obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/plasteel, +/area/toxins/mixing{ + name = "\improper Toxins Lab" + }) "xuA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" @@ -92261,41 +85551,30 @@ /area/maintenance/fpmaint2{ name = "Port Maintenance" }) -"xvd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - req_access_txt = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/carpet, -/area/library) -"xyA" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan, -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 4; - level = 2 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/atmos) -"xyZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/carpet, -/area/crew_quarters/theatre) -"xBd" = ( +"xvi" = ( /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) +"xxA" = ( +/obj/effect/spawner/window/reinforced, +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plating, +/area/engine/gravitygenerator) "xDw" = ( /obj/effect/decal/warning_stripes/east, /obj/machinery/meter, @@ -92304,15 +85583,23 @@ }, /turf/simulated/floor/engine, /area/engine/engineering) +"xDS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "red" + }, +/area/security/brig) "xEi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel/dark, /area/tcommsat/server) "xFR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -92322,8 +85609,8 @@ }, /area/medical/reception) "xGP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/starboard) "xHf" = ( @@ -92333,38 +85620,14 @@ d2 = 8; icon_state = "4-8" }, -/turf/simulated/floor/plasteel, -/area/engine/engineering) -"xHU" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/decal/warning_stripes/south, -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 4 - }, -/turf/simulated/floor/engine, -/area/engine/engineering) -"xJS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "neutralcorner" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/area/hallway/primary/central) +/turf/simulated/floor/plasteel, +/area/engine/engineering) "xLf" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 10 @@ -92382,59 +85645,64 @@ tag = "icon-stage_stairs" }, /area/security/podbay) -"xQq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/bluegrid, -/area/turret_protected/ai_upload) -"xQv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 +"xSh" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/turf/simulated/floor/bluegrid, -/area/turret_protected/ai_upload) -"xRI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - level = 1 +/turf/simulated/floor/plasteel{ + icon_state = "white" }, -/turf/simulated/floor/wood, -/area/security/vacantoffice) +/area/medical/reception) +"xUe" = ( +/obj/structure/table/wood, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/chapel/main) "xXW" = ( /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/security/podbay) -"xYx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 +"xYR" = ( +/obj/structure/closet/crate, +/obj/effect/spawner/lootdrop/maintenance{ + lootcount = 3; + name = "3maintenance loot spawner" }, +/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6; - level = 1 + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, -/area/security/permabrig) -"xYW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/plating, -/area/engine/engineering) +/area/quartermaster/sorting{ + name = "\improper Warehouse" + }) "xZq" = ( /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/solar/starboard) +"yag" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/medical/surgeryobs) "yaq" = ( /obj/machinery/power/emitter{ anchored = 1; @@ -92452,22 +85720,71 @@ }, /turf/simulated/floor/plating, /area/engine/engineering) +"yaQ" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "bar" + }, +/area/crew_quarters/bar) +"ycU" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "bar" + }, +/area/crew_quarters/bar) "yeW" = ( /obj/structure/sign/securearea{ desc = "A warning sign which reads 'RADIOACTIVE AREA'"; icon_state = "radiation"; - name = "RADIOACTIVE AREA"; - pixel_x = 0; - pixel_y = 0 + name = "RADIOACTIVE AREA" }, /turf/simulated/wall/r_wall, /area/engine/supermatter) -"yij" = ( +"ygd" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/carpet, +/area/hallway/primary/port) +"ygK" = ( +/obj/structure/chair/stool{ + pixel_y = 8 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/plating, -/area/construction) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/crew_quarters/locker) +"ygY" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/engine, +/area/engine/engineering) +"yhg" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/carpet, +/area/ntrep) (1,1,1) = {" aaa @@ -103110,13 +96427,13 @@ tlh aLB aLB aLB -aLB -aLB -aML -aML -aML +gwJ +aTP +aUY +aUY +aUY aZk -baJ +myY dgx bdR aYg @@ -103131,7 +96448,7 @@ bip bdR bzw bdR -baJ +eGG bFe aWD aaa @@ -103370,7 +96687,7 @@ aLB aLB aLB aLB -aWH +aML aXU aWD baX @@ -103388,8 +96705,8 @@ bin aUN aUN aUN -baJ -bDn +baX +dgx aUN aaa aaa @@ -103402,7 +96719,7 @@ bTH aWD dgi bBt -dgs +dgx dgz dgz dgz @@ -103627,10 +96944,10 @@ aLB aLB aLB aLB -aWI +aML aXV aWD -bbF +baX bcR bcy bhb @@ -103645,8 +96962,8 @@ biq aUN bAR bzx -bBv -bDp +tjR +dgx aUN aaa aaa @@ -103654,11 +96971,11 @@ aaa aaa aaa aUN -bRT +baJ bUO bQN -bBt -bBt +dgo +dgo dgv dgz dgz @@ -103884,10 +97201,10 @@ aLB aLB aLB aLB -aWI +aML aXW aZm -bbF +baX bBt dgx bhb @@ -103902,8 +97219,8 @@ bin aUN bAQ baJ -bBt -bDp +xhx +dgx aUN aaa aaa @@ -104141,12 +97458,12 @@ aLB aLB aLB aLB -yij +aLB aML aZm -vZb -dgo -beO +baX +bBt +dgx bhW aUN bin @@ -104158,9 +97475,9 @@ brs bin aUN bhb -bzz -dgo -bFn +baJ +xhx +bhV aWD aaa aaa @@ -104172,7 +97489,7 @@ bCx bUS fhW lPA -dgo +lPA pOV dgz dgz @@ -104398,7 +97715,7 @@ aLB aSt aLB aLB -yij +aLB aML aWD bbS @@ -104417,7 +97734,7 @@ aUN bDU bzy bBw -vFn +dgx aUN aaa aaa @@ -104428,8 +97745,8 @@ aUN baJ bUQ aWD -dgl -bsx +dgi +bBt dgw dgz dgD @@ -104652,10 +97969,10 @@ aLB aLB aLB aLB -aSu aLB aLB -yij +aLB +aLB aML aWD bdH @@ -104673,8 +97990,8 @@ bin aUN aUN aUN -baJ -bDK +baX +bDm aWD abq kmF @@ -104909,10 +98226,10 @@ aLB aLB aLB aLB -aSu aLB aLB -yij +aLB +aLB aXX aWD jCT @@ -104930,7 +98247,7 @@ bip bdR bzw bdR -baJ +eSE bFG aWD kmF @@ -105167,9 +98484,9 @@ aML aLB aLB aSv -aTP -aUY -dJz +rID +uAA +uAA aXY aZn bcf @@ -105187,7 +98504,7 @@ bin aUN aUN aUN -baJ +wRy bES aWD bMT @@ -105199,7 +98516,7 @@ aWD baJ bLC bLD -bXI +nbG bXH apf abq @@ -105444,20 +98761,20 @@ bin aaa aUN bzA +pSL +bcR +niH +uWq +uWq +uWq +uWq +uWq +uWq bBv -bEJ -brU -bky -hBn -bMK -bMK -bMK -bQx -bRW dgb apf auJ -cEg +eYE apf aaa aaa @@ -105703,18 +99020,18 @@ aWD bCx bBx bDt -bnX -bgW +rmz +ahq bKR bNm bMB bOf -bPM +ahq bRy bTm apf bLK -avU +rvu apf bZP bZS @@ -105921,15 +99238,15 @@ abq apf awE avQ -awc -atk -atk +avW +pHQ atk atk atk atk +ijy aEC -atk +fZo aHX apd aHk @@ -105937,10 +99254,10 @@ aHk aOl aHk aHk -aqB -auA -aHv -aHv +qob +fZo +vHW +vHW aYm aWq aYT @@ -105953,7 +99270,7 @@ bky bky brU bky -bky +kWi buD bxr bky @@ -105966,12 +99283,12 @@ apf apf apf apf -bPN +bjE apf apf apf aoX -avU +rvu bWm bZP bcE @@ -106188,14 +99505,14 @@ apf alL apf aIJ -atk -aHv -aHv +uqy +aVF +aVF aPe -aEC -atk -atk -aWs +lwN +uqy +ahC +apd apd apd aYb @@ -106218,7 +99535,7 @@ dgj bBz bDv bFo -bLN +bXI bgY bgY bjE @@ -106227,8 +99544,8 @@ bQy bgY bgY cJU -cJV -bDL +cJU +rGT cae bZQ cdr @@ -106475,18 +99792,18 @@ btm btm bFJ apf -cwu +cdn aEj bKy apf atj -bPP +apd aoX auy auC -bWg +aoX cgo -avU +rvu caw cbo ccp @@ -106730,20 +100047,20 @@ bfG bfG bfG bDC -bpB +bDC apf bHd aUu anE apf aqB -bPQ -atk -atk -atk +apd +apd +apd +apd bWi -aHv -bYS +cgo +rvu bZS bZS bZS @@ -107258,9 +100575,9 @@ bTo bFp aqB cQS -bZT +bXK cdD -ccq +arU apd apf aaa @@ -107494,7 +100811,7 @@ biy bko bma brl -dxy +brV brA btp bvC @@ -107505,18 +100822,18 @@ bFW bFp bHf bHf -fNU +bHf bME -hZZ +eoq hZZ bRB bTn bUD bFp ayB -bYV +rvu apf -bPQ +apd aEj cdG apf @@ -107750,28 +101067,28 @@ bgX bmS bkp bmb -bjP +tZW but brB -bto -bvB -bvB -bzC -bBD +ePy +ygd +ygd +vaE +inj bDA bFr bHg bHg -koz +bHg bOP bOi -bOi -xRI +sHl +bHf bHf bUE bFp apd -bYV +rvu apf cbq apf @@ -107814,7 +101131,7 @@ cMz cSZ clp cPp -cQm +cIS cQZ cHZ abq @@ -108023,7 +101340,7 @@ bKA bHf bOj bPT -szt +bHf bHf bHf bWj @@ -108064,7 +101381,7 @@ aaa aaa cHZ cIS -cJI +cIR cHj cLH cMA @@ -108265,20 +101582,20 @@ bgX bkr bgX bgX -bpB +bDC brx bfG bfG bfG bfG bDC -fZu +bDC bFp bJz bIS bHf bHf -bKB +oeP bPU bHf bTn @@ -108292,9 +101609,9 @@ dan ceN chP ceN -cPj +ceN ckv -cPj +ceN cof bZU cow @@ -108320,7 +101637,7 @@ aaa aaa aaa cFv -cIR +ppw cJJ cKO cLI @@ -108542,7 +101859,7 @@ bTo bUF bFp auC -bYV +avU bZU bZU bZU @@ -108578,9 +101895,9 @@ aaa aaa cHZ cIT -cJK +cIR cHj -cLH +naY cMC cNv cOA @@ -108799,17 +102116,17 @@ bFp bFp bFp apf -bYV +avU bZU cbs cuV cdJ ceO bZU -chq -bxt +chy +ckw bZU -cmY +ebA bZU cpS crc @@ -108818,7 +102135,7 @@ cty cqZ cry chy -cdL +chy czd bZU cFR @@ -108845,8 +102162,8 @@ cPr cQp cQZ cHZ -dew -dey +cSA +arA aaa aaa aaa @@ -109004,7 +102321,7 @@ akt akt akt awE -aoZ +awe apf abq abq @@ -109056,17 +102373,17 @@ bTp bUG bWk apf -bYT +bfl bZU cem dfi dgC cfm bZU -cji -cje +chy +bgZ bZU -cje +ebA bZU cpA cdK @@ -109086,7 +102403,7 @@ cdN bZU cNa cNP -cOK +chy cfc bZU aaa @@ -109303,7 +102620,7 @@ bBK bDG bBK bHk -bIV +bHm bKC bMH bOl @@ -109313,17 +102630,17 @@ arJ apd deJ apf -bYV +avU bZU cbu ceE -chv -chc +chy +cEB cfU -che +ceE clu bZU -cje +ebA bZU bZU bZU @@ -109332,7 +102649,7 @@ cdO cdO bZU bZU -cyl +bZU bZU cAg cDk @@ -109519,15 +102836,15 @@ ars auf auw awK -axm +xuA aqB apf aAU aCs aDv -aEN aEK aEK +qHi aIO bOg aCs @@ -109566,11 +102883,11 @@ cBE cBE bBK bRF -arL +arU apd deH apf -bYV +avU bZU ceu cHV @@ -109589,12 +102906,12 @@ cod cod cod cym -cyZ +cym cAw -cod +tYS cDj -cBk -cBk +cjl +cjl cGg cJR bZU @@ -109782,13 +103099,13 @@ apf apf aCs aFF -aEO +aEK aGf aHs -aIP +aEK aKd ayK -aSm +afl axX aSm aSm @@ -109798,7 +103115,7 @@ aSm aSm aYo aSm -aSm +vjp bdm bdZ nig @@ -109809,7 +103126,7 @@ bpD brK bpK aXi -btw +btv bvH bxT bzH @@ -109823,11 +103140,11 @@ cgp bIU bBK bRG -bPP +apd atj apd apf -bYV +avU bZU cbw ccx @@ -109835,7 +103152,7 @@ cdN chS bZU ckH -clw +cEL bZU cog coD @@ -109854,11 +103171,11 @@ cFT ckD cIb cDT -cEQ +cOM cGZ -cEQ -cMU -cPx +cOM +cOM +cOM cJR bZU aaa @@ -109867,7 +103184,7 @@ cJO cKS cLO cMH -cNC +cNv cOE cPt cQs @@ -110026,7 +103343,7 @@ aaa akI aoY alr -any +tvx apc aqq arE @@ -110041,32 +103358,32 @@ aCt aDx aEP aGg -aGg +hVe aIQ aKe azT aMS -aOu -aPJ -aOu -aSz -aOu -aOu -aOu -aPJ -aOu -aOu +nLH +nLH +nLH +wtP +lid +nLH +nLH +nLH +nLH +lBy bcs -qaM +kfI bgV -aXi -biF +wvO +nHB bpo bmj boh bpL buu -btx +btv bvH bxT bzH @@ -110080,9 +103397,9 @@ bBK bOm bBK bRH -bPQ -bUH -bXU +apd +apd +auI bXK cak bZU @@ -110092,7 +103409,7 @@ bZU bZU bZU bib -cje +bgZ bZU cog coC @@ -110106,7 +103423,7 @@ coC czp cAx czp -cAx +kwD dbu cEY cEY @@ -110123,13 +103440,13 @@ cFv cJP cKT cLP -cMI -cND +cMB +cNB cOF cKM cWe cRd -cRY +cYM cSG cHZ aaa @@ -110282,15 +103599,15 @@ abq aaa akI ajy -amp -anz +alr +tvx aoV aqs arG akt auy avY -axo +axn aoX aoX avU @@ -110304,15 +103621,15 @@ aKf aCs aMT aRo -aPQ +aSb aRo aSN -aRo +nYP aXw aRo -aPQ -aRo +aSb aRo +nYP aRo bdZ bjd @@ -110320,10 +103637,10 @@ bfw biG bpy bmk -boi +boh bpM aXi -btw +btv bvH bBp bfG @@ -110341,7 +103658,7 @@ bRH bVR bWm apf -bYV +avU apf auC apf @@ -110380,7 +103697,7 @@ cHZ cOH cPK cQN -cMJ +cMN cTf cTv cKM @@ -110547,7 +103864,7 @@ atd akt auz avX -axo +axn cgo cgo avU @@ -110560,15 +103877,15 @@ aCs aCs aCs aMY -aOs +aRo aPP -aRp -aSG -oGg +aRo +aYi +nYP aWS -aOs -bar -aOs +aRo +baT +aRo bcu bfg bea @@ -110577,7 +103894,7 @@ bfw biH bfw bml -boj +boh bpN bfw btz @@ -110598,7 +103915,7 @@ apf apf apf apf -aPT +avU cgH cgU apf @@ -110608,12 +103925,12 @@ cjr chy ckA bZU -cmV +clj coC coy crE -ctR -cuW +crE +crE cwe cwC coC @@ -110625,8 +103942,8 @@ cEi cEY cGi cIq -cJX -cKy +cGo +cGo cGo cMV cEY @@ -110804,7 +104121,7 @@ akt akt apf apd -axo +axn aoX aoX avU @@ -110819,9 +104136,9 @@ aLP aNb aRo baT -tdP +aRo baT -upv +nYP aYi aRo baT @@ -110837,24 +104154,24 @@ bpF bok bpO bfw -ksa +btv bvK bxY bzJ -bCt +bXI bDL -bFu -bFu -bFu -bFu -bMJ -bFu -bFu -bFu -bFu -bFu -bFu -bFu +bgY +bgY +bgY +bgY +aSM +bgY +bgY +bgY +bgY +bgY +bgY +bgY bZR apf chn @@ -110865,12 +104182,12 @@ dgG cuV clU bZU -cmV +clj coC cpW crH ctW -cuZ +crH cwg cxm cyp @@ -110882,7 +104199,7 @@ czt cFa cGp cIv -cKa +cLi cKD cLi cNc @@ -111062,28 +104379,28 @@ aoX aEU aHv aHY -ayD +jap azN aNm aCu aDA aET -cbm -ccw +bkX +bnW aMq aCu aPw aMW aOu aYh -eKN +aOu aTL tca aYh aOu bas aOu -aOu +tca bcv beb bfv @@ -111122,29 +104439,29 @@ cju cjk bZU bZU -cmV +clj coC cpV -crE +tSj ctV -crE +uov ihM -crE -cyo -czs +mfz +eIg +yag czn cCs cCv -czs -cEZ -cGo +yag +qwd +wyc dmU -cGo +jgD cKA -cGo +dxa cKL cEY -cNT +clj bZU abq aaa @@ -111313,18 +104630,18 @@ alv amr anD ato -axp +ato bFu ate aGj -cJU -cJU -bgY +hka +ato +bFu azK aAX aCu aDB -bnW +xYR aGk cjv clW @@ -111333,15 +104650,15 @@ aLS aMZ aOW aOu -aRq +aSz beb mGz aOu aOu aYk -aRo +iZz baV -bcw +bdZ bfq bfw bfw @@ -111379,7 +104696,7 @@ bZU bZU bZU bZU -cmW +clo coC cpY crE @@ -111569,11 +104886,11 @@ akx alw apH anE -aoZ +awe apd apd aoZ -auC +gqF ajg ajg ayF @@ -111581,7 +104898,7 @@ azP ajg aCu aCE -bkX +pNK aEH ciy cli @@ -111597,8 +104914,8 @@ aOu aWM aYl aOu -aOu -bcx +tca +qaM bfp bhX bkx @@ -111610,7 +104927,7 @@ btO bfw ksa bvN -bxT +vNe bzK bDs bFY @@ -111627,7 +104944,7 @@ bzK cgs bYi bZW -bZY +bFw bzK cho cfX @@ -111865,7 +105182,7 @@ bmq bon bpR aXi -rPA +btv bvH bxT bai @@ -111874,7 +105191,7 @@ bDN bFw bHr bIZ -bHr +fla bFw bOo bFw @@ -111882,7 +105199,7 @@ bRK bTt bai bFw -bFw +jrE bZc bZZ bzK @@ -112119,10 +105436,10 @@ bkK biL bkB bmr -boj +boh bpS brJ -rPA +btv bvH bxT bzM @@ -112131,7 +105448,7 @@ bBQ bBQ bBQ bBQ -bBQ +teW bBQ bBQ bBQ @@ -112162,12 +105479,12 @@ cwY czv cYO cCx -cDv +mRP cxp cDc cxp cIV -cKd +cxp cKW cxp cNI @@ -112339,7 +105656,7 @@ aaa abq alL alz -anG +cgU auB aqy apd @@ -112348,7 +105665,7 @@ cgm ajg axt aAY -aAY +iip aBa aCw aCw @@ -112387,11 +105704,11 @@ bBR bBR bFx bBR -xvd bBR +hiO +bMM +bMM bMM -bBR -bBR bRL bTv bUJ @@ -112412,8 +105729,8 @@ cpb crd csG cua -cvd -cwj +djx +dio cxr uQo cxy @@ -112421,10 +105738,10 @@ cBq cCE cDx cEk -cEk +jlB cHb cIW -cKf +cIW cKX cLv cNK @@ -112580,9 +105897,9 @@ add ady aeb aey -aeX -afC agf +afC +aeX agO ahz abB @@ -112600,7 +105917,7 @@ amv apd aqz cgo -cgo +bbj auD ajg awX @@ -112617,7 +105934,7 @@ ajg aME aNX apf -aPT +avU apf aWh aTY @@ -112636,7 +105953,7 @@ bmt bss btR bfw -rPA +btv bvH bxT bai @@ -112644,18 +105961,18 @@ bBS bBS bzK bHs -bKI bBQ -bMN +teW +bFw bOp bFw bRM bFw bai bWt -tNG +esf +bHr bHr -kHS bzK ccA auy @@ -112675,7 +105992,7 @@ cxt csJ cys cBp -cys +dZM csJ csJ cFd @@ -112857,7 +106174,7 @@ anI aph aqA apd -apd +ksz auE ajg axv @@ -112871,10 +106188,10 @@ abq aaa aaa aKj -aNE aNa +hDK apf -aPT +avU apf aSK aTZ @@ -112901,8 +106218,8 @@ bzK bzK bzK bKw -bKI bBQ +teW bFw bOp bFw @@ -112910,9 +106227,9 @@ bRM bTw bzK bWu -bWt +dDw bZf -qBH +tNG bzK chp auJ @@ -112927,8 +106244,8 @@ crf csI cpB cmX -cwk -cxs +cwj +cxt csJ cbJ cBs @@ -112940,7 +106257,7 @@ cHd cIY cIA cFd -cLK +cLk cNM bSD cLz @@ -113131,7 +106448,7 @@ aGy aLV aRB apf -aPT +avU apf bZa aWt @@ -113145,12 +106462,12 @@ bfw bjJ bkS bmi -bmi +pkX bmv brX bsi aAM -btE +bkG bvH byd bzK @@ -113158,8 +106475,8 @@ bBT bDO bFy bFw -bKI bBQ +teW bFw bOq bPY @@ -113185,10 +106502,10 @@ csH cue cri cwj -cxt +dOQ cys czw -cBr +cBs cCF cpF csJ @@ -113200,7 +106517,7 @@ cFd cLw cNL cPy -cNT +clj chy chy cHZ @@ -113213,7 +106530,7 @@ bZU cUm cSK cTA -cUj +cTD cZs cSO daS @@ -113388,7 +106705,7 @@ aHj aLW aNe apf -aPT +avU apf apf apf @@ -113415,8 +106732,8 @@ bDw bDP bzK bHu -bKI bBQ +teW bFw bOr bFw @@ -113439,8 +106756,8 @@ cok cpb crd csN -cua -cri +rJk +imZ cwl cxu csJ @@ -113454,10 +106771,10 @@ cHg cJa cKj cKe -cLW -cNN +cLk +cNM cPy -cNT +clj coD chy bZU @@ -113637,31 +106954,31 @@ aaa aBb aCy aDF -aEY +aEZ aGo aHC aGu aHb -aLX +aLW aNf -aOz +aOy aPV -azS +bgY aSM aVk aVq -azS +bgY aYX -azS -azS +bgY +bgY azB apf bfD bhl -biR bhl -bmx -boq +bhl +bmw +bhl bpX brM btG @@ -113672,8 +106989,8 @@ bzK bzK bzK bKE -bKI bBQ +teW bFw bOs bPZ @@ -113699,7 +107016,7 @@ csE cuk cvf cwj -cxt +jNa cys czy cBt @@ -113707,15 +107024,15 @@ cCK cDO csJ cFg -cHe +cHg cIZ cIB cFd -cLw -cNK +jzm +wEZ cPy cRl -cTZ +cOM cNZ cKV cZq @@ -113732,7 +107049,7 @@ cZt cSO cSO dbw -cWP +cUX cSO cXF cYl @@ -113864,9 +107181,9 @@ acU adn adn aep -ado +oxC afd -ado +iXL fZa agS ahF @@ -113885,8 +107202,8 @@ aaa apf aqB arU -aEl -axa +atj +apd ajg axz axQ @@ -113894,7 +107211,7 @@ aaa aBb aCz aDG -aEZ +dtM aGp aHB aIY @@ -113916,7 +107233,7 @@ beg bfE bhm biS -bkF +biS bmy bos btS @@ -113928,9 +107245,9 @@ bzK bBT bDO bFz -bHw -bJa +bFw bBQ +teW bFw bOt bRh @@ -113946,7 +107263,7 @@ bdq cdT chT cgf -chJ +oRr clY cmX cmX @@ -113968,27 +107285,27 @@ cHi cGm cKk cFd -cLw -cNK +cLk +cNM cPy cRo -cji +chy chy bZU cZw daM dby bZU -cyE +svF bZU -cSf +cTD cWm cTD cZa -cUR +cSf dfs -teY -cWr +cUX +cWs cUX cSO dbL @@ -114127,7 +107444,7 @@ afp agq acN ahE -dOL +aiy aiE abB aaa @@ -114141,8 +107458,8 @@ abq abq alL aqC -amz -aEj +apd +apd auI awg awZ @@ -114173,12 +107490,12 @@ apf ceY bhn biT -bkG +iNL bmz bot bpZ aAM -rPA +btv bvR bxT bzK @@ -114186,8 +107503,8 @@ bDw bDP bzK bHx -bBQ -bBQ +spv +svR bMP bzK bzK @@ -114202,7 +107519,7 @@ apf ccC cdT cfs -cgg +cgf chK clX ckF @@ -114225,7 +107542,7 @@ cHh cFd cKe cFd -cLw +cLk cKQ cPy cPy @@ -114236,7 +107553,7 @@ cDU daL cPy cPy -cyE +svF bZU cSg cRh @@ -114398,7 +107715,7 @@ abq aaa apf anE -arN +apd ajg ajg ajg @@ -114416,9 +107733,9 @@ aIZ aLZ aNi kDt -fFk -izL -vJx +aPX +aRu +aRu aRu aRu aWT @@ -114460,40 +107777,40 @@ ccD cdT chU cgf -chJ cjt -oRr +cjt +cjt cLT cpE cxI -csS +ckU cuL -cvi -cwo -cxw +cKW +cYO +cDv cxL cxp cNG -cxp +ekd cpH cCH -cFP +cIV cHl cxp cxp cKY cLY -cDv +mFx cKW cRp -cUo +cxp cxp cYO cZI daO cRV cPy -cyE +svF bZU cSh cRh @@ -114503,7 +107820,7 @@ cUT cSO cSO cWt -cZk +cSO cSO cSO dhn @@ -114670,12 +107987,12 @@ aBb aBb abq aIX -aMa +aLW aNj -aOC +kDt aPX aRu -aSO +aRu hBM aRu aWT @@ -114683,74 +108000,74 @@ aYr aZD avx bcI -beh +bNp bjl blI biV bkI -biV +cfI bkI -bqa -beh -btJ -bvT -byg -bzP -byg -bFZ +bQF +bNp +bNp +bek +bfV +bfV +bfV +bsV bFA byg -bJb -byg -byg -dUP -byg -byg -byg -bUL -byg -bFZ +bfV +bfV +bfV +bfV +bfV +bfV +bfV +bjm +bfV +bsV bZh -byg -cMS +bfV +bfV ccE cdT cfz cdq chL cik -cil +cik cjA cpD crj csQ -cuK +ckd cvh -cwn -cxv +cDe +cDe cyt czD cNF uMx -uMx +cFj cEl cFj cHk -uMx -uMx -uMx +cFj +cFj +cFj cLX cNU cPA -cNU +qee cUe -uQl -cDe +cFj +cFj cZy daN cRu cPy -cyE +svF bZU cRh cRh @@ -114929,23 +108246,23 @@ aaa aKj aPx aNk -avx +qlH aPZ -aRu -aSP +aUg +aUg atJ bmK aWU aYs aZE -avx +pvu bcJ bei bfI bfI biW bfI -bfI +oJQ bfI bjn bfI @@ -114956,18 +108273,18 @@ bzQ bfI bfI bfI -bfI +oJQ bJc bKL bfI -bOu +bfI bfI bfI bfI bjn bfI bfI -bfI +oJQ caC cby ccF @@ -114980,7 +108297,7 @@ cim cop cdT crm -ctq +ckU cuM cvk cwq @@ -114988,12 +108305,12 @@ cwq cyw cAh cwq -cwq -cwq -cEO +pAj cwq cHy cwq +bOZ +cwq cwq cwq cwq @@ -115002,12 +108319,12 @@ cvk cRL cUq cXr -wgm -cZQ +cRL +daP daP dbG cPy -cyE +svF bZU dem deL @@ -115143,7 +108460,7 @@ aaa abB aci aco -acA +wEq acF aco adp @@ -115152,7 +108469,7 @@ aer aeP acN afx -agu +agq acN ahI aiy @@ -115189,7 +108506,7 @@ aNl aOA aQa aRu -aSP +aRu bmJ aVt aWV @@ -115201,18 +108518,18 @@ bej bfJ bhp biX -bfS +bdb bpI -bfS +bdb bqb brO -bfS -bfS -bfS +bdb +bdb +bdb bzR -bfS -bfS -bfS +bdb +bdb +bdb bfS bJd bKM @@ -115224,10 +108541,10 @@ bTC bUM bWz bXT -bMR +oWL bMR bek -ccG +bfV chM chM cel @@ -115247,9 +108564,9 @@ czJ cCa cDf cDW -cEn -cFU cHm +cFU +kzH cDW cKZ cKZ @@ -115257,22 +108574,22 @@ cKZ cKZ cKZ cRE -cUp +cUq cXw dfO cZO cYC cRU cRU -cyE +svF bZU del -cTG +deN deN deU cZX cVU -cWv +cWz dfG cWz cXI @@ -115401,18 +108718,18 @@ acg aca acr acD -acM -acZ -ads +acg +aet +adm adS -aeu -aeS +aco +aeO acN acN acN acN ahx -aiD +aiB aje aiK abq @@ -115446,10 +108763,10 @@ cDt aOA aQb aRu -aSP aRu +hnI aVu -fgw +aRu aYr aZG aOF @@ -115494,7 +108811,7 @@ ciX cjD cdT cxI -csS +ckU crP cvj cvj @@ -115513,7 +108830,7 @@ cIF cJM cLb cKZ -cwj +gSK cUp ckQ cRU @@ -115521,15 +108838,15 @@ cOU daU cRX cRU -cyE +svF bZU cUx -cTH -deN +ktX +lUv deY cVw cUY -gdk +dfw cWV cXm cXJ @@ -115703,10 +109020,10 @@ aRN aOA aQc aRu -aSR -aUg -aUg -elA +aRu +aRu +aRu +aRu aYv aZH asL @@ -115751,7 +109068,7 @@ ciY clZ cjT cmq -ctq +ckU cnn cjQ cnp @@ -115786,8 +109103,8 @@ deN deX cVz cUZ -hEP -cWV +cWz +jQZ cUX cXJ dhl @@ -115919,13 +109236,13 @@ abB adb adu adU -ado -ado +het +fCO afv -ado -xYx +iXL +fZa agU -ahN +ahG aiG acN abB @@ -115954,7 +109271,7 @@ aaa aaa aaa aAf -nbq +aKs aMe bTq aOA @@ -115967,9 +109284,9 @@ aWW aYw bcd axg -bcN -bek -bfK +bNp +mmk +tFb bhr biZ bkL @@ -115985,8 +109302,8 @@ bCl aPC bFH bMV -bJg -bKP +bJf +bKO bNM bOR bRu @@ -116006,15 +109323,15 @@ cgr chM cjw cjO -ckG +ckI ckK ckN crW cmj cnq +hCM cpZ -cyA -cAk +cAm cAF cDf cDm @@ -116028,7 +109345,7 @@ cLd cLd cLd cwj -cUp +cUq cXA cRU daf @@ -116043,7 +109360,7 @@ deP dfo fPa fPa -iYb +fPa cWW cXn cXK @@ -116211,7 +109528,7 @@ aFd aaa aaa aHG -aKt +aKs aMf aKm aOF @@ -116224,7 +109541,7 @@ aOF aUo aOF aOF -bcO +bQF ben bfM bhq @@ -116237,7 +109554,7 @@ bvq bwc bvY bym -bzV +uvM bBX bqc bHq @@ -116252,20 +109569,20 @@ bTF bUP bWA bYR -bZx -caM -bek -ccG +vBv +dDT +vNb +bfV ceq kNJ cjz ptc chM cjx -cjP +cjO ckI cmq -ctq +ckU cnn cjQ cwr @@ -116296,12 +109613,12 @@ bTc bZU cSR cTK -cUs +deN cUY cVw cUY -cWu -cWV +dfw +xUe cUX cXJ dhl @@ -116453,7 +109770,7 @@ aoW aqa arj aqa -aqH +aqa aCT amx amx @@ -116481,7 +109798,7 @@ abq aaa aZJ bbg -bcN +bNp bek bjA bhq @@ -116500,7 +109817,7 @@ bqc bHv bEx bJh -bKQ +bKZ bxq bOS bRv @@ -116512,22 +109829,22 @@ bYZ bZx caM bek -cdA +bjD chM cca cfx chW chM ciY -clZ +wVS cjT cmq -ctq +ckU ckt cvj cui +hCM cpZ -cyC cAm cBd cDf @@ -116552,14 +109869,14 @@ cRU cRm bZU cST -cTK +rUJ cUs cUZ cVz cUZ -cWw -cWV -cXm +cWz +ijf +wzo cXJ dhl aaa @@ -116738,7 +110055,7 @@ aOG aaa aUr bbh -bcQ +bcM bel bfO bhq @@ -116751,7 +110068,7 @@ brS bje bya bym -bzV +thC bBY bqc bHt @@ -116769,7 +110086,7 @@ bYw bMS caD bek -ccG +bfV chM cck cgI @@ -116780,10 +110097,10 @@ cjR cdT ckM ckO -wlG +cnn cvj csX -cpZ +oUk cyB cAl cAW @@ -116810,13 +110127,13 @@ cRm bZU cSU cTK -cUs +deN cVa cVA cVa -cWy -cWX -cZx +dfw +cVa +dfw cXL cSO aaa @@ -116954,7 +110271,7 @@ acN acN acN ahQ -aiy +rjj ajF acN akH @@ -116986,7 +110303,7 @@ aKw aMf aaa aOG -aQg +aOG aVw aSU aUj @@ -116997,7 +110314,7 @@ aZJ bbi bcP beo -bfK +acw bht bjc bkP @@ -117007,7 +110324,7 @@ btP brT bje byu -byn +bym bzX bBZ aPG @@ -117026,7 +110343,7 @@ bOB bMS bUM ben -ccK +bjm chM chM chM @@ -117036,11 +110353,11 @@ cjy cjy cdT cpx -ctI +ckU csx cvj cvj -cvU +pAk cyG cAo cyG @@ -117055,7 +110372,7 @@ cBv bTa clI cmc -jeK +cIo cVb cnE cIm @@ -117217,10 +110534,10 @@ ajT akG akR alN -amY vLL vLL vLL +hRw vLL vLL asM @@ -117233,7 +110550,7 @@ aqJ azA aAa aBf -ayL +alM aDM aFg aAE @@ -117244,8 +110561,8 @@ aMf abq aOG aQh -vLz -hNq +aRA +aRA aUk aVx aOG @@ -117265,7 +110582,7 @@ buB bje bye bym -bzY +bzV bCa aPF bFH @@ -117283,7 +110600,7 @@ bXY bMW can bek -ccG +bfV cfi cia cjC @@ -117298,7 +110615,7 @@ cuP cvo cwv cxC -cyD +xkY cAn cCk cDg @@ -117309,14 +110626,14 @@ cIf cJh cKn bRn -cMd +cIo clQ -cMd -wxw +cIo +cIo cnc cpJ cIm -cmV +clj bZU bZU bZU @@ -117324,7 +110641,7 @@ cRr bZU cWZ cVs -cNH +cWi cXa cSO cSO @@ -117470,11 +110787,11 @@ agV ahS aiJ ajH -akf +tYX akK ajH -alF -aAs +xDS +qiC qiC qiC apm @@ -117485,26 +110802,26 @@ qiC awt atq atq -wSU -axI +atq +atq ayR aAb -aRP +rDS aCG -aDN +aKH aDN aCF -aHJ +vZl aJd aKy aMf aaa aOG aUP -wRS +aRA aSV aUl -sGi +aUk aZx aOG bcl @@ -117539,12 +110856,12 @@ bWD bXZ bMW caN -cbA -bda +bek +bcX cdW cDS cjF -ckU +xSh cmq cnn cma @@ -117555,7 +110872,7 @@ cuS cvL cma cxF -cyH +cmq cAp cCm cDg @@ -117567,13 +110884,13 @@ cHs cGh cDg bRt -rOw -cIo +cSB +cSB cmu cVm col cIm -cmV +clj bZU cPH cSN @@ -117581,7 +110898,7 @@ cSr cTq cTO cVD -cWf +cTt cUv cUv dau @@ -117727,14 +111044,14 @@ acN ahR aiI ajG -ajU +akf ajJ akT alO -apn atr atr atr +hNy atr aqd atr @@ -117742,12 +111059,12 @@ asV arZ atr atr -gHt -aII -ulS +atr +aFz +atr aAc -aBh -azw +aFz +aKc aDO aFh aCr @@ -117768,7 +111085,7 @@ aZN bbk bdS beq -bfS +bdb aYx abq abq @@ -117795,14 +111112,14 @@ bPS bWE bZw bZA -caM -bek +dDT +uhY bcX cdW cia cjE -ckT -cjG +xSh +cmq ckf coo coo @@ -117813,7 +111130,7 @@ coo coo cxE cmq -cAp +aac cCl cDh cBv @@ -117826,21 +111143,21 @@ cBv bSE clV cmd -sEe +cIo cVl cIn cIm -cmW +clo bZU cPI cQM +pue cRt -cRt -cRt +cVc cTP -cUw cRt cRt +nej cRt cTr cXb @@ -118001,7 +111318,7 @@ asS agB asS axK -aqJ +sOB aAd aBi akD @@ -118015,17 +111332,17 @@ aMf aaa aOG aQk -qYF +aRA aSX -aUl -iHq +wfs +aRA aWZ aOG bco -bbl +aZL bgH bek -bfS +bdb aYx abq abq @@ -118036,12 +111353,12 @@ bur bwg boE bAj -bCf -bAk +boE +boE bGa -bAk +boE aUi -bJk +bJf bKO bMY bPq @@ -118054,7 +111371,7 @@ bMW bMW caP cbC -ccL +bbr cdX cjj ckd @@ -118070,7 +111387,7 @@ cuF coo cxH cyI -cAp +aac cCl czC cAq @@ -118093,14 +111410,14 @@ cPJ cQM cTg cSk -cSk +gnZ cTQ -pue -cVc +cSo +cSo +gTp cRt -cVZ dbj -cXd +cXb cYf cXb cYf @@ -118260,8 +111577,8 @@ avd aqY atr lgv -aBj -ayL +aFA +alM aDP aFg aAE @@ -118272,9 +111589,9 @@ aMf abq aOG aQh -xQv -xQq -fDi +aRA +aRA +aUk aVz aOG aOG @@ -118282,7 +111599,7 @@ aZL aZL bdU bek -bfS +bdb aYx abq aBV @@ -118290,14 +111607,14 @@ aIb bkW btY brY +bAk btQ -btQ -bAe -btQ +bAj +boE bDr -oqV +boE bHD -aPU +aUi bJj bKX bMW @@ -118310,8 +111627,8 @@ bMW bMW bMW caO -bek -bcX +beo +mVW cdW cjh cmq @@ -118322,12 +111639,12 @@ cia cpM cmq xFR -cmp +clL cvM cia cxG cmq -cAp +aac cnn czC cCi @@ -118338,24 +111655,24 @@ dhB cGj czC bSX -bRr +cSB cSB cmw -cIn +diT com cIm -cje +bgZ bZU bZU cQR cRv -lUY -lUY -lUY -cUy -cVd -lUY -cWa +cRt +cRt +cRt +cRt +cRt +cRt +cRt cTr cXb cTX @@ -118506,20 +111823,20 @@ hIT ala aon app -aqK +app arV avb auS -auS +fBO ayV auT aDD ayq -alF +vSx aZa -aRP +rDS aCI -aDN +aKH aDN aCF aHJ @@ -118537,9 +111854,9 @@ aOG aaa aZJ bbm -bcN +bNp bek -bfS +bdb aYx abq aCV @@ -118556,11 +111873,11 @@ bDX byq bkW bLS -xca +bKO bMZ bOG bQn -bRZ +bQn bRZ bWb bWG @@ -118572,9 +111889,9 @@ bcX cdW cia cky -clL -cmq -cmq +clK +xkY +nVg cox cpP eKV @@ -118582,14 +111899,14 @@ vuE crC cvR cwx -cmq +kIc cmq cAs cCo czC cEe cBB -cCB +dhB dhA dhD cGk @@ -118601,7 +111918,7 @@ cna cnC coq cIm -cmY +bgZ bZU cSc cRn @@ -118773,9 +112090,9 @@ auR aDg asS aqJ -aYL -aBh -azw +lgv +aFz +aKc aDO aFi aCr @@ -118794,22 +112111,22 @@ aOG aaa aUr bbn -bcW +bbr bel -bfS +bdb aYx abq aBY bop boC -boE +teE bsa boE byp byq bTh -dPn -ogV +boE +boE bFK bkW bLl @@ -118818,7 +112135,7 @@ btk bOH bSa bSa -bSa +eQf bUX bWH bYJ @@ -118829,19 +112146,19 @@ bcX cdZ cDS ckx -clK -cmp +cmq +cmq cnn cia cpO fsY -crC +xFR cmq cvO cia -cxI -cyJ -cAr +cxF +cmq +aac cCn czC cMs @@ -118854,14 +112171,14 @@ czC bTb cIn cIn -vVE -cQA +cna +pUh cos cIm -cmY +bgZ bZU cPL -cRk +cQM cRx cTr cUz @@ -119010,12 +112327,12 @@ abq agA agA ahV -aiN -aiN +ahU +ahU akc akr pJV -pJV +waJ anL asa agA @@ -119053,13 +112370,13 @@ aZJ bbo bcX bek -bfS +bdb aYx abq aDK bpV boD -boE +gDB bsa boE byw @@ -119075,7 +112392,7 @@ bxo bNb bSa bSb -bSa +eQf bUY bWI bYd @@ -119098,7 +112415,7 @@ cwb cwy cxJ cmq -cAp +aac cno czC cAu @@ -119115,11 +112432,11 @@ cnb cVv cot cIm -cQi +clu bZU cPM -cRs -cRy +cQM +cRx cTt cUv cUv @@ -119288,8 +112605,8 @@ axi asd atr lgv -aBj -ayL +aFA +alM aDQ aFg aAE @@ -119310,13 +112627,13 @@ aMf bbp bcX bek -bfS +bdb aYx abq bkW bpY boE -boE +gDB bvW btU bwh @@ -119332,14 +112649,14 @@ bvl bNf bSa bSa -bSa -bSa +cfJ +odF bWJ bYe bZm cas -faY -ccM +vNb +bcX cea cjm cDS @@ -119355,7 +112672,7 @@ coo coo cia clM -cAt +cms coo cYF czC @@ -119376,14 +112693,14 @@ cNV czI bZU cRq -cRy +cRx +cRt cRt cRt cRt cRt cRt cRt -pue cTr cXb cTX @@ -119535,7 +112852,7 @@ aof aop aps aqN -asc +aqN aqN auW agB @@ -119547,33 +112864,33 @@ azF baq aRP aCJ -aDN +aKH aDN aCF aHJ -aJj -aKF -aMh -aNr -aMh +aJh +aKC +aKC +aKw +aKC aQp aRC -aMh +aKC aMh aXR -aOH -aNr +aKC +aKw aZP bbq -bcY +bcX ber -bfS +bdb aYx abq aEh bqf boD -boE +gDB bwf boE bwi @@ -119596,7 +112913,7 @@ bYf bZl car ccn -ccN +bcX cdW cfo cgw @@ -119605,12 +112922,12 @@ cjH cgw coz cnd -cgw -cgw +jwh +dWX cgw ctQ -cwz -siL +cgw +cgw cgw cAv cCp @@ -119625,24 +112942,24 @@ cLg cMT cns cns -hHX +cEX cWG cMh cNS cNW cON cPN -cRD -cRy +cQM +cRx +cRt +nej cRt cRt cRt -cVZ -cVh -lUY -daw +cVc +cRt dbm -cXp +cXb cYf cYX cYf @@ -119786,42 +113103,42 @@ ajL akd akN alB -alB +spg anM aoc aoo apr aqM arY -atv +arY auV -awz +crz awz aqJ aFz amE aqJ -nUW -aBm -azw +lgv +aFl +aKc aDO aFj aCr aHM aJg aKG -aMi +aKG aNs -aMi -aMi -aMi -aMi +aKG +aKG +aKG +aKG aUp aMi -aXa +aMi aYz aZQ -bbr +kuf bcZ bes bfU @@ -119854,38 +113171,38 @@ bZn car cbE qBP -kuf +mOc cfp +tEL cgx -pXI cjI -ckV +tPc tPc cnt +wFW +xvi tPc tPc tPc -dSJ -cub dRX -pdC +tPc cxK cyL -czG -tEL -tEL -oJA -cDz -xBd -cgx -cGq rEw cgx cgx -gsn +cgx +cDz +cgx +cgx +cgx +rEw +cgx +cgx +cgx cWl -oUC -tEL +cDz +cgx cNX cOO cPO @@ -119893,13 +113210,13 @@ cRB cRA cTC cTc -cTc +dGT cUA cVi cVC cRt cTr -cXf +cXb cTX cTX cTX @@ -120045,20 +113362,20 @@ agA aks alY anO -aof -atr +tCC +dKL api aqP -atr +dKL atw auZ atv -atv -awB +fhH +arY aFB ayw -aPb -bcB +aOY +aZb aBn akD akD @@ -120067,19 +113384,19 @@ amx aKL aJk aNt -aMj aNt -aMj -elv -aMj -aMj +aNt +aNt +aNt +aNt +aNt aUq -aMj -aMj -aMj +aNt +aNt +aNt aZR bbs -bda +bcX bek bfV aYx @@ -120087,22 +113404,22 @@ abq aDK bqh boD -boE +hht bvW btW bwi bBU byq -bCf -bEa +boE +bDY bFP bHy -bKY -bLd +bJn +bLb bNd bOL bQr -bSd +bQr bSd cgq bWM @@ -120110,38 +113427,38 @@ bYg bZn car cco -ccN +bcX cee cfq cgy -oym -cjJ -pDi +cgy +cgy +cgy cmm cnu -cmm +lHZ cqk crI csT cuc -cuc +pMS cuc czx cyM czH cAA cCQ -qtw +cmm cEv -cEo +cmm cFl -cGr +cmm czH cIt cuc cuc cWH -cmm +lHZ cmm cCQ cOP @@ -120150,7 +113467,7 @@ cRO cSX cTV cUB -cTW +wuT cWB cWT dac @@ -120301,7 +113618,7 @@ aku agA alD alY -alC +tAk atK aoq aoq @@ -120310,11 +113627,11 @@ aoq aoq auY awA -atr -aos -aFA -amE -atr +egZ +dKL +vss +sxA +dKL nUW aBo aCK @@ -120323,7 +113640,7 @@ aHL aGx aHO aJl -aKI +aNt aMk aMk aOK @@ -120336,22 +113653,22 @@ aXb aYA aZS bbt -bcX -bek -bfV +lDm +beo +jGr aYx abq bkW bqg boE -boE +hht bvW btX bwk bBO byq bCh -bEb +bwi bFQ bGu bJr @@ -120360,14 +113677,14 @@ bvy bOM bSe bSe -bSe -bSe +yhg +anr bWN nKy bZo cas -faY -ccM +uhY +bcX ced cfr cft @@ -120381,7 +113698,7 @@ cmo cmo cmo cvn -cvn +nhK cwE cmo cyN @@ -120572,7 +113889,7 @@ akD akD amx aPm -rHe +aAc alF alM aDS @@ -120601,14 +113918,14 @@ abq aEh cfh boD -boE +hht bsa boE byy byq byq bDW -bEc +bwi bFR bkW bJs @@ -120617,7 +113934,7 @@ bxp bON bSe bSf -bSe +gEi bVc bWO bYn @@ -120647,7 +113964,7 @@ cDo cBK cDH cDC -cEq +cDC cFm cGt cHo @@ -120814,7 +114131,7 @@ abq abq atK alC -alY +dnu alS atK aoj @@ -120827,8 +114144,8 @@ awC akD aAl aFV -aKb -aPc +alM +aqJ beT aBq aCL @@ -120841,12 +114158,12 @@ aKK aMk aNv aNA -aNA +vOE aRE aTa -aNq -aVE -aVE +bNP +oVK +mZH aYC aMk beD @@ -120858,14 +114175,14 @@ abq aBY bqj boG -boE +mAa bsa boE byx byq bAi bDQ -bEd +boE bFS bkW bJt @@ -120885,8 +114202,8 @@ bcX cef cft cgA -cid cic +gnJ ckX cmo cnw @@ -120904,7 +114221,7 @@ cAC cBJ cCI cDD -kxc +cEr cCI cGu cHo @@ -120918,10 +114235,10 @@ cQk cOS cpR cIx -cmY +ebA bZU cUG -cSo +nxh cUE cSV abq @@ -121083,7 +114400,7 @@ avf akD akD aAn -aAn +gKb aKA aRP bfm @@ -121103,11 +114420,11 @@ aRF aTb aNq aVE -aVE +sYp baO aMk beR -bdc +bMR bek bfV aYx @@ -121116,13 +114433,13 @@ aBY bql bsc btZ -bsg +bua bwn bAb byq byq byq -bEe +bDX byq bkW bMm @@ -121142,26 +114459,26 @@ bdb cee cOm cgB -cie cic +cie ckY cmo -cnx +tvw coP cqh crL csV -crL +vOx cvq cxZ cmo -czW +ciw czL cAD cBJ cCJ -cDD -cEr +fZG +nXf cFn cGv cHq @@ -121169,13 +114486,13 @@ cIw cJl cMm cLm -cMk -cLo -cQv +nzK +nzK +pzX cOT cPS cIx -cmY +ebA bZU cTh cTU @@ -121342,12 +114659,12 @@ akD aFg aFX aKc -aQy -bfk +atr +lgv aFA amE aDU -aFn +aGr amx aHS aJp @@ -121355,16 +114672,16 @@ aOb aMl aNx aUa -hnt +aNA aNA aTc aNq aVE -aVE +sYp baL aMk aMk -bdc +bMR bek bfV aYx @@ -121374,12 +114691,12 @@ aIH bkW bum bsh -bua -byQ +fGt +sLs bBW bCA bEf -bsh +byQ bFT aRj bJv @@ -121395,12 +114712,12 @@ bNh bNh caR bek -ccO -ceg +bdb +cee cfu -cgC -cif -iWi +cic +cic +cie ckZ cmo cng @@ -121424,15 +114741,15 @@ cJb cHp cIu cJk -cMj -cLp +pkf +uEN cLo cLr cQv cPR cSx cIx -cmY +ebA bZU cTi cWo @@ -121600,12 +114917,12 @@ amE amE amx aUx -tay -aWo +lgv +vDc amE aDX aFo -alM +fZC aHT aJq aOi @@ -121616,12 +114933,12 @@ aQs aSy aTd aUs -nLj +aNC aXd -gGG +aNC aZT aMk -bdc +bMR bek bfV aYx @@ -121631,13 +114948,13 @@ abq aJY buE bvr -bAk -bAk -bCc -bAk +boE +boE +bAj +boE bEg -bFU -bAk +boE +boE aUi bJw bLi @@ -121665,7 +114982,7 @@ coK cqg crK crN -cws +crN cvs cxY cxD @@ -121681,11 +114998,11 @@ czM czM cIx cJn -qsd -nzK -nzK -nzK -pzX +pkf +cLo +cLo +xqz +ryN cOX cPW cSs @@ -121855,12 +115172,12 @@ atL akD aAo aGr -aKb -aPc +alM +aqJ aAm aBu aAN -aDW +aDN aFp aGA aHU @@ -121869,17 +115186,17 @@ aOh aMl aNz avB -eSB +aNA aNA aTc aNq aVE -aVE -veh +sYp +aNC aZU aYA -bdd -bet +bMR +bek bfV aYx abq @@ -121896,20 +115213,20 @@ bhw bEh bhw bhw -bJx -bLj +bJw +bLe bOC bOU bRw bTE bTE -bTE +uMj bXW bYD bNh cay -cbH -ccQ +bek +bfK cee cOm cgE @@ -121932,7 +115249,7 @@ cDq cCR cEF cDF -cFX +cFY cID cHC cKh @@ -121940,13 +115257,13 @@ cIx cJm pkf cLr -cMl -cNh -cQw +cLo +cLp +cQv cOW cPV cIx -cmY +ebA iTR chy chy @@ -122107,17 +115424,17 @@ atC aqV asn akD -avp +avf akD akD aAn -aAn +gKb aKB aRP bfF -aFz -amE -aDX +hYq +sxA +hio aFq amx amx @@ -122131,8 +115448,8 @@ aRH bjb aNq aVE -aVE -aYF +sYp +aNC aZV aLL bde @@ -122153,7 +115470,7 @@ bCm bEi bFV bhw -bJo +bJw bLi bNh bQe @@ -122166,7 +115483,7 @@ bZk bNh caz bek -xJS +bfK cee cft cgF @@ -122189,7 +115506,7 @@ cAG cBi cAG cDF -qHr +cFY cFq cHK cKs @@ -122355,11 +115672,11 @@ aiW ajY akQ akz -amP +amQ aoe apC apC -npj +apC atD aqV asm @@ -122370,12 +115687,12 @@ akD aFg aGE aKc -aQy -bfA +atr +lgv aFz amE aDY -aFr +aDO aGB aze aze @@ -122383,16 +115700,16 @@ aze aMk aNB aOR -aNA +iUs aRI aTf -aNq -aVE -aVE -aNC +wma +pAO +sjx +erv aNC aYA -bdc +bMR bek bfX bhw @@ -122423,11 +115740,11 @@ bYP bNh cbb bek -xJS +bfK cei cOm cgG -cii +cic bUy cld cks @@ -122616,7 +115933,7 @@ amQ aoe apD ara -lhK +apC atE aqV aqj @@ -122628,7 +115945,7 @@ akD akD akD azG -fTe +lgv aCl aCO aCO @@ -122645,11 +115962,11 @@ aNA aWi aNq aVG -aNC +krK aNC aZW aMk -bdc +bMR bek bfY bhw @@ -122680,7 +115997,7 @@ bNU bNh cbi ben -ccR +bfM bZu cfw cgu @@ -122690,8 +116007,8 @@ clc clm cnA bVj -bVC -cti +rZk +rZk csZ cum cvw @@ -122874,8 +116191,8 @@ amB apE arb aoH -gog -gog +apC +apC aso axL avs @@ -122885,7 +116202,7 @@ aAp aGF aKO aqJ -bgl +lgv bnu aCO aDZ @@ -122902,17 +116219,17 @@ aRJ aMk aMk aMk -aXb +vrH aYA aMk aMk -bdf +bUM ben bfZ bhw bjh byk -bmW +blb boI bqp boI @@ -122924,7 +116241,7 @@ bCp bEl bHC bhw -bJo +bJw bLi bHB bNh @@ -122935,14 +116252,14 @@ ccl bWW bZz bZX -caM -bek -xJS +nza +beo +acw bbg bZU bZU bZU -cyl +bZU bZU bZU crU @@ -122962,13 +116279,13 @@ cDJ cic cHT cFs -cvv +fvO cuv cIy cJq -mpt +cic cLs -cjK +cic cNj cOf cOZ @@ -123126,13 +116443,13 @@ aiZ akb alA alu -amQ -amF +tBw +qME anU arc vgP atG -aqV +jKJ ass atz avu @@ -123144,7 +116461,7 @@ aMo aPb bgI aBw -aCP +dKR aEa aFt aGD @@ -123155,21 +116472,21 @@ aMn aSD aOT aQu -aRK +aJX aWk aMn aXZ -aQC -aQC -aQC +orm +fOf +eUz ayu -bdc +rVv bev -bfV +jGr bhw bji blc -bmX +blc bsH bqq bsj @@ -123182,7 +116499,7 @@ bEm bIy bhw bMG -bLo +bLi bOY bNh bRP @@ -123190,11 +116507,11 @@ bSn bTT cdB bWX -bZz -bZX -caM -bek -xJS +tST +vtR +pyX +vNb +bfK bbi bZU cfE @@ -123209,27 +116526,27 @@ cmz cfw cuo cvy -cwN +bVC cxP cyX -czP -cAJ +qnt +qnt cBP cCO -pdV -cEw -cFt +bVC +bVC +bVC cGC -cCO -iNq -cCO -qcX +bVC +cxP +bVC +bVC cLt cMp cNk cOg -cPY -cPY +bVC +bVC cQQ cRJ cVJ @@ -123383,11 +116700,11 @@ aja ugy akU als -amT +amQ amF apC apC -vXU +apC apy aqV asr @@ -123396,7 +116713,7 @@ avt axf ayZ aAq -aAq +pef aLv aWo aAr @@ -123416,17 +116733,17 @@ aRL aUO con aVI +imC aTn -aYH aTn bby -bdg +bde beu bjD bhw bjj blb -bmY +blb boK bqr boI @@ -123451,7 +116768,7 @@ bZD bZX caM bek -xJS +bfK bbi bZU bVI @@ -123474,8 +116791,8 @@ cAK cBQ cCP cFb -cEx -cFu +cic +cwV cGD cHx cIy @@ -123488,7 +116805,7 @@ cOh cPb cic cfw -cRI +dDV cSW cTm cNz @@ -123650,7 +116967,7 @@ aqX asw axL avZ -avt +axf azd aAv aHf @@ -123670,14 +116987,14 @@ aNF aOV aOV aRM -aTj +aNH aUv aVJ aXg -aYI -vVo +aTo +aTo bbz -bdh +bMR bek bfW bhw @@ -123695,7 +117012,7 @@ bDl bhw bhw bhw -bJo +bJw bLi bNh bNh @@ -123908,7 +117225,7 @@ ast atB avw axH -azb +azx aAu aHf aNo @@ -123924,18 +117241,18 @@ bNV aLM aMn aNG -aNH +pTP aQw aVB aTk -con +pXV aVK -aTo +ilf aYJ aZY -ayu -bdc -bek +lDa +fEr +vNb bfV bhw bnE @@ -123949,7 +117266,7 @@ bhw cgh cIj bDk -cgj +bTV bKv bHK bJC @@ -123961,10 +117278,10 @@ bSp cJT bWy bYp -bZE +bKv bZr -caB -cbI +bbr +bel cdE bZu bZU @@ -123979,7 +117296,7 @@ cqp crU cmz cvX -cvz +ptn cwQ bYI bNN @@ -123989,7 +117306,7 @@ cBS cDK cxU cGx -cHz +cIE cHL cIE cJz @@ -123997,12 +117314,12 @@ cEK cKx cKx cKx -cNn +cOp cOj cPd cPZ cOp -cmY +bgZ cvY cmi aaa @@ -124187,11 +117504,11 @@ aRO aWl aMn aVL -aTo +paZ aYK aZZ bbA -bdc +bMR bek bfV brN @@ -124222,14 +117539,14 @@ bht deF bNp bek -sQp +bdb cek -chd -dhd +ceE +cuV cin -cjU +chy dhq -cBk +cjl cOM bVr cqq @@ -124248,18 +117565,18 @@ cxU cGz cFx cGG -cHA +doV cJz cEK cfH cfH cfH -cNn +cOp cPi cPe cQa cOp -coe +tfV cwt cmi aaa @@ -124276,8 +117593,8 @@ aaa aaa cVG cmD -cXP -cYp +cXR +dab cnW cZr cZH @@ -124426,9 +117743,9 @@ atK avk atK atK -aXC +aze vDW -aBD +aze aCS aCS aCS @@ -124444,11 +117761,11 @@ aMn aMn aMn caH -ayu +wUE cdP aZZ bbB -bdc +bMR bek bgb bfV @@ -124469,7 +117786,7 @@ bHL bcN bLs bNp -bNp +ftd bQF bSW bTW @@ -124478,7 +117795,7 @@ bXP bYr bNp bNp -cbA +bek ccU bZu bZu @@ -124488,7 +117805,7 @@ bZu clj bZO cqo -crv +cfY csn ctE cmz @@ -124503,7 +117820,7 @@ cBU cPC cxU cGy -cFy +cFC cGH cKv cLn @@ -124511,12 +117828,12 @@ cEK cNd chu chu -cNn +cOp cOl cPf dcd cOp -cmY +bgZ cuV cmi aaa @@ -124534,7 +117851,7 @@ aaa cVG dbC cXQ -cYq +dab dcq cZr cZH @@ -124684,8 +118001,8 @@ avl awG axW aze -aAw aBE +aAw akD aEf ayG @@ -124700,8 +118017,8 @@ bXQ bYF aTm aWy -aVK -aTo +leu +wsx aYK aZZ beS @@ -124714,29 +118031,29 @@ bfI bnb boO bqu +oJQ bfI bfI -bww byG -bbr -bbr -bbr -bbr +mOc +mOc +mOc +mOc bHM bJF bLt -bbr +mOc bOV bQG -bbr -bbr -bbr -bbr -bbr -bbr -bbr +mOc +mOc +mOc +mOc +mOc +mOc +mOc ccr -ccV +bZt aYx cfG cgM @@ -124761,19 +118078,19 @@ cEd cxU cGQ cFz -cGI +cGH cIK cLQ cEK cgL chu cke -cNn +cOp cJL cPg cKN cOp -cmY +bgZ bZU bZU bZU @@ -124791,7 +118108,7 @@ aaa cVG cXt cXR -cYr +kNr dcl cZr cpf @@ -124923,10 +118240,10 @@ aui awx azt mcY -xbe +poJ xXW -alJ -azE +xbe +msg aid alq alq @@ -124956,40 +118273,40 @@ aBI aQz aQV aTo -aTo +aTr cbe -aTn +uQj aYM aZZ bbD -bdj +bde bey bgd -bhz -bjo +bMR +bUM blg bnc boP bqv bsl -buk -bwx -bwx -bCE -bhz -bhz -bhz -bhz -qCG -bLu -bNr -bOW -bQH -bNr -bTX -bNr -bNr -bNr +bMR +bMR +bMR +bRO +bMR +bMR +bMR +bMR +bdc +bKM +bdb +bfS +bqb +bdb +bdb +bdb +bdb +bdb bZt caF cbK @@ -125018,19 +118335,19 @@ cDP cxU cGF cFA -cGI +cGH cIJ cLG cEK cKB chE cKB -cNn +cOp cOn cPh cQd cOp -cOt +hLt bZU cVe chy @@ -125198,8 +118515,8 @@ avm awG axW aze -aAy aBG +aAy akD aEg caj @@ -125212,8 +118529,8 @@ aSJ aBI aQA aQV -aTo -aTp +udB +eRU aVO aTp bbe @@ -125243,14 +118560,14 @@ bHA bsp bQI bQI -aUJ +aUX aUX aUX bQI bZu cgK +mhx cbL -ccX aYx cfB cgO @@ -125270,24 +118587,24 @@ cxU cBh cBc cAR -cAN +kvG cCV cxU cGU cFB -cGJ +cGH cHA cKr -cJr +cEK cYS cLx cYT -cNo +cOp cOo cQq cQe cOp -cmY +bgZ bZU cVj cuV @@ -125316,7 +118633,7 @@ dbo dab daG dbz -dcg +dbo dab dbT dci @@ -125456,7 +118773,7 @@ axC amO aze aAz -aBH +aze akD aEg alW @@ -125470,8 +118787,8 @@ aBI aQB aQV aTp -aTq -aVO +ygK +aTu aTo bmL aoG @@ -125494,13 +118811,13 @@ bDV bGc bID bHO -bCy +hwe bLw bCy bQC bQI bTD -bUa +bSt bVt bYu bZb @@ -125517,12 +118834,12 @@ clj cmz cny cnI -cqt +cnI crZ cOm cuv -cvG -cwU +cvD +cwL cxV cxV cxV @@ -125539,12 +118856,12 @@ cJs cKB cLy cKB -cNn cOp cOp cOp cOp -cmY +cOp +bgZ cPT cVg cuV @@ -125569,11 +118886,11 @@ das daa dar oiv -oiv +daa dbd -dbn -ntG -daH +dar +daa +daa dbJ dbU dez @@ -125706,7 +119023,7 @@ alq alq atF awp -aEg +dFD amO amO amO @@ -125729,17 +119046,17 @@ aQV aTq aUy aVP -aXj +aTo aYP aoG aoG -bdo +azy bez bgf bhB bjq bkk -bnf +bne boS bqy bso @@ -125749,21 +119066,21 @@ byI bsm bCv bEr -bGd -bHO +jGU +lfV bJH bLx -bCy +yaQ bQE bQI bVs -eIn -okl -bXd +bSt +bVq +mAt bYE bZv cbD -cbN +lpc ccZ cen cfC @@ -125774,7 +119091,7 @@ cmZ cmA cnI coU -skc +cnI csa cfw cic @@ -125794,18 +119111,18 @@ cHG cIG cJt cNq -obL +cIE cOr cEK cln clN chy chy -cmY +bgZ cPT cPT cmy -cUJ +cvW bZU bZU aaa @@ -125824,7 +119141,7 @@ cYR cZD daq dab -iae +dbs dfD dbr dab @@ -125833,7 +119150,7 @@ dbA dbr dab dbV -cYR +sOJ ddX bMp bMv @@ -125983,8 +119300,8 @@ aPS aOZ aQD aQW -aTr -aUz +aTo +ygK aVQ aTo aYK @@ -125997,9 +119314,9 @@ bhC bjr aOD vEp -boR -bqx -blC +qeW +fhF +har buo bwA bCk @@ -126008,19 +119325,19 @@ bEo bCy bGe bHO -bCy -bLy +hwe +bLw bCy bHO bNn bSt -bUb +bSt bXc mAt bZd bZv caQ -cbO +mQu cda ceo cbO @@ -126041,7 +119358,7 @@ cxM cAH cBj cDN -lfz +cDN cEH cxV cGV @@ -126058,10 +119375,10 @@ cQE cPj cPj cRP -cRN +clT cPT cVo -cji +chy cUK cZN bZU @@ -126072,7 +119389,7 @@ aaa aaa cVI cVG -deA +cVG cVG cVG cnv @@ -126239,21 +119556,21 @@ aBI aBI aBI aRn -aRT +aQW aTs -aTn +spj aVR aXk aYK bab aoG -bdn +bak bez bjF bhD bjs bkk -bng +bne boR bqz bsm @@ -126266,20 +119583,20 @@ bEs bGd bHP bJI -bLy +bLw bCy bHO bQJ bSt -bSt +wBj bYt -mAt +sLS bSt bZv cbn -cbN +iuh cdb -cfD +saH uzt cgS cjf @@ -126302,7 +119619,7 @@ cEA cEJ cDI cEI -cFE +cHF cGN cHI cII @@ -126333,7 +119650,7 @@ cxT cVG cmG cXV -cYu +ueD dgW cZr cpg @@ -126473,11 +119790,11 @@ abq anQ aok aok -avq +bAC aok aok avv -akh +qWM aBr aok aKM @@ -126487,7 +119804,7 @@ aok aBI aQd aRt -aTe +aQd aBI aGJ aIe @@ -126496,35 +119813,35 @@ aMr aTg aBI aQI -aRT +aQW aTt -aTo +wsx aTq aTp aYK bac aoG -bdo +azy bez bgi bhE bjt bez bnh -boR -bqx +iTo +qIg bsp bup bwB byK bAu -bCy -bCy +lUc +mhq bGf -bHO +rfg +lFH +bLw bCy -bLz -bNw bPa bQL bSv @@ -126534,8 +119851,8 @@ mAt cba bZv cbd -cbP -cdc +cbS +cdh cdh cdh cgT @@ -126575,7 +119892,7 @@ cRR cTa bZU cVp -cji +chy cUL cYw bZU @@ -126590,7 +119907,7 @@ aaa cVG dbK cXW -cYu +dab cYU cZr bMu @@ -126738,37 +120055,37 @@ axS aBs aSH biO -bSH -axY -azC +biO +biO +kKz aBI aCU aEk -aFD +aJw aGL -aIh +aJw aJz aJw aBI aBI aBI aVp -aRU +aQV aTu -aTq +ygK aVT aTq aYK bad bbG -bdY +baD bez bez bez bez bez bni -boU +boR bqA bsp buq @@ -126777,11 +120094,11 @@ byL bAv bCz bEt -bGg +bGd bHQ bJJ bLA -bCy +ycU bHO bRU bSw @@ -126791,8 +120108,8 @@ mAt bZj bZv cbt -dHm -cdd +cbS +cdh cdh cdh bYA @@ -126802,7 +120119,7 @@ clj cmB cnK coW -cnK +hjH csc ctL cuy @@ -126825,14 +120142,14 @@ crU cdN cjn chy -cmY +jaV bZU cQJ cQU cTo bZU bZU -cUc +ckD bZU bZU bZU @@ -126847,7 +120164,7 @@ aaa cVG dbF cXX -ueD +dab cYV cZr bMu @@ -126991,7 +120308,7 @@ avv avv avv avv -asv +qWM aBr aOB aOB @@ -127010,15 +120327,15 @@ aMs aNM aBI aVm -aRU -aTv -aTq +aQV +aTu +ygK aVU aTo aYK bae aoG -bdo +azy aoG bgj bhF @@ -127036,31 +120353,31 @@ bEE bCy bIE bHO -bCy +hwe bLw bCy bPb bQK bSw bSt -bVq -mAt -bSt +keY +vfe +hmM caG -cbW -cbO +njo +tTh cde ces -lIR -bYz +cde +edg cjf bZv clo cmB cnK +cnK coX -cqx -bIO +lgr cto cuz cwH @@ -127082,13 +120399,13 @@ cKG cLB chy cuV -cmY +jaV bZU cQI -beV +chy cTd -cuE -cwF +cdO +ceE cWq cmi aaa @@ -127248,7 +120565,7 @@ afb cYd aim afb -asv +qWM afb avr avr @@ -127268,8 +120585,8 @@ aBI aBI aVr aRV -aTw -aTp +aTu +jCi aVV aTq aYK @@ -127278,11 +120595,11 @@ aoG bec bmM bks -bhG +asJ aoG blm -dnk -xla +bne +boR bqx bsp bus @@ -127305,9 +120622,9 @@ bNx bNz bZy cbW -cbR -cdf -oBY +cbN +uzt +uzt cfD bYC cjZ @@ -127316,16 +120633,16 @@ clj cmB cnL coY -lFT +cnK bIO cuj cuA -cwH +iyv cha cyP cmB cfY -cAX +cvW dhw bZU cAc @@ -127334,7 +120651,7 @@ cFG cGR cHM cIL -cFG +hLW ceD ceN ceN @@ -127521,18 +120838,18 @@ aIk aJC aLd aMt -aNN +aGM bVm aQJ aVH aTx -aTp -aTq +eRU +eQt aTp bbu aZZ aoG -bdo +azy aoG buC buC @@ -127550,7 +120867,7 @@ bEO bEv bEv bEv -bEv +bIL baN bHS bQM @@ -127559,10 +120876,10 @@ bSy bUf bXb bXX -bSw +gMS bZv cbv -cbS +cbP cdh cdh cdh @@ -127574,10 +120891,10 @@ cmB cnM cnK lFT -bIO +qaB ctS cuB -cwH +eiF cha cyO cmB @@ -127585,7 +120902,7 @@ clP cDX dhu bZU -cmY +dVK cuV bZU cHQ @@ -127596,9 +120913,9 @@ cfY cuV chy chy -cOv -den -cQj +cmY +chy +chy cQW cRQ cUd @@ -127750,12 +121067,12 @@ aaa aaa aij alb -akk +wzV alb aij aii cWS -akh +oVM akh akh anc @@ -127767,7 +121084,7 @@ atO avr awO ayb -azg +aAC aAC aPW avr @@ -127777,13 +121094,13 @@ aGN aIl aJD aLe -aMu -aNO +aLe +aLe bWp aQK aRX aTy -aTo +vge aTo aTp aYK @@ -127807,8 +121124,8 @@ bCC bCH bCH bEv -bEv -bbR +bIL +bCH bEv bTZ bQI @@ -127819,7 +121136,7 @@ bQI bNB bZv ccs -cbS +cbP cdh cdh cdh @@ -127829,23 +121146,23 @@ bZv clj cmB cnN -coZ +cnK cqM cmB cuN cuC clS -cxd +cha cyS cmB bZU -cAZ +cfU bZU bZU -cmY +dVK chy cFH -cGT +cFH cHY cEy cFH @@ -128008,12 +121325,12 @@ aaa aij akk apV -cyq +akk aij ail cWS aki -aki +mKy ama and asz @@ -128023,19 +121340,19 @@ asC atP avr awP -aya +wSh azh -aAD +aAB aBL avr aEm aFG aGO aIp -aJF +qTK +aLf +aLf aLf -aNP -aNP bVo aQL aRY @@ -128064,9 +121381,9 @@ bCC bau bvz bEv -bCH +kry bbQ -bDR +bCH bEv bQP bQI @@ -128076,18 +121393,18 @@ bXk bNA bZv cbF -ktI -imQ +cbO +lIR cet imQ -edg +gaa cku bZv clj cmB cnK -cpa -cqz +cnK +cnK bIP cuD cwh @@ -128096,8 +121413,8 @@ cyb cyR cmB cAc -dht -cmC +chP +ceN ctm cFc bZU @@ -128280,7 +121597,7 @@ asC atQ avr awo -awo +nuB avr awo aBN @@ -128289,7 +121606,7 @@ avv aHZ aGP aIn -aJF +qTK aLg avv aNQ @@ -128297,7 +121614,7 @@ aNQ aNQ aRZ aTA -aRZ +lSh aNQ aNQ aNQ @@ -128320,16 +121637,16 @@ bsp bEP bvz bDS -bEv -bEv -bCH -bIL +ljZ +vyo +dTK +soT bEv bQQ bQI bUh bVx -bVx +hKu bND bZv ccv @@ -128352,14 +121669,14 @@ csz cmB cmB cmB -cmY +dVK ckD chy bZU bZU bZU bGQ -thz +cHS cJu cBN cMr @@ -128521,7 +121838,7 @@ aaa aij aiL akk -akk +apV cyF cKm aij @@ -128530,10 +121847,10 @@ akj ald amc amc -aoy -apU +amc +apW arm -asD +asC atR aBy gQu @@ -128546,8 +121863,8 @@ aEo aFI aGQ aJF -aJE -nhZ +fUI +aLf aMy aNQ aUf @@ -128578,9 +121895,9 @@ bCF bEy bCH bEv +bIL +bEv bEv -bLF -bHT bEv bSj bQI @@ -128598,26 +121915,26 @@ cgd bZv bZv cnO -cmC -cmC -cmC -cmC +ckJ +ckJ +ckJ +ckJ csg ctm -cmC +ceN cxe -cmC -cmC -cmC +ceN +ceN +ceN cAd -cEa +cem cEB cDa chy cEM cEN -pkJ -cJf +cHS +cJu cBN cLq cFH @@ -128796,14 +122113,14 @@ aCm awS ayd azj -aAG +azj aBO aCX aEp aFJ aGR aJG -aJG +law aLh aMy aNQ @@ -128811,8 +122128,8 @@ aPq aQN aSB aTC -aSB -aVZ +sbG +aWa aXr aNQ azy @@ -128828,16 +122145,16 @@ boY bqx aoG aoG -bwK +bbE aoG bAz bCG bEz -poN -dTK +bEv +bCH bJM -dTK -vYK +bCH +bEv bEv bQS bQI @@ -128867,13 +122184,13 @@ bZU bZU bZU bZU -cAZ +cfU bZU bZU cFe bZU cFK -cHS +xtA cJw cFH cJA @@ -129035,32 +122352,32 @@ abq aij ajj akk -akk +rDe akk cZi aij ajn akl -erQ -amd +ald +amc amc amc apW aro -asF +mKy atT aCe awT aye aAe aAH -aye +oQz aCY aEq aJE aGS aJE -aJE +vHA aGS aMw aNQ @@ -129068,7 +122385,7 @@ aPh aQN aSA aTD -aSA +wSP aWa aXp aNQ @@ -129094,7 +122411,7 @@ bGl bHE bHI bIh -bbR +bCH bEv bQT bQI @@ -129124,7 +122441,7 @@ cyc cxf bZU cAe -cEb +ceu bZU iDw cDM @@ -129303,8 +122620,8 @@ ame ame ame apX -apY -aki +ivn +mKy auP avv avv @@ -129325,7 +122642,7 @@ aPI blh aSB aQX -aSB +sbG aWa aXv aVc @@ -129342,16 +122659,16 @@ boR buV aoG buz -aKU +azy aoG aoG aoG bEB bHU bHU -bHU +nhP bLH -bJL +bHU bPd bEG bQI @@ -129368,7 +122685,7 @@ bZv caV ciA bZv -cdo +kUj asJ asI aoG @@ -129377,7 +122694,7 @@ csj cwF cuE cwG -cxg +chy cyT cPT cfY @@ -129560,8 +122877,8 @@ amf amj aoA apY -apY -aki +ivn +mKy auH avv axP @@ -129582,7 +122899,7 @@ aPz aQO aSc aTF -aSc +qts aWc aXu aNQ @@ -129608,7 +122925,7 @@ bHW bLI bJO bTd -bIN +bHW bPe bEG bEG @@ -129624,8 +122941,8 @@ cex mcn chD clq -cbU -clt +mcn +ceA asJ coM aoG @@ -129633,8 +122950,8 @@ bZU bZU bZU bZU +pes cvV -cxh bZU bZU bZU @@ -129817,8 +123134,8 @@ akh anh akh akh -akh -aki +pKv +mKy atW avv awV @@ -129852,8 +123169,8 @@ bhM bjy bbH bnf -bpa -bqG +iTo +qIg bmB buI bwO @@ -129861,15 +123178,15 @@ bCe bAB aoG bED -bGo -xyZ +bHW +bHW gIN bLJ bKm -bHW +bKm bQU bTQ -bUl +uBN bVB bXp bEG @@ -129877,7 +123194,7 @@ bXi bYy asJ asJ -sfr +kUj asJ asJ asJ @@ -129890,8 +123207,8 @@ cqC csk ctp cww +rHl ceu -ctl cyd bZU aaa @@ -130072,10 +123389,10 @@ ako ajp amh amh -aki +mKy apZ apZ -aki +mKy avJ avv ayp @@ -130105,7 +123422,7 @@ bbH bgO beE bgq -bhN +bhJ bjz bbH bnk @@ -130120,14 +123437,14 @@ aoG bGh bGp bHX -bHX +kZl bha bJN bPg bEG bTP -bUg -bUm +bUl +bUl bXq bEG caI @@ -130139,7 +123456,7 @@ bxI asI aoG aoG -clv +aAL aoG aoG buC @@ -130147,8 +123464,8 @@ cLV chy cdK cuG -chy -cxi +cji +cvW cye bZU abq @@ -130362,15 +123679,15 @@ bbH bdv beE bgr -bhN +bhJ bnJ bbH -dnk -xla +bne +boR bqx aoG aoG -bwK +bbE aoG buy aoG @@ -130387,11 +123704,11 @@ bUn bVD bXr bEG -fFl +asJ kUj arr asI -sfr +kUj asJ cis buC @@ -130404,7 +123721,7 @@ cqF chy chy chy -chy +cji cuH cyf bZU @@ -130598,7 +123915,7 @@ axR aAL aBT aoG -dHr +gip aoG aoG aoG @@ -130619,11 +123936,11 @@ bbH bhd beG bgs -bhP +bgs bjB blq iHk -boV +xfn bqx aoG arr @@ -130648,12 +123965,12 @@ bZF ofz bdl asI -sfr +kUj asJ cir buC clR -bVK +avC asJ coO buC @@ -130661,7 +123978,7 @@ cqE chy chy chy -chy +cji chy cyg cmi @@ -130856,7 +124173,7 @@ aoG aBU aCZ aEw -aFL +aGW aGW aGW aGW @@ -130881,17 +124198,17 @@ bjC bbH bnp bpd -bqI -bst +bqy +bln bvj bwS -bCI +aGW bBq -bCI -bEH -bCI -bCI -bCI +aGW +aNR +aGW +aGW +aGW bOy bNF bNF @@ -130901,11 +124218,11 @@ bNF bWT bNF bNF -oMK +ofz caZ cbX asI -sfr +kUj asJ cfK cfK @@ -130918,7 +124235,7 @@ cqH cdK chy cuH -cvW +uBl chy cyg bZU @@ -131110,7 +124427,7 @@ asJ ayk asI aoG -dHr +gip asI cwA cwA @@ -131143,7 +124460,7 @@ aoG aoG aoG aoG -bAF +bbG aoG aoG aoG @@ -131162,7 +124479,7 @@ aoG aoG asI asI -sfr +kUj asJ cfK ciD @@ -131364,10 +124681,10 @@ air afb avy aub -ayl +avC asJ aoG -dHr +gip arr cwA aHH @@ -131393,14 +124710,14 @@ bgu bmm bnM bam -bno -bpe +bne +boR bqK bqx bwo bqx byT -bAG +byT bEQ bEI bGr @@ -131621,9 +124938,9 @@ air afb avz asJ -aym +asJ awL -ayo +aAL aBX asJ cwA @@ -131658,8 +124975,8 @@ buF bwT bwT bwT -bCK bwT +gdd bJR bGs gda @@ -131675,7 +124992,7 @@ bUr bZH aoG azp -sfr +kUj asJ asJ cfK @@ -131881,7 +125198,7 @@ asI ayn asJ aoG -dHr +gip asI cwA aIz @@ -131909,12 +125226,12 @@ bom bam bns bpg -bqM +bnr bsw buG bzb -byU -byU +bGt +bGt bFa bGv bGt @@ -131932,14 +125249,14 @@ asJ bZI aoG bef -sfr +kUj asJ cfK cfK chQ aRQ cly -sdQ +cly cor clA clA @@ -132138,13 +125455,13 @@ aoG aoG aoG aoG -dHr +gip aDa cwA akP dom aIw -aJM +rNt aLr nMC aNV @@ -132179,7 +125496,7 @@ bNj bDT bNK bCM -bPm +bCM bCM axh bqN @@ -132196,7 +125513,7 @@ ciu ciH bhv biB -jmm +biB bul clB cqr @@ -132423,7 +125740,7 @@ bjH aGt brP bsY -bqO +bxd bsy bwH bwV @@ -132440,12 +125757,12 @@ bQk bCM bSG asJ -bVJ -bXs -chG -bYH +asJ +aDa +asJ +asJ awL -ayo +aAL cfy asJ cfK @@ -132680,7 +125997,7 @@ bjI aFP brb bpi -bqP +bpn bsz dqh bzr @@ -132697,9 +126014,9 @@ bOD bCM cBF cBG -bVK +avC asJ -chF +aub ckg bXt aoG @@ -132909,7 +126226,7 @@ avz buC bZJ asJ -aBW +dHr aCg aEA aGc @@ -132939,13 +126256,13 @@ bnw bpi bqQ bqR -bwH +dqh bAs bjN bxI bCN bEM -bGx +bGw bIe bJT bLU @@ -133182,7 +126499,7 @@ ccH aQY ccH aYS -aQY +aIB aJO bbO aFR @@ -133196,7 +126513,7 @@ bnx bpj bqR bpn -bwH +dqh bAr bjN asJ @@ -133420,7 +126737,7 @@ aou asJ avC awL -ayo +aAL ayr atA aCa @@ -133441,9 +126758,9 @@ aPp aZc ccz baw -bct -bfe -bct +blt +bmh +blt bik bkw blt @@ -133451,8 +126768,8 @@ bmh bof bny bpk -bpn -bqS +foM +mDj buJ bzv byV @@ -133686,7 +127003,7 @@ aGb kxf bAL aIF -aJU +baB aLU aQR aOg @@ -133696,7 +127013,7 @@ baB aWp aVh aYW -lwo +baB xHf bcq aFR @@ -133710,7 +127027,7 @@ bnz bpi bqS bsC -bqS +gkU bxm bjN buz @@ -133953,8 +127270,8 @@ aJb aCg aCg aZe -dMG -vRY +aJZ +rFa aCg aFR aFR @@ -133967,7 +127284,7 @@ aWw bpi bqS bsC -bqS +gkU bxn bjN bjN @@ -134200,7 +127517,7 @@ aPn iof aCg hAg -aJV +len len len len @@ -134210,7 +127527,7 @@ len len len aZd -vny +len pcW aCg ayE @@ -134222,7 +127539,7 @@ baE iNu qHS dfz -bqT +bxd bsD buK bxc @@ -134236,7 +127553,7 @@ bJX bLY bNR bPu -bRa +iEd bNR bVv ied @@ -134246,7 +127563,7 @@ caf bNR cce cdx -ceI +uUE cfQ bSP ciO @@ -134442,9 +127759,9 @@ abq amk ank aoI -ank -art -asj +pjn +pjn +xxA aue avG axc @@ -134476,24 +127793,24 @@ aQF bck aIu rDF -bgE +bqO bnC dfB dgL -bpn +foM aZo -bxd +bqT byX bFF bCO -bER +bRa bGC bIk bJY -bLZ -bGI -bPw +ccf bGG +bPw +uTZ bSM bCN bWU @@ -134502,8 +127819,8 @@ bWU bCN biz ccf -nbt -bPw +bGG +nzX bIn chi civ @@ -134700,7 +128017,7 @@ amk anl aoJ ann -aru +ank asg avR avF @@ -134734,11 +128051,11 @@ hIG aFR uaQ bli -bli +sFz dfA iZY bvt -bpn +iRu bqU bCu bFD @@ -134747,10 +128064,10 @@ bGD bLc bIl bJZ -bMa +ccf bGG bPw -bGG +sVC bUo bCN bCN @@ -134759,8 +128076,8 @@ bCN bCN cDd ccf -nbt -bPw +bGG +nzX bGG bIq ciQ @@ -134957,9 +128274,9 @@ amk apJ ank aqh -kNc +ank asQ -awk +avV avI amk amk @@ -134970,8 +128287,8 @@ aEn aCg aHi aCg -aLw -aMQ +ygY +gid kWg kWg kez @@ -134990,18 +128307,18 @@ aFR aFR uaQ pSk -dfg -dfg +uDi +vmY blj dgO bjN +rPb bAP -rrO bnt bnt bCM bzL -bzL +uYO bzL bzL bMb @@ -135016,8 +128333,8 @@ bZG bCN biA ccf -qhv -bPw +bGG +nzX bGG bIq ciR @@ -135214,15 +128531,15 @@ amk ann aoJ anl -arv +ank asj -avV +nnI avH axM amk aAK cbc -aCh +nRh aEd plu aFY @@ -135248,12 +128565,12 @@ kKa anq deW dfg -dfg +eNd bsZ anq bnt +cZS bxf -jdX bnt bCL bCR @@ -135261,7 +128578,7 @@ bEU bGE bIm bKa -xhr +bMc bMi bPx bRd @@ -135274,7 +128591,7 @@ bZL bKa bMc bGG -bPw +nzX ceI chj ciS @@ -135472,7 +128789,7 @@ ank aoK asK arw -asg +dYi awn awU ayz @@ -135505,7 +128822,7 @@ rYj anq avP dfh -dft +eNd dfI anq bvu @@ -135516,9 +128833,9 @@ bAU bCM bEV uTZ -jdi +bIn bKb -dvV +bIo bNc bPy bRe @@ -135531,7 +128848,7 @@ bGG cbg bGG bGG -bPw +nzX bPw chk ciE @@ -135741,8 +129058,8 @@ pNG pmh aFZ aJb -aMI -naP +aLw +aDL kGw ebV lJX @@ -135753,7 +129070,7 @@ kRX ebV kGw tvk -xHU +ccu aCg aKT tgE @@ -135767,12 +129084,12 @@ bta anq bsG bza -bza -esj +fxB +fxB bAV bCT bEW -bGG +sVC bIo bKc bMd @@ -135998,7 +129315,7 @@ pNG lcc vZU aJb -aLw +vIz aLN kGw ebV @@ -136010,7 +129327,7 @@ flr ebV kGw dea -ccu +oCE aCg aKT bfz @@ -136035,7 +129352,7 @@ bKd bMe bNc bIp -bIn +edB nqA hnC bYk @@ -136045,7 +129362,7 @@ cag cbT bGG bGG -bGG +uOL bSS bIq ciV @@ -136250,7 +129567,7 @@ ans asI azy aCg -aDf +nRh aDi fmP aFY @@ -136287,7 +129604,7 @@ bAX bCM bEY jLP -pFi +bIq bKe bMf bNa @@ -136512,7 +129829,7 @@ aCg aCg aHi aCg -gsr +aLw aJW pUq lOU @@ -136533,7 +129850,7 @@ wxE gyy anq pRy -dfy +aoN btc anq bsJ @@ -136790,8 +130107,8 @@ wxE qtt anq dfk -deZ -bkV +aoN +aoN anq bsJ bwv @@ -136808,7 +130125,7 @@ bNe bPC bRi bSU -xyA +bPC bPC bRi bSU @@ -137065,7 +130382,7 @@ bzL bHG bzL bIt -kkt +bHG bHG bzL bIt @@ -137808,7 +131125,7 @@ nRh nRh nRh yaq -xYW +aOd hfb aCg aKT @@ -138593,7 +131910,7 @@ aaa aaa abq bIu -bwU +bwL aaa abq aaa @@ -142448,7 +135765,7 @@ abq bpr aaa aaa -bwU +bwL aaa aaa bpr @@ -144763,7 +138080,7 @@ bsf buS bxv bBg -bGS +bsf bsf bsf bKp @@ -145008,16 +138325,16 @@ bgM bcb moJ bsf -nwx -nEe -sJj +bsf +bsf +bsf bsf blN bic beW beW bsT -buP +qSf bxu bBf bGO @@ -145266,14 +138583,14 @@ bfc bic beW mcP -qAm -nKW +mcP +mcP beW bfb beX -brj -bsn -bsU +beX +beX +bvh buT bxx bBi @@ -145282,9 +138599,9 @@ beX bvh bKq bsf -nwx -nEe -sJj +bsf +bsf +bsf bsf bUA bsf @@ -145540,13 +138857,13 @@ beX bfb beW mcP -qAm -nKW +mcP +mcP bfb beW beW bKk -bKo +wri bsd abd aaa @@ -145803,7 +139120,7 @@ bgN beX beX bvh -bKo +wri bsd abd aaa @@ -146060,7 +139377,7 @@ bgN beX beX bvh -bKo +wri bsd abd aaa @@ -146317,7 +139634,7 @@ aXL beX beX bvh -bKo +wri bPH abd abd @@ -146574,7 +139891,7 @@ aXL beX beX bvh -bKo +wri bNY aXH aaa @@ -146806,12 +140123,12 @@ aXL aXL bdI bif -bil +bdL bil bjY -bil -bil -bil +nvN +kgV +kgV bpt brm bdI @@ -147056,7 +140373,7 @@ abd aUU aWB bbW -say +rqY bdN beX aXL @@ -147070,11 +140387,11 @@ bdI bdI bmT hLH -lYf +bif bdI bvd buX -bxC +bxD bCX bri bDd @@ -147082,13 +140399,13 @@ bFj bIA bHN dwC -oOT +bOa bOa bKl aXL beX bvh -rKu +fES cUI bzh bsd @@ -147336,7 +140653,7 @@ bDa bBk bDe bKn -bPJ +bDe bRq bRs fZV @@ -147346,7 +140663,7 @@ aXL beX bvh cQc -cUM +bbY cWj bsd abd @@ -147569,8 +140886,8 @@ aaa abd aUU aWB -bbW -bzh +pkq +rzT bdN beX aXL @@ -147583,27 +140900,27 @@ blD bdI bdI bow -bpu -brn +hLH +bif bdI bvg buZ -bxE -bCX +bxD +nPe bri bDg bGT bIB bHN xEi -jsQ +bOa bOa bKl aXL beX bvh -cLL -cUI +ijt +kXs bzh bsd abd @@ -147833,12 +141150,12 @@ beX aXL aXL bdI -bii +bif bfN bhH biU -bhH -bhH +wul +fWW boJ bph brQ @@ -148094,14 +141411,14 @@ bid bfH bjS blG -bjS +jNj bfH bid bpq bra bdI brk -bvb +brk bzf brk brk @@ -150157,9 +143474,9 @@ brf brf bdM bdM -bdM +dCV bzo -bdM +qbE bdM bdM bdM diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm index 1be71d3b8a8..210d381f45e 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm @@ -132,7 +132,7 @@ /area/ruin/powered/beach) "ax" = ( /obj/machinery/disco/immobile, -/turf/simulated/floor/light/colour_cycle, +/turf/simulated/floor/light, /area/ruin/powered/beach) "ay" = ( /obj/machinery/door/airlock/sandstone{ diff --git a/_maps/map_files/RandomRuins/SpaceRuins/clownmime.dmm b/_maps/map_files/RandomRuins/SpaceRuins/clownmime.dmm index 853fed945a1..f3c7a0b0e89 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/clownmime.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/clownmime.dmm @@ -146,7 +146,7 @@ /turf/simulated/floor/plating/airless, /area/space/nearstation) "F" = ( -/obj/structure/computerframe/HONKputer, +/obj/structure/computerframe, /turf/simulated/floor/plasteel/airless, /area/space/nearstation) "G" = ( diff --git a/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm b/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm index 6f97ce3e9f8..df9c798059c 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm @@ -1,4 +1,78 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aa" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_y = 0; + tag = "" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4; + level = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/fans/tiny, +/obj/machinery/door/poddoor{ + id_tag = "SSBtestchamber"; + name = "Syndicate Test Lab Blast Door" + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/testlab) +"ab" = ( +/obj/machinery/door_control{ + id = "SSBtestchamber"; + name = "Blast Door Control" + }, +/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/area/ruin/unpowered/syndicate_space_base/testlab) +"ac" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/fans/tiny, +/obj/machinery/door/poddoor{ + id_tag = "SSBtestchamber"; + name = "Syndicate Test Lab Blast Door" + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/unpowered/syndicate_space_base/testlab) +"ad" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/camera/emp_proof{ + c_tag = "Test Lab West"; + dir = 4; + network = list("SyndicateTestLab") + }, +/turf/simulated/floor/engine, +/area/ruin/unpowered/syndicate_space_base/testlab) +"ae" = ( +/obj/machinery/camera/emp_proof{ + c_tag = "Test Lab East"; + dir = 9; + network = list("SyndicateTestLab") + }, +/turf/simulated/floor/engine, +/area/ruin/unpowered/syndicate_space_base/testlab) "aj" = ( /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plasteel{ @@ -1191,18 +1265,6 @@ icon_state = "dark" }, /area/ruin/unpowered/syndicate_space_base/telecomms) -"mE" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/fans/tiny, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/ruin/unpowered/syndicate_space_base/testlab) "mP" = ( /obj/machinery/power/generator, /obj/structure/cable/yellow, @@ -1404,14 +1466,6 @@ icon_state = "brown" }, /area/ruin/unpowered/syndicate_space_base/cargo) -"ol" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/engine, -/area/ruin/unpowered/syndicate_space_base/testlab) "ow" = ( /obj/structure/closet/crate/medical, /obj/item/storage/firstaid/fire{ @@ -1861,32 +1915,6 @@ icon_state = "dark" }, /area/ruin/unpowered/syndicate_space_base/main) -"un" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - pixel_y = 0; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/fans/tiny, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/ruin/unpowered/syndicate_space_base/testlab) "uq" = ( /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" @@ -2388,7 +2416,7 @@ }, /area/ruin/unpowered/syndicate_space_base/main) "yf" = ( -/obj/machinery/computer/monitor{ +/obj/machinery/computer/monitor/secret{ name = "Engine Grid Power Monitoring Computer" }, /obj/structure/cable/yellow, @@ -4114,7 +4142,7 @@ icon_state = "0-2"; pixel_y = 1 }, -/obj/machinery/computer/monitor{ +/obj/machinery/computer/monitor/secret{ name = "Output Grid Power Monitoring Computer" }, /turf/simulated/floor/plating, @@ -4926,6 +4954,13 @@ icon_state = "dark" }, /area/ruin/unpowered/syndicate_space_base/main) +"ZG" = ( +/obj/machinery/computer/security/telescreen{ + name = "Test Lab Monitor"; + network = list("SyndicateTestLab") + }, +/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/area/ruin/unpowered/syndicate_space_base/testlab) "ZR" = ( /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -6837,8 +6872,8 @@ TD TD rr CM -TD -TD +ZG +ab TD CM ZR @@ -6897,13 +6932,13 @@ ia ia ia TD -un +aa TD ia ia ia TD -mE +ac TD AV AV @@ -7022,7 +7057,7 @@ fH fH RC uN -ol +ad RF RF dH @@ -7952,7 +7987,7 @@ qv Vl Vl Vl -Vl +ae Vl Vl Vl diff --git a/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm b/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm index 3a657a7e054..bf7d50fab83 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm @@ -133,7 +133,7 @@ }, /area/derelict/bridge) "av" = ( -/obj/machinery/computer/monitor, +/obj/machinery/computer/monitor/secret, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkblue" @@ -3697,7 +3697,7 @@ name = "Derelict Annex" }) "hD" = ( -/obj/machinery/computer/monitor, +/obj/machinery/computer/monitor/secret, /turf/simulated/floor/plasteel{ icon_state = "caution"; dir = 5 @@ -6735,7 +6735,7 @@ }) "nS" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/beetsoup, +/obj/item/reagent_containers/food/snacks/soup/beetsoup, /turf/simulated/floor/plasteel{ icon_state = "bar" }, diff --git a/_maps/map_files/RandomZLevels/beach.dmm b/_maps/map_files/RandomZLevels/beach.dmm index 3001121184a..e77a5d19162 100644 --- a/_maps/map_files/RandomZLevels/beach.dmm +++ b/_maps/map_files/RandomZLevels/beach.dmm @@ -18,10 +18,6 @@ }, /turf/simulated/floor/beach/away/water/deep/sand_floor, /area/awaymission/undersea) -"af" = ( -/obj/structure/constructshell, -/turf/simulated/floor/beach/away/water/deep/wood_floor, -/area/awaymission/undersea) "ag" = ( /obj/structure/chair/wood/wings, /turf/simulated/floor/beach/away/water/deep/wood_floor, @@ -46312,7 +46308,7 @@ ad ad ad ah -af +ah ah ah ar @@ -46823,7 +46819,7 @@ av av ad ad -af +ah ah ah ah @@ -48108,7 +48104,7 @@ av av ad ad -af +ah ah ah ah @@ -48625,7 +48621,7 @@ ad ad ad ah -af +ah ah ah ah diff --git a/_maps/map_files/RandomZLevels/blackmarketpackers.dmm b/_maps/map_files/RandomZLevels/blackmarketpackers.dmm index d4015627b27..a931d28b377 100644 --- a/_maps/map_files/RandomZLevels/blackmarketpackers.dmm +++ b/_maps/map_files/RandomZLevels/blackmarketpackers.dmm @@ -2536,7 +2536,7 @@ icon_state = "0-4"; d2 = 4 }, -/obj/machinery/computer/monitor, +/obj/machinery/computer/monitor/secret, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, /area/awaymission/BMPship/Aft) diff --git a/_maps/map_files/RandomZLevels/centcomAway.dmm b/_maps/map_files/RandomZLevels/centcomAway.dmm index 640d9c18651..92efd02f4f8 100644 --- a/_maps/map_files/RandomZLevels/centcomAway.dmm +++ b/_maps/map_files/RandomZLevels/centcomAway.dmm @@ -2785,7 +2785,7 @@ d2 = 8; icon_state = "0-8" }, -/obj/machinery/computer/monitor, +/obj/machinery/computer/monitor/secret, /turf/simulated/floor/plasteel{ icon_state = "yellow" }, diff --git a/_maps/map_files/RandomZLevels/moonoutpost19.dmm b/_maps/map_files/RandomZLevels/moonoutpost19.dmm index cfe208e1557..c54db920e91 100644 --- a/_maps/map_files/RandomZLevels/moonoutpost19.dmm +++ b/_maps/map_files/RandomZLevels/moonoutpost19.dmm @@ -1308,7 +1308,7 @@ icon_state = "0-4"; d2 = 4 }, -/obj/machinery/computer/monitor, +/obj/machinery/computer/monitor/secret, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -5160,7 +5160,7 @@ /turf/simulated/floor/plating, /area/awaycontent/a7) "hm" = ( -/obj/machinery/computer/monitor, +/obj/machinery/computer/monitor/secret, /obj/structure/cable, /turf/simulated/floor/plating, /area/awaycontent/a7) diff --git a/_maps/map_files/RandomZLevels/spacebattle.dmm b/_maps/map_files/RandomZLevels/spacebattle.dmm index 82ff15e5bd5..41249533907 100644 --- a/_maps/map_files/RandomZLevels/spacebattle.dmm +++ b/_maps/map_files/RandomZLevels/spacebattle.dmm @@ -666,7 +666,7 @@ /area/awaymission/spacebattle/cruiser) "cS" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/snacks/stew, +/obj/item/reagent_containers/food/snacks/soup/stew, /turf/simulated/floor/plasteel{ icon_state = "cafeteria"; dir = 2 diff --git a/_maps/map_files/RandomZLevels/terrorspiders.dmm b/_maps/map_files/RandomZLevels/terrorspiders.dmm index e540f5a9246..706a69f5e17 100644 --- a/_maps/map_files/RandomZLevels/terrorspiders.dmm +++ b/_maps/map_files/RandomZLevels/terrorspiders.dmm @@ -7975,7 +7975,7 @@ icon_state = "0-4"; d2 = 4 }, -/obj/machinery/computer/monitor{ +/obj/machinery/computer/monitor/secret{ name = "primary power monitoring console" }, /obj/structure/sign/nosmoking_2{ @@ -10652,7 +10652,7 @@ /turf/simulated/floor/plating/asteroid/airless, /area/awaymission/UO71/outside) "vV" = ( -/obj/machinery/computer/monitor, +/obj/machinery/computer/monitor/secret, /turf/simulated/floor/plasteel, /area/awaymission/UO71/bridge) "vW" = ( @@ -11805,7 +11805,7 @@ }, /area/awaymission/UO71/eng) "yc" = ( -/obj/machinery/computer/monitor{ +/obj/machinery/computer/monitor/secret{ name = "primary power monitoring console" }, /obj/structure/cable, diff --git a/_maps/map_files/RandomZLevels/undergroundoutpost45.dmm b/_maps/map_files/RandomZLevels/undergroundoutpost45.dmm index cb3cd4abde8..4222dec00eb 100644 --- a/_maps/map_files/RandomZLevels/undergroundoutpost45.dmm +++ b/_maps/map_files/RandomZLevels/undergroundoutpost45.dmm @@ -11078,7 +11078,7 @@ icon_state = "0-4"; d2 = 4 }, -/obj/machinery/computer/monitor{ +/obj/machinery/computer/monitor/secret{ name = "primary power monitoring console" }, /obj/structure/sign/nosmoking_2{ @@ -15909,7 +15909,7 @@ name = "UO45 Engineering" }) "xg" = ( -/obj/machinery/computer/monitor{ +/obj/machinery/computer/monitor/secret{ name = "primary power monitoring console" }, /obj/structure/cable, diff --git a/_maps/map_files/RandomZLevels/wildwest.dmm b/_maps/map_files/RandomZLevels/wildwest.dmm index 5ceeeac6383..50a7074a7a9 100644 --- a/_maps/map_files/RandomZLevels/wildwest.dmm +++ b/_maps/map_files/RandomZLevels/wildwest.dmm @@ -1217,7 +1217,7 @@ }, /area/awaymission/wwgov) "dy" = ( -/obj/item/reagent_containers/food/snacks/stew, +/obj/item/reagent_containers/food/snacks/soup/stew, /turf/simulated/floor/plasteel{ tag = "icon-stage_bleft"; icon_state = "stage_bleft" diff --git a/_maps/map_files/generic/centcomm.dmm b/_maps/map_files/generic/centcomm.dmm index 6c9d3a41b19..9bb63d73f29 100644 --- a/_maps/map_files/generic/centcomm.dmm +++ b/_maps/map_files/generic/centcomm.dmm @@ -25,8 +25,7 @@ /area/syndicate_mothership) "ai" = ( /obj/item/radio/intercom/syndicate{ - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) @@ -35,7 +34,6 @@ /obj/item/clothing/under/dress/dress_saloon, /obj/item/clothing/head/hairflower, /turf/simulated/floor/holofloor{ - dir = 2; icon_state = "cult"; tag = "icon-cult" }, @@ -50,7 +48,6 @@ /obj/effect/landmark/costume/random, /obj/structure/rack/holorack, /turf/simulated/floor/holofloor{ - dir = 2; icon_state = "cult"; tag = "icon-cult" }, @@ -68,7 +65,6 @@ /obj/structure/chair/stool/holostool, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/holofloor{ - dir = 2; icon_state = "asteroid"; tag = "icon-asteroid" }, @@ -85,7 +81,6 @@ /area/space) "ar" = ( /turf/simulated/floor/holofloor{ - dir = 2; icon = 'icons/turf/floors/plating.dmi'; icon_state = "asteroid"; tag = "icon-asteroid" @@ -109,7 +104,6 @@ /obj/structure/table/holotable/wood, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/holofloor{ - dir = 2; icon_state = "asteroid"; tag = "icon-asteroid" }, @@ -191,7 +185,6 @@ "aL" = ( /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/holofloor{ - dir = 2; icon = 'icons/turf/floors/plating.dmi'; icon_state = "asteroid"; tag = "icon-asteroid" @@ -210,7 +203,6 @@ /area/space) "aO" = ( /turf/simulated/floor/holofloor{ - dir = 2; icon_state = "cult"; tag = "icon-cult" }, @@ -268,7 +260,6 @@ "aX" = ( /obj/structure/flora/ausbushes/sparsegrass, /turf/simulated/floor/holofloor{ - dir = 2; icon = 'icons/turf/floors/plating.dmi'; icon_state = "asteroid"; tag = "icon-asteroid" @@ -277,7 +268,6 @@ "aY" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/holofloor{ - dir = 2; icon_state = "asteroid"; tag = "icon-asteroid" }, @@ -301,7 +291,6 @@ "bb" = ( /obj/structure/table/holotable/wood, /turf/simulated/floor/holofloor{ - dir = 2; icon_state = "grimy"; tag = "icon-grimy" }, @@ -316,7 +305,6 @@ /area/holodeck/source_meetinghall) "bd" = ( /turf/simulated/floor/holofloor{ - dir = 2; icon = 'icons/turf/floors/plating.dmi'; icon_state = "asteroid7"; tag = "icon-asteroid7" @@ -516,7 +504,6 @@ /area/space) "bX" = ( /turf/simulated/floor/holofloor{ - dir = 2; icon_state = "green" }, /area/holodeck/source_emptycourt) @@ -570,7 +557,6 @@ /area/holodeck/source_snowfield) "cm" = ( /turf/simulated/floor/holofloor{ - dir = 2; icon_state = "grimy"; tag = "icon-grimy" }, @@ -704,8 +690,7 @@ /area/centcom/evac) "cI" = ( /obj/structure/shuttle/engine/propulsion{ - dir = 8; - icon_state = "propulsion" + dir = 8 }, /turf/simulated/floor/plating/airless, /area/shuttle/specops) @@ -763,7 +748,6 @@ "cW" = ( /obj/machinery/light/spot{ dir = 1; - icon_state = "tube1"; tag = "icon-tube1 (NORTH)" }, /turf/simulated/floor/plasteel/dark, @@ -773,7 +757,6 @@ /obj/machinery/kitchen_machine/microwave/upgraded, /obj/machinery/light/spot{ dir = 1; - icon_state = "tube1"; tag = "icon-tube1 (NORTH)" }, /turf/simulated/floor/plasteel/freezer, @@ -833,7 +816,6 @@ /obj/item/camera, /obj/machinery/light/spot{ dir = 1; - icon_state = "tube1"; tag = "icon-tube1 (NORTH)" }, /turf/simulated/floor/plasteel{ @@ -855,7 +837,6 @@ "di" = ( /obj/machinery/light/spot{ dir = 1; - icon_state = "tube1"; tag = "icon-tube1 (NORTH)" }, /turf/simulated/floor/beach/away/sand, @@ -880,14 +861,12 @@ id_tag = "vox_southeast_lock"; locked = 1; req_access_txt = "152"; - req_one_access = null; - req_one_access_txt = "0" + req_one_access = null }, /turf/simulated/floor/plating/nitrogen, /area/shuttle/vox) "dp" = ( /turf/simulated/floor/holofloor{ - dir = 2; icon_state = "red" }, /area/holodeck/source_basketball) @@ -1027,16 +1006,13 @@ "dQ" = ( /obj/machinery/light/spot{ dir = 1; - icon_state = "tube1"; tag = "icon-tube1 (NORTH)" }, /turf/simulated/floor/plasteel/grimy, /area/ninja/outpost) "dR" = ( /obj/structure/table, -/obj/machinery/recharger{ - pixel_y = 0 - }, +/obj/machinery/recharger, /turf/simulated/floor/plasteel/freezer, /area/ninja/holding) "dS" = ( @@ -1131,7 +1107,6 @@ /area/syndicate_mothership) "el" = ( /turf/simulated/floor/holofloor{ - dir = 2; icon_state = "green" }, /area/holodeck/source_basketball) @@ -1166,15 +1141,6 @@ icon_state = "cafeteria" }, /area/ninja/holding) -"eq" = ( -/obj/machinery/light{ - dir = 4; - icon_state = "tube1" - }, -/turf/simulated/floor/plasteel{ - icon_state = "bar" - }, -/area/syndicate_mothership) "eu" = ( /obj/structure/chair/stool, /obj/machinery/computer/security/telescreen{ @@ -1237,8 +1203,7 @@ req_access_txt = "150" }, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5; - icon_state = "intact" + dir = 5 }, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/syndicate) @@ -1252,14 +1217,12 @@ "eG" = ( /obj/structure/shuttle/engine/propulsion{ dir = 1; - icon_state = "propulsion"; tag = "icon-propulsion (NORTH)" }, /turf/simulated/floor/plating/airless, /area/shuttle/syndicate_elite) "eH" = ( /turf/simulated/floor/holofloor{ - dir = 2; icon_state = "green" }, /area/holodeck/source_boxingcourt) @@ -1333,7 +1296,6 @@ "eT" = ( /obj/machinery/light/spot{ dir = 1; - icon_state = "tube1"; tag = "icon-tube1 (NORTH)" }, /obj/machinery/computer/syndicate_depot/teleporter, @@ -1369,7 +1331,6 @@ /obj/machinery/door_control{ id = "syndicate_sit_1"; name = "Blast Doors"; - pixel_x = 0; pixel_y = -23; req_access_txt = "150" }, @@ -1409,7 +1370,6 @@ }, /obj/machinery/light/spot{ dir = 8; - icon_state = "tube1"; tag = "icon-tube1 (WEST)" }, /turf/simulated/floor/engine, @@ -1454,7 +1414,7 @@ /turf/simulated/floor/wood, /area/syndicate_mothership) "fe" = ( -/obj/machinery/cryopod/right, +/obj/machinery/cryopod/offstation/right, /turf/simulated/floor/plasteel/dark, /area/centcom/specops) "ff" = ( @@ -1490,7 +1450,7 @@ /turf/simulated/floor/engine/cult, /area/wizard_station) "fl" = ( -/obj/machinery/cryopod, +/obj/machinery/cryopod/offstation, /turf/simulated/floor/plasteel/dark, /area/centcom/specops) "fm" = ( @@ -1512,7 +1472,6 @@ /obj/machinery/vending/magivend, /obj/machinery/light/spot{ dir = 1; - icon_state = "tube1"; tag = "icon-tube1 (NORTH)" }, /turf/simulated/floor/engine/cult, @@ -1566,8 +1525,7 @@ width = 9 }, /obj/machinery/door/airlock/titanium/glass{ - id_tag = "s_docking_airlock"; - req_one_access_txt = "0" + id_tag = "s_docking_airlock" }, /obj/docking_port/stationary{ dir = 8; @@ -1640,8 +1598,6 @@ /area/ninja/holding) "fL" = ( /obj/machinery/computer/cryopod{ - density = 0; - pixel_x = 0; pixel_y = 32 }, /turf/simulated/floor/plasteel, @@ -1696,14 +1652,11 @@ /area/holodeck/source_thunderdomecourt) "fU" = ( /obj/structure/table/wood, -/obj/machinery/recharger{ - pixel_y = 0 - }, +/obj/machinery/recharger, /turf/simulated/floor/engine/cult, /area/wizard_station) "fV" = ( /obj/machinery/power/apc{ - dir = 2; name = "Gamma Armory APC"; pixel_y = -24 }, @@ -1712,15 +1665,13 @@ icon_state = "0-4" }, /obj/structure/sign/securearea{ - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/gamma/space) "fW" = ( /obj/machinery/light/spot{ dir = 8; - icon_state = "tube1"; tag = "icon-tube1 (WEST)" }, /turf/simulated/floor/engine/cult, @@ -1742,7 +1693,6 @@ "ga" = ( /obj/machinery/light/spot{ dir = 8; - icon_state = "tube1"; tag = "icon-tube1 (WEST)" }, /turf/simulated/floor/plasteel/dark, @@ -1750,7 +1700,6 @@ "gb" = ( /obj/machinery/light/spot{ dir = 4; - icon_state = "tube1"; tag = "icon-tube1 (EAST)" }, /turf/simulated/floor/plasteel/dark, @@ -1777,7 +1726,6 @@ "gg" = ( /obj/machinery/light/spot{ dir = 1; - icon_state = "tube1"; tag = "icon-tube1 (NORTH)" }, /turf/simulated/floor/plasteel/dark, @@ -2003,7 +1951,6 @@ /area/space) "hd" = ( /obj/docking_port/stationary/transit{ - dir = 1; dwidth = 1; height = 4; id = "pod1_transit"; @@ -2028,7 +1975,6 @@ /area/syndicate_mothership) "hh" = ( /obj/docking_port/stationary/transit{ - dir = 1; dwidth = 1; height = 4; id = "pod2_transit"; @@ -2040,7 +1986,6 @@ "hi" = ( /obj/docking_port/stationary{ area_type = /area/syndicate_mothership; - dir = 1; dwidth = 11; height = 18; id = "emergency_syndicate"; @@ -2173,8 +2118,7 @@ /area/shuttle/syndicate) "ic" = ( /obj/structure/closet/fireaxecabinet{ - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /obj/machinery/light{ dir = 1; @@ -2188,7 +2132,6 @@ /area/shuttle/escape) "id" = ( /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "browncorner" }, /area/shuttle/escape) @@ -2216,7 +2159,6 @@ /area/syndicate_mothership) "ij" = ( /obj/item/radio/intercom/syndicate{ - pixel_x = 0; pixel_y = 25 }, /obj/item/twohanded/required/kirbyplants, @@ -2315,16 +2257,13 @@ }, /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /turf/simulated/floor/plasteel/freezer, /area/syndicate_mothership) "iB" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "bar" @@ -2562,7 +2501,6 @@ "jq" = ( /obj/machinery/light/spot{ dir = 4; - icon_state = "tube1"; tag = "icon-tube1 (EAST)" }, /obj/structure/closet/syndicate/sst, @@ -2585,7 +2523,6 @@ "jt" = ( /obj/machinery/light/small{ dir = 4; - icon_state = "bulb1"; tag = "icon-bulb1 (EAST)" }, /obj/structure/chair/comfy/shuttle{ @@ -2604,7 +2541,6 @@ "jw" = ( /obj/machinery/light/small{ dir = 8; - icon_state = "bulb1"; tag = "icon-bulb1 (WEST)" }, /obj/structure/chair/comfy/shuttle{ @@ -2701,13 +2637,11 @@ /area/syndicate_mothership) "jH" = ( /obj/machinery/door/window{ - dir = 4; name = "Infirmary"; req_access_txt = "150" }, /obj/machinery/light/spot{ dir = 1; - icon_state = "tube1"; tag = "icon-tube1 (NORTH)" }, /turf/simulated/floor/mineral/plastitanium/red, @@ -2726,7 +2660,6 @@ /area/syndicate_mothership) "jM" = ( /obj/machinery/door/window{ - dir = 4; name = "Uplink Management Control"; req_access_txt = "151" }, @@ -2858,20 +2791,17 @@ /area/shuttle/assault_pod) "kn" = ( /obj/machinery/sleeper/syndie{ - dir = 2; - icon_state = "sleeper_s-open" + dir = 2 }, /turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "kp" = ( /obj/machinery/light/spot{ dir = 1; - icon_state = "tube1"; tag = "icon-tube1 (NORTH)" }, /obj/machinery/sleeper/syndie{ - dir = 2; - icon_state = "sleeper_s-open" + dir = 2 }, /turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) @@ -2880,8 +2810,7 @@ /area/syndicate_mothership) "ks" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) @@ -2964,14 +2893,13 @@ /obj/item/storage/fancy/crayons, /obj/machinery/light/spot{ dir = 1; - icon_state = "tube1"; tag = "icon-tube1 (NORTH)" }, /turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "kL" = ( /obj/structure/table, -/obj/item/gun/energy/ionrifle, +/obj/item/gun/energy/ionrifle/carbine, /turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) "kM" = ( @@ -3040,7 +2968,6 @@ /obj/structure/closet/secure_closet/personal, /obj/machinery/light/spot{ dir = 4; - icon_state = "tube1"; tag = "icon-tube1 (EAST)" }, /turf/simulated/floor/carpet, @@ -3165,7 +3092,6 @@ /obj/structure/reagent_dispensers/beerkeg, /obj/machinery/light/spot{ dir = 1; - icon_state = "tube1"; tag = "icon-tube1 (NORTH)" }, /turf/simulated/floor/plasteel{ @@ -3187,7 +3113,6 @@ "lv" = ( /obj/machinery/light/spot{ dir = 1; - icon_state = "tube1"; tag = "icon-tube1 (NORTH)" }, /turf/simulated/floor/plasteel/freezer, @@ -3247,7 +3172,6 @@ /obj/structure/chair/stool, /obj/machinery/light/spot{ dir = 4; - icon_state = "tube1"; tag = "icon-tube1 (EAST)" }, /turf/simulated/floor/plasteel{ @@ -3381,7 +3305,6 @@ "me" = ( /obj/structure/table, /obj/machinery/processor{ - pixel_x = 0; pixel_y = 10 }, /turf/simulated/floor/plasteel{ @@ -3391,7 +3314,6 @@ "mf" = ( /obj/machinery/camera{ c_tag = "CentComm Special Ops. Mass Drivers"; - dir = 2; network = list("ERT","CentComm") }, /turf/simulated/floor/plasteel/dark{ @@ -3424,7 +3346,6 @@ "mj" = ( /obj/machinery/camera{ c_tag = "CentComm Special Ops. Assault Armor Storage"; - dir = 2; network = list("ERT","CentComm") }, /turf/simulated/floor/plasteel/dark{ @@ -3447,7 +3368,6 @@ /obj/structure/table, /obj/machinery/light/spot{ dir = 4; - icon_state = "tube1"; tag = "icon-tube1 (EAST)" }, /turf/simulated/floor/plasteel{ @@ -3464,7 +3384,6 @@ "mn" = ( /obj/machinery/mass_driver{ dir = 8; - drive_range = 50; id_tag = "ASSAULT3"; name = "gravpult" }, @@ -3552,7 +3471,6 @@ "mB" = ( /obj/machinery/mass_driver{ dir = 8; - drive_range = 50; id_tag = "ASSAULT2"; name = "gravpult" }, @@ -3655,7 +3573,6 @@ /obj/machinery/sleeper/upgraded, /obj/machinery/light/spot{ dir = 4; - icon_state = "tube1"; tag = "icon-tube1 (EAST)" }, /turf/simulated/floor/carpet, @@ -3746,7 +3663,6 @@ "nl" = ( /obj/machinery/mass_driver{ dir = 8; - drive_range = 50; id_tag = "ASSAULT1"; name = "gravpult" }, @@ -3765,8 +3681,7 @@ /area/syndicate_mothership) "nr" = ( /obj/item/radio/intercom/syndicate{ - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) @@ -3795,7 +3710,6 @@ /obj/item/card/id/centcom, /obj/machinery/light/spot{ dir = 4; - icon_state = "tube1"; tag = "icon-tube1 (EAST)" }, /obj/item/door_remote/centcomm, @@ -3950,7 +3864,6 @@ "nN" = ( /obj/machinery/mass_driver{ dir = 8; - drive_range = 50; id_tag = "ASSAULT0"; name = "gravpult" }, @@ -3968,8 +3881,7 @@ /area/centcom/specops) "nP" = ( /obj/machinery/mech_bay_recharge_port/upgraded/unsimulated{ - dir = 8; - icon_state = "recharge_port" + dir = 8 }, /turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) @@ -4043,7 +3955,6 @@ "ol" = ( /obj/machinery/camera{ c_tag = "CentComm Special Ops. Bathroom"; - dir = 2; network = list("ERT","CentComm") }, /obj/structure/table/reinforced, @@ -4088,7 +3999,6 @@ ailock = 1; check_synth = 1; name = "Gamma Turret Control Panel"; - pixel_x = 0; req_access = list(114) }, /turf/simulated/floor/plasteel{ @@ -4111,7 +4021,6 @@ /obj/item/storage/box/cups, /obj/machinery/camera{ c_tag = "CentComm Special Ops. Ready Room North"; - dir = 2; network = list("ERT","CentComm") }, /turf/simulated/floor/plasteel/dark, @@ -4137,7 +4046,6 @@ }, /obj/machinery/camera{ c_tag = "CentComm Special Ops. Starting Room"; - dir = 2; network = list("ERT","CentComm") }, /turf/simulated/floor/plasteel/dark{ @@ -4171,14 +4079,11 @@ /obj/item/gun/projectile/shotgun/automatic/combat, /obj/item/gun/projectile/shotgun/automatic/combat, /obj/machinery/status_display{ - density = 0; layer = 4; - pixel_x = 0; pixel_y = 32 }, /obj/machinery/light/spot{ dir = 8; - icon_state = "tube1"; tag = "icon-tube1 (WEST)" }, /turf/simulated/floor/mineral/plastitanium/red, @@ -4190,7 +4095,6 @@ /obj/item/gun/energy/sniperrifle, /obj/machinery/light/spot{ dir = 4; - icon_state = "tube1"; tag = "icon-tube1 (EAST)" }, /obj/machinery/ai_status_display{ @@ -4360,8 +4264,7 @@ /area/shuttle/escape) "pa" = ( /obj/structure/sign/securearea{ - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/gamma/space) @@ -4468,8 +4371,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/mech_bay_recharge_port/upgraded, /turf/simulated/floor/mineral/plastitanium/red, @@ -4482,12 +4384,6 @@ /obj/machinery/computer/mech_bay_power_console, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/gamma/space) -"pt" = ( -/obj/machinery/door/airlock/titanium{ - req_access_txt = "0" - }, -/turf/simulated/floor/plating, -/area/shuttle/gamma/space) "pu" = ( /obj/mecha/combat/durand/loaded{ operation_req_access = list(1) @@ -4495,8 +4391,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/gamma/space) @@ -4554,7 +4449,6 @@ "pK" = ( /obj/machinery/camera{ c_tag = "CentComm Special Ops. Bathroom"; - dir = 2; network = list("ERT","CentComm") }, /turf/simulated/floor/plasteel/freezer, @@ -4562,15 +4456,13 @@ "pL" = ( /obj/machinery/door/airlock/centcom{ name = "Bathroom"; - opacity = 1; - req_access_txt = "0" + opacity = 1 }, /turf/simulated/floor/plasteel/dark, /area/centcom/specops) "pN" = ( /obj/machinery/door_control{ desc = "A remote control switch to block view of the singularity."; - icon_state = "doorctrl0"; id = "GRAVPULTS"; name = "Gravity Catapults"; pixel_x = -6; @@ -4579,7 +4471,6 @@ }, /obj/machinery/door_control{ desc = "A remote control switch to block view of the singularity."; - icon_state = "doorctrl0"; id = "ASSAULT"; name = "Mech Storage"; pixel_x = 6; @@ -4588,7 +4479,6 @@ }, /obj/machinery/door_control{ desc = "A remote control switch to block view of the singularity."; - icon_state = "doorctrl0"; id = "CCTELE"; name = "Teleporter Access"; pixel_x = -6; @@ -4619,8 +4509,7 @@ "pR" = ( /obj/machinery/computer/station_alert, /obj/structure/sign/poster/official/nanotrasen_logo{ - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /turf/simulated/floor/plasteel{ dir = 5; @@ -4646,7 +4535,6 @@ "pW" = ( /obj/machinery/newscaster{ layer = 3.3; - pixel_x = 0; pixel_y = -27 }, /turf/simulated/floor/plasteel/dark, @@ -4654,7 +4542,6 @@ "pX" = ( /obj/machinery/door_control{ desc = "A remote control switch to connect the ready room to the rest of Centcom."; - icon_state = "doorctrl0"; id = "SPECOPS"; name = "Ready Room"; pixel_x = -6; @@ -4663,7 +4550,6 @@ }, /obj/machinery/door_control{ desc = "A remote control switch to block view of the singularity."; - icon_state = "doorctrl0"; id = "specopsoffice"; name = "Privacy Shutters"; pixel_x = 6; @@ -4672,7 +4558,6 @@ }, /obj/machinery/door_control{ desc = "A remote control switch to block view of the singularity."; - icon_state = "doorctrl0"; id = "CCGAMMA"; name = "Gamma Lockdown"; pixel_x = -6; @@ -4694,14 +4579,11 @@ "qb" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/structure/mirror{ dir = 4; - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /turf/simulated/floor/plasteel/freezer, /area/centcom/specops) @@ -4779,8 +4661,7 @@ "qu" = ( /obj/machinery/door/airlock/centcom{ name = "Bathroom"; - opacity = 1; - req_access_txt = "0" + opacity = 1 }, /turf/simulated/floor/plasteel/freezer, /area/centcom/specops) @@ -4809,8 +4690,7 @@ "qy" = ( /obj/machinery/door/airlock/centcom{ name = "Unit 4"; - opacity = 1; - req_access_txt = "0" + opacity = 1 }, /turf/simulated/floor/plasteel/freezer, /area/centcom/bathroom) @@ -4841,7 +4721,6 @@ "qC" = ( /obj/machinery/shower{ dir = 4; - icon_state = "shower"; pixel_x = 5; tag = "icon-shower (EAST)" }, @@ -4851,7 +4730,6 @@ "qD" = ( /obj/machinery/shower{ dir = 8; - icon_state = "shower"; pixel_x = -5; tag = "icon-shower (WEST)" }, @@ -4960,7 +4838,6 @@ /obj/structure/table, /obj/machinery/door_control{ desc = "A remote control switch for port-side blast doors."; - icon_state = "doorctrl0"; id = "CentComPort"; name = "Security Doors"; pixel_y = -4; @@ -5015,8 +4892,7 @@ "re" = ( /obj/machinery/door/airlock/centcom{ name = "Unit 3"; - opacity = 1; - req_access_txt = "0" + opacity = 1 }, /turf/simulated/floor/plasteel/freezer, /area/centcom/bathroom) @@ -5051,9 +4927,7 @@ "rl" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/structure/mirror{ pixel_x = 32 @@ -5080,8 +4954,7 @@ "ro" = ( /obj/machinery/door/airlock/centcom{ name = "Unit 2"; - opacity = 1; - req_access_txt = "0" + opacity = 1 }, /turf/simulated/floor/plasteel/freezer, /area/centcom/bathroom) @@ -5130,8 +5003,7 @@ "rx" = ( /obj/machinery/door/airlock/centcom{ name = "Bathroom"; - opacity = 1; - req_access_txt = "0" + opacity = 1 }, /turf/simulated/floor/plasteel/freezer, /area/centcom/evac) @@ -5160,8 +5032,7 @@ "rD" = ( /obj/machinery/door/airlock/centcom{ name = "Unit 1"; - opacity = 1; - req_access_txt = "0" + opacity = 1 }, /turf/simulated/floor/plasteel/freezer, /area/centcom/bathroom) @@ -5180,8 +5051,7 @@ icon_state = "door_locked"; id_tag = "emergency_away"; name = "Arrival Airlock"; - req_access = null; - req_access_txt = "0" + req_access = null }, /turf/simulated/floor/plating, /area/centcom/evac) @@ -5195,7 +5065,6 @@ "rJ" = ( /obj/structure/shuttle/engine/propulsion{ dir = 1; - icon_state = "propulsion"; tag = "icon-propulsion (NORTH)" }, /turf/simulated/floor/plating/airless, @@ -5221,7 +5090,6 @@ /area/centcom/evac) "rO" = ( /obj/docking_port/stationary{ - dir = 1; dwidth = 1; height = 4; id = "pod1_away"; @@ -5232,7 +5100,6 @@ /area/space) "rP" = ( /obj/docking_port/stationary{ - dir = 1; dwidth = 1; height = 4; id = "pod2_away"; @@ -5245,7 +5112,6 @@ /obj/structure/window/reinforced, /obj/structure/shuttle/engine/heater{ dir = 1; - icon_state = "heater"; tag = "icon-heater (NORTH)" }, /turf/simulated/floor/plating/airless, @@ -5258,14 +5124,12 @@ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; - name = "EXTERNAL AIRLOCK"; - pixel_x = 0 + name = "EXTERNAL AIRLOCK" }, /turf/simulated/wall/indestructible/riveted, /area/centcom/evac) "rW" = ( /obj/docking_port/mobile/emergency{ - dir = 4; dwidth = 11; height = 18; width = 29 @@ -5310,8 +5174,7 @@ "sc" = ( /obj/structure/table, /obj/item/storage/firstaid/regular{ - pixel_x = 2; - pixel_y = 0 + pixel_x = 2 }, /obj/item/storage/firstaid/regular{ pixel_x = -2; @@ -5331,18 +5194,14 @@ "sg" = ( /obj/machinery/vending/wallmed{ name = "Emergency NanoMed"; - pixel_x = -30; - pixel_y = 0; - req_access_txt = "0" + pixel_x = -30 }, /turf/simulated/floor/mineral/titanium/blue, /area/centcom/evac) "si" = ( /obj/machinery/vending/wallmed{ name = "Emergency NanoMed"; - pixel_x = 30; - pixel_y = 0; - req_access_txt = "0" + pixel_x = 30 }, /turf/simulated/floor/mineral/titanium/blue, /area/centcom/evac) @@ -5383,8 +5242,7 @@ /area/centcom/evac) "st" = ( /obj/structure/closet/secure_closet/bar{ - req_access = null; - req_access_txt = "0" + req_access = null }, /turf/simulated/floor/wood, /area/centcom/evac) @@ -5400,8 +5258,7 @@ "sx" = ( /obj/machinery/door/airlock/centcom{ name = "Rest Area"; - opacity = 1; - req_access_txt = "0" + opacity = 1 }, /turf/simulated/floor/wood, /area/centcom/evac) @@ -5409,7 +5266,6 @@ /obj/machinery/computer/secure_data, /obj/machinery/light/spot{ dir = 8; - icon_state = "tube1"; tag = "icon-tube1 (WEST)" }, /turf/simulated/floor/mineral/plastitanium/red, @@ -5431,9 +5287,7 @@ /area/centcom/evac) "sC" = ( /obj/machinery/door/window/northright{ - base_state = "right"; dir = 4; - icon_state = "right"; name = "Security Desk"; req_access_txt = "104" }, @@ -5491,8 +5345,7 @@ /area/centcom/evac) "sL" = ( /obj/machinery/door/airlock/hatch{ - name = "Infirmary"; - req_access_txt = "0" + name = "Infirmary" }, /turf/simulated/floor/mineral/titanium/yellow, /area/centcom/evac) @@ -5522,25 +5375,21 @@ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; - name = "EXTERNAL AIRLOCK"; - pixel_x = 0 + name = "EXTERNAL AIRLOCK" }, /turf/simulated/wall/indestructible/fakeglass, /area/centcom/ferry) "sR" = ( /obj/machinery/door/airlock/centcom{ name = "Medical Treatment Post"; - opacity = 1; - req_access_txt = "0" + opacity = 1 }, /turf/simulated/floor/plasteel, /area/centcom/evac) "sS" = ( /obj/machinery/vending/wallmed{ name = "Emergency NanoMed"; - pixel_x = -30; - pixel_y = 0; - req_access_txt = "0" + pixel_x = -30 }, /turf/simulated/floor/mineral/titanium, /area/centcom/evac) @@ -5552,7 +5401,6 @@ /area/tdome/tdomeobserve) "sU" = ( /obj/structure/table{ - dir = 2; icon_state = "tabledir" }, /obj/item/reagent_containers/food/drinks/cans/cola, @@ -5631,8 +5479,7 @@ "td" = ( /obj/machinery/door/airlock/external{ id_tag = "ferry_away"; - name = "Ferry Airlock"; - req_access_txt = "0" + name = "Ferry Airlock" }, /turf/simulated/floor/plating, /area/centcom/ferry) @@ -5678,9 +5525,7 @@ "tk" = ( /obj/machinery/vending/wallmed{ name = "Emergency NanoMed"; - pixel_x = 30; - pixel_y = 0; - req_access_txt = "0" + pixel_x = 30 }, /obj/machinery/vending/snack, /turf/simulated/floor/mineral/titanium/blue, @@ -5712,8 +5557,7 @@ /area/centcom/evac) "tp" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9; - icon_state = "intact" + dir = 9 }, /turf/simulated/floor/plasteel/white, /area/centcom/evac) @@ -5787,16 +5631,9 @@ /area/centcom/evac) "tx" = ( /obj/structure/table, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = 0; - pixel_y = 0 - }, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = 0; - pixel_y = 0 - }, +/obj/item/reagent_containers/glass/beaker/cryoxadone, +/obj/item/reagent_containers/glass/beaker/cryoxadone, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whiteblue"; tag = "icon-whitehall (WEST)" }, @@ -5810,7 +5647,6 @@ name = "Canister: \[O2] (CRYO)" }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whiteblue"; tag = "icon-whitehall (WEST)" }, @@ -5833,7 +5669,6 @@ /obj/item/storage/firstaid/adv, /obj/item/storage/firstaid/brute, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "whiteblue"; tag = "icon-whitehall (WEST)" }, @@ -6051,11 +5886,9 @@ /obj/structure/table, /obj/machinery/door_control{ desc = "A remote control switch for port-side blast doors."; - icon_state = "doorctrl0"; id = "thunderdome"; name = "Main Blast Doors"; pixel_x = -3; - pixel_y = 0; req_access_txt = "104" }, /turf/simulated/floor/plasteel{ @@ -6072,7 +5905,6 @@ /area/tdome/tdomeadmin) "uc" = ( /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "greencorner" }, /area/centcom/control) @@ -6112,10 +5944,8 @@ /obj/structure/table, /obj/machinery/door_control{ desc = "A remote control switch for port-side blast doors."; - icon_state = "doorctrl0"; id = "thunderdomehea"; name = "Ranged Gear"; - pixel_x = 0; pixel_y = 5; req_access_txt = "104" }, @@ -6128,10 +5958,8 @@ /obj/structure/table, /obj/machinery/door_control{ desc = "A remote control switch for port-side blast doors."; - icon_state = "doorctrl0"; id = "thunderdomeaxe"; name = "Specialist Supply"; - pixel_x = 0; pixel_y = 5; req_access_txt = "104" }, @@ -6141,10 +5969,8 @@ /obj/structure/table, /obj/machinery/door_control{ desc = "A remote control switch for port-side blast doors."; - icon_state = "doorctrl0"; id = "thunderdomegen"; name = "General Equiptment"; - pixel_x = 0; pixel_y = 5; req_access_txt = "104" }, @@ -6186,7 +6012,6 @@ "uq" = ( /obj/machinery/camera{ c_tag = "CentComm Special Ops. Bathroom"; - dir = 2; network = list("ERT","CentComm") }, /turf/simulated/floor/plasteel/dark, @@ -6729,15 +6554,13 @@ /area/admin) "vN" = ( /obj/machinery/door/airlock/hatch{ - name = "Clothing Storage"; - req_access_txt = "0" + name = "Clothing Storage" }, /turf/simulated/floor/plasteel, /area/admin) "vO" = ( /obj/machinery/door/airlock/hatch{ - name = "Mecha Room"; - req_access_txt = "0" + name = "Mecha Room" }, /turf/simulated/floor/plasteel, /area/admin) @@ -6787,8 +6610,7 @@ /area/admin) "wc" = ( /obj/machinery/door/airlock/hatch{ - name = "External Airlock"; - req_access_txt = "0" + name = "External Airlock" }, /turf/simulated/floor/plasteel, /area/admin) @@ -6828,8 +6650,7 @@ /area/space) "wl" = ( /obj/machinery/door/airlock/hatch{ - name = "Armory"; - req_access_txt = "0" + name = "Armory" }, /turf/simulated/floor/plasteel, /area/admin) @@ -7037,8 +6858,7 @@ opacity = 0 }, /obj/machinery/door/airlock/hatch{ - name = "Chem Lab"; - req_access_txt = "0" + name = "Chem Lab" }, /turf/simulated/floor/plasteel/freezer, /area/admin) @@ -7089,7 +6909,6 @@ "wM" = ( /obj/structure/mirror{ dir = 4; - pixel_x = 0; pixel_y = -32 }, /turf/simulated/floor/plasteel, @@ -7117,11 +6936,9 @@ /obj/item/gun/energy/pulse/pistol, /obj/machinery/door_control{ desc = "A remote control switch to lock down the admin lab."; - icon_state = "doorctrl0"; id = "ADMINCHEMLOCKDOWN"; name = "Lockdown"; - pixel_y = 24; - req_access_txt = "0" + pixel_y = 24 }, /turf/simulated/floor/carpet, /area/admin) @@ -7248,8 +7065,7 @@ "xl" = ( /obj/structure/table, /obj/machinery/door/window/southleft{ - name = "security checkpoint"; - req_access_txt = "0" + name = "security checkpoint" }, /turf/simulated/floor/carpet, /area/admin) @@ -7301,8 +7117,7 @@ /area/admin) "xr" = ( /obj/machinery/door/airlock/hatch{ - name = "Tool Storage"; - req_access_txt = "0" + name = "Tool Storage" }, /turf/simulated/floor/plasteel/dark, /area/admin) @@ -7371,8 +7186,7 @@ /obj/structure/table, /obj/item/grenade/syndieminibomb{ pixel_x = 4; - pixel_y = 2; - pixel_z = 0 + pixel_y = 2 }, /obj/item/grenade/syndieminibomb{ pixel_x = -1 @@ -7381,9 +7195,7 @@ /area/admin) "xE" = ( /obj/structure/table, -/obj/machinery/recharger{ - pixel_y = 0 - }, +/obj/machinery/recharger, /obj/item/toy/cards/deck/syndicate/black, /turf/simulated/floor/plasteel/dark, /area/admin) @@ -7409,8 +7221,7 @@ }, /obj/machinery/door/airlock/hatch{ desc = "Uh oh."; - name = "Operating Theater"; - req_access_txt = "0" + name = "Operating Theater" }, /turf/simulated/floor/plasteel/freezer, /area/admin) @@ -7426,8 +7237,7 @@ "xO" = ( /obj/machinery/door/airlock/hatch{ desc = "You've heard rumors of the horrors that go on within this lab."; - name = "Laboratory (DANGER!)"; - req_access_txt = "0" + name = "Laboratory (DANGER!)" }, /turf/simulated/floor/plasteel, /area/admin) @@ -7485,10 +7295,7 @@ pixel_x = -3; pixel_y = -3 }, -/obj/item/card/id{ - pixel_x = 0; - pixel_y = 0 - }, +/obj/item/card/id, /obj/item/card/id/admin{ pixel_x = 3; pixel_y = 3 @@ -7531,8 +7338,7 @@ /area/admin) "yl" = ( /obj/machinery/door/airlock/public/glass{ - name = "Computer Hub"; - req_access_txt = "0" + name = "Computer Hub" }, /obj/machinery/door/poddoor{ density = 0; @@ -7553,8 +7359,7 @@ "yn" = ( /obj/machinery/door/airlock/hatch{ desc = "For all your shady business needs"; - name = "Gambling Den"; - req_access_txt = "0" + name = "Gambling Den" }, /turf/simulated/floor/wood, /area/admin) @@ -7585,8 +7390,7 @@ /area/centcom/evac) "yw" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /turf/simulated/floor/plasteel, /area/trader_station/sol) @@ -7701,11 +7505,8 @@ /obj/structure/table, /obj/machinery/door_control{ desc = "A remote control switch to lock down external access to the admin room."; - icon_state = "doorctrl0"; id = "ADMINLOCKDOWN"; - name = "Lockdown"; - pixel_y = 0; - req_access_txt = "0" + name = "Lockdown" }, /turf/simulated/floor/plasteel, /area/admin) @@ -7716,9 +7517,7 @@ /area/centcom/evac) "yX" = ( /obj/structure/table/reinforced, -/obj/machinery/recharger{ - pixel_y = 0 - }, +/obj/machinery/recharger, /turf/simulated/floor/mineral/plastitanium/red, /area/centcom/evac) "yY" = ( @@ -7750,15 +7549,13 @@ "zd" = ( /obj/machinery/door/airlock/hatch{ desc = "Danger: May contain robustness"; - name = "Dojo"; - req_access_txt = "0" + name = "Dojo" }, /turf/simulated/floor/plasteel/dark, /area/admin) "ze" = ( /obj/machinery/door/airlock/public/glass{ - name = "Shuttle Bay"; - req_access_txt = "0" + name = "Shuttle Bay" }, /turf/simulated/floor/plasteel, /area/admin) @@ -7902,8 +7699,7 @@ id_tag = "vox_northwest_lock"; locked = 1; req_access_txt = "152"; - req_one_access = null; - req_one_access_txt = "0" + req_one_access = null }, /turf/simulated/floor/plating/nitrogen, /area/shuttle/vox) @@ -7933,14 +7729,12 @@ "zM" = ( /obj/machinery/door/window{ dir = 1; - name = "Suit Storage"; - req_access_txt = "0" + name = "Suit Storage" }, /turf/simulated/floor/engine, /area/admin) "zN" = ( /obj/machinery/door/poddoor/shutters{ - dir = 4; id_tag = "commandcenter"; name = "Privacy Shutters" }, @@ -7952,8 +7746,7 @@ /area/centcom/evac) "zP" = ( /obj/machinery/door/airlock{ - name = "Toilet"; - req_access_txt = "0" + name = "Toilet" }, /turf/simulated/floor/plasteel, /area/trader_station/sol) @@ -7978,8 +7771,7 @@ id_tag = "vox_northeast_lock"; locked = 1; req_access_txt = "152"; - req_one_access = null; - req_one_access_txt = "0" + req_one_access = null }, /obj/docking_port/mobile{ dir = 2; @@ -8073,9 +7865,7 @@ }, /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /turf/simulated/floor/plasteel/freezer, /area/trader_station/sol) @@ -8106,8 +7896,7 @@ /obj/machinery/door/window{ dir = 8; name = "Toilet"; - opacity = 1; - req_access_txt = "0" + opacity = 1 }, /turf/simulated/floor/plasteel/freezer, /area/trader_station/sol) @@ -8118,7 +7907,6 @@ /obj/structure/window/reinforced, /obj/structure/shuttle/engine/heater{ dir = 1; - icon_state = "heater"; tag = "icon-heater (NORTH)" }, /turf/simulated/floor/plating/airless, @@ -8180,8 +7968,7 @@ /area/admin) "AI" = ( /obj/machinery/door/airlock/hatch{ - name = "Teleporter Access"; - req_access_txt = "0" + name = "Teleporter Access" }, /obj/machinery/door/poddoor{ density = 0; @@ -8284,7 +8071,6 @@ "AY" = ( /obj/machinery/light/spot{ dir = 8; - icon_state = "tube1"; tag = "icon-tube1 (WEST)" }, /obj/machinery/pdapainter, @@ -8294,7 +8080,6 @@ /obj/structure/table, /obj/machinery/light/spot{ dir = 4; - icon_state = "tube1"; tag = "icon-tube1 (EAST)" }, /obj/item/storage/backpack/satchel, @@ -8304,7 +8089,6 @@ "Ba" = ( /obj/machinery/light/spot{ dir = 8; - icon_state = "tube1"; tag = "icon-tube1 (WEST)" }, /obj/machinery/vending/tool, @@ -8394,8 +8178,7 @@ /area/syndicate_mothership) "Bt" = ( /obj/structure/chair/comfy/red{ - dir = 1; - icon_state = "comfychair" + dir = 1 }, /obj/effect/landmark{ name = "Syndicate Officer" @@ -8635,7 +8418,6 @@ frequency = 1331; icon_state = "door_locked"; id_tag = "synd_outer"; - locked = 0; name = "Ship External Access"; req_access = null; req_access_txt = "150" @@ -8747,7 +8529,6 @@ "CO" = ( /obj/machinery/door/window{ base_state = "right"; - dir = 4; icon_state = "right"; name = "Equipment Room"; req_access_txt = "150" @@ -8770,7 +8551,6 @@ /obj/item/clothing/gloves/color/latex/nitrile, /obj/item/clothing/mask/breath, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "cmo" }, /area/shuttle/escape) @@ -8781,8 +8561,7 @@ id_tag = "vox_southwest_lock"; locked = 1; req_access_txt = "152"; - req_one_access = null; - req_one_access_txt = "0" + req_one_access = null }, /turf/simulated/floor/plating/nitrogen, /area/shuttle/vox) @@ -8835,8 +8614,7 @@ req_access_txt = "101" }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) @@ -8894,7 +8672,6 @@ frequency = 1441; id_tag = "syndicate_jail_airlock_control"; name = "Syndicate Jail Access Controller"; - pixel_x = 0; pixel_y = 24; req_access_txt = "150"; tag_exterior_door = "syndicate_jail_airlock_external"; @@ -8907,7 +8684,6 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "cmo" }, /area/shuttle/escape) @@ -8929,7 +8705,6 @@ "DP" = ( /obj/machinery/light/spot{ dir = 1; - icon_state = "tube1"; tag = "icon-tube1 (NORTH)" }, /obj/effect/spawner/lootdrop/trade_sol/donksoft, @@ -8990,7 +8765,6 @@ dir = 1 }, /turf/simulated/floor/holofloor{ - dir = 2; icon_state = "green" }, /area/holodeck/source_basketball) @@ -9085,7 +8859,6 @@ "EM" = ( /obj/item/radio/intercom{ dir = 8; - name = "station intercom (General)"; pixel_x = -28 }, /obj/machinery/recharge_station, @@ -9182,7 +8955,6 @@ /area/shuttle/administration) "Fc" = ( /obj/machinery/door/window{ - dir = 4; name = "Equipment Room"; req_access_txt = "150" }, @@ -9271,9 +9043,7 @@ dir = 1 }, /obj/structure/table, -/obj/machinery/recharger{ - pixel_y = 0 - }, +/obj/machinery/recharger, /turf/simulated/floor/mineral/plastitanium/red/nitrogen, /area/shuttle/vox) "Fr" = ( @@ -9309,7 +9079,6 @@ /obj/item/stock_parts/cell/high, /obj/machinery/light/small{ dir = 8; - icon_state = "bulb1"; tag = "icon-bulb1 (WEST)" }, /turf/simulated/floor/plasteel{ @@ -9331,7 +9100,6 @@ "FG" = ( /obj/machinery/light/spot{ dir = 1; - icon_state = "tube1"; tag = "icon-tube1 (NORTH)" }, /turf/simulated/floor/mineral/titanium/blue, @@ -9428,8 +9196,7 @@ master_tag = "synd_airlock"; name = "interior access button"; pixel_x = 25; - pixel_y = 25; - req_access_txt = "0" + pixel_y = 25 }, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/syndicate) @@ -9469,12 +9236,10 @@ "GL" = ( /obj/structure/table/reinforced, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/item/reagent_containers/food/drinks/mug/med, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "cmo" }, /area/shuttle/escape) @@ -9530,8 +9295,7 @@ dir = 8 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -9569,7 +9333,6 @@ /area/shuttle/syndicate) "Hp" = ( /turf/simulated/floor/holofloor{ - dir = 2; icon_state = "rampbottom"; tag = "icon-rampbottom" }, @@ -9644,7 +9407,6 @@ "HN" = ( /obj/machinery/light/spot{ dir = 1; - icon_state = "tube1"; tag = "icon-tube1 (NORTH)" }, /turf/simulated/floor/plasteel/dark, @@ -9687,8 +9449,7 @@ /area/tdome) "Ic" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/structure/chair/comfy/shuttle{ dir = 4 @@ -9715,8 +9476,7 @@ "Ij" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /turf/simulated/floor/plasteel, /area/shuttle/escape) @@ -9765,7 +9525,6 @@ name = "Bolt Cell Doors"; normaldoorcontrol = 1; pixel_x = 6; - pixel_y = 0; req_access_txt = "150"; specialfunctions = 4 }, @@ -9774,7 +9533,6 @@ name = "Bolt Jail Door"; normaldoorcontrol = 1; pixel_x = -5; - pixel_y = 0; req_access_txt = "150"; specialfunctions = 4 }, @@ -9785,7 +9543,6 @@ dir = 1 }, /turf/simulated/floor/holofloor{ - dir = 2; icon_state = "asteroid7"; tag = "icon-asteroid7" }, @@ -9828,7 +9585,6 @@ /obj/item/clothing/under/color/green, /obj/item/holo/esword/green, /turf/simulated/floor/holofloor{ - dir = 2; icon_state = "green" }, /area/holodeck/source_thunderdomecourt) @@ -9836,8 +9592,7 @@ /obj/structure/table, /obj/item/grenade/syndieminibomb{ pixel_x = 4; - pixel_y = 2; - pixel_z = 0 + pixel_y = 2 }, /obj/item/grenade/syndieminibomb{ pixel_x = -1 @@ -9850,9 +9605,7 @@ }, /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/syndicate) @@ -9923,7 +9676,6 @@ "Jn" = ( /obj/machinery/light/spot{ dir = 8; - icon_state = "tube1"; tag = "icon-tube1 (WEST)" }, /turf/simulated/floor/mineral/plastitanium/red, @@ -9955,7 +9707,6 @@ /area/shuttle/escape) "Jx" = ( /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "cmo" }, /area/shuttle/escape) @@ -10057,9 +9808,7 @@ /area/vox_station) "Kw" = ( /obj/structure/table, -/obj/machinery/recharger{ - pixel_y = 0 - }, +/obj/machinery/recharger, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/syndicate) "Kx" = ( @@ -10069,7 +9818,6 @@ "Ky" = ( /obj/machinery/door/poddoor/shutters{ density = 0; - dir = 4; icon_state = "open"; id_tag = "adminshuttleshutters"; name = "Blast Shutters"; @@ -10102,7 +9850,6 @@ "KF" = ( /obj/item/radio/intercom{ dir = 8; - name = "station intercom (General)"; pixel_x = -28 }, /obj/structure/chair/comfy/shuttle{ @@ -10132,7 +9879,6 @@ "KM" = ( /obj/machinery/light/spot{ dir = 8; - icon_state = "tube1"; tag = "icon-tube1 (WEST)" }, /obj/structure/chair/comfy/shuttle{ @@ -10147,7 +9893,6 @@ }, /obj/machinery/light/spot{ dir = 1; - icon_state = "tube1"; tag = "icon-tube1 (NORTH)" }, /obj/structure/chair/comfy/shuttle, @@ -10228,7 +9973,6 @@ "Li" = ( /obj/machinery/light/spot{ dir = 4; - icon_state = "tube1"; tag = "icon-tube1 (EAST)" }, /turf/simulated/floor/mineral/plastitanium/red, @@ -10236,7 +9980,6 @@ "Lj" = ( /obj/machinery/light/spot{ dir = 8; - icon_state = "tube1"; tag = "icon-tube1 (WEST)" }, /turf/simulated/floor/mineral/plastitanium/red, @@ -10250,7 +9993,6 @@ "Lm" = ( /obj/machinery/door/poddoor/shutters{ density = 0; - dir = 4; icon_state = "open"; id_tag = "voxshutters"; name = "Blast Shutters"; @@ -10303,7 +10045,6 @@ /obj/item/storage/box/handcuffs, /obj/machinery/light/spot{ dir = 8; - icon_state = "tube1"; tag = "icon-tube1 (WEST)" }, /turf/simulated/floor/mineral/plastitanium/red, @@ -10331,7 +10072,6 @@ /obj/item/storage/backpack/medic, /obj/item/storage/belt/medical, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "cmo" }, /area/shuttle/escape) @@ -10406,7 +10146,6 @@ id = "syndicate_elite"; name = "Blast Doors"; pixel_x = -25; - pixel_y = 0; req_access_txt = "150" }, /obj/machinery/door/poddoor{ @@ -10461,7 +10200,6 @@ "MB" = ( /obj/machinery/light/spot{ dir = 1; - icon_state = "tube1"; tag = "icon-tube1 (NORTH)" }, /turf/simulated/floor/mineral/titanium/blue, @@ -10492,8 +10230,7 @@ "MI" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/plasteel, /area/shuttle/escape) @@ -10546,7 +10283,6 @@ "Nb" = ( /obj/machinery/light/spot{ dir = 8; - icon_state = "tube1"; tag = "icon-tube1 (WEST)" }, /turf/simulated/floor/mineral/plastitanium/red, @@ -10565,7 +10301,6 @@ /obj/machinery/clonepod/upgraded, /obj/machinery/light/spot{ dir = 1; - icon_state = "tube1"; tag = "icon-tube1 (NORTH)" }, /turf/simulated/floor/mineral/titanium, @@ -10592,7 +10327,6 @@ "Nv" = ( /obj/machinery/light/spot{ dir = 4; - icon_state = "tube1"; tag = "icon-tube1 (EAST)" }, /turf/simulated/floor/plasteel/dark, @@ -10621,8 +10355,7 @@ /area/shuttle/escape) "NB" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /turf/simulated/floor/plating/nitrogen, /area/shuttle/vox) @@ -10695,8 +10428,7 @@ dir = 4 }, /obj/structure/shuttle/engine/heater{ - dir = 8; - icon_state = "heater" + dir = 8 }, /turf/simulated/floor/plating/airless, /area/shuttle/specops) @@ -10706,7 +10438,6 @@ "NY" = ( /obj/machinery/light/spot{ dir = 1; - icon_state = "tube1"; tag = "icon-tube1 (NORTH)" }, /obj/structure/chair/comfy/shuttle{ @@ -10799,16 +10530,14 @@ "Oy" = ( /obj/machinery/door/airlock/medical/glass{ id_tag = null; - name = "Escape Shuttle Infirmary"; - req_access_txt = "0" + name = "Escape Shuttle Infirmary" }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, /area/shuttle/escape) "Oz" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/plasteel, /area/shuttle/escape) @@ -10902,7 +10631,6 @@ "Pl" = ( /obj/machinery/light/spot{ dir = 8; - icon_state = "tube1"; tag = "icon-tube1 (WEST)" }, /obj/machinery/suit_storage_unit/syndicate/secure, @@ -10938,8 +10666,7 @@ /area/shuttle/administration) "PD" = ( /obj/structure/shuttle/engine/propulsion{ - dir = 8; - icon_state = "propulsion" + dir = 8 }, /turf/simulated/floor/plating/airless, /area/shuttle/trade/sol) @@ -10961,7 +10688,6 @@ /obj/item/tank/internals/nitrogen, /obj/machinery/light/spot{ dir = 4; - icon_state = "tube1"; tag = "icon-tube1 (EAST)" }, /turf/simulated/floor/mineral/plastitanium/red/nitrogen, @@ -11039,7 +10765,6 @@ }, /obj/structure/bed/roller, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "cmo" }, /area/shuttle/escape) @@ -11127,8 +10852,7 @@ "QD" = ( /obj/machinery/door/airlock/medical/glass{ id_tag = null; - name = "Escape Shuttle Infirmary"; - req_access_txt = "0" + name = "Escape Shuttle Infirmary" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -11150,8 +10874,7 @@ /area/shuttle/escape) "QH" = ( /obj/structure/reagent_dispensers/fueltank/chem{ - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -11165,9 +10888,11 @@ "QK" = ( /obj/machinery/light/spot{ dir = 8; - icon_state = "tube1"; tag = "icon-tube1 (WEST)" }, +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/specops) "QL" = ( @@ -11181,7 +10906,6 @@ /area/syndicate_mothership/jail) "QQ" = ( /turf/simulated/floor/holofloor{ - dir = 2; icon = 'icons/turf/floors/plating.dmi'; icon_state = "asteroid6"; tag = "icon-asteroid6" @@ -11189,7 +10913,6 @@ /area/holodeck/source_desert) "QR" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 2; frequency = 1331; id_tag = "synd_pump" }, @@ -11234,7 +10957,6 @@ "Re" = ( /obj/machinery/light/spot{ dir = 8; - icon_state = "tube1"; tag = "icon-tube1 (WEST)" }, /obj/machinery/sleeper/syndie{ @@ -11252,7 +10974,6 @@ /obj/structure/window/reinforced, /obj/structure/shuttle/engine/heater{ dir = 1; - icon_state = "heater"; tag = "icon-heater (NORTH)" }, /turf/simulated/floor/plating/airless, @@ -11278,7 +10999,6 @@ "Rn" = ( /obj/machinery/light/spot{ dir = 4; - icon_state = "tube1"; tag = "icon-tube1 (EAST)" }, /obj/machinery/door_control{ @@ -11286,16 +11006,14 @@ layer = 3; name = "Loading Doors"; pixel_x = 24; - pixel_y = 8; - req_access_txt = "0" + pixel_y = 8 }, /obj/machinery/door_control{ id = "QMLoaddoor"; layer = 3; name = "Loading Doors"; pixel_x = 24; - pixel_y = -8; - req_access_txt = "0" + pixel_y = -8 }, /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/supply) @@ -11348,7 +11066,6 @@ "RF" = ( /obj/structure/shuttle/engine/propulsion{ dir = 1; - icon_state = "propulsion"; tag = "icon-propulsion (NORTH)" }, /turf/simulated/floor/plating/airless, @@ -11435,8 +11152,7 @@ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; - name = "EXTERNAL AIRLOCK"; - pixel_x = 0 + name = "EXTERNAL AIRLOCK" }, /turf/simulated/wall/mineral/plastitanium, /area/shuttle/syndicate) @@ -11446,7 +11162,6 @@ "Sp" = ( /obj/item/flag/med, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "cmo" }, /area/shuttle/escape) @@ -11469,9 +11184,7 @@ /turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "Sv" = ( -/obj/machinery/atmospherics/unary/tank/air{ - dir = 2 - }, +/obj/machinery/atmospherics/unary/tank/air, /turf/simulated/wall/mineral/plastitanium, /area/shuttle/syndicate) "Sy" = ( @@ -11497,7 +11210,6 @@ "SH" = ( /obj/machinery/light/spot{ dir = 8; - icon_state = "tube1"; tag = "icon-tube1 (WEST)" }, /turf/simulated/floor/mineral/titanium/blue, @@ -11539,7 +11251,6 @@ /obj/item/clothing/head/helmet/riot/knight/blue, /obj/item/holo/claymore/blue, /turf/simulated/floor/holofloor{ - dir = 2; icon_state = "blue" }, /area/holodeck/source_knightarena) @@ -11617,8 +11328,7 @@ network = list("SS13","Research Outpost","Mining Outpost","Telecomms") }, /obj/structure/sign/poster/official/nanotrasen_logo{ - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /turf/simulated/floor/plasteel{ dir = 9; @@ -11652,7 +11362,6 @@ "TQ" = ( /obj/structure/holowindow, /turf/simulated/floor/holofloor{ - dir = 2; icon_state = "asteroid7"; tag = "icon-asteroid7" }, @@ -11740,7 +11449,6 @@ /area/shuttle/syndicate) "Uv" = ( /turf/simulated/floor/holofloor{ - dir = 2; icon = 'icons/turf/floors/plating.dmi'; icon_state = "asteroid5"; tag = "icon-asteroid5" @@ -11752,9 +11460,7 @@ /area/shuttle/syndicate) "Uy" = ( /obj/structure/table/holotable, -/obj/machinery/readybutton{ - pixel_y = 0 - }, +/obj/machinery/readybutton, /turf/simulated/floor/holofloor{ dir = 6; icon_state = "green" @@ -11775,7 +11481,6 @@ "UC" = ( /obj/machinery/light/spot{ dir = 8; - icon_state = "tube1"; tag = "icon-tube1 (WEST)" }, /obj/structure/window/reinforced, @@ -11787,7 +11492,6 @@ "UD" = ( /obj/machinery/door/window{ base_state = "right"; - dir = 4; icon_state = "right"; name = "Infirmary"; req_access_txt = "150" @@ -11852,7 +11556,6 @@ "Va" = ( /obj/machinery/camera{ c_tag = "CentComm Special Ops. Shuttle"; - dir = 2; network = list("ERT","CentComm") }, /obj/structure/chair/comfy/shuttle, @@ -11879,7 +11582,6 @@ }, /obj/machinery/light/spot{ dir = 1; - icon_state = "tube1"; tag = "icon-tube1 (NORTH)" }, /turf/simulated/floor/mineral/plastitanium/red, @@ -12024,7 +11726,6 @@ /area/shuttle/syndicate) "VZ" = ( /turf/simulated/floor/holofloor{ - dir = 2; icon_state = "asteroid7"; tag = "icon-asteroid7" }, @@ -12065,7 +11766,6 @@ "Wh" = ( /obj/machinery/door/airlock/command/glass{ name = "Escape Shuttle Cockpit"; - req_access_txt = "0"; req_one_access_txt = "2;19" }, /turf/simulated/floor/plasteel{ @@ -12106,7 +11806,6 @@ "Wp" = ( /obj/machinery/light/spot{ dir = 1; - icon_state = "tube1"; tag = "icon-tube1 (NORTH)" }, /obj/structure/chair/comfy/shuttle, @@ -12147,7 +11846,6 @@ "WL" = ( /obj/machinery/light/spot{ dir = 4; - icon_state = "tube1"; tag = "icon-tube1 (EAST)" }, /obj/structure/chair/comfy/shuttle{ @@ -12194,7 +11892,6 @@ "Xi" = ( /obj/machinery/light/spot{ dir = 1; - icon_state = "tube1"; tag = "icon-tube1 (NORTH)" }, /obj/machinery/door_control{ @@ -12202,16 +11899,14 @@ name = "Blast door control"; pixel_x = -5; pixel_y = 35; - req_access = list(101); - req_access_txt = "0" + req_access = list(101) }, /obj/machinery/door_control{ id = "adminshuttleshutters"; name = "Shutter control"; pixel_x = 5; pixel_y = 35; - req_access = list(101); - req_access_txt = "0" + req_access = list(101) }, /obj/structure/chair/comfy/shuttle{ dir = 4 @@ -12270,7 +11965,6 @@ id = "syndicate_sit_1"; name = "Blast Doors"; pixel_x = -25; - pixel_y = 0; req_access_txt = "150" }, /obj/structure/fans/tiny, @@ -12311,7 +12005,6 @@ "XC" = ( /obj/machinery/light/spot{ dir = 4; - icon_state = "tube1"; tag = "icon-tube1 (EAST)" }, /turf/simulated/floor/mineral/titanium, @@ -12319,7 +12012,6 @@ "XG" = ( /obj/structure/bed/roller, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "cmo" }, /area/shuttle/escape) @@ -12329,7 +12021,6 @@ "XJ" = ( /obj/machinery/light/spot{ dir = 8; - icon_state = "tube1"; tag = "icon-tube1 (WEST)" }, /obj/machinery/access_button{ @@ -12383,7 +12074,6 @@ /area/shuttle/vox) "Ya" = ( /obj/machinery/atm{ - pixel_x = 0; pixel_y = 32 }, /obj/structure/chair/comfy/shuttle{ @@ -12393,9 +12083,7 @@ /area/shuttle/trade/sol) "Yc" = ( /obj/structure/table/holotable, -/obj/machinery/readybutton{ - pixel_y = 0 - }, +/obj/machinery/readybutton, /turf/simulated/floor/holofloor{ dir = 9; icon_state = "red" @@ -12435,7 +12123,6 @@ "Yl" = ( /obj/machinery/light/spot{ dir = 4; - icon_state = "tube1"; tag = "icon-tube1 (EAST)" }, /turf/simulated/floor/mineral/plastitanium/red, @@ -12541,7 +12228,6 @@ "Za" = ( /obj/structure/shuttle/engine/heater{ dir = 8; - icon_state = "heater"; tag = "icon-heater (WEST)" }, /obj/structure/window/plasmareinforced{ @@ -12572,7 +12258,6 @@ "Zi" = ( /obj/machinery/sleeper, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "cmo" }, /area/shuttle/escape) @@ -12602,7 +12287,6 @@ }, /obj/machinery/light/spot{ dir = 8; - icon_state = "tube1"; tag = "icon-tube1 (WEST)" }, /turf/simulated/floor/plating/nitrogen, @@ -12641,7 +12325,6 @@ }, /obj/machinery/light/spot{ dir = 4; - icon_state = "tube1"; tag = "icon-tube1 (EAST)" }, /turf/simulated/floor/plating/nitrogen, @@ -12658,7 +12341,6 @@ "ZK" = ( /obj/machinery/light/spot{ dir = 8; - icon_state = "tube1"; tag = "icon-tube1 (WEST)" }, /turf/simulated/floor/mineral/plastitanium/red, @@ -26965,7 +26647,7 @@ fm of of of -pt +pn of of of @@ -56463,7 +56145,7 @@ aN Yi ik hn -eq +hD iL ex hn diff --git a/_maps/metastation.dm b/_maps/metastation.dm deleted file mode 100644 index 1e71d218835..00000000000 --- a/_maps/metastation.dm +++ /dev/null @@ -1,27 +0,0 @@ -/* -All z-levels should be identical in size. Their numbers should not matter. -The order of z-levels should not matter as long as their attributes are properly defined at MAP_TRANSITION_CONFIG. -Old code checked for the number of the z-level (for example whether there are any revheads on Z1), -currently it should check for the define (for example whether there are any revheads on any z-levels defined as STATION_LEVEL). -z1 = centcomm -z2 = station -z3 = lavaland -*/ - -#if !defined(USING_MAP_DATUM) - #include "map_files\generic\centcomm.dmm" - #include "map_files\MetaStation\MetaStation.dmm" - #include "map_files\generic\Lavaland.dmm" - - #define MAP_TRANSITION_CONFIG list(\ -DECLARE_LEVEL(CENTCOMM, SELFLOOPING, list(ADMIN_LEVEL, BLOCK_TELEPORT, IMPEDES_MAGIC)),\ -DECLARE_LEVEL(MAIN_STATION, CROSSLINKED, list(STATION_LEVEL, STATION_CONTACT, REACHABLE, AI_OK)),\ -DECLARE_LEVEL(MINING, SELFLOOPING, list(ORE_LEVEL, REACHABLE, STATION_CONTACT, HAS_WEATHER, AI_OK))) - - #define USING_MAP_DATUM /datum/map/metastation - -#elif !defined(MAP_OVERRIDE) - - #warn a map has already been included, ignoring MetaStation. - -#endif diff --git a/code/__DEFINES/gamemode.dm b/code/__DEFINES/gamemode.dm index 9aee8f85eba..042fdc6e3e9 100644 --- a/code/__DEFINES/gamemode.dm +++ b/code/__DEFINES/gamemode.dm @@ -32,7 +32,6 @@ #define SPECIAL_ROLE_FREE_GOLEM "Free Golem" #define SPECIAL_ROLE_GOLEM "Golem" #define SPECIAL_ROLE_HEAD_REV "Head Revolutionary" -#define SPECIAL_ROLE_HONKSQUAD "Honksquad" #define SPECIAL_ROLE_REV "Revolutionary" #define SPECIAL_ROLE_MORPH "Morph" #define SPECIAL_ROLE_MULTIVERSE "Multiverse Traveller" diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm index a7f14a0ffe1..22ecbc1208e 100644 --- a/code/__DEFINES/is_helpers.dm +++ b/code/__DEFINES/is_helpers.dm @@ -22,8 +22,6 @@ #define iseffect(A) (istype(A, /obj/effect)) -#define is_cleanable(A) (istype(A, /obj/effect/decal/cleanable) || istype(A, /obj/effect/rune)) //if something is cleanable - #define isclothing(A) (istype(A, /obj/item/clothing)) #define is_pen(W) (istype(W, /obj/item/pen)) diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index e75eb49a02e..ad182c9f9c4 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -363,7 +363,7 @@ #define INVESTIGATE_BOMB "bombs" // The SQL version required by this version of the code -#define SQL_VERSION 22 +#define SQL_VERSION 24 // Vending machine stuff #define CAT_NORMAL 1 diff --git a/code/__DEFINES/preferences.dm b/code/__DEFINES/preferences.dm index 73e7b2227dc..ba292ab65f6 100644 --- a/code/__DEFINES/preferences.dm +++ b/code/__DEFINES/preferences.dm @@ -55,8 +55,9 @@ // Yes I know this being an "enable to disable" is misleading, but it avoids having to tweak all existing pref entries #define PREFTOGGLE_2_REVERB_DISABLE 512 #define PREFTOGGLE_2_FORCE_WHITE_RUNECHAT 1024 +#define PREFTOGGLE_2_SIMPLE_STAT_PANEL 2048 -#define TOGGLES_2_TOTAL 2047 // If you add or remove a preference toggle above, make sure you update this define with the total value of the toggles combined. +#define TOGGLES_2_TOTAL 4095 // If you add or remove a preference toggle above, make sure you update this define with the total value of the toggles combined. #define TOGGLES_2_DEFAULT (PREFTOGGLE_2_FANCYUI|PREFTOGGLE_2_ITEMATTACK|PREFTOGGLE_2_WINDOWFLASHING|PREFTOGGLE_2_RUNECHAT|PREFTOGGLE_2_DEATHMESSAGE|PREFTOGGLE_2_EMOTE_BUBBLE) @@ -94,7 +95,7 @@ #define EXP_TYPE_SERVICE "Service" #define EXP_TYPE_WHITELIST "Whitelist" -#define EXP_DEPT_TYPE_LIST list(EXP_TYPE_SERVICE, EXP_TYPE_MEDICAL, EXP_TYPE_ENGINEERING, EXP_TYPE_SCIENCE, EXP_TYPE_SECURITY, EXP_TYPE_COMMAND, EXP_TYPE_SILICON, EXP_TYPE_SPECIAL) +#define EXP_DEPT_TYPE_LIST list(EXP_TYPE_SUPPLY, EXP_TYPE_SERVICE, EXP_TYPE_MEDICAL, EXP_TYPE_ENGINEERING, EXP_TYPE_SCIENCE, EXP_TYPE_SECURITY, EXP_TYPE_COMMAND, EXP_TYPE_SILICON, EXP_TYPE_SPECIAL, EXP_TYPE_GHOST) // Defines just for parallax because its levels make storing it in the regular prefs a pain in the ass // These dont need to be bitflags because there isnt going to be more than one at a time of these active @@ -104,3 +105,12 @@ #define PARALLAX_MED 4 #define PARALLAX_HIGH 8 #define PARALLAX_INSANE 16 + +// 2FA Defines. These are the same as the schema DB enums // + +/// Client has 2FA disabled +#define _2FA_DISABLED "DISABLED" +/// Client will be prompted for 2FA on IP changes +#define _2FA_ENABLED_IP "ENABLED_IP" +/// Client will be prompted for 2FA always +#define _2FA_ENABLED_ALWAYS "ENABLED_ALWAYS" diff --git a/code/__HELPERS/_logging.dm b/code/__HELPERS/_logging.dm index 34e7f3fda28..0d7a945ffde 100644 --- a/code/__HELPERS/_logging.dm +++ b/code/__HELPERS/_logging.dm @@ -134,9 +134,6 @@ GLOBAL_PROTECT(log_end) /proc/log_href(text) rustg_log_write(GLOB.world_href_log, "HREF: [html_decode(text)][GLOB.log_end]") -/proc/log_asset(text) - rustg_log_write(GLOB.world_asset_log, "ASSET: [text][GLOB.log_end]") - /proc/log_runtime_summary(text) rustg_log_write(GLOB.runtime_summary_log, "[text][GLOB.log_end]") @@ -147,6 +144,9 @@ GLOBAL_PROTECT(log_end) rustg_log_write(GLOB.sql_log, "[text][GLOB.log_end]") SEND_TEXT(world.log, text) // Redirect it to DD too +/proc/log_chat_debug(text) + rustg_log_write(GLOB.chat_debug_log, "[text][GLOB.log_end]") + // A logging proc that only outputs after setup is done, to // help devs test initialization stuff that happens a lot /proc/log_after_setup(message) diff --git a/code/__HELPERS/names.dm b/code/__HELPERS/names.dm index 29e0f9b52b9..b8b47aa8656 100644 --- a/code/__HELPERS/names.dm +++ b/code/__HELPERS/names.dm @@ -15,9 +15,9 @@ GLOBAL_VAR(church_name) return name -GLOBAL_VAR(command_name) +// TODO: Remove this. Its always gonna be NAS Trurl /proc/command_name() - return GLOB.using_map.dock_name + return "NAS Trurl" GLOBAL_VAR(religion_name) /proc/religion_name() @@ -31,11 +31,8 @@ GLOBAL_VAR(religion_name) return capitalize(name) -/proc/system_name() - return GLOB.using_map.starsys_name - /proc/station_name() - return GLOB.using_map.station_name + return SSmapping.map_datum.fluff_name /proc/new_station_name() var/random = rand(1,5) diff --git a/code/__HELPERS/text.dm b/code/__HELPERS/text.dm index 970f90684bb..1d9b6550b84 100644 --- a/code/__HELPERS/text.dm +++ b/code/__HELPERS/text.dm @@ -513,6 +513,8 @@ text = replacetext(text, "\[cell\]", "
")
text = replacetext(text, "\[time\]", "[station_time_timestamp()]") // TO DO
+ text = replacetext(text, "\[date\]", "[GLOB.current_date_string]")
+ text = replacetext(text, "\[station\]", "[SSmapping.map_datum.fluff_name]")
if(!no_font)
if(P)
text = "[text]"
@@ -651,3 +653,79 @@
// return the split html object to the caller
return s
+
+//Used for applying byonds text macros to strings that are loaded at runtime
+/proc/apply_text_macros(string)
+ var/next_backslash = findtext(string, "\\")
+ if(!next_backslash)
+ return string
+
+ var/leng = length(string)
+
+ var/next_space = findtext(string, " ", next_backslash + length(string[next_backslash]))
+ if(!next_space)
+ next_space = leng - next_backslash
+
+ if(!next_space) //trailing bs
+ return string
+
+ var/base = next_backslash == 1 ? "" : copytext(string, 1, next_backslash)
+ 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)
+ //prefixes/agnostic
+ if("the")
+ rest = text("\the []", rest)
+ if("a")
+ rest = text("\a []", rest)
+ if("an")
+ rest = text("\an []", rest)
+ if("proper")
+ rest = text("\proper []", rest)
+ if("improper")
+ rest = text("\improper []", rest)
+ if("roman")
+ rest = text("\roman []", rest)
+ //postfixes
+ if("th")
+ base = text("[]\th", rest)
+ if("s")
+ base = text("[]\s", rest)
+ if("he")
+ base = text("[]\he", rest)
+ if("she")
+ base = text("[]\she", rest)
+ if("his")
+ base = text("[]\his", rest)
+ if("himself")
+ base = text("[]\himself", rest)
+ if("herself")
+ base = text("[]\herself", rest)
+ if("hers")
+ base = text("[]\hers", rest)
+
+ . = base
+ if(rest)
+ . += .(rest)
+
+/**
+ * Proc to generate a "rank colour" from a client
+ *
+ * This takes the client and looks at various factors in order, such as patreon status, staff rank, and more
+ * Arguments:
+ * * C - The client were looking up
+ */
+/proc/client2rankcolour(client/C)
+ // First check if end user is an admin
+ if(C.holder)
+ if(C.holder.rank in GLOB.rank_colour_map)
+ // Return their rank colour if they are in here
+ return GLOB.rank_colour_map[C.holder.rank]
+
+ // If they arent an admin, see if they are a patreon. Just accept any level
+ if(C.donator_level)
+ return "#e67e22" // Patreon orange
+ return null
+
diff --git a/code/__HELPERS/traits.dm b/code/__HELPERS/traits.dm
index 74760fd22b4..a6d288d6af0 100644
--- a/code/__HELPERS/traits.dm
+++ b/code/__HELPERS/traits.dm
@@ -99,7 +99,7 @@
Remember to update _globalvars/traits.dm if you're adding/removing/renaming traits.
*/
-//mob traits
+//***** MOB TRAITS *****//
#define TRAIT_BLIND "blind"
#define TRAIT_MUTE "mute"
#define TRAIT_DEAF "deaf"
@@ -119,6 +119,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
#define TRAIT_XENO_HOST "xeno_host" //Tracks whether we're gonna be a baby alien's mummy.
#define TRAIT_SHOCKIMMUNE "shock_immunity"
#define TRAIT_TESLA_SHOCKIMMUNE "tesla_shock_immunity"
+#define TRAIT_TELEKINESIS "telekinesis"
#define TRAIT_RESISTHEAT "resist_heat"
#define TRAIT_RESISTHEATHANDS "resist_heat_handsonly" //For when you want to be able to touch hot things, but still want fire to be an issue.
#define TRAIT_RESISTCOLD "resist_cold"
@@ -152,8 +153,9 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
#define TRAIT_NOEXAMINE "no_examine"
#define TRAIT_NOPAIN "no_pain"
-/// Blowing kisses actually does damage to the victim
-#define TRAIT_KISS_OF_DEATH "kiss_of_death"
+//***** ITEM TRAITS *****//
+/// Show what machine/door wires do when held.
+#define TRAIT_SHOW_WIRE_INFO "show_wire_info"
//
// common trait sources
diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm
index 3056485d755..8478d8c0c91 100644
--- a/code/__HELPERS/unsorted.dm
+++ b/code/__HELPERS/unsorted.dm
@@ -31,19 +31,20 @@
return 1
-/proc/Get_Angle(atom/movable/start,atom/movable/end)//For beams.
- if(!start || !end) return 0
+/proc/get_angle(atom/movable/start, atom/movable/end)//For beams.
+ if(!start || !end)
+ return 0
var/dy
var/dx
- dy=(32*end.y+end.pixel_y)-(32*start.y+start.pixel_y)
- dx=(32*end.x+end.pixel_x)-(32*start.x+start.pixel_x)
+ dy = (32 * end.y + end.pixel_y) - (32 * start.y + start.pixel_y)
+ dx = (32 * end.x + end.pixel_x) - (32 * start.x + start.pixel_x)
if(!dy)
- return (dx>=0)?90:270
- .=arctan(dx/dy)
- if(dy<0)
- .+=180
- else if(dx<0)
- .+=360
+ return (dx >= 0) ? 90 : 270
+ . = arctan(dx / dy)
+ if(dy < 0)
+ . += 180
+ else if(dx < 0)
+ . += 360
//Returns location. Returns null if no location was found.
/proc/get_teleport_loc(turf/location,mob/target,distance = 1, density = 0, errorx = 0, errory = 0, eoffsetx = 0, eoffsety = 0)
@@ -1246,10 +1247,6 @@ GLOBAL_LIST_INIT(wall_items, typecacheof(list(/obj/machinery/power/apc, /obj/mac
return 1
return 0
-
-/proc/get_angle(atom/a, atom/b)
- return atan2(b.y - a.y, b.x - a.x)
-
/proc/atan2(x, y)
if(!x && !y) return 0
return y >= 0 ? arccos(x / sqrt(x * x + y * y)) : -arccos(x / sqrt(x * x + y * y))
@@ -2072,7 +2069,7 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new)
return _list
/// Waits at a line of code until X is true
-#define UNTIL(X) while(!(X)) stoplag()
+#define UNTIL(X) while(!(X)) sleep(world.tick_lag)
// Check if the source atom contains another atom
/atom/proc/contains(atom/location)
diff --git a/code/_globalvars/lists/misc.dm b/code/_globalvars/lists/misc.dm
index ebdf2017900..2873a626590 100644
--- a/code/_globalvars/lists/misc.dm
+++ b/code/_globalvars/lists/misc.dm
@@ -30,7 +30,8 @@ GLOBAL_LIST_INIT(restricted_camera_networks, list(
"UO45",
"UO45R",
"UO71",
- "Xeno"
+ "Xeno",
+ "SyndicateTestLab"
)) //Those networks can only be accessed by preexisting terminals. AIs and new terminals can't use them.
GLOBAL_LIST_INIT(ruin_landmarks, list())
@@ -54,4 +55,7 @@ GLOBAL_LIST_INIT(cooking_recipes, list(RECIPE_MICROWAVE = list(), RECIPE_OVEN =
GLOBAL_LIST_INIT(cooking_ingredients, list(RECIPE_MICROWAVE = list(), RECIPE_OVEN = list(), RECIPE_GRILL = list(), RECIPE_CANDY = list()))
GLOBAL_LIST_INIT(cooking_reagents, list(RECIPE_MICROWAVE = list(), RECIPE_OVEN = list(), RECIPE_GRILL = list(), RECIPE_CANDY = list()))
+/// Associative list of admin rank to colour. Set in config/rank_colours.txt
+GLOBAL_LIST_EMPTY(rank_colour_map)
+
#define EGG_LAYING_MESSAGES list("lays an egg.", "squats down and croons.", "begins making a huge racket.", "begins clucking raucously.")
diff --git a/code/_globalvars/lists/objects.dm b/code/_globalvars/lists/objects.dm
index ab3bfa85451..4c22d37dc32 100644
--- a/code/_globalvars/lists/objects.dm
+++ b/code/_globalvars/lists/objects.dm
@@ -18,6 +18,7 @@ GLOBAL_LIST_INIT(cell_logs, list())
GLOBAL_LIST_INIT(navigation_computers, list())
GLOBAL_LIST_INIT(all_areas, list())
+GLOBAL_LIST_INIT(all_unique_areas, list()) // List of all unique areas. AKA areas with there_can_be_many = FALSE
GLOBAL_LIST_INIT(machines, list())
GLOBAL_LIST_INIT(rcd_list, list()) //list of Rapid Construction Devices.
diff --git a/code/_globalvars/lists/reagents.dm b/code/_globalvars/lists/reagents.dm
index 833da2a9879..0684be758cd 100644
--- a/code/_globalvars/lists/reagents.dm
+++ b/code/_globalvars/lists/reagents.dm
@@ -40,7 +40,7 @@ GLOBAL_LIST_INIT(drinks, list("beer2","hot_coco","orangejuice","tomatojuice","li
"booger","bloodymary","gargleblaster","bravebull","tequilasunrise","toxinsspecial",
"beepskysmash","salglu_solution","irishcream","manlydorf","longislandicedtea",
"moonshine","b52","irishcoffee","margarita","blackrussian","manhattan",
- "manhattan_proj","whiskeysoda","antifreeze","barefoot","snowwhite","demonsblood",
+ "manhattan_proj","whiskeysoda","adminfreeze","antifreeze","barefoot","snowwhite","demonsblood",
"vodkatonic","ginfizz","bahama_mama","singulo","sbiten","devilskiss","red_mead",
"mead","iced_beer","grog","aloe","andalusia","alliescocktail","soy_latte",
"cafe_latte","acidspit","amasec","neurotoxin","hippiesdelight","bananahonk",
diff --git a/code/_globalvars/logging.dm b/code/_globalvars/logging.dm
index 1e0a82c1c28..c111aff28cf 100644
--- a/code/_globalvars/logging.dm
+++ b/code/_globalvars/logging.dm
@@ -11,8 +11,6 @@ GLOBAL_VAR(world_qdel_log)
GLOBAL_PROTECT(world_qdel_log)
GLOBAL_VAR(world_href_log)
GLOBAL_PROTECT(world_href_log)
-GLOBAL_VAR(world_asset_log)
-GLOBAL_PROTECT(world_asset_log)
GLOBAL_VAR(runtime_summary_log)
GLOBAL_PROTECT(runtime_summary_log)
GLOBAL_VAR(tgui_log)
@@ -21,6 +19,8 @@ GLOBAL_VAR(http_log)
GLOBAL_PROTECT(http_log)
GLOBAL_VAR(sql_log)
GLOBAL_PROTECT(sql_log)
+GLOBAL_VAR(chat_debug_log)
+GLOBAL_PROTECT(chat_debug_log)
GLOBAL_VAR(round_id)
GLOBAL_PROTECT(round_id)
diff --git a/code/_globalvars/mapping.dm b/code/_globalvars/mapping.dm
index 2b435e0bede..caf4a2a58bb 100644
--- a/code/_globalvars/mapping.dm
+++ b/code/_globalvars/mapping.dm
@@ -8,9 +8,6 @@ GLOBAL_LIST_INIT(alldirs, list(NORTH, SOUTH, EAST, WEST, NORTHEAST, NORTHWEST, S
GLOBAL_LIST_INIT(alldirs2, list(NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST, NORTH, SOUTH, EAST, WEST))
GLOBAL_LIST_INIT(diagonals, list(NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST))
-// This must exist early on or shit breaks bad
-GLOBAL_DATUM_INIT(using_map, /datum/map, new USING_MAP_DATUM)
-
GLOBAL_LIST(global_map) // This is the array of zlevels | list(list(1,5),list(4,3)) | becomes a 2D array of zlevels
//Resulting sector map looks like
//|_1_|_4_|
diff --git a/code/_globalvars/misc.dm b/code/_globalvars/misc.dm
index cb8920f30ed..554fa2581a4 100644
--- a/code/_globalvars/misc.dm
+++ b/code/_globalvars/misc.dm
@@ -86,13 +86,9 @@ GLOBAL_VAR_INIT(copier_items_printed, 0)
GLOBAL_VAR_INIT(copier_max_items, 300)
GLOBAL_VAR_INIT(copier_items_printed_logged, FALSE)
-
-GLOBAL_VAR(map_name) // Self explanatory
-
GLOBAL_DATUM_INIT(data_core, /datum/datacore, new) // Station datacore, manifest, etc
GLOBAL_VAR_INIT(panic_bunker_enabled, FALSE) // Is the panic bunker enabled
-GLOBAL_VAR_INIT(pending_server_update, FALSE)
GLOBAL_LIST_EMPTY(ability_verbs) // Create-level abilities
GLOBAL_LIST_INIT(pipe_colors, list("grey" = PIPE_COLOR_GREY, "red" = PIPE_COLOR_RED, "blue" = PIPE_COLOR_BLUE, "cyan" = PIPE_COLOR_CYAN, "green" = PIPE_COLOR_GREEN, "yellow" = PIPE_COLOR_YELLOW, "purple" = PIPE_COLOR_PURPLE))
diff --git a/code/_globalvars/traits.dm b/code/_globalvars/traits.dm
index 382303c1212..39551da14b6 100644
--- a/code/_globalvars/traits.dm
+++ b/code/_globalvars/traits.dm
@@ -24,6 +24,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
"TRAIT_XENO_HOST" = TRAIT_XENO_HOST,
"TRAIT_SHOCKIMMUNE" = TRAIT_SHOCKIMMUNE,
"TRAIT_TESLA_SHOCKIMMUNE" = TRAIT_TESLA_SHOCKIMMUNE,
+ "TRAIT_TELEKINESIS" = TRAIT_TELEKINESIS,
"TRAIT_RESISTHEAT" = TRAIT_RESISTHEAT,
"TRAIT_RESISTHEATHANDS" = TRAIT_RESISTHEATHANDS,
"TRAIT_RESISTCOLD" = TRAIT_RESISTCOLD,
@@ -45,7 +46,6 @@ GLOBAL_LIST_INIT(traits_by_type, list(
"TRAIT_DWARF" = TRAIT_DWARF,
"TRAIT_SILENT_FOOTSTEPS" = TRAIT_SILENT_FOOTSTEPS,
"TRAIT_ALCOHOL_TOLERANCE" = TRAIT_ALCOHOL_TOLERANCE,
- "TRAIT_KISS_OF_DEATH" = TRAIT_KISS_OF_DEATH,
"TRAIT_COMIC_SANS" = TRAIT_COMIC_SANS,
"TRAIT_NOFINGERPRINTS" = TRAIT_NOFINGERPRINTS,
@@ -57,7 +57,12 @@ GLOBAL_LIST_INIT(traits_by_type, list(
"TRAIT_NOGERMS" = TRAIT_NOGERMS,
"TRAIT_NODECAY" = TRAIT_NODECAY,
"TRAIT_NOEXAMINE" = TRAIT_NOEXAMINE,
- "TRAIT_NOPAIN" = TRAIT_NOPAIN)))
+ "TRAIT_NOPAIN" = TRAIT_NOPAIN
+ ),
+ /obj/item = list(
+ "TRAIT_SHOW_WIRE_INFO" = TRAIT_SHOW_WIRE_INFO
+ )
+))
/// value -> trait name, generated on use from trait_by_type global
GLOBAL_LIST(trait_name_map)
diff --git a/code/_onclick/ai.dm b/code/_onclick/ai.dm
index a907a5dfc45..b023aaa4dd0 100644
--- a/code/_onclick/ai.dm
+++ b/code/_onclick/ai.dm
@@ -215,11 +215,3 @@
if(!ai_control_check(user))
return
toggle_light(user)
-
-// AI-CONTROLLED SLIP GENERATOR IN AI CORE
-
-/obj/machinery/ai_slipper/AICtrlClick(mob/living/silicon/ai/user) //Turns liquid dispenser on or off
- ToggleOn()
-
-/obj/machinery/ai_slipper/AIAltClick() //Dispenses liquid if on
- Activate()
diff --git a/code/_onclick/click_override.dm b/code/_onclick/click_override.dm
index 0336c809511..7c720643fe8 100644
--- a/code/_onclick/click_override.dm
+++ b/code/_onclick/click_override.dm
@@ -27,10 +27,10 @@
/obj/item/badminBook/attack_self(mob/living/user as mob)
if(user.middleClickOverride)
- to_chat(user, "You try to draw power from the [src], but you cannot hold the power at this time!")
+ to_chat(user, "You try to draw power from [src], but you cannot hold the power at this time!")
return
user.middleClickOverride = clickBehavior
- to_chat(user, "You draw a bit of power from the [src], you can use middle click or alt click to release the power!")
+ to_chat(user, "You draw a bit of power from [src], you can use middle click or alt click to release the power!")
/datum/middleClickOverride/badminClicker
var/summon_path = /obj/item/reagent_containers/food/snacks/cookie
diff --git a/code/_onclick/cyborg.dm b/code/_onclick/cyborg.dm
index 2bf62cdc5c7..e9e27a53387 100644
--- a/code/_onclick/cyborg.dm
+++ b/code/_onclick/cyborg.dm
@@ -169,16 +169,6 @@
/obj/machinery/power/apc/BorgCtrlClick(mob/living/silicon/robot/user) // turns off/on APCs. Forwards to AI code.
AICtrlClick(user)
-
-// AI SLIPPER
-
-/obj/machinery/ai_slipper/BorgCtrlClick(mob/living/silicon/robot/user) //Turns liquid dispenser on or off
- ToggleOn()
-
-/obj/machinery/ai_slipper/BorgAltClick(mob/living/silicon/robot/user) //Dispenses liquid if on
- Activate()
-
-
// TURRETCONTROL
/obj/machinery/turretid/BorgCtrlClick(mob/living/silicon/robot/user) //turret control on/off. Forwards to AI code.
diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm
index 35c250abc32..180e5a55e64 100644
--- a/code/_onclick/hud/alert.dm
+++ b/code/_onclick/hud/alert.dm
@@ -122,12 +122,12 @@
icon_state = "too_much_oxy"
/obj/screen/alert/not_enough_nitro
- name = "Choking (No N)"
+ name = "Choking (No N2)"
desc = "You're not getting enough nitrogen. Find some good air before you pass out!"
icon_state = "not_enough_nitro"
/obj/screen/alert/too_much_nitro
- name = "Choking (N)"
+ name = "Choking (N2)"
desc = "There's too much nitrogen in the air, and you're breathing it in! Find some good air before you pass out!"
icon_state = "too_much_nitro"
diff --git a/code/_onclick/hud/blob_overmind.dm b/code/_onclick/hud/blob_overmind.dm
index 01940be1d8b..c408c1cd7b6 100644
--- a/code/_onclick/hud/blob_overmind.dm
+++ b/code/_onclick/hud/blob_overmind.dm
@@ -132,6 +132,8 @@
if(isovermind(usr))
var/mob/camera/blob/B = usr
B.split_consciousness()
+ if(B.split_used) // Destroys split proc if the split is succesfully used
+ qdel(src)
/datum/hud/blob_overmind/New(mob/user)
..()
@@ -194,6 +196,8 @@
using.screen_loc = ui_storage2
static_inventory += using
- using = new /obj/screen/blob/Split()
- using.screen_loc = ui_acti
- static_inventory += using
+ var/mob/camera/blob/B = user
+ if(!B.is_offspring) // Checks if the blob is an offspring, to not create split button if it is
+ using = new /obj/screen/blob/Split()
+ using.screen_loc = ui_acti
+ static_inventory += using
diff --git a/code/_onclick/hud/robot.dm b/code/_onclick/hud/robot.dm
index bd1c5210826..c476232387d 100644
--- a/code/_onclick/hud/robot.dm
+++ b/code/_onclick/hud/robot.dm
@@ -78,15 +78,6 @@
var/mob/living/silicon/robot/R = usr
R.toggle_ionpulse()
-/obj/screen/robot/panel
- name = "installed modules"
- icon_state = "panel"
-
-/obj/screen/robot/panel/Click()
- if(issilicon(usr))
- var/mob/living/silicon/robot/R = usr
- R.installed_modules()
-
/obj/screen/robot/mov_intent
name = "fast/slow toggle"
icon_state = "running"
@@ -224,16 +215,6 @@
var/x = -4 //Start at CENTER-4,SOUTH+1
var/y = 1
- //Unfortunately adding the emag module to the list of modules has to be here. This is because a borg can
- //be emagged before they actually select a module. - or some situation can cause them to get a new module
- // - or some situation might cause them to get de-emagged or something.
- if(R.emagged || R.weapons_unlock)
- if(!(R.module.emag in R.module.modules))
- R.module.modules.Add(R.module.emag)
- else
- if(R.module.emag in R.module.modules)
- R.module.modules.Remove(R.module.emag)
-
for(var/atom/movable/A in R.module.modules)
if( (A != R.module_state_1) && (A != R.module_state_2) && (A != R.module_state_3) )
//Module is not currently active
diff --git a/code/_onclick/other_mobs.dm b/code/_onclick/other_mobs.dm
index b2338937ebc..7eed9f0e2ef 100644
--- a/code/_onclick/other_mobs.dm
+++ b/code/_onclick/other_mobs.dm
@@ -45,7 +45,7 @@
if(HAS_TRAIT(src, TRAIT_LASEREYES) && a_intent == INTENT_HARM)
LaserEyes(A)
- if(dna.GetSEState(GLOB.teleblock))
+ if(HAS_TRAIT(src, TRAIT_TELEKINESIS))
A.attack_tk(src)
if(isturf(A) && get_dist(src, A) <= 1)
diff --git a/code/_onclick/telekinesis.dm b/code/_onclick/telekinesis.dm
index 342af86c0b6..5e22e548a99 100644
--- a/code/_onclick/telekinesis.dm
+++ b/code/_onclick/telekinesis.dm
@@ -39,7 +39,7 @@
/obj/item/attack_tk(mob/user)
if(user.stat || !isturf(loc))
return
- if(user.dna?.GetSEState(GLOB.teleblock) && !user.get_active_hand()) // both should already be true to get here
+ if(HAS_TRAIT(user, TRAIT_TELEKINESIS) && !user.get_active_hand()) // both should already be true to get here
var/obj/item/tk_grab/O = new(src)
O.form_grab(user, src)
else
@@ -109,7 +109,7 @@
if(!host || host != user)
qdel(src)
return
- if(!host.dna?.GetSEState(GLOB.teleblock))
+ if(!HAS_TRAIT(host, TRAIT_TELEKINESIS))
qdel(src)
return
if(isobj(target) && !isturf(target.loc))
@@ -139,6 +139,12 @@
else
+ if(focus.buckled_mobs)
+ to_chat(user, "This object is too heavy to move with something buckled to it!")
+ return
+ if(length(focus.client_mobs_in_contents))
+ to_chat(user, "This object is too heavy to move with something inside of it!")
+ return
apply_focus_overlay()
focus.throw_at(target, 10, 1, user)
last_throw = world.time
diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm
index aa43133d111..2c3d3202a31 100644
--- a/code/controllers/configuration.dm
+++ b/code/controllers/configuration.dm
@@ -275,6 +275,12 @@
/// Enable auto profiler of rounds
var/auto_profile = FALSE
+ // Enable map voting
+ var/map_voting_enabled = FALSE
+
+ // 2FA auth host
+ var/_2fa_auth_host = null
+
/datum/configuration/New()
for(var/T in subtypesof(/datum/game_mode))
var/datum/game_mode/M = T
@@ -770,6 +776,10 @@
max_client_cid_history = text2num(value)
if("enable_auto_profiler")
auto_profile = TRUE
+ if("enable_map_voting")
+ map_voting_enabled = TRUE
+ if("2fa_host")
+ _2fa_auth_host = value
else
log_config("Unknown setting in configuration: '[name]'")
@@ -925,3 +935,34 @@
runnable_modes[M] = probabilities[M.config_tag]
// to_chat(world, "DEBUG: runnable_mode\[[runnable_modes.len]\] = [M.config_tag]")
return runnable_modes
+
+/datum/configuration/proc/load_rank_colour_map()
+ var/list/lines = file2list("config/rank_colours.txt")
+
+ for(var/line in lines)
+ // Skip newlines
+ if(!length(line))
+ continue
+ // Skip comments
+ if(line[1] == "#")
+ continue
+
+ //Split the line at every " - "
+ var/list/split_holder = splittext(line, " - ")
+ if(!length(split_holder))
+ continue
+
+ // Rank is before the " - "
+ var/rank = split_holder[1]
+ if(!rank)
+ continue
+
+ // Color is after the " - "
+ var/colour = ""
+ if(length(split_holder) >= 2)
+ colour = split_holder[2]
+
+ if(rank && colour)
+ GLOB.rank_colour_map[rank] = colour
+ else
+ stack_trace("Invalid colour for rank '[rank]' in config/rank_colours.txt")
diff --git a/code/controllers/subsystem/blackbox.dm b/code/controllers/subsystem/blackbox.dm
index 1512d8e6e70..acfb7444323 100644
--- a/code/controllers/subsystem/blackbox.dm
+++ b/code/controllers/subsystem/blackbox.dm
@@ -65,7 +65,7 @@ SUBSYSTEM_DEF(blackbox)
sqlversion = versions[FV.key]
var/datum/db_query/query_feedback_save = SSdbcore.NewQuery({"
- INSERT DELAYED IGNORE INTO [format_table_name("feedback")] (datetime, round_id, key_name, key_type, version, json)
+ INSERT IGNORE INTO [format_table_name("feedback")] (datetime, round_id, key_name, key_type, version, json)
VALUES (NOW(), :rid, :keyname, :keytype, :version, :json)"}, list(
"rid" = text2num(GLOB.round_id),
"keyname" = FV.key,
diff --git a/code/controllers/subsystem/chat_pings.dm b/code/controllers/subsystem/chat_pings.dm
new file mode 100644
index 00000000000..ad013cab3d6
--- /dev/null
+++ b/code/controllers/subsystem/chat_pings.dm
@@ -0,0 +1,16 @@
+SUBSYSTEM_DEF(chat_pings)
+ name = "Chat Pings"
+ flags = SS_NO_INIT
+ runlevels = RUNLEVEL_INIT | RUNLEVEL_LOBBY | RUNLEVEL_SETUP | RUNLEVEL_GAME | RUNLEVEL_POSTGAME // ALL OF THEM
+ wait = 30 SECONDS // Chat pings every 30 seconds
+ /// List of all held chat datums
+ var/list/datum/chatOutput/chat_datums = list() // Do NOT put this in Initialize(). You will cause issues.
+
+/datum/controller/subsystem/chat_pings/fire(resumed)
+ for(var/datum/chatOutput/CO as anything in chat_datums)
+ CO.updatePing()
+ if(MC_TICK_CHECK)
+ return
+
+/datum/controller/subsystem/chat_pings/stat_entry()
+ ..("P: [length(chat_datums)]")
diff --git a/code/controllers/subsystem/dbcore.dm b/code/controllers/subsystem/dbcore.dm
index 81aab3b0759..4cfe06083e3 100644
--- a/code/controllers/subsystem/dbcore.dm
+++ b/code/controllers/subsystem/dbcore.dm
@@ -193,7 +193,7 @@ SUBSYSTEM_DEF(dbcore)
if(!IsConnected())
return
var/datum/db_query/query_round_end = SSdbcore.NewQuery(
- "UPDATE [format_table_name("round")] SET end_datetime = Now(), game_mode_result = :game_mode_result, station_name = :station_name WHERE id = :round_id",
+ "UPDATE [format_table_name("round")] SET end_datetime = Now(), game_mode_result = :game_mode_result WHERE id = :round_id",
list("game_mode_result" = SSticker.mode_result, "station_name" = station_name(), "round_id" = GLOB.round_id)
)
query_round_end.Execute()
diff --git a/code/controllers/subsystem/http.dm b/code/controllers/subsystem/http.dm
index ad5407bfdca..6c7178a69fa 100644
--- a/code/controllers/subsystem/http.dm
+++ b/code/controllers/subsystem/http.dm
@@ -12,8 +12,11 @@ SUBSYSTEM_DEF(http)
/// Total requests the SS has processed in a round
var/total_requests
-/datum/controller/subsystem/http/Initialize(start_timeofday)
+/datum/controller/subsystem/http/PreInit()
+ . = ..()
rustg_create_async_http_client() // Open the door
+
+/datum/controller/subsystem/http/Initialize(start_timeofday)
active_async_requests = list()
return ..()
diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm
index ac8165aca7a..87846d051f0 100644
--- a/code/controllers/subsystem/mapping.dm
+++ b/code/controllers/subsystem/mapping.dm
@@ -1,31 +1,51 @@
SUBSYSTEM_DEF(mapping)
- name = "Mapping"
- init_order = INIT_ORDER_MAPPING // 9
- flags = SS_NO_FIRE
+ name = "Mapping"
+ init_order = INIT_ORDER_MAPPING // 9
+ flags = SS_NO_FIRE
+ /// What map datum are we using
+ var/datum/map/map_datum
+ /// What map will be used next round
+ var/datum/map/next_map
+
+// This has to be here because world/New() uses [station_name()], which looks this datum up
+/datum/controller/subsystem/mapping/PreInit()
+ . = ..()
+ if(map_datum) // Dont do this again if we are recovering
+ return
+ if(fexists("data/next_map.txt"))
+ var/list/lines = file2list("data/next_map.txt")
+ // Check its valid
+ try
+ map_datum = text2path(lines[1])
+ map_datum = new map_datum
+ catch
+ map_datum = new /datum/map/cyberiad // Assume cyberiad if non-existent
+ fdel("data/next_map.txt") // Remove to avoid the same map existing forever
+ else
+ map_datum = new /datum/map/cyberiad // Assume cyberiad if non-existent
+
+/datum/controller/subsystem/mapping/Shutdown()
+ if(next_map) // Save map for next round
+ var/F = file("data/next_map.txt")
+ F << next_map.type
/datum/controller/subsystem/mapping/Initialize(timeofday)
// Load all Z level templates
preloadTemplates()
+
+ // Load the station
+ loadStation()
+
+ // Load lavaland
+ loadLavaland()
+
// Pick a random away mission.
if(!config.disable_away_missions)
load_away_mission()
+
// Seed space ruins
if(!config.disable_space_ruins)
- // load in extra levels of space ruins
- var/load_zlevels_timer = start_watch()
- log_startup_progress("Creating random space levels...")
- var/num_extra_space = rand(config.extra_space_ruin_levels_min, config.extra_space_ruin_levels_max)
- for(var/i = 1, i <= num_extra_space, i++)
- GLOB.space_manager.add_new_zlevel("Ruin Area #[i]", linkage = CROSSLINKED, traits = list(REACHABLE, SPAWN_RUINS))
- log_startup_progress("Loaded random space levels in [stop_watch(load_zlevels_timer)]s.")
-
- // Now spawn ruins, random budget between 20 and 30 for all zlevels combined.
- // While this may seem like a high number, the amount of ruin Z levels can be anywhere between 3 and 7.
- // Note that this budget is not split evenly accross all zlevels
- log_startup_progress("Seeding ruins...")
- var/seed_ruins_timer = start_watch()
- seedRuins(levels_by_trait(SPAWN_RUINS), rand(20, 30), /area/space, GLOB.space_ruins_templates)
- log_startup_progress("Successfully seeded ruins in [stop_watch(seed_ruins_timer)]s.")
+ handleRuins()
// Makes a blank space level for the sake of randomness
GLOB.space_manager.add_new_zlevel("Empty Area", linkage = CROSSLINKED, traits = list(REACHABLE))
@@ -63,12 +83,6 @@ SUBSYSTEM_DEF(mapping)
GLOB.ghostteleportlocs = sortAssoc(GLOB.ghostteleportlocs)
- // Map name. Break these down into SSmapping controller vars instaed of GLOBs at some point
- if(GLOB.using_map && GLOB.using_map.name)
- GLOB.map_name = "[GLOB.using_map.name]"
- else
- GLOB.map_name = "Unknown"
-
// World name
if(config && config.server_name)
world.name = "[config.server_name]: [station_name()]"
@@ -77,6 +91,56 @@ SUBSYSTEM_DEF(mapping)
return ..()
+// Do not confuse with seedRuins()
+/datum/controller/subsystem/mapping/proc/handleRuins()
+ // load in extra levels of space ruins
+ var/load_zlevels_timer = start_watch()
+ log_startup_progress("Creating random space levels...")
+ var/num_extra_space = rand(config.extra_space_ruin_levels_min, config.extra_space_ruin_levels_max)
+ for(var/i in 1 to num_extra_space)
+ GLOB.space_manager.add_new_zlevel("Ruin Area #[i]", linkage = CROSSLINKED, traits = list(REACHABLE, SPAWN_RUINS))
+ log_startup_progress("Loaded random space levels in [stop_watch(load_zlevels_timer)]s.")
+
+ // Now spawn ruins, random budget between 20 and 30 for all zlevels combined.
+ // While this may seem like a high number, the amount of ruin Z levels can be anywhere between 3 and 7.
+ // Note that this budget is not split evenly accross all zlevels
+ log_startup_progress("Seeding ruins...")
+ var/seed_ruins_timer = start_watch()
+ seedRuins(levels_by_trait(SPAWN_RUINS), rand(20, 30), /area/space, GLOB.space_ruins_templates)
+ log_startup_progress("Successfully seeded ruins in [stop_watch(seed_ruins_timer)]s.")
+
+// Loads in the station
+/datum/controller/subsystem/mapping/proc/loadStation()
+ ASSERT(map_datum.map_path)
+ if(!fexists(map_datum.map_path))
+ // Make a VERY OBVIOUS error
+ to_chat(world, "ERROR: The path specified for the map to load is invalid. No station has been loaded!")
+ return
+
+ var/watch = start_watch()
+ log_startup_progress("Loading [map_datum.fluff_name]...")
+ // This should always be Z2, but you never know
+ var/map_z_level = GLOB.space_manager.add_new_zlevel(MAIN_STATION, linkage = CROSSLINKED, traits = list(STATION_LEVEL, STATION_CONTACT, REACHABLE, AI_OK))
+ GLOB.maploader.load_map(file(map_datum.map_path), z_offset = map_z_level)
+ log_startup_progress("Loaded [map_datum.fluff_name] in [stop_watch(watch)]s")
+
+ // Save station name in the DB
+ if(!SSdbcore.IsConnected())
+ return
+ var/datum/db_query/query_set_map = SSdbcore.NewQuery(
+ "UPDATE [format_table_name("round")] SET start_datetime=NOW(), map_name=:mapname, station_name=:stationname WHERE id=:round_id",
+ list("mapname" = map_datum.technical_name, "stationname" = map_datum.fluff_name, "round_id" = GLOB.round_id)
+ )
+ query_set_map.Execute(async = FALSE) // This happens during a time of intense server lag, so should be non-async
+ qdel(query_set_map)
+
+// Loads in lavaland
+/datum/controller/subsystem/mapping/proc/loadLavaland()
+ var/watch = start_watch()
+ log_startup_progress("Loading Lavaland...")
+ var/lavaland_z_level = GLOB.space_manager.add_new_zlevel(MINING, linkage = SELFLOOPING, traits = list(ORE_LEVEL, REACHABLE, STATION_CONTACT, HAS_WEATHER, AI_OK))
+ GLOB.maploader.load_map(file("_maps/map_files/generic/Lavaland.dmm"), z_offset = lavaland_z_level)
+ log_startup_progress("Loaded Lavaland in [stop_watch(watch)]s")
/datum/controller/subsystem/mapping/proc/seedRuins(list/z_levels = null, budget = 0, whitelist = /area/space, list/potentialRuins)
if(!z_levels || !z_levels.len)
diff --git a/code/controllers/subsystem/shuttles.dm b/code/controllers/subsystem/shuttles.dm
index c86f988bcd4..4eb3adc62da 100644
--- a/code/controllers/subsystem/shuttles.dm
+++ b/code/controllers/subsystem/shuttles.dm
@@ -135,8 +135,6 @@ SUBSYSTEM_DEF(shuttle)
to_chat(user, "The emergency shuttle has been disabled by Centcom.")
return
- call_reason = trim(html_encode(call_reason))
-
if(length(call_reason) < CALL_SHUTTLE_REASON_LENGTH)
to_chat(user, "Reason is too short. [CALL_SHUTTLE_REASON_LENGTH] character minimum.")
return
diff --git a/code/controllers/subsystem/titlescreen.dm b/code/controllers/subsystem/titlescreen.dm
index 7fe59ec9093..90ea775885e 100644
--- a/code/controllers/subsystem/titlescreen.dm
+++ b/code/controllers/subsystem/titlescreen.dm
@@ -16,8 +16,6 @@ SUBSYSTEM_DEF(title)
else if(L.len > 1)
if(use_rare_screens && lowertext(L[1]) == "rare")
title_screens += S
- else if(GLOB.using_map && (lowertext(L[1]) == lowertext(GLOB.using_map.name)))
- title_screens += S
if(!isemptylist(title_screens))
if(length(title_screens) > 1)
diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm
index 346297d900f..743d14a3962 100644
--- a/code/controllers/subsystem/vote.dm
+++ b/code/controllers/subsystem/vote.dm
@@ -177,6 +177,16 @@ SUBSYSTEM_DEF(vote)
if("crew_transfer")
if(. == "Initiate Crew Transfer")
init_shift_change(null, 1)
+ if("map")
+ // Find target map.
+ var/datum/map/top_voted_map
+ for(var/x in subtypesof(/datum/map))
+ var/datum/map/M = x
+ // Set top voted map
+ if(. == "[initial(M.fluff_name)] ([initial(M.technical_name)])")
+ top_voted_map = M
+ to_chat(world, "Map for next round: [initial(top_voted_map.fluff_name)] ([initial(top_voted_map.technical_name)])")
+ SSmapping.next_map = new top_voted_map
if(restart)
@@ -197,7 +207,7 @@ SUBSYSTEM_DEF(vote)
return vote
return 0
-/datum/controller/subsystem/vote/proc/initiate_vote(vote_type, initiator_key)
+/datum/controller/subsystem/vote/proc/initiate_vote(vote_type, initiator_key, code_invoked = FALSE)
if(!mode)
if(started_time != null && !check_rights(R_ADMIN))
var/next_allowed_time = (started_time + config.vote_delay)
@@ -223,6 +233,14 @@ SUBSYSTEM_DEF(vote)
return 0
question = "End the shift?"
choices.Add("Initiate Crew Transfer", "Continue The Round")
+ if("map")
+ if(!(check_rights(R_SERVER) || code_invoked))
+ return FALSE
+ question = "Map for next round"
+ for(var/x in subtypesof(/datum/map))
+ var/datum/map/M = x
+ choices.Add("[initial(M.fluff_name)] ([initial(M.technical_name)])")
+
if("custom")
question = html_encode(input(usr,"What is the vote for?") as text|null)
if(!question) return 0
@@ -248,11 +266,7 @@ SUBSYSTEM_DEF(vote)
Click here or type vote to place your vote.
You have [config.vote_period/10] seconds to vote."})
switch(vote_type)
- if("crew_transfer")
- SEND_SOUND(world, sound('sound/ambience/alarm4.ogg'))
- if("gamemode")
- SEND_SOUND(world, sound('sound/ambience/alarm4.ogg'))
- if("custom")
+ if("crew_transfer", "gamemode", "custom", "map")
SEND_SOUND(world, sound('sound/ambience/alarm4.ogg'))
if(mode == "gamemode" && SSticker.ticker_going)
SSticker.ticker_going = FALSE
@@ -321,6 +335,12 @@ SUBSYSTEM_DEF(vote)
if(admin)
dat += "\t([config.allow_vote_mode?"Allowed":"Disallowed"])"
+ dat += "| Name | Rank | Activity |
|---|---|---|
| Heads | ||
| [name] | [heads[name]] | [isactive[name]] |
| Security | ||
| [name] | [sec[name]] | [isactive[name]] |
| Engineering | ||
| [name] | [eng[name]] | [isactive[name]] |
| Medical | ||
| [name] | [med[name]] | [isactive[name]] |
| Science | ||
| [name] | [sci[name]] | [isactive[name]] |
| Service | ||
| [name] | [ser[name]] | [isactive[name]] |
| Supply | ||
| [name] | [sup[name]] | [isactive[name]] |
| Silicon | ||
| [name] | [bot[name]] | [isactive[name]] |
| Miscellaneous | ||
| [name] | [misc[name]] | [isactive[name]] |
According to the [src.name], you are now in outer space. Hold your breath.
\ + text += "According to [src], you are now in outer space. Hold your breath.
\ " if(AREA_SPECIAL) - text += "This place is not noted on the [src.name].
" + text += "This place is not noted on [src].
" return text @@ -57,7 +57,7 @@ . = ..() var/area/A = get_area() if(get_area_type() == AREA_STATION) - . += "According to the [src], you are now in \"[sanitize(A.name)]\".
" + . += "According to [src], you are now in \"[sanitize(A.name)]\".
" var/datum/browser/popup = new(user, "blueprints", "[src]", 700, 500) popup.set_content(.) popup.open() @@ -79,7 +79,7 @@ . = ..() var/area/A = get_area() if(get_area_type() == AREA_STATION) - . += "According to the [src], you are now in \"[sanitize(A.name)]\".
" + . += "According to [src], you are now in \"[sanitize(A.name)]\".
" var/datum/browser/popup = new(user, "blueprints", "[src]", 700, 500) popup.set_content(.) popup.open() @@ -106,7 +106,7 @@ . = ..() var/area/A = get_area() if(get_area_type() == AREA_STATION) - . += "According to the [src], you are now in \"[sanitize(A.name)]\".
" + . += "According to [src], you are now in \"[sanitize(A.name)]\".
" . += "You may move an amendment to the drawing.
" if(!viewing) . += "" diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm index 5c4fc643d85..f5ea00a9d87 100644 --- a/code/game/objects/items/bodybag.dm +++ b/code/game/objects/items/bodybag.dm @@ -59,7 +59,7 @@ if(over_object == usr && (in_range(src, usr) || usr.contents.Find(src))) if(!ishuman(usr) || opened || length(contents)) return FALSE - visible_message("[usr] folds up the [name]") + visible_message("[usr] folds up [src].") new item_path(get_turf(src)) qdel(src) diff --git a/code/game/objects/items/candle.dm b/code/game/objects/items/candle.dm index 48e72a2cf9b..5bab3d47fde 100644 --- a/code/game/objects/items/candle.dm +++ b/code/game/objects/items/candle.dm @@ -40,7 +40,7 @@ /obj/item/candle/welder_act(mob/user, obj/item/I) . = TRUE if(I.tool_use_check(user, 0)) //Don't need to flash eyes because you are a badass - light("[user] casually lights the [name] with [I], what a badass.") + light("[user] casually lights [src] with [I], what a badass.") /obj/item/candle/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume, global_overlay = TRUE) if(!lit) diff --git a/code/game/objects/items/cardboard_cutouts.dm b/code/game/objects/items/cardboard_cutouts.dm index 788de290b19..f10c88e0907 100644 --- a/code/game/objects/items/cardboard_cutouts.dm +++ b/code/game/objects/items/cardboard_cutouts.dm @@ -120,10 +120,6 @@ name = "Unknown" desc = "A cardboard cutout of a cultist." icon_state = "cutout_cultist" - //if("Clockwork Cultist") - // name = "[random_name(pick(MALE,FEMALE))]" - // desc = "A cardboard cutout of a servant of Ratvar." - // icon_state = "cutout_servant" if("Revolutionary") name = "Unknown" desc = "A cardboard cutout of a revolutionary." diff --git a/code/game/objects/items/changestone.dm b/code/game/objects/items/changestone.dm deleted file mode 100644 index 0f3851e1777..00000000000 --- a/code/game/objects/items/changestone.dm +++ /dev/null @@ -1,23 +0,0 @@ -/obj/item/changestone - name = "An uncut ruby" - desc = "The ruby shines and catches the light, despite being uncut" - icon = 'icons/obj/artifacts.dmi' - icon_state = "changerock" - -/obj/item/changestone/attack_hand(mob/user as mob) - if(istype(user,/mob/living/carbon/human)) - var/mob/living/carbon/human/H = user - if(!H.gloves) - if(H.gender == FEMALE) - H.change_gender(MALE) - else - H.change_gender(FEMALE) - H.dna.ready_dna(H) - H.update_body() - ..() - - - - - - diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index 8fb04c81473..50ce47c4d58 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -174,6 +174,11 @@ colourName = "purple" ..() +/obj/item/toy/crayon/black + icon_state = "crayonblack" + colour = "#000000" + colourName = "black" + /obj/item/toy/crayon/white icon_state = "crayonwhite" colour = "#FFFFFF" @@ -232,23 +237,23 @@ //Spraycan stuff /obj/item/toy/crayon/spraycan - icon_state = "spraycan_cap" + name = "\improper Nanotrasen-brand Rapid Paint Applicator" desc = "A metallic container containing tasty paint." + icon_state = "spraycan_cap" var/capped = 1 instant = 1 validSurfaces = list(/turf/simulated/floor,/turf/simulated/wall) /obj/item/toy/crayon/spraycan/New() ..() - name = "Nanotrasen-brand Rapid Paint Applicator" update_icon() /obj/item/toy/crayon/spraycan/attack_self(mob/living/user as mob) var/choice = input(user,"Spraycan options") in list("Toggle Cap","Change Drawing","Change Color") switch(choice) if("Toggle Cap") - to_chat(user, "You [capped ? "Remove" : "Replace"] the cap of the [src]") - capped = capped ? 0 : 1 + to_chat(user, "You [capped ? "remove" : "replace"] the cap of [src].") + capped = !capped icon_state = "spraycan[capped ? "_cap" : ""]" update_icon() if("Change Drawing") diff --git a/code/game/objects/items/devices/autopsy.dm b/code/game/objects/items/devices/autopsy.dm index c96e935432c..4564d5d6442 100644 --- a/code/game/objects/items/devices/autopsy.dm +++ b/code/game/objects/items/devices/autopsy.dm @@ -74,7 +74,7 @@ var/dead_notes = input("Insert any relevant notes") var/obj/item/paper/R = new(user.loc) R.name = "Official Coroner's Report - [dead_name]" - R.info = "Nanotrasen Science Station [GLOB.using_map.station_short] - Coroner's Report

Below is a QR code to scan inside your authenticator app to generate 2FA codes. Please verify it before closing this window. (Behind this window is a text box)
" + var/img_data = "