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, "\[logo\]", "​") 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 += "
  • " + if(admin) + dat += "Map" + else + dat += "Map (Disallowed)" + dat += "
  • " //custom if(admin) @@ -381,6 +401,9 @@ SUBSYSTEM_DEF(vote) if("gamemode") if(config.allow_vote_mode || admin) initiate_vote("gamemode",usr.key) + if("map") + if(admin) + initiate_vote("map", usr.key) if("crew_transfer") if(config.allow_vote_restart || admin) initiate_vote("crew_transfer",usr.key) diff --git a/code/datums/action.dm b/code/datums/action.dm index 79dbd4bd2cf..be7f82494f9 100644 --- a/code/datums/action.dm +++ b/code/datums/action.dm @@ -383,6 +383,9 @@ /datum/action/item_action/hands_free/activate name = "Activate" +/datum/action/item_action/hands_free/activate/always + check_flags = null + /datum/action/item_action/toggle_research_scanner name = "Toggle Research Scanner" button_icon_state = "scan_mode" @@ -426,6 +429,7 @@ desc = "Activates the jump boot's internal propulsion system, allowing the user to dash over 4-wide gaps." icon_icon = 'icons/mob/actions/actions.dmi' button_icon_state = "jetboot" + use_itemicon = FALSE ///prset for organ actions /datum/action/item_action/organ_action diff --git a/code/datums/beam.dm b/code/datums/beam.dm index 3b5c9d2f5fb..23388c3f61b 100644 --- a/code/datums/beam.dm +++ b/code/datums/beam.dm @@ -58,7 +58,7 @@ return ..() /datum/beam/proc/Draw() - var/Angle = round(Get_Angle(origin,target)) + var/Angle = round(get_angle(origin, target)) var/matrix/rot_matrix = matrix() rot_matrix.Turn(Angle) diff --git a/code/datums/components/material_container.dm b/code/datums/components/material_container.dm index 38ee8ed6042..f4b8e84204f 100644 --- a/code/datums/components/material_container.dm +++ b/code/datums/components/material_container.dm @@ -130,13 +130,13 @@ /datum/component/material_container/proc/insert_stack(obj/item/stack/S, amt, multiplier = 1) if(isnull(amt)) - amt = S.amount + amt = S.get_amount() if(amt <= 0) return FALSE - if(amt > S.amount) - amt = S.amount + if(amt > S.get_amount()) + amt = S.get_amount() var/material_amt = get_item_material_amount(S) if(!material_amt) diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm index b258a18b94c..38b1dd5954d 100644 --- a/code/datums/datacore.dm +++ b/code/datums/datacore.dm @@ -5,129 +5,6 @@ //This list tracks characters spawned in the world and cannot be modified in-game. Currently referenced by respawn_character(). var/list/locked = list() -/datum/datacore/proc/get_manifest(monochrome, OOC) - var/list/heads = new() - var/list/sec = new() - var/list/eng = new() - var/list/med = new() - var/list/sci = new() - var/list/ser = new() - var/list/sup = new() - var/list/bot = new() - var/list/misc = new() - var/list/isactive = new() - var/dat = {" - - - - "} - var/even = 0 - // sort mobs - for(var/datum/data/record/t in GLOB.data_core.general) - var/name = t.fields["name"] - var/rank = t.fields["rank"] - var/real_rank = t.fields["real_rank"] - if(OOC) - var/activetext = "Inactive" - for(var/thing in GLOB.human_list) - var/mob/living/carbon/human/H = thing - if(H.real_name != name) - continue - if(H.client && H.client.inactivity <= 6000) - activetext = "Active" - break - if(isLivingSSD(H)) - activetext = "SSD" - break - isactive[name] = activetext - else - isactive[name] = t.fields["p_stat"] - var/department = 0 - if(real_rank in GLOB.command_positions) - heads[name] = rank - department = 1 - if(real_rank in GLOB.security_positions) - sec[name] = rank - department = 1 - if(real_rank in GLOB.engineering_positions) - eng[name] = rank - department = 1 - if(real_rank in GLOB.medical_positions) - med[name] = rank - department = 1 - if(real_rank in GLOB.science_positions) - sci[name] = rank - department = 1 - if(real_rank in GLOB.service_positions) - ser[name] = rank - department = 1 - if(real_rank in GLOB.supply_positions) - sup[name] = rank - department = 1 - if(real_rank in GLOB.nonhuman_positions) - bot[name] = rank - department = 1 - if(!department && !(name in heads)) - misc[name] = rank - if(heads.len > 0) - dat += "" - for(var/name in heads) - dat += "" - even = !even - if(sec.len > 0) - dat += "" - for(var/name in sec) - dat += "" - even = !even - if(eng.len > 0) - dat += "" - for(var/name in eng) - dat += "" - even = !even - if(med.len > 0) - dat += "" - for(var/name in med) - dat += "" - even = !even - if(sci.len > 0) - dat += "" - for(var/name in sci) - dat += "" - even = !even - if(ser.len > 0) - dat += "" - for(var/name in ser) - dat += "" - even = !even - if(sup.len > 0) - dat += "" - for(var/name in sup) - dat += "" - even = !even - if(bot.len > 0) - dat += "" - for(var/name in bot) - dat += "" - even = !even - if(misc.len > 0) - dat += "" - for(var/name in misc) - dat += "" - even = !even - - dat += "
    NameRankActivity
    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]]
    " - dat = replacetext(dat, "\n", "") // so it can be placed on paper correctly - dat = replacetext(dat, "\t", "") - return dat - - /* We can't just insert in HTML into the TGUI so we need the raw data to play with. Instead of creating this list over and over when someone leaves their PDA open to the page diff --git a/code/datums/diseases/transformation.dm b/code/datums/diseases/transformation.dm index fdfafa89314..4098e15e2af 100644 --- a/code/datums/diseases/transformation.dm +++ b/code/datums/diseases/transformation.dm @@ -15,6 +15,7 @@ var/list/stage3 = list("You feel utterly plain.") var/list/stage4 = list("You feel white bread.") var/list/stage5 = list("Oh the humanity!") + var/transformation_text = null var/new_form = /mob/living/carbon/human /datum/disease/transformation/stage_act() @@ -44,6 +45,8 @@ return if(affected_mob.notransform) return + if(transformation_text) + to_chat(affected_mob, transformation_text) affected_mob.notransform = 1 affected_mob.canmove = 0 affected_mob.icon = null @@ -243,4 +246,5 @@ stage3 = list("Your appendages are melting away.", "Your limbs begin to lose their shape.") stage4 = list("You're ravenous.") stage5 = list("You have become a morph.") + transformation_text = "This transformation does NOT make you an antagonist if you were not one already. If you were not an antagonist, you should not eat any steal objectives or the contents of the armory." new_form = /mob/living/simple_animal/hostile/morph diff --git a/code/datums/helper_datums/construction_datum.dm b/code/datums/helper_datums/construction_datum.dm index 155bbaed8dc..7c05f7806f9 100644 --- a/code/datums/helper_datums/construction_datum.dm +++ b/code/datums/helper_datums/construction_datum.dm @@ -47,7 +47,7 @@ /datum/construction/proc/custom_action(step, used_atom, user) if(istype(used_atom, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/C = used_atom - if(C.amount<4) + if(C.get_amount() < 4) to_chat(user, ("There's not enough cable to finish the task.")) return 0 else @@ -55,7 +55,7 @@ playsound(holder, C.usesound, 50, 1) else if(istype(used_atom, /obj/item/stack)) var/obj/item/stack/S = used_atom - if(S.amount < 5) + if(S.get_amount() < 5) to_chat(user, ("There's not enough material in this stack.")) return 0 else @@ -113,7 +113,7 @@ // STACKS if(istype(used_atom,/obj/item/stack)) var/obj/item/stack/stack=used_atom - if(stack.amount < amount) + if(stack.get_amount() < amount) to_chat(user, "You don't have enough [stack]! You need at least [amount].") return 0 stack.use(amount) diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 35e0053822d..29a1b29de97 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -1375,46 +1375,20 @@ switch(href_list["silicon"]) if("unemag") var/mob/living/silicon/robot/R = current - if(istype(R)) - R.emagged = 0 - if(R.module) - if(R.activated(R.module.emag)) - R.module_active = null - if(R.module_state_1 == R.module.emag) - R.module_state_1 = null - R.contents -= R.module.emag - else if(R.module_state_2 == R.module.emag) - R.module_state_2 = null - R.contents -= R.module.emag - else if(R.module_state_3 == R.module.emag) - R.module_state_3 = null - R.contents -= R.module.emag - R.clear_supplied_laws() - R.laws = new /datum/ai_laws/crewsimov - log_admin("[key_name(usr)] has un-emagged [key_name(current)]") - message_admins("[key_name_admin(usr)] has un-emagged [key_name_admin(current)]") + if(!istype(R)) + return + R.unemag() + log_admin("[key_name(usr)] has un-emagged [key_name(current)]") + message_admins("[key_name_admin(usr)] has un-emagged [key_name_admin(current)]") if("unemagcyborgs") - if(isAI(current)) - var/mob/living/silicon/ai/ai = current - for(var/mob/living/silicon/robot/R in ai.connected_robots) - R.emagged = 0 - if(R.module) - if(R.activated(R.module.emag)) - R.module_active = null - if(R.module_state_1 == R.module.emag) - R.module_state_1 = null - R.contents -= R.module.emag - else if(R.module_state_2 == R.module.emag) - R.module_state_2 = null - R.contents -= R.module.emag - else if(R.module_state_3 == R.module.emag) - R.module_state_3 = null - R.contents -= R.module.emag - R.clear_supplied_laws() - R.laws = new /datum/ai_laws/crewsimov - log_admin("[key_name(usr)] has unemagged [key_name(ai)]'s cyborgs") - message_admins("[key_name_admin(usr)] has unemagged [key_name_admin(ai)]'s cyborgs") + if(!isAI(current)) + return + var/mob/living/silicon/ai/ai = current + for(var/mob/living/silicon/robot/R in ai.connected_robots) + R.unemag() + log_admin("[key_name(usr)] has unemagged [key_name(ai)]'s cyborgs") + message_admins("[key_name_admin(usr)] has unemagged [key_name_admin(ai)]'s cyborgs") else if(href_list["common"]) switch(href_list["common"]) diff --git a/code/datums/outfits/outfit.dm b/code/datums/outfits/outfit.dm index 1c5aba0f171..283b6951b9f 100644 --- a/code/datums/outfits/outfit.dm +++ b/code/datums/outfits/outfit.dm @@ -111,6 +111,8 @@ for(var/path in backpack_contents) var/number = backpack_contents[path] + if(!number) + number = 1 for(var/i in 1 to number) H.equip_or_collect(new path(H), slot_in_backpack) diff --git a/code/datums/outfits/outfit_admin.dm b/code/datums/outfits/outfit_admin.dm index 22d61c818ec..816a80f7379 100644 --- a/code/datums/outfits/outfit_admin.dm +++ b/code/datums/outfits/outfit_admin.dm @@ -3,7 +3,7 @@ /datum/outfit/admin/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() - if(!visualsOnly) + if(!visualsOnly && H.mind) H.mind.assigned_role = name H.job = name @@ -84,7 +84,7 @@ shoes = /obj/item/clothing/shoes/magboots/syndie r_pocket = /obj/item/radio/uplink/nuclear l_pocket = /obj/item/pinpointer/advpinpointer - l_hand = /obj/item/tank/jetpack/oxygen/harness + l_hand = /obj/item/tank/internals/oxygen/red backpack_contents = list( /obj/item/storage/box/survival_syndi = 1, @@ -627,6 +627,10 @@ /obj/item/implanter/death_alarm = 1, ) + implants = list(/obj/item/implant/mindshield, + /obj/item/implant/death_alarm + ) + /datum/outfit/admin/solgov_rep/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() if(visualsOnly) @@ -634,33 +638,44 @@ var/obj/item/card/id/I = H.wear_id if(istype(I)) - apply_to_card(I, H, get_all_accesses(), name, "lifetimeid") + apply_to_card(I, H, get_all_centcom_access(), name, "lifetimeid") + I.assignment = "Solar Federation Representative" + H.sec_hud_set_ID() /datum/outfit/admin/solgov name = "Solar Federation Marine" - uniform = /obj/item/clothing/under/solgov suit = /obj/item/clothing/suit/armor/bulletproof back = /obj/item/storage/backpack/security - belt = /obj/item/storage/belt/military/assault - head = /obj/item/clothing/head/soft/solgov - glasses = /obj/item/clothing/glasses/hud/security/night + belt = /obj/item/storage/belt/military/assault/marines/full + head = /obj/item/clothing/head/soft/solgov/marines + glasses = /obj/item/clothing/glasses/night gloves = /obj/item/clothing/gloves/combat shoes = /obj/item/clothing/shoes/combat l_ear = /obj/item/radio/headset/ert id = /obj/item/card/id - l_hand = /obj/item/gun/projectile/automatic/ar + l_hand = /obj/item/gun/projectile/automatic/shotgun/bulldog + suit_store = /obj/item/gun/projectile/automatic/pistol/m1911 r_pocket = /obj/item/flashlight/seclite pda = /obj/item/pda backpack_contents = list( /obj/item/storage/box/responseteam = 1, - /obj/item/ammo_box/magazine/m556 = 3, /obj/item/clothing/shoes/magboots = 1, - /obj/item/gun/projectile/automatic/pistol/m1911 = 1, - /obj/item/ammo_box/magazine/m45 = 2 + /obj/item/whetstone = 1, + /obj/item/clothing/mask/gas/explorer/marines = 1, + /obj/item/reagent_containers/hypospray/autoinjector/survival = 1 ) - var/is_tsf_lieutenant = FALSE + cybernetic_implants = list( + /obj/item/organ/internal/cyberimp/arm/flash, + /obj/item/organ/internal/cyberimp/chest/nutriment, + /obj/item/organ/internal/cyberimp/eyes/hud/security + ) + implants = list(/obj/item/implant/mindshield, + /obj/item/implant/death_alarm + ) + + var/is_solgov_lieutenant = FALSE /datum/outfit/admin/solgov/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -668,31 +683,80 @@ if(visualsOnly) return - if(is_tsf_lieutenant) + if(is_solgov_lieutenant) H.real_name = "Lieutenant [pick(GLOB.last_names)]" else H.real_name = "[pick("Corporal", "Sergeant", "Staff Sergeant", "Sergeant First Class", "Master Sergeant", "Sergeant Major")] [pick(GLOB.last_names)]" H.name = H.real_name var/obj/item/card/id/I = H.wear_id - if(istype(I)) - apply_to_card(I, H, get_all_accesses(), name, "lifetimeid") + I.assignment = name + if(istype(I) && is_solgov_lieutenant) + apply_to_card(I, H, get_centcom_access("Emergency Response Team Leader"), name, "lifetimeid") + else if(istype(I)) + apply_to_card(I, H, get_centcom_access("Emergency Response Team Member"), name, "lifetimeid") + H.sec_hud_set_ID() /datum/outfit/admin/solgov/lieutenant name = "Solar Federation Lieutenant" - uniform = /obj/item/clothing/under/solgov/command - head = /obj/item/clothing/head/soft/solgov/command + head = /obj/item/clothing/head/beret/solgov/command + glasses = /obj/item/clothing/glasses/night back = /obj/item/storage/backpack/satchel + l_ear = /obj/item/radio/headset/ert/alt/commander l_hand = null + belt = /obj/item/melee/baton/loaded + suit_store = /obj/item/gun/projectile/automatic/pistol/deagle l_pocket = /obj/item/pinpointer/advpinpointer backpack_contents = list( /obj/item/storage/box/responseteam = 1, - /obj/item/melee/classic_baton/telescopic = 1, + /obj/item/storage/box/handcuffs = 1, /obj/item/clothing/shoes/magboots/advance = 1, - /obj/item/gun/projectile/automatic/pistol/deagle = 1, - /obj/item/ammo_box/magazine/m50 = 2 + /obj/item/reagent_containers/hypospray/autoinjector/survival = 1, + /obj/item/clothing/mask/gas/explorer/marines = 1, + /obj/item/ammo_box/magazine/m50 = 3 ) - is_tsf_lieutenant = TRUE + is_solgov_lieutenant = TRUE + +/datum/outfit/admin/solgov/elite + name = "Solar Federation Specops Marine" + uniform = /obj/item/clothing/under/solgov/elite + head = /obj/item/clothing/head/soft/solgov/marines/elite + belt = /obj/item/storage/belt/military/assault/marines/elite/full + l_hand = /obj/item/gun/projectile/automatic/ar + backpack_contents = list( + /obj/item/storage/box/responseteam = 1, + /obj/item/clothing/shoes/magboots/advance = 1, + /obj/item/whetstone = 1, + /obj/item/clothing/mask/gas/explorer/marines = 1, + /obj/item/reagent_containers/hypospray/autoinjector/survival = 1 + ) + cybernetic_implants = list( + /obj/item/organ/internal/cyberimp/eyes/hud/security, + /obj/item/organ/internal/cyberimp/chest/nutriment, + /obj/item/organ/internal/cyberimp/brain/anti_stun/hardened, + /obj/item/organ/internal/cyberimp/arm/flash, + /obj/item/organ/internal/eyes/cybernetic/shield + ) +/datum/outfit/admin/solgov/elite/lieutenant + name = "Solar Federation Specops Lieutenant" + uniform = /obj/item/clothing/under/solgov/command/elite + head = /obj/item/clothing/head/beret/solgov/command/elite + glasses = /obj/item/clothing/glasses/night + back = /obj/item/storage/backpack/satchel + belt = /obj/item/melee/baton/loaded + l_hand = null + suit_store = /obj/item/gun/projectile/automatic/pistol/deagle + l_pocket = /obj/item/pinpointer/advpinpointer + l_ear = /obj/item/radio/headset/ert/alt/commander + backpack_contents = list( + /obj/item/storage/box/responseteam = 1, + /obj/item/storage/box/handcuffs = 1, + /obj/item/clothing/shoes/magboots/advance = 1, + /obj/item/clothing/mask/gas/explorer/marines = 1, + /obj/item/reagent_containers/hypospray/autoinjector/survival = 1, + /obj/item/ammo_box/magazine/m50 = 3 + ) + is_solgov_lieutenant = TRUE /datum/outfit/admin/sol_trader name = "Sol Trader" @@ -720,6 +784,7 @@ var/obj/item/card/id/I = H.wear_id if(istype(I)) apply_to_card(I, H, list(ACCESS_TRADE_SOL, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS), name) + H.sec_hud_set_ID() /datum/outfit/admin/chrono name = "Chrono Legionnaire" @@ -1158,3 +1223,68 @@ var/obj/item/radio/headset/R = H.l_ear if(istype(R)) R.flags |= NODROP + +/datum/outfit/admin/honksquad + name = "Honksquad" + + uniform = /obj/item/clothing/under/rank/clown + mask = /obj/item/clothing/mask/gas/clown_hat + back = /obj/item/storage/backpack/clown + id = /obj/item/card/id/clown + + backpack_contents = list( + /obj/item/storage/box/survival = 1, + /obj/item/bikehorn = 1, + /obj/item/stamp/clown = 1, + /obj/item/toy/crayon/rainbow = 1, + /obj/item/reagent_containers/spray/waterflower = 1, + /obj/item/reagent_containers/food/snacks/grown/banana = 1, + ) + + shoes = /obj/item/clothing/shoes/clown_shoes + suit = /obj/item/clothing/suit/storage/det_suit + pda = /obj/item/pda/clown + l_ear = /obj/item/radio/headset + r_pocket = /obj/item/reagent_containers/food/pill/patch/jestosterone + +/datum/outfit/admin/honksquad/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + if(H.gender == FEMALE) + uniform = /obj/item/clothing/under/rank/clown/sexy + mask = /obj/item/clothing/mask/gas/clown_hat/sexy + + if(prob(50)) + // You have to do it like this to make it work with assoc lists without a runtime. + // Trust me. + backpack_contents.Add(/obj/item/gun/energy/clown) + backpack_contents[/obj/item/gun/energy/clown] = 1 // Amount. Not boolean. Do not TRUE this. You turkey. + else + backpack_contents.Add(/obj/item/gun/throw/piecannon) + backpack_contents[/obj/item/gun/throw/piecannon] = 1 + +/datum/outfit/admin/honksquad/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + if(visualsOnly) + return + + // Setup their clumsy gene + H.dna.SetSEState(GLOB.clumsyblock, TRUE) + H.check_mutations = TRUE + + // Setup their headset + var/obj/item/radio/R = H.l_ear + if(istype(R)) + R.set_frequency(DTH_FREQ) // Clowns can be part of "special operations" + + // And their PDA + var/obj/item/pda/P = H.wear_pda + if(istype(P)) + P.owner = H.real_name + P.ownjob = "Clown" + P.name = "PDA-[H.real_name] ([P.ownjob])" + + // And their ID + var/obj/item/card/id/I = H.wear_id + if(istype(I)) + apply_to_card(I, H, list(ACCESS_CLOWN), "Clown") + H.sec_hud_set_ID() diff --git a/code/datums/spells/construct_spells.dm b/code/datums/spells/construct_spells.dm index afc91f922ab..57dd43ad38c 100644 --- a/code/datums/spells/construct_spells.dm +++ b/code/datums/spells/construct_spells.dm @@ -49,7 +49,7 @@ /obj/effect/proc_holder/spell/aoe_turf/conjure/soulstone name = "Summon Soulstone" - desc = "This spell reaches into Nar'Sie's realm, summoning one of the legendary fragments across time and space" + desc = "This spell reaches into Redspace, summoning one of the legendary fragments across time and space" action_icon_state = "summonsoulstone" action_background_icon_state = "bg_cult" school = "conjuration" @@ -68,7 +68,7 @@ /obj/effect/proc_holder/spell/aoe_turf/conjure/pylon name = "Cult Pylon" - desc = "This spell conjures a fragile crystal from Nar'Sie's realm. Makes for a convenient light source." + desc = "This spell conjures a fragile crystal from Redspace. Makes for a convenient light source." action_icon_state = "pylon" action_background_icon_state = "bg_cult" school = "conjuration" @@ -118,7 +118,12 @@ /obj/effect/proc_holder/spell/targeted/ethereal_jaunt/shift/do_jaunt(mob/living/target) target.set_light(0) ..() - target.set_light(2, 3, l_color = SSticker.cultdat ? SSticker.cultdat.construct_glow : LIGHT_COLOR_BLOOD_MAGIC) + if(isconstruct(target)) + var/mob/living/simple_animal/hostile/construct/C = target + if(C.holy) + C.set_light(3, 5, LIGHT_COLOR_DARK_BLUE) + else + C.set_light(2, 3, l_color = SSticker.cultdat ? SSticker.cultdat.construct_glow : LIGHT_COLOR_BLOOD_MAGIC) /obj/effect/proc_holder/spell/targeted/ethereal_jaunt/shift/jaunt_steam(mobloc) return diff --git a/code/datums/spells/lichdom.dm b/code/datums/spells/lichdom.dm index 9175fd677fb..32f2cd7e520 100644 --- a/code/datums/spells/lichdom.dm +++ b/code/datums/spells/lichdom.dm @@ -95,7 +95,7 @@ if((ABSTRACT in item.flags) || (NODROP in item.flags)) continue marked_item = item - to_chat(M, "You begin to focus your very being into the [item.name]...") + to_chat(M, "You begin to focus your very being into [item]...") break if(!marked_item) @@ -104,7 +104,7 @@ spawn(50) if(marked_item.loc != M) //I changed my mind I don't want to put my soul in a cheeseburger! - to_chat(M, "Your soul snaps back to your body as you drop the [marked_item.name]!") + to_chat(M, "Your soul snaps back to your body as you drop [marked_item]!") marked_item = null return name = "RISE!" diff --git a/code/datums/spells/mime.dm b/code/datums/spells/mime.dm index 7142448dbdf..79c4e796aa1 100644 --- a/code/datums/spells/mime.dm +++ b/code/datums/spells/mime.dm @@ -21,7 +21,7 @@ if(!usr.mind.miming) to_chat(usr, "You must dedicate yourself to silence first.") return - invocation = "[usr.real_name] looks as if a wall is in front of [usr.p_them()]." + invocation = "[usr.name] looks as if a wall is in front of [usr.p_them()]." else invocation_type ="none" ..() @@ -86,7 +86,7 @@ if(!usr.mind.miming) to_chat(usr, "You must dedicate yourself to silence first.") return - invocation = "[usr.real_name] looks as if a blockade is in front of [usr.p_them()]." + invocation = "[usr.name] looks as if a blockade is in front of [usr.p_them()]." else invocation_type ="none" ..() diff --git a/code/datums/spells/summonitem.dm b/code/datums/spells/summonitem.dm index bac924e8240..2e7d3d8278a 100644 --- a/code/datums/spells/summonitem.dm +++ b/code/datums/spells/summonitem.dm @@ -80,7 +80,7 @@ var/obj/item/organ/external/part = X if(item_to_retrieve in part.embedded_objects) part.embedded_objects -= item_to_retrieve - to_chat(C, "The [item_to_retrieve] that was embedded in your [part] has mysteriously vanished. How fortunate!") + to_chat(C, "\The [item_to_retrieve] that was embedded in your [part] has mysteriously vanished. How fortunate!") if(!C.has_embedded_objects()) C.clear_alert("embeddedobject") break @@ -99,7 +99,7 @@ if(!item_to_retrieve) return - item_to_retrieve.loc.visible_message("The [item_to_retrieve.name] suddenly disappears!") + item_to_retrieve.loc.visible_message("\The [item_to_retrieve] suddenly disappears!") if(target.hand) //left active hand @@ -112,10 +112,10 @@ butterfingers = 1 if(butterfingers) item_to_retrieve.loc = target.loc - item_to_retrieve.loc.visible_message("The [item_to_retrieve.name] suddenly appears!") + item_to_retrieve.loc.visible_message("\The [item_to_retrieve] suddenly appears!") playsound(get_turf(target),'sound/magic/summonitems_generic.ogg',50,1) else - item_to_retrieve.loc.visible_message("The [item_to_retrieve.name] suddenly appears in [target]'s hand!") + item_to_retrieve.loc.visible_message("\The [item_to_retrieve] suddenly appears in [target]'s hand!") playsound(get_turf(target),'sound/magic/summonitems_generic.ogg',50,1) if(message) diff --git a/code/datums/spells/wizard.dm b/code/datums/spells/wizard.dm index a954f72cb13..acaeeb41487 100644 --- a/code/datums/spells/wizard.dm +++ b/code/datums/spells/wizard.dm @@ -374,7 +374,7 @@ for(var/am in thrownatoms) var/atom/movable/AM = am - if(AM == user || AM.anchored) + if(AM == user || AM.anchored || AM.move_resist == INFINITY) continue throwtarget = get_edge_target_turf(user, get_dir(user, get_step_away(AM, user))) diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index 3a856a8d130..5ee45d3291f 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -935,6 +935,14 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY containername = "surgery crate" access = ACCESS_MEDICAL +/datum/supply_packs/medical/gloves + name = "Nitrile Glove Crate" + contains = list(/obj/item/clothing/gloves/color/latex/nitrile, + /obj/item/clothing/gloves/color/latex/nitrile, + /obj/item/clothing/gloves/color/latex/nitrile, + /obj/item/clothing/gloves/color/latex/nitrile) + cost = 50 + containername = "nitrile glove crate" ////////////////////////////////////////////////////////////////////////////// //////////////////////////// Science ///////////////////////////////////////// diff --git a/code/datums/tgs_event_handler.dm b/code/datums/tgs_event_handler.dm index df140ad6ff6..9dd5b624115 100644 --- a/code/datums/tgs_event_handler.dm +++ b/code/datums/tgs_event_handler.dm @@ -1,39 +1,53 @@ +/// Will our restart be slower? +GLOBAL_VAR_INIT(slower_restart, FALSE) + +/proc/server_announce_global(announcement_text) + to_chat(world, "\[Server] [announcement_text]") + +/proc/server_announce_adminonly(announcement_text) + to_chat(GLOB.admins, "\[Server] \[Admin] [announcement_text]") + /datum/tgs_event_handler/impl var/datum/timedevent/reattach_timer + /datum/tgs_event_handler/impl/HandleEvent(event_code, ...) switch(event_code) if(TGS_EVENT_REBOOT_MODE_CHANGE) var/list/reboot_mode_lookup = list ("[TGS_REBOOT_MODE_NORMAL]" = "be normal", "[TGS_REBOOT_MODE_SHUTDOWN]" = "shutdown the server", "[TGS_REBOOT_MODE_RESTART]" = "hard restart the server") var/old_reboot_mode = args[2] var/new_reboot_mode = args[3] - message_admins("\[Server]\[Info] Reboot will no longer [reboot_mode_lookup["[old_reboot_mode]"]], it will instead [reboot_mode_lookup["[new_reboot_mode]"]]") + if(new_reboot_mode == TGS_REBOOT_MODE_SHUTDOWN) + GLOB.slower_restart = TRUE + else + GLOB.slower_restart = FALSE + server_announce_adminonly("\[Info] Reboot will no longer [reboot_mode_lookup["[old_reboot_mode]"]], it will instead [reboot_mode_lookup["[new_reboot_mode]"]]") if(TGS_EVENT_PORT_SWAP) - message_admins("\[Server]\[Info] Changing port from [world.port] to [args[2]]") + server_announce_adminonly("\[Info] Changing port from [world.port] to [args[2]]") if(TGS_EVENT_INSTANCE_RENAMED) - message_admins("\[Server]\[Info] Instance renamed to from [world.TgsInstanceName()] to [args[2]]") + server_announce_adminonly("\[Info] Instance renamed to from [world.TgsInstanceName()] to [args[2]]") if(TGS_EVENT_COMPILE_START) - message_admins("\[Server]\[Info] Code deployment started, new game version incoming next round...") + server_announce_adminonly("\[Info] Code deployment started, new game version incoming next round...") if(TGS_EVENT_COMPILE_CANCELLED) - message_admins("\[Server]\[Warning] Code deployment cancelled!") + server_announce_adminonly("\[Warning] Code deployment cancelled! Consult a maintainer/host to see if this was intentional!") if(TGS_EVENT_COMPILE_FAILURE) - message_admins("\[Server]\[Error] Code deployment failed! Inform a maintainer/host immediately!") + server_announce_adminonly("\[Error] Code deployment failed! Inform a maintainer/host immediately!") if(TGS_EVENT_DEPLOYMENT_COMPLETE) - message_admins("\[Server]\[Info] Code deployment complete!") - to_chat(world, "Server updated, changes will be applied on the next round...") + server_announce_adminonly("\[Info] Code deployment complete!") + server_announce_global("Server update complete. Changes will be applied on the next round.") if(TGS_EVENT_WATCHDOG_DETACH) - message_admins("\[Server]\[Info] Server manager restarting...") + server_announce_adminonly("\[Info] Server manager restarting...") reattach_timer = addtimer(CALLBACK(src, .proc/LateOnReattach), 1 MINUTES, TIMER_STOPPABLE) if(TGS_EVENT_WATCHDOG_REATTACH) var/datum/tgs_version/old_version = world.TgsVersion() var/datum/tgs_version/new_version = args[2] if(!old_version.Equals(new_version)) - message_admins("\[Server]\[Info] Manager back online. TGS has been updated to v[new_version.deprefixed_parameter]") + server_announce_adminonly("\[Info] Server manager back online. TGS has been updated to v[new_version.deprefixed_parameter]") else - message_admins("\[Server]\[Info] Manager back online") + server_announce_adminonly("\[Info] Server manager back online") if(reattach_timer) deltimer(reattach_timer) reattach_timer = null /datum/tgs_event_handler/impl/proc/LateOnReattach() - message_admins("\[Server]\[Warning] TGS hasn't notified us of it coming back for a full minute! Is there a problem?") + server_announce_adminonly("\[Warning] TGS hasn't notified us of it coming back for a full minute! Is there a problem?") diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index 61c1e8df625..10ee68c1104 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -864,6 +864,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) reference = "CQC" item = /obj/item/CQC_manual cost = 13 + cant_discount = TRUE /datum/uplink_item/stealthy_weapons/cameraflash name = "Camera Flash" @@ -1016,6 +1017,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) cost = 11 surplus = 0 cant_discount = TRUE + hijack_only = TRUE /datum/uplink_item/explosives/emp_bomb name = "EMP bomb" @@ -1425,7 +1427,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) name = "Power Sink" desc = "When screwed to wiring attached to an electric grid, then activated, this large device places excessive load on the grid, causing a stationwide blackout. The sink cannot be carried because of its excessive size. Ordering this sends you a small beacon that will teleport the power sink to your location on activation." reference = "PS" - item = /obj/item/powersink + item = /obj/item/radio/beacon/syndicate/power_sink cost = 10 /datum/uplink_item/device_tools/singularity_beacon diff --git a/code/datums/wires/wires.dm b/code/datums/wires/wires.dm index 691018cd6fa..102b80f4359 100644 --- a/code/datums/wires/wires.dm +++ b/code/datums/wires/wires.dm @@ -209,7 +209,7 @@ /** * Proc called to determine if the user can see wire define information, such as "Contraband", "Door Bolts", etc. * - * If the user is an admin, or has a multitool which reveals wire information in their active hand, the proc returns TRUE. + * If the user is an admin, or has an item which reveals wire information in their active hand, the proc returns TRUE. * * Arguments: * * user - the mob who is interacting with the wires. @@ -217,10 +217,9 @@ /datum/wires/proc/can_see_wire_info(mob/user) if(user.can_admin_interact()) return TRUE - else if(istype(user.get_active_hand(), /obj/item/multitool)) - var/obj/item/multitool/M = user.get_active_hand() - if(M.shows_wire_information) - return TRUE + var/obj/item/held_item = user.get_active_hand() + if(istype(held_item) && HAS_TRAIT(held_item, TRAIT_SHOW_WIRE_INFO)) + return TRUE return FALSE /** diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index 6565779e14b..e8e08609e82 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -75,6 +75,12 @@ ///Used to decide what the maximum time between ambience is var/max_ambience_cooldown = 90 SECONDS +/area/New(loc, ...) + if(!there_can_be_many) // Has to be done in New else the maploader will fuck up and find subtypes for the parent + GLOB.all_unique_areas[type] = src + ..() + + /area/Initialize(mapload) GLOB.all_areas += src icon_state = "" diff --git a/code/game/area/ss13_areas.dm b/code/game/area/ss13_areas.dm index 736a6d84447..decf7408b74 100644 --- a/code/game/area/ss13_areas.dm +++ b/code/game/area/ss13_areas.dm @@ -607,53 +607,75 @@ NOTE: there are two lists of areas in the end of this file: centcom and station icon_state = "fpmaint" /area/maintenance/fpmaint - name = "EVA Maintenance" + name = "Fore-Port Maintenance" icon_state = "fpmaint" /area/maintenance/fpmaint2 - name = "Arrivals North Maintenance" + name = "Fore-Port Secondary Maintenance" icon_state = "fpmaint" /area/maintenance/fsmaint - name = "Dormitory Maintenance" + name = "Fore-Starboard Maintenance" icon_state = "fsmaint" /area/maintenance/fsmaint2 - name = "Bar Maintenance" + name = "Fore-Starboard Secondary Maintenance" icon_state = "fsmaint" /area/maintenance/asmaint - name = "Medbay Maintenance" + name = "Aft-Starboard Maintenance" icon_state = "asmaint" /area/maintenance/asmaint2 - name = "Science Maintenance" + name = "Aft-Starboard Secondary Maintenance" icon_state = "asmaint" /area/maintenance/apmaint - name = "Cargo Maintenance" + name = "Aft-Port Maintenance" + icon_state = "apmaint" + +/area/maintenance/apmaint2 + name = "Aft-Port Secondary Maintenance" icon_state = "apmaint" /area/maintenance/maintcentral - name = "Bridge Maintenance" + name = "Central Maintenance" icon_state = "maintcentral" +/area/maintenance/maintcentral2 + name = "Central Secondary Maintenance" + icon_state = "maintcentral" /area/maintenance/fore name = "Fore Maintenance" icon_state = "fmaint" +/area/maintenance/fore2 + name = "Fore Secondary Maintenance" + icon_state = "fmaint" + +/area/maintenance/aft + name = "Aft Maintenance" + icon_state = "amaint" + +/area/maintenance/aft2 + name = "Aft Secondary Maintenance" + icon_state = "amaint" + /area/maintenance/starboard name = "Starboard Maintenance" icon_state = "smaint" +/area/maintenance/starboard2 + name = "Starboard Secondary Maintenance" + icon_state = "smaint" + /area/maintenance/port - name = "Locker Room Maintenance" + name = "Port Maintenance" icon_state = "pmaint" -/area/maintenance/aft - name = "Engineering Maintenance" - icon_state = "amaint" - +/area/maintenance/port2 + name = "Port Secondary Maintenance" + icon_state = "pmaint" /area/maintenance/storage name = "Atmospherics Maintenance" icon_state = "green" @@ -677,18 +699,18 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/maintenance/electrical name = "Electrical Maintenance" - icon_state = "yellow" + icon_state = "elec" /area/maintenance/abandonedbar name = "Maintenance Bar" - icon_state = "yellow" + icon_state = "oldbar" power_equip = 0 power_light = 0 power_environ = 0 /area/maintenance/electrical_shop name ="Electronics Den" - icon_state = "yellow" + icon_state = "elec" /area/maintenance/gambling_den name = "Gambling Den" @@ -696,7 +718,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/maintenance/consarea name = "Alternate Construction Area" - icon_state = "yellow" + icon_state = "construction" //Hallway @@ -836,7 +858,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/comms name = "\improper Communications Relay" - icon_state = "tcomsatcham" + icon_state = "tcomms" sound_environment = SOUND_AREA_STANDARD_STATION /area/server @@ -846,11 +868,11 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/ntrep name = "\improper Nanotrasen Representative's Office" - icon_state = "bluenew" + icon_state = "ntrep" /area/blueshield name = "\improper Blueshield's Office" - icon_state = "blueold" + icon_state = "blueshield" /area/centcomdocks name = "\improper Central Command Docks" @@ -919,7 +941,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/crew_quarters/bar name = "\improper Bar" - icon_state = "bar" + icon_state = "barstation" sound_environment = SOUND_AREA_WOODFLOOR /area/crew_quarters/bar/atrium @@ -1048,45 +1070,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/holodeck/source_knightarena name = "\improper Holodeck - Knight Arena" - -//Embassies -/area/embassy/ - name = "\improper Embassy Hallway" - -/area/embassy/tajaran - name = "\improper Tajaran Embassy" - icon_state = "tajaran" - -/area/embassy/skrell - name = "\improper Skrell Embassy" - icon_state = "skrell" - -/area/embassy/unathi - name = "\improper Unathi Embassy" - icon_state = "unathi" - -/area/embassy/kidan - name = "\improper Kidan Embassy" - icon_state = "kidan" - -/area/embassy/diona - name = "\improper Diona Embassy" - icon_state = "diona" - -/area/embassy/slime - name = "\improper Slime Person Embassy" - icon_state = "slime" - -/area/embassy/grey - name = "\improper Grey Embassy" - icon_state = "grey" - -/area/embassy/vox - name = "\improper Vox Embassy" - icon_state = "vox" - - - //Engineering /area/engine ambientsounds = ENGINEERING_SOUNDS @@ -1108,7 +1091,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station sound_environment = SOUND_AREA_SMALL_ENCLOSED /area/engine/equipmentstorage - name = "\improper Engineering Equipment Storage" + name = "Engineering Equipment Storage" icon_state = "storage" sound_environment = SOUND_AREA_SMALL_ENCLOSED @@ -1260,7 +1243,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/medical/biostorage - name = "\improper Medical Storage" + name = "Medical Storage" icon_state = "medbaysecstorage" /area/medical/reception @@ -1285,19 +1268,19 @@ NOTE: there are two lists of areas in the end of this file: centcom and station icon_state = "patientsward" /area/medical/patient_a - name = "\improper Isolation A" + name = "Isolation A" icon_state = "medbayisoa" /area/medical/patient_b - name = "\improper Isolation B" + name = "Isolation B" icon_state = "medbayisob" /area/medical/patient_c - name = "\improper Isolation C" + name = "Isolation C" icon_state = "medbayisoc" /area/medical/iso_access - name = "\improper Isolation Access" + name = "Isolation Access" icon_state = "medbayisoaccess" /area/medical/cmo @@ -1305,23 +1288,19 @@ NOTE: there are two lists of areas in the end of this file: centcom and station icon_state = "CMO" /area/medical/cmostore - name = "\improper Medical Secondary Storage" + name = "Medical Secondary Storage" icon_state = "medbaysecstorage" /area/medical/robotics - name = "\improper Robotics" - icon_state = "medresearch" + name = "Robotics" + icon_state = "research" /area/medical/research - name = "\improper Medical Research" - icon_state = "medresearch" - -/area/medical/research_shuttle_dock - name = "\improper Research Shuttle Dock" - icon_state = "medresearch" + name = "Research Division" + icon_state = "research" /area/medical/virology - name = "\improper Virology" + name = "Virology" icon_state = "virology" /area/medical/virology/lab @@ -1336,7 +1315,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station sound_environment = SOUND_AREA_SMALL_ENCLOSED /area/medical/chemistry - name = "\improper Chemistry" + name = "Chemistry" icon_state = "chem" /area/medical/surgery @@ -1344,19 +1323,19 @@ NOTE: there are two lists of areas in the end of this file: centcom and station icon_state = "surgery" /area/medical/surgery1 - name = "\improper Surgery 1" + name = "Surgery 1" icon_state = "surgery1" /area/medical/surgery2 - name = "\improper Surgery 2" + name = "Surgery 2" icon_state = "surgery2" /area/medical/surgeryobs - name = "\improper Surgery Observation" + name = "Surgery Observation" icon_state = "surgery" /area/medical/cryo - name = "\improper Cryogenics" + name = "Cryogenics" icon_state = "cryo" /area/medical/exam_room @@ -1376,7 +1355,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station icon_state = "exam_room" /area/medical/paramedic - name = "\improper Paramedic" + name = "Paramedic" icon_state = "medbay" //Security @@ -1441,35 +1420,31 @@ NOTE: there are two lists of areas in the end of this file: centcom and station icon_state = "brig" /area/security/execution - name = "\improper Execution" + name = "Execution" icon_state = "execution" can_get_auto_cryod = FALSE /area/security/processing - name = "\improper Prisoner Processing" + name = "Prisoner Processing" icon_state = "prisonerprocessing" can_get_auto_cryod = FALSE /area/security/interrogation - name = "\improper Interrogation" + name = "Interrogation" icon_state = "interrogation" can_get_auto_cryod = FALSE /area/security/seceqstorage - name = "\improper Security Equipment Storage" + name = "Security Equipment Storage" icon_state = "securityequipmentstorage" -/area/security/interrogationhallway - name = "\improper Interrogation Hallway" - icon_state = "interrogationhall" - /area/security/courtroomdandp name = "\improper Courtroom Defense and Prosecution" icon_state = "seccourt" sound_environment = SOUND_AREA_LARGE_ENCLOSED /area/security/interrogationobs - name = "\improper Interrogation Observation" + name = "Interrogation Observation" icon_state = "security" can_get_auto_cryod = FALSE @@ -1505,7 +1480,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station icon_state = "secarmory" /area/security/securehallway - name = "\improper Security Secure Hallway" + name = "\improper Brig Secure Hallway" icon_state = "securehall" /area/security/hos @@ -1530,11 +1505,11 @@ NOTE: there are two lists of areas in the end of this file: centcom and station icon_state = "nuke_storage" /area/security/customs - name = "\improper Customs" + name = "Customs" icon_state = "checkpoint1" /area/security/customs2 - name = "\improper Customs" + name = "Customs" icon_state = "security" /area/security/checkpoint @@ -1601,7 +1576,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station icon_state = "mining" /area/quartermaster/miningstorage - name = "\improper Mining Storage" + name = "Mining Storage" icon_state = "green" /area/quartermaster/mechbay @@ -1614,7 +1589,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station sound_environment = SOUND_AREA_SMALL_ENCLOSED /area/hydroponics - name = "\improper Hydroponics" + name = "Hydroponics" icon_state = "hydro" sound_environment = SOUND_AREA_STANDARD_STATION @@ -1629,7 +1604,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station sound_environment = SOUND_AREA_STANDARD_STATION /area/toxins/lab - name = "\improper Research and Development" + name = "Research and Development" icon_state = "toxlab" /area/toxins/hallway @@ -1650,7 +1625,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station xenobiology_compatible = TRUE /area/toxins/xenobiology/xenoflora_storage - name = "\improper Xenoflora Storage" + name = "Xenoflora Storage" icon_state = "toxlab" /area/toxins/xenobiology/xenoflora @@ -1658,7 +1633,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station icon_state = "toxlab" /area/toxins/storage - name = "\improper Toxins Storage" + name = "Toxins Storage" icon_state = "toxstorage" /area/toxins/test_area @@ -1671,7 +1646,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station icon_state = "toxmix" /area/toxins/launch - name = "Toxins Launch Room" + name = "\improper Toxins Launch Room" icon_state = "toxlaunch" /area/toxins/misc_lab @@ -1739,7 +1714,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station icon_state = "auxstorage" /area/storage/office - name = "\improper Office Supplies" + name = "Office Supplies" icon_state = "office_supplies" // ENGIE OUTPOST @@ -2061,45 +2036,27 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/tcommsat/chamber name = "\improper Telecoms Central Compartment" - icon_state = "tcomsatcham" + icon_state = "tcomms" // These areas are needed for MetaStation's AI sat -/area/turret_protected/tcomsat - name = "\improper Telecoms Satellite" - icon_state = "tcomsatlob" - ambientsounds = list('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg') - /area/turret_protected/tcomfoyer name = "\improper Telecoms Foyer" - icon_state = "tcomsatentrance" - ambientsounds = list('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg') - -/area/turret_protected/tcomwest - name = "\improper Telecoms West Wing" - icon_state = "tcomsatwest" + icon_state = "tcomms" ambientsounds = list('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg') /area/turret_protected/tcomeast name = "\improper Telecoms East Wing" - icon_state = "tcomsateast" + icon_state = "tcomms" ambientsounds = list('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg') /area/tcommsat/computer name = "\improper Telecoms Control Room" - icon_state = "tcomsatcomp" + icon_state = "tcomms" sound_environment = SOUND_AREA_MEDIUM_SOFTFLOOR /area/tcommsat/server name = "\improper Telecoms Server Room" - icon_state = "tcomsatcham" - -/area/tcommsat/lounge - name = "\improper Telecoms Lounge" - icon_state = "tcomsatlounge" - -/area/tcommsat/powercontrol - name = "\improper Telecoms Power Control" - icon_state = "tcomsatwest" + icon_state = "tcomms" // Away Missions /area/awaymission diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 66df3d4a76c..fc5e1d8eb5f 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -413,6 +413,9 @@ /atom/proc/emag_act() return +/atom/proc/unemag() + return + /** * Respond to a radioactive wave hitting this atom * @@ -941,9 +944,6 @@ GLOBAL_LIST_EMPTY(blood_splatter_icons) /atom/proc/narsie_act() return -/atom/proc/ratvar_act() - return - /** * Respond to an electric bolt action on our item * @@ -1072,7 +1072,7 @@ GLOBAL_LIST_EMPTY(blood_splatter_icons) Returning TRUE here will override the above proc's result. */ /atom/proc/CanAStarPassTo(ID, dir, obj/destination) - return TRUE + return FALSE /** Call this when you want to present a renaming prompt to the user. @@ -1139,3 +1139,11 @@ GLOBAL_LIST_EMPTY(blood_splatter_icons) else name = "[prefix][t]" return t + +/atom/proc/set_angle(degrees) + var/matrix/M = matrix() + M.Turn(degrees) + // If we aint 0, make it NN transform + if(degrees) + appearance_flags |= PIXEL_SCALE + transform = M diff --git a/code/game/data_huds.dm b/code/game/data_huds.dm index 3692f725361..61097b2c796 100644 --- a/code/game/data_huds.dm +++ b/code/game/data_huds.dm @@ -178,14 +178,19 @@ /mob/living/carbon/med_hud_set_status() var/image/holder = hud_list[STATUS_HUD] var/mob/living/simple_animal/borer/B = has_brain_worms() - var/dead = stat == DEAD || HAS_TRAIT(src, TRAIT_FAKEDEATH) // To the right of health bar - if(dead) - var/revivable = timeofdeath && (round(world.time - timeofdeath) < DEFIB_TIME_LIMIT) + if(stat == DEAD || HAS_TRAIT(src, TRAIT_FAKEDEATH)) + var/revivable + if(!ghost_can_reenter()) // DNR or AntagHUD + revivable = FALSE + else if(timeofdeath && (round(world.time - timeofdeath) < DEFIB_TIME_LIMIT)) + revivable = TRUE + if(revivable) holder.icon_state = "hudflatline" else holder.icon_state = "huddead" + else if(HAS_TRAIT(src, TRAIT_XENO_HOST)) holder.icon_state = "hudxeno" else if(B && B.controlling) diff --git a/code/game/dna/dna2.dm b/code/game/dna/dna2.dm index b0323825c70..2dfe4d660c9 100644 --- a/code/game/dna/dna2.dm +++ b/code/game/dna/dna2.dm @@ -14,6 +14,7 @@ GLOBAL_LIST_INIT(assigned_mutation_blocks, new(DNA_SE_LENGTH)) // Used to determine what each block means (admin hax and species stuff on /vg/, mostly) GLOBAL_LIST_INIT(assigned_blocks, new(DNA_SE_LENGTH)) +/// Assoc list. Key = type of the mutation, value = the mutation GLOBAL_LIST_EMPTY(dna_mutations) GLOBAL_LIST_EMPTY(good_blocks) diff --git a/code/game/dna/dna2_domutcheck.dm b/code/game/dna/dna2_domutcheck.dm index d82e652dbb7..8da02df0806 100644 --- a/code/game/dna/dna2_domutcheck.dm +++ b/code/game/dna/dna2_domutcheck.dm @@ -3,7 +3,8 @@ // M: Mob to mess with // flags: See below, bitfield. /proc/domutcheck(mob/living/M, flags = 0) - for(var/datum/mutation/mutation in GLOB.dna_mutations) + for(var/mutation_type in GLOB.dna_mutations) + var/datum/mutation/mutation = GLOB.dna_mutations[mutation_type] if(!M || !M.dna) return if(!mutation.block) @@ -32,7 +33,7 @@ var/mutation_active = M.dna.GetSEState(mutation.block) // Sanity checks, don't skip. - if(!mutation.can_activate(M, flags) && mutation_active) + if(mutation_active && !mutation.can_activate(M, flags)) //testing("[M] - Failed to activate [gene.name] (can_activate fail).") return FALSE @@ -46,11 +47,7 @@ if(mutation_active) //testing("[gene.name] activated!") mutation.activate(M) - if(M) - M.active_mutations |= mutation.type // If Gene is NOT active: else //testing("[gene.name] deactivated!") mutation.deactivate(M) - if(M) - M.active_mutations -= mutation.type diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm index 11aa0cce55a..7e9b6c34634 100644 --- a/code/game/dna/dna_modifier.dm +++ b/code/game/dna/dna_modifier.dm @@ -150,16 +150,16 @@ if(usr.incapacitated() || usr.buckled) //are you cuffed, dying, lying, stunned or other return if(!ishuman(usr)) //Make sure they're a mob that has dna - to_chat(usr, "Try as you might, you can not climb up into the [src].") + to_chat(usr, "Try as you might, you can not climb up into [src].") return if(occupant) - to_chat(usr, "The [src] is already occupied!") + to_chat(usr, "[src] is already occupied!") return if(usr.abiotic()) to_chat(usr, "Subject cannot have abiotic items on.") return if(usr.has_buckled_mobs()) //mob attached to us - to_chat(usr, "[usr] will not fit into the [src] because [usr.p_they()] [usr.p_have()] a slime latched onto [usr.p_their()] head.") + to_chat(usr, "[usr] will not fit into [src] because [usr.p_they()] [usr.p_have()] a slime latched onto [usr.p_their()] head.") return usr.stop_pulling() usr.forceMove(src) @@ -188,7 +188,7 @@ if(!istype(user.loc, /turf) || !istype(O.loc, /turf)) // are you in a container/closet/pod/etc? return if(occupant) - to_chat(user, "The [src] is already occupied!") + to_chat(user, "[src] is already occupied!") return var/mob/living/L = O if(!istype(L) || L.buckled) @@ -200,9 +200,9 @@ to_chat(user, "[L] will not fit into [src] because [L.p_they()] [L.p_have()] a slime latched onto [L.p_their()] head.") return if(L == user) - visible_message("[user] climbs into the [src].") + visible_message("[user] climbs into [src].") else - visible_message("[user] puts [L.name] into the [src].") + visible_message("[user] puts [L.name] into [src].") put_in(L) if(user.pulling == L) user.stop_pulling() @@ -235,7 +235,7 @@ to_chat(user, "Subject cannot have abiotic items on.") return if(G.affecting.has_buckled_mobs()) //mob attached to us - to_chat(user, "will not fit into the [src] because [G.affecting.p_they()] [G.affecting.p_have()] a slime latched onto [G.affecting.p_their()] head.") + to_chat(user, "[G] will not fit into [src] because [G.affecting.p_they()] [G.affecting.p_have()] a slime latched onto [G.affecting.p_their()] head.") return if(panel_open) to_chat(usr, "Close the maintenance panel first.") diff --git a/code/game/dna/mutations/_mutations.dm b/code/game/dna/mutations/_mutations.dm index a9718394066..8ed4022c5be 100644 --- a/code/game/dna/mutations/_mutations.dm +++ b/code/game/dna/mutations/_mutations.dm @@ -31,7 +31,9 @@ // Called when the gene activates. Do your magic here. /datum/mutation/proc/activate(mob/living/M) + SHOULD_CALL_PARENT(TRUE) M.gene_stability -= instability + M.active_mutations |= type // |= is probably not required but just in case for(var/thing in traits_to_add) ADD_TRAIT(M, thing, GENETIC_MUTATION) if(length(activation_messages)) @@ -42,7 +44,9 @@ // Called when the gene deactivates. Undo your magic here. // Only called when the block is deactivated. /datum/mutation/proc/deactivate(mob/living/M) + SHOULD_CALL_PARENT(TRUE) M.gene_stability += instability + M.active_mutations -= type for(var/thing in traits_to_add) REMOVE_TRAIT(M, thing, GENETIC_MUTATION) if(length(deactivation_messages)) diff --git a/code/game/dna/mutations/monkey.dm b/code/game/dna/mutations/monkey.dm index 4ebe366bfb7..c9e91179527 100644 --- a/code/game/dna/mutations/monkey.dm +++ b/code/game/dna/mutations/monkey.dm @@ -9,6 +9,7 @@ return ishuman(M) /datum/mutation/monkey/activate(mob/living/carbon/human/H) + ..() if(!istype(H)) return if(issmall(H)) @@ -42,6 +43,7 @@ return H /datum/mutation/monkey/deactivate(mob/living/carbon/human/H) + ..() if(!istype(H)) return if(!issmall(H)) diff --git a/code/game/dna/mutations/powers.dm b/code/game/dna/mutations/powers.dm index 98d94299bfc..c0e20372a19 100644 --- a/code/game/dna/mutations/powers.dm +++ b/code/game/dna/mutations/powers.dm @@ -80,7 +80,7 @@ /datum/mutation/noprints name = "No Prints" activation_messages = list("Your fingers feel numb.") - deactivation_messages = list("your fingers no longer feel numb.") + deactivation_messages = list("Your fingers no longer feel numb.") instability = GENE_INSTABILITY_MINOR traits_to_add = list(TRAIT_NOFINGERPRINTS) @@ -161,7 +161,7 @@ /datum/mutation/xray name = "X-Ray Vision" activation_messages = list("The walls suddenly disappear.") - deactivation_messages = list("the walls around you re-appear.") + deactivation_messages = list("The walls around you re-appear.") instability = GENE_INSTABILITY_MAJOR traits_to_add = list(TRAIT_XRAY_VISION) activation_prob = 15 @@ -185,6 +185,7 @@ activation_messages = list("You feel smarter.") deactivation_messages = list("You feel dumber.") instability = GENE_INSTABILITY_MAJOR + traits_to_add = list(TRAIT_TELEKINESIS) activation_prob = 15 /datum/mutation/tk/New() diff --git a/code/game/gamemodes/blob/blob.dm b/code/game/gamemodes/blob/blob.dm index 83fefdf9deb..ba674aae658 100644 --- a/code/game/gamemodes/blob/blob.dm +++ b/code/game/gamemodes/blob/blob.dm @@ -15,7 +15,6 @@ GLOBAL_LIST_EMPTY(blob_nodes) recommended_enemies = 1 restricted_jobs = list("Cyborg", "AI") - var/declared = 0 var/burst = 0 var/cores_to_spawn = 1 @@ -75,8 +74,7 @@ GLOBAL_LIST_EMPTY(blob_nodes) log_game("[key_name(blob)] has been selected as a Blob") greet_blob(blobmind) to_chat(blob, "You feel very tired and bloated! You don't have long before you burst!") - spawn(600) - burst_blob(blobmind) + addtimer(CALLBACK(src, .proc/burst_blob, blobmind), 60 SECONDS) return 1 /datum/game_mode/blob/proc/make_blobs(count) @@ -103,6 +101,7 @@ GLOBAL_LIST_EMPTY(blob_nodes) to_chat(blob.current, "Find a good location to spawn the core and then take control and overwhelm the station!") to_chat(blob.current, "When you have found a location, wait until you spawn; this will happen automatically and you cannot speed up the process.") to_chat(blob.current, "If you go outside of the station level, or in space, then you will die; make sure your location has lots of ground to cover.") + to_chat(blob.current, "For more information, check the wiki page: ([config.wikiurl]/index.php/Blob)") SEND_SOUND(blob.current, sound('sound/magic/mutate.ogg')) return @@ -127,8 +126,7 @@ GLOBAL_LIST_EMPTY(blob_nodes) if(!warned) to_chat(C, "You feel ready to burst, but this isn't an appropriate place! You must return to the station!") message_admins("[key_name_admin(C)] was in space when the blobs burst, and will die if [C.p_they()] [C.p_do()] not return to the station.") - spawn(300) - burst_blob(blob, 1) + addtimer(CALLBACK(src, .proc/burst_blob, blob, 1), 30 SECONDS) else burst++ log_admin("[key_name(C)] was in space when attempting to burst as a blob.") @@ -172,33 +170,22 @@ GLOBAL_LIST_EMPTY(blob_nodes) show_message("You feel like you are about to burst.") - sleep(wait_time / 2) - - burst_blobs() - - // Stage 0 - sleep(wait_time) - stage(0) + addtimer(CALLBACK(src, .proc/burst_blobs), (wait_time / 2)) // Stage 1 - sleep(wait_time) - stage(1) + addtimer(CALLBACK(src, .proc/stage, 1), (wait_time * 2 + wait_time / 2)) // Stage 2 - sleep(30000) - stage(2) + addtimer(CALLBACK(src, .proc/stage, 2), 50 MINUTES) return ..() /datum/game_mode/blob/proc/stage(stage) switch(stage) - if(0) - send_intercept(1) - declared = 1 if(1) GLOB.event_announcement.Announce("Confirmed outbreak of level 5 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", 'sound/AI/outbreak5.ogg') if(2) - send_intercept(2) + send_intercept(1) /datum/game_mode/proc/update_blob_icons_added(datum/mind/mob_mind) var/datum/atom_hud/antag/antaghud = GLOB.huds[ANTAG_HUD_BLOB] diff --git a/code/game/gamemodes/blob/blob_finish.dm b/code/game/gamemodes/blob/blob_finish.dm index d14069b9d24..c95c0fb2539 100644 --- a/code/game/gamemodes/blob/blob_finish.dm +++ b/code/game/gamemodes/blob/blob_finish.dm @@ -26,7 +26,6 @@ to_chat(world, "The staff has won!") to_chat(world, "The alien organism has been eradicated from the station") log_game("Blob mode completed with a crew victory.") - to_chat(world, "Rebooting in 30s") ..() return 1 diff --git a/code/game/gamemodes/blob/blob_report.dm b/code/game/gamemodes/blob/blob_report.dm index 670c9ea8aa4..ad3cedafb85 100644 --- a/code/game/gamemodes/blob/blob_report.dm +++ b/code/game/gamemodes/blob/blob_report.dm @@ -5,19 +5,6 @@ if(0) return if(1) - interceptname = "Level 5-6 Biohazard Response Procedures" - intercepttext += "Nanotrasen Update: Biohazard Alert.
    " - intercepttext += "Reports indicate the probable transfer of a biohazardous agent onto [station_name()] during the last crew deployment cycle.
    " - intercepttext += "Preliminary analysis of the organism classifies it as a level 5 biohazard. Its origin is unknown.
    " - intercepttext += "Nanotrasen has issued a directive 7-10 for [station_name()]. The station is to be considered quarantined.
    " - intercepttext += "Orders for all [station_name()] personnel follows:
    " - intercepttext += " 1. Do not leave the quarantine area.
    " - intercepttext += " 2. Locate any outbreaks of the organism on the station.
    " - intercepttext += " 3. If found, use any neccesary means to contain the organism.
    " - intercepttext += " 4. Avoid damage to the capital infrastructure of the station.
    " - intercepttext += "
    Note in the event of a quarantine breach or uncontrolled spread of the biohazard, the directive 7-10 may be upgraded to a directive 7-12.
    " - intercepttext += "Message ends." - if(2) var/nukecode = rand(10000, 99999) for(var/obj/machinery/nuclearbomb/bomb in GLOB.machines) if(bomb && bomb.r_code) diff --git a/code/game/gamemodes/blob/blobs/core.dm b/code/game/gamemodes/blob/blobs/core.dm index a12f53150ca..b4a9bf3c3e8 100644 --- a/code/game/gamemodes/blob/blobs/core.dm +++ b/code/game/gamemodes/blob/blobs/core.dm @@ -117,13 +117,13 @@ if(C && !QDELETED(src)) var/mob/camera/blob/B = new(loc) + B.is_offspring = is_offspring B.key = C.key B.blob_core = src overmind = B color = overmind.blob_reagent_datum.color if(B.mind && !B.mind.special_role) B.mind.make_Overmind() - B.is_offspring = is_offspring /obj/structure/blob/core/proc/lateblobtimer() addtimer(CALLBACK(src, .proc/lateblobcheck), 50) diff --git a/code/game/gamemodes/changeling/changeling.dm b/code/game/gamemodes/changeling/changeling.dm index 7d074e869e7..01f87d3b758 100644 --- a/code/game/gamemodes/changeling/changeling.dm +++ b/code/game/gamemodes/changeling/changeling.dm @@ -147,6 +147,7 @@ GLOBAL_LIST_INIT(possible_changeling_IDs, list("Alpha","Beta","Gamma","Delta","E for(var/datum/objective/objective in changeling.objectives) to_chat(changeling.current, "Objective #[obj_count]: [objective.explanation_text]") obj_count++ + to_chat(changeling.current, "For more information, check the wiki page: ([config.wikiurl]/index.php/Changeling)") return /datum/game_mode/proc/remove_changeling(datum/mind/changeling_mind) diff --git a/code/game/gamemodes/changeling/changeling_power.dm b/code/game/gamemodes/changeling/changeling_power.dm index 47f83b4618b..5741447cd58 100644 --- a/code/game/gamemodes/changeling/changeling_power.dm +++ b/code/game/gamemodes/changeling/changeling_power.dm @@ -93,5 +93,7 @@ the same goes for Remove(). if you override Remove(), call parent or else your p /datum/action/changeling/proc/transform_dna(mob/living/carbon/human/H, datum/dna/D) if(!D) return - - H.change_dna(D, TRUE) + var/changesSpecies = TRUE + if (H.dna.species.name == D.species.name) + changesSpecies = FALSE + H.change_dna(D, changesSpecies) diff --git a/code/game/gamemodes/changeling/powers/digitalcamo.dm b/code/game/gamemodes/changeling/powers/digitalcamo.dm index 29385d33636..ddb6a6c03c4 100644 --- a/code/game/gamemodes/changeling/powers/digitalcamo.dm +++ b/code/game/gamemodes/changeling/powers/digitalcamo.dm @@ -1,11 +1,11 @@ /datum/action/changeling/digitalcamo name = "Digital Camouflage" desc = "By evolving the ability to distort our form and proprotions, we defeat common altgorithms used to detect lifeforms on cameras." - helptext = "We cannot be tracked by camera while using this skill. However, humans looking at us will find us... uncanny." + helptext = "We cannot be tracked by camera while using this skill." button_icon_state = "digital_camo" dna_cost = 1 -//Prevents AIs tracking you but makes you easily detectable to the human-eye. +//Prevents AIs tracking you. /datum/action/changeling/digitalcamo/sting_action(mob/user) if(user.digitalcamo) diff --git a/code/game/gamemodes/changeling/powers/linglink.dm b/code/game/gamemodes/changeling/powers/linglink.dm index 30242968920..f245c711269 100644 --- a/code/game/gamemodes/changeling/powers/linglink.dm +++ b/code/game/gamemodes/changeling/powers/linglink.dm @@ -49,7 +49,7 @@ to_chat(user, "We stealthily stab [target] with a minor proboscis...") to_chat(target, "You experience a stabbing sensation and your ears begin to ring...") if(3) - to_chat(user, "You mold the [target]'s mind like clay, [target.p_they()] can now speak in the hivemind!") + to_chat(user, "You mold [target]'s mind like clay, [target.p_they()] can now speak in the hivemind!") to_chat(target, "A migraine throbs behind your eyes, you hear yourself screaming - but your mouth has not opened!") for(var/mob/M in GLOB.mob_list) if(GLOB.all_languages["Changeling"] in M.languages) diff --git a/code/game/gamemodes/changeling/powers/mutations.dm b/code/game/gamemodes/changeling/powers/mutations.dm index 420628a0198..f0569db3909 100644 --- a/code/game/gamemodes/changeling/powers/mutations.dm +++ b/code/game/gamemodes/changeling/powers/mutations.dm @@ -38,7 +38,7 @@ /datum/action/changeling/weapon/sting_action(mob/user) if(!user.drop_item()) - to_chat(user, "The [user.get_active_hand()] is stuck to your hand, you cannot grow a [weapon_name_simple] over it!") + to_chat(user, "[user.get_active_hand()] is stuck to your hand, you cannot grow a [weapon_name_simple] over it!") return var/obj/item/W = new weapon_type(user, silent) user.put_in_hands(W) @@ -173,8 +173,11 @@ name = "Tentacle" desc = "We ready a tentacle to grab items or victims with. Costs 10 chemicals." helptext = "We can use it once to retrieve a distant item. If used on living creatures, the effect depends on the intent: \ - Help will simply drag them closer, Disarm will grab whatever they are holding instead of them, Grab will put the victim in our hold after catching it, \ - and Harm will stun it, and stab it if we are also holding a sharp weapon. Cannot be used while in lesser form." + Help will drag the target closer. \ + Disarm will grab whatever the target is holding. \ + Grab will put the target in our grip after we catch it. \ + Harm will drag the target closer and stab it if we are holding a sharp weapon in our other hand. \ + Cannot be used while in our lesser form." button_icon_state = "tentacle" chemical_cost = 10 dna_cost = 2 @@ -209,7 +212,7 @@ to_chat(loc, "You prepare to extend a tentacle.") /obj/item/gun/magic/tentacle/shoot_with_empty_chamber(mob/living/user as mob|obj) - to_chat(user, "The [name] is not ready yet.") + to_chat(user, "[src] is not ready yet.") /obj/item/gun/magic/tentacle/suicide_act(mob/user) user.visible_message("[user] coils [src] tightly around [user.p_their()] neck! It looks like [user.p_theyre()] trying to commit suicide.") diff --git a/code/game/gamemodes/cult/blood_magic.dm b/code/game/gamemodes/cult/blood_magic.dm index 2583fd693d3..47a979fd108 100644 --- a/code/game/gamemodes/cult/blood_magic.dm +++ b/code/game/gamemodes/cult/blood_magic.dm @@ -249,7 +249,7 @@ /datum/action/innate/cult/blood_spell/horror/Destroy() var/obj/effect/proc_holder/horror/destroy = PH . = ..() - if(destroy && !QDELETED(destroy)) + if(!QDELETED(destroy)) QDEL_NULL(destroy) /datum/action/innate/cult/blood_spell/horror/Activate() @@ -264,7 +264,7 @@ /obj/effect/proc_holder/horror/Destroy() var/datum/action/innate/cult/blood_spell/AA = attached_action . = ..() - if(AA && !QDELETED(AA)) + if(!QDELETED(AA)) QDEL_NULL(AA) /obj/effect/proc_holder/horror/proc/toggle(mob/user) @@ -464,9 +464,15 @@ var/list/potential_runes = list() var/list/teleportnames = list() var/list/duplicaterunecount = list() + var/atom/movable/teleportee if(!iscultist(target) || !proximity) to_chat(user, "You can only teleport adjacent cultists with this spell!") return + if(user != target) // So that the teleport effect shows on the correct mob + teleportee = target + else + teleportee = user + for(var/R in GLOB.teleport_runes) var/obj/effect/rune/teleport/T = R var/resultkey = T.listkey @@ -487,16 +493,15 @@ log_game("Teleport spell failed - user in away mission") return - var/mob/living/L = target var/input_rune_key = input(user, "Choose a rune to teleport to.", "Rune to Teleport to") as null|anything in potential_runes //we know what key they picked var/obj/effect/rune/teleport/actual_selected_rune = potential_runes[input_rune_key] //what rune does that key correspond to? - if(!src || QDELETED(src) || !user || user.l_hand != src && user.r_hand != src || user.incapacitated() || !actual_selected_rune) + if(QDELETED(src) || !user || user.l_hand != src && user.r_hand != src || user.incapacitated() || !actual_selected_rune) return uses-- - var/turf/origin = get_turf(user) + var/turf/origin = get_turf(teleportee) var/turf/destination = get_turf(actual_selected_rune) - INVOKE_ASYNC(actual_selected_rune, /obj/effect/rune/.proc/teleport_effect, user, origin, destination) + INVOKE_ASYNC(actual_selected_rune, /obj/effect/rune/.proc/teleport_effect, teleportee, origin, destination) if(is_mining_level(user.z) && !is_mining_level(destination.z)) //No effect if you stay on lavaland actual_selected_rune.handle_portal("lava") @@ -510,7 +515,7 @@ target.visible_message("Dust flows from [user]'s hand, and [target] disappears in a flash of red light!", \ "You suddenly find yourself somewhere else!") destination.visible_message("There is a boom of outrushing air as something appears above the rune!", null, "You hear a boom.") - L.forceMove(destination) + teleportee.forceMove(destination) return ..() //Shackles @@ -658,7 +663,7 @@ /obj/item/melee/blood_magic/empower/afterattack(atom/target, mob/user, proximity_flag, click_parameters) if(proximity_flag) - //Shielded suit + // Shielded suit if(istype(target, /obj/item/clothing/suit/hooded/cultrobes/cult_shield)) var/obj/item/clothing/suit/hooded/cultrobes/cult_shield/C = target if(C.current_charges < 3) @@ -672,7 +677,7 @@ to_chat(user, "[target] is already at full charge!") return - //Plasteel to runed metal + // Veil Shifter else if(istype(target, /obj/item/cult_shift)) var/obj/item/cult_shift/S = target if(S.uses < 4) @@ -843,42 +848,13 @@ uses += max(1, temp) /obj/item/melee/blood_magic/manipulator/attack_self(mob/living/user) - var/list/options = list("Blood Orb (50)", "Blood Recharge (75)", "Blood Spear (150)", "Blood Bolt Barrage (300)") - var/choice = input(user, "Choose a greater blood rite...", "Greater Blood Rites") as null|anything in options + var/list/options = list("Blood Orb (50)" = image(icon = 'icons/obj/cult.dmi', icon_state = "summoning_orb"), + "Blood Recharge (75)" = image(icon = 'icons/mob/actions/actions_cult.dmi', icon_state = "blood_charge"), + "Blood Spear (150)" = image(icon = 'icons/mob/actions/actions_cult.dmi', icon_state = "bloodspear"), + "Blood Bolt Barrage (300)" = image(icon = 'icons/mob/actions/actions_cult.dmi', icon_state = "blood_barrage")) + var/choice = show_radial_menu(user, src, options) + switch(choice) - if("Blood Spear (150)") - if(uses < BLOOD_SPEAR_COST) - to_chat(user, "You need [BLOOD_SPEAR_COST] charges to perform this rite.") - else - uses -= BLOOD_SPEAR_COST - var/turf/T = get_turf(user) - qdel(src) - var/datum/action/innate/cult/spear/S = new(user) - var/obj/item/twohanded/cult_spear/rite = new(T) - S.Grant(user, rite) - rite.spear_act = S - if(user.put_in_hands(rite)) - to_chat(user, "A [rite.name] appears in your hand!") - else - user.visible_message("A [rite.name] appears at [user]'s feet!", \ - "A [rite.name] materializes at your feet.") - - if("Blood Bolt Barrage (300)") - if(uses < BLOOD_BARRAGE_COST) - to_chat(user, "You need [BLOOD_BARRAGE_COST] charges to perform this rite.") - else - var/obj/rite = new /obj/item/gun/projectile/shotgun/boltaction/enchanted/arcane_barrage/blood() - uses -= BLOOD_BARRAGE_COST - qdel(src) - user.swap_hand() - user.drop_item() - if(user.put_in_hands(rite)) - to_chat(user, "Both of your hands glow with power!") - else - to_chat(user, "You need a free hand for this rite!") - uses += BLOOD_BARRAGE_COST // Refund the charges - qdel(rite) - if("Blood Orb (50)") if(uses < BLOOD_ORB_COST) to_chat(user, "You need [BLOOD_ORB_COST] charges to perform this rite.") @@ -898,7 +874,7 @@ if(user.put_in_hands(rite)) to_chat(user, "A [rite.name] appears in your hand!") else - user.visible_message("A [rite.name] appears at [user]'s feet!", \ + user.visible_message("A [rite.name] appears at [user]'s feet!", "A [rite.name] materializes at your feet.") if("Blood Recharge (75)") @@ -914,3 +890,36 @@ to_chat(user, "You need a free hand for this rite!") uses += BLOOD_RECHARGE_COST // Refund the charges qdel(rite) + + if("Blood Spear (150)") + if(uses < BLOOD_SPEAR_COST) + to_chat(user, "You need [BLOOD_SPEAR_COST] charges to perform this rite.") + else + uses -= BLOOD_SPEAR_COST + var/turf/T = get_turf(user) + qdel(src) + var/datum/action/innate/cult/spear/S = new(user) + var/obj/item/twohanded/cult_spear/rite = new(T) + S.Grant(user, rite) + rite.spear_act = S + if(user.put_in_hands(rite)) + to_chat(user, "A [rite.name] appears in your hand!") + else + user.visible_message("A [rite.name] appears at [user]'s feet!", + "A [rite.name] materializes at your feet.") + + if("Blood Bolt Barrage (300)") + if(uses < BLOOD_BARRAGE_COST) + to_chat(user, "You need [BLOOD_BARRAGE_COST] charges to perform this rite.") + else + var/obj/rite = new /obj/item/gun/projectile/shotgun/boltaction/enchanted/arcane_barrage/blood() + uses -= BLOOD_BARRAGE_COST + qdel(src) + user.swap_hand() + user.drop_item() + if(user.put_in_hands(rite)) + to_chat(user, "Both of your hands glow with power!") + else + to_chat(user, "You need a free hand for this rite!") + uses += BLOOD_BARRAGE_COST // Refund the charges + qdel(rite) diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index 04c9e13b605..fb15a380c60 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -85,6 +85,9 @@ GLOBAL_LIST_EMPTY(all_cults) to_chat(cult_mind.current, CULT_GREETING) equip_cultist(cult_mind.current) cult_mind.current.faction |= "cult" + var/datum/objective/servecult/obj = new + obj.owner = cult_mind + cult_mind.objectives += obj if(cult_mind.assigned_role == "Clown") to_chat(cult_mind.current, "A dark power has allowed you to overcome your clownish nature, letting you wield weapons without harming yourself.") @@ -96,54 +99,11 @@ GLOBAL_LIST_EMPTY(all_cults) add_cult_actions(cult_mind) update_cult_icons_added(cult_mind) cult_objs.study(cult_mind.current) + to_chat(cult_mind.current, "For more information, check the wiki page: ([config.wikiurl]/index.php/Cultist)") cult_threshold_check() addtimer(CALLBACK(src, .proc/cult_threshold_check), 2 MINUTES) // Check again in 2 minutes for latejoiners ..() -/** - * Decides at the start of the round how many conversions are needed to rise/ascend. - * - * The number is decided by (Percentage * (Players - Cultists)), so for example at 110 players it would be 11 conversions for rise. (0.1 * (110 - 4)) - * These values change based on population because 20 cultists are MUCH more powerful if there's only 50 players, compared to 120. - * - * Below 100 players, [CULT_RISEN_LOW] and [CULT_ASCENDANT_LOW] are used. - * Above 100 players, [CULT_RISEN_HIGH] and [CULT_ASCENDANT_HIGH] are used. - */ -/datum/game_mode/proc/cult_threshold_check() - var/players = length(GLOB.player_list) - var/cultists = get_cultists() // Don't count the starting cultists towards the number of needed conversions - if(players >= CULT_POPULATION_THRESHOLD) - // Highpop - ascend_percent = CULT_ASCENDANT_HIGH - rise_number = round(CULT_RISEN_HIGH * (players - cultists)) - ascend_number = round(CULT_ASCENDANT_HIGH * (players - cultists)) - else - // Lowpop - ascend_percent = CULT_ASCENDANT_LOW - rise_number = round(CULT_RISEN_LOW * (players - cultists)) - ascend_number = round(CULT_ASCENDANT_LOW * (players - cultists)) - -/** - * Returns the current number of cultists and constructs. - * - * Returns the number of cultists and constructs in a list ([1] = Cultists, [2] = Constructs), or as one combined number. - * - * * separate - Should the number be returned in two separate values (Humans and Constructs) or as one? - */ -/datum/game_mode/proc/get_cultists(separate = FALSE) - var/cultists = 0 - var/constructs = 0 - for(var/I in cult) - var/datum/mind/M = I - if(ishuman(M.current) && !M.current.has_status_effect(STATUS_EFFECT_SUMMONEDGHOST)) - cultists++ - else if(isconstruct(M.current)) - constructs++ - if(separate) - return list(cultists, constructs) - else - return cultists + constructs - /datum/game_mode/proc/equip_cultist(mob/living/carbon/human/H, metal = TRUE) if(!istype(H)) return @@ -207,8 +167,84 @@ GLOBAL_LIST_EMPTY(all_cults) ascend(cult_mind.current) check_cult_size() cult_objs.study(cult_mind.current) + to_chat(cult_mind.current, "For more information, check the wiki page: ([config.wikiurl]/index.php/Cultist)") return TRUE +/datum/game_mode/proc/remove_cultist(datum/mind/cult_mind, show_message = TRUE, remove_gear = FALSE) + if(!(cult_mind in cult)) // Not actually a cultist in the first place + return + + var/mob/cultist = cult_mind.current + cult -= cult_mind + cultist.faction -= "cult" + cult_mind.special_role = null + for(var/datum/objective/servecult/S in cult_mind.objectives) + cult_mind.objectives -= S + qdel(S) + for(var/datum/action/innate/cult/C in cultist.actions) + qdel(C) + update_cult_icons_removed(cult_mind) + + if(ishuman(cultist)) + var/mob/living/carbon/human/H = cultist + REMOVE_TRAIT(H, CULT_EYES, null) + H.change_eye_color(H.original_eye_color, FALSE) + H.update_eyes() + H.remove_overlay(HALO_LAYER) + H.update_body() + if(remove_gear) // No flagellants robe for non-cultists + for(var/I in H.contents) + if(is_type_in_list(I, CULT_CLOTHING)) + H.unEquip(I) + check_cult_size() + if(show_message) + cultist.visible_message("[cultist] looks like [cultist.p_they()] just reverted to [cultist.p_their()] old faith!", + "An unfamiliar white light flashes through your mind, cleansing the taint of [SSticker.cultdat ? SSticker.cultdat.entity_title1 : "Nar'Sie"] and the memories of your time as their servant with it.") + + +/** + * Decides at the start of the round how many conversions are needed to rise/ascend. + * + * The number is decided by (Percentage * (Players - Cultists)), so for example at 110 players it would be 11 conversions for rise. (0.1 * (110 - 4)) + * These values change based on population because 20 cultists are MUCH more powerful if there's only 50 players, compared to 120. + * + * Below 100 players, [CULT_RISEN_LOW] and [CULT_ASCENDANT_LOW] are used. + * Above 100 players, [CULT_RISEN_HIGH] and [CULT_ASCENDANT_HIGH] are used. + */ +/datum/game_mode/proc/cult_threshold_check() + var/players = length(GLOB.player_list) + var/cultists = get_cultists() // Don't count the starting cultists towards the number of needed conversions + if(players >= CULT_POPULATION_THRESHOLD) + // Highpop + ascend_percent = CULT_ASCENDANT_HIGH + rise_number = round(CULT_RISEN_HIGH * (players - cultists)) + ascend_number = round(CULT_ASCENDANT_HIGH * (players - cultists)) + else + // Lowpop + ascend_percent = CULT_ASCENDANT_LOW + rise_number = round(CULT_RISEN_LOW * (players - cultists)) + ascend_number = round(CULT_ASCENDANT_LOW * (players - cultists)) + +/** + * Returns the current number of cultists and constructs. + * + * Returns the number of cultists and constructs in a list ([1] = Cultists, [2] = Constructs), or as one combined number. + * + * * separate - Should the number be returned as a list with two separate values (Humans and Constructs) or as one number. + */ +/datum/game_mode/proc/get_cultists(separate = FALSE) + var/cultists = 0 + var/constructs = 0 + for(var/I in cult) + var/datum/mind/M = I + if(ishuman(M.current) && !M.current.has_status_effect(STATUS_EFFECT_SUMMONEDGHOST)) + cultists++ + else if(isconstruct(M.current)) + constructs++ + if(separate) + return list(cultists, constructs) + else + return cultists + constructs /datum/game_mode/proc/check_cult_size() if(cult_ascendant) @@ -238,6 +274,8 @@ GLOBAL_LIST_EMPTY(all_cults) /datum/game_mode/proc/rise(cultist) if(ishuman(cultist) && iscultist(cultist)) var/mob/living/carbon/human/H = cultist + if(!H.original_eye_color) + H.original_eye_color = H.get_eye_color() H.change_eye_color(BLOODCULT_EYE, FALSE) H.update_eyes() ADD_TRAIT(H, CULT_EYES, CULT_TRAIT) @@ -249,29 +287,6 @@ GLOBAL_LIST_EMPTY(all_cults) new /obj/effect/temp_visual/cult/sparks(get_turf(H), H.dir) H.update_halo_layer() - -/datum/game_mode/proc/remove_cultist(datum/mind/cult_mind, show_message = TRUE) - if(cult_mind in cult) - var/mob/cultist = cult_mind.current - cult -= cult_mind - cultist.faction -= "cult" - cult_mind.special_role = null - for(var/datum/action/innate/cult/C in cultist.actions) - qdel(C) - update_cult_icons_removed(cult_mind) - - if(ishuman(cultist)) - var/mob/living/carbon/human/H = cultist - REMOVE_TRAIT(H, CULT_EYES, null) - H.change_eye_color(H.original_eye_color, FALSE) - H.update_eyes() - H.remove_overlay(HALO_LAYER) - H.update_body() - check_cult_size() - if(show_message) - cultist.visible_message("[cultist] looks like [cultist.p_they()] just reverted to [cultist.p_their()] old faith!", - "An unfamiliar white light flashes through your mind, cleansing the taint of [SSticker.cultdat ? SSticker.cultdat.entity_title1 : "Nar'Sie"] and the memories of your time as their servant with it.") - /datum/game_mode/proc/update_cult_icons_added(datum/mind/cult_mind) var/datum/atom_hud/antag/culthud = GLOB.huds[ANTAG_HUD_CULT] if(cult_mind.current) diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index ca1938a76ea..24ffbb96ce3 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -316,7 +316,8 @@ var/mob/living/carbon/C = user if(C.pulling) var/atom/movable/pulled = C.pulling - pulled.forceMove(T) + var/turf/turf_behind = get_turf(get_step(T, turn(C.dir, 180))) + pulled.forceMove(turf_behind) . = pulled /obj/item/cult_shift/attack_self(mob/user) @@ -324,7 +325,7 @@ to_chat(user, "[src] is dull and unmoving in your hands.") return if(!iscultist(user)) - user.unEquip(src, 1) + user.unEquip(src, TRUE) step(src, pick(GLOB.alldirs)) to_chat(user, "[src] flickers out of your hands, too eager to move!") return @@ -332,36 +333,31 @@ var/outer_tele_radius = 9 var/mob/living/carbon/C = user - var/turf/mobloc = get_turf(C) - var/list/turfs = new/list() - for(var/turf/T in range(user, outer_tele_radius)) + var/list/turfs = list() + for(var/turf/T in orange(user, outer_tele_radius)) if(!is_teleport_allowed(T.z)) break - if(get_dir(C, T) != C.dir) + if(get_dir(C, T) != C.dir) // This seems like a very bad way to do this continue - if(T == mobloc) - continue - if(istype(T, /turf/space)) + if(isspaceturf(T)) continue if(T.x > world.maxx-outer_tele_radius || T.x < outer_tele_radius) continue //putting them at the edge is dumb if(T.y > world.maxy-outer_tele_radius || T.y < outer_tele_radius) continue - turfs += T - if(turfs) + if(length(turfs)) uses-- + var/turf/mobloc = get_turf(C) var/turf/destination = pick(turfs) if(uses <= 0) - icon_state ="shifter_drained" - playsound(mobloc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + icon_state = "shifter_drained" + playsound(src, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) new /obj/effect/temp_visual/dir_setting/cult/phase/out(mobloc, C.dir) - var/atom/movable/pulled = handle_teleport_grab(destination, C) + handle_teleport_grab(destination, C) C.forceMove(destination) - if(pulled) - C.start_pulling(pulled) //forcemove resets pulls, so we need to re-pull new /obj/effect/temp_visual/dir_setting/cult/phase(destination, C.dir) playsound(destination, 'sound/effects/phasein.ogg', 25, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) diff --git a/code/game/gamemodes/cult/cult_objectives.dm b/code/game/gamemodes/cult/cult_objectives.dm index 4565e66ff29..ca8921b7534 100644 --- a/code/game/gamemodes/cult/cult_objectives.dm +++ b/code/game/gamemodes/cult/cult_objectives.dm @@ -133,13 +133,13 @@ for(var/mob/living/carbon/human/H in GLOB.player_list) if(is_admin_level(H.z)) //We can't sacrifice people that are on the centcom z-level continue - if(H.mind && !is_convertable_to_cult(H.mind) && (H.stat != DEAD) && (H.mind.offstation_role != TRUE)) + if(H.mind && !iscultist(H) && !is_convertable_to_cult(H.mind) && (H.stat != DEAD) && !H.mind.offstation_role) target_candidates += H.mind if(!length(target_candidates)) //There are no living unconvertables on the station. Looking for a Sacrifice Target among the ordinary crewmembers for(var/mob/living/carbon/human/H in GLOB.player_list) if(is_admin_level(H.z)) //We can't sacrifice people that are on the centcom z-level continue - if(H.mind && !iscultist(H) && (H.stat != DEAD) && (H.mind.offstation_role != TRUE)) + if(H.mind && !iscultist(H) && (H.stat != DEAD) && !H.mind.offstation_role) // Same checks, but add them even if they could be converted target_candidates += H.mind if(length(target_candidates)) target = pick(target_candidates) diff --git a/code/game/gamemodes/cult/cult_structures.dm b/code/game/gamemodes/cult/cult_structures.dm index b2b4dfa534e..1638fa00faf 100644 --- a/code/game/gamemodes/cult/cult_structures.dm +++ b/code/game/gamemodes/cult/cult_structures.dm @@ -195,6 +195,7 @@ GLOBAL_LIST_INIT(blacklisted_pylon_turfs, typecacheof(list( /turf/simulated/floor/engine/cult, /turf/space, + /turf/simulated/wall/indestructible, /turf/simulated/floor/plating/lava, /turf/simulated/floor/chasm, /turf/simulated/wall/cult, diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm index 5211b82ea44..47a53ef89c6 100644 --- a/code/game/gamemodes/cult/ritual.dm +++ b/code/game/gamemodes/cult/ritual.dm @@ -84,6 +84,10 @@ /obj/item/melee/cultblade/dagger/proc/can_scribe(mob/living/user) if(!src || !user || loc != user || user.incapacitated()) return FALSE + if(drawing_rune) + to_chat(user, "You're already drawing a rune!") + return FALSE + var/turf/T = get_turf(user) if(isspaceturf(T)) return FALSE @@ -135,12 +139,12 @@ to_chat(user, "The veil is not weak enough here to summon a cultist, you must be on station!") return - var/old_color = user.color // we'll temporarily redden the user for better feedback to fellow cultists. Store this to revert them back. + var/old_color = user.color // we'll temporarily redden the user for better feedback to fellow cultists. Store this to revert them back. if(narsie_rune) if(!narsie_rune_check(user, A)) return // don't do shit var/list/summon_areas = gamemode.cult_objs.obj_summon.summon_spots - if(!(A in summon_areas)) // Check again to make sure they didn't move + if(!(A in summon_areas)) // Check again to make sure they didn't move to_chat(user, "The ritual can only begin where the veil is weak - in [english_list(summon_areas)]!") return GLOB.command_announcement.Announce("Figments from an eldritch god are being summoned into the [A.map_name] from an unknown dimension. Disrupt the ritual at all costs, before the station is destroyed! Space law and SOP are suspended. The entire crew must kill cultists on sight.", "Central Command Higher Dimensional Affairs", 'sound/AI/spanomalies.ogg') @@ -148,7 +152,7 @@ var/turf/T = I var/obj/machinery/shield/cult/narsie/N = new(T) shields |= N - user.color = "red" + user.color = COLOR_RED // Draw the rune var/mob/living/carbon/human/H = user @@ -161,12 +165,14 @@ user.visible_message(others_message, "You slice open your body and begin drawing a sigil of [SSticker.cultdat.entity_title3].") + drawing_rune = TRUE // Only one at a time var/scribe_successful = do_after(user, initial(rune.scribe_delay) * scribe_multiplier, target = runeturf) for(var/V in shields) // Only used for the 'Tear Veil' rune var/obj/machinery/shield/S = V if(S && !QDELETED(S)) qdel(S) user.color = old_color + drawing_rune = FALSE if(!scribe_successful) return diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index 4c98a3c59d3..8c725b41898 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -130,6 +130,9 @@ To draw a rune, use a ritual dagger. visible_message("[src] suddenly appears!") alpha = initial(alpha) +/obj/effect/rune/is_cleanable() + return TRUE + /* There are a few different procs each rune runs through when a cultist activates it. @@ -263,6 +266,8 @@ structure_check() searches for nearby cultist structures required for the invoca var/turf/T = get_turf(src) for(var/mob/living/M in T) if(!iscultist(M) || (M.mind && is_sacrifice_target(M.mind))) + if(isconstruct(M)) // No offering constructs please + continue offer_targets += M // Offering a head/brain @@ -364,6 +369,7 @@ structure_check() searches for nearby cultist structures required for the invoca return var/sacrifice_fulfilled + var/worthless = FALSE var/datum/game_mode/gamemode = SSticker.mode if(offering.mind) GLOB.sacrificed += offering.mind @@ -377,13 +383,16 @@ structure_check() searches for nearby cultist structures required for the invoca if(sacrifice_fulfilled) to_chat(M, "\"Yes! This is the one I desire! You have done well.\"") else - if(ishuman(offering) || isrobot(offering)) + if(ishuman(offering) && offering.mind.offstation_role && offering.mind.special_role != SPECIAL_ROLE_ERT) //If you try it on a ghost role, you get nothing + to_chat(M, "\"This soul is of no use to either of us.\"") + worthless = TRUE + else if(ishuman(offering) || isrobot(offering)) to_chat(M, "\"I accept this sacrifice.\"") else to_chat(M, "\"I accept this meager sacrifice.\"") playsound(offering, 'sound/misc/demon_consume.ogg', 100, TRUE) - if((ishuman(offering) || isrobot(offering) || isbrain(offering)) && offering.mind) + if(((ishuman(offering) || isrobot(offering) || isbrain(offering)) && offering.mind) && !worthless) var/obj/item/soulstone/stone = new /obj/item/soulstone(get_turf(src)) stone.invisibility = INVISIBILITY_MAXIMUM // So it's not picked up during transfer_soul() stone.transfer_soul("FORCE", offering, user) // If it cannot be added @@ -418,6 +427,8 @@ structure_check() searches for nearby cultist structures required for the invoca /obj/effect/rune/teleport/Destroy() GLOB.teleport_runes -= src + QDEL_NULL(inner_portal) + QDEL_NULL(outer_portal) return ..() /obj/effect/rune/teleport/invoke(list/invokers) @@ -452,7 +463,7 @@ structure_check() searches for nearby cultist structures required for the invoca var/input_rune_key = input(user, "Choose a rune to teleport to.", "Rune to Teleport to") as null|anything in potential_runes //we know what key they picked var/obj/effect/rune/teleport/actual_selected_rune = potential_runes[input_rune_key] //what rune does that key correspond to? - if(!src || !Adjacent(user) || QDELETED(src) || user.incapacitated() || !actual_selected_rune) + if(QDELETED(src) || QDELETED(actual_selected_rune) ||!Adjacent(user) || user.incapacitated()) fail_invoke() return @@ -587,7 +598,8 @@ structure_check() searches for nearby cultist structures required for the invoca return sacrifices_used += SOULS_TO_REVIVE mob_to_revive.revive() - mob_to_revive.grab_ghost() + if(mob_to_revive.ghost_can_reenter()) + mob_to_revive.grab_ghost() if(!mob_to_revive.client || mob_to_revive.client.is_afk()) set waitfor = FALSE @@ -685,7 +697,7 @@ structure_check() searches for nearby cultist structures required for the invoca cultists[M.current.real_name] = M.current var/input = input(user, "Who do you wish to call to [src]?", "Acolytes") as null|anything in cultists var/mob/living/cultist_to_summon = cultists[input] - if(!src || QDELETED(src) || !Adjacent(user) || user.incapacitated()) + if(QDELETED(src) || !Adjacent(user) || user.incapacitated()) return if(!cultist_to_summon) log_game("Summon Cultist rune failed - no target") @@ -882,6 +894,7 @@ structure_check() searches for nearby cultist structures required for the invoca var/mob/living/carbon/human/new_human = new(T) new_human.real_name = ghost_to_spawn.real_name new_human.key = ghost_to_spawn.key + new_human.gender = ghost_to_spawn.gender new_human.alpha = 150 //Makes them translucent new_human.equipOutfit(/datum/outfit/ghost_cultist) //give them armor new_human.apply_status_effect(STATUS_EFFECT_SUMMONEDGHOST) //ghosts can't summon more ghosts, also lets you see actual ghosts @@ -981,6 +994,9 @@ structure_check() searches for nearby cultist structures required for the invoca /obj/effect/rune/narsie/cult_conceal() //can't hide this, and you wouldn't want to return +/obj/effect/rune/narsie/is_cleanable() //No, you can't just yeet a cleaning grenade to remove it. + return FALSE + /obj/effect/rune/narsie/invoke(list/invokers) if(used) return @@ -999,7 +1015,7 @@ structure_check() searches for nearby cultist structures required for the invoca //BEGIN THE SUMMONING gamemode.cult_objs.succesful_summon() used = TRUE - color = rgb(255, 0, 0) + color = COLOR_RED ..() SEND_SOUND(world, sound('sound/effects/dimensional_rend.ogg')) to_chat(world, "The veil... is... TORN!!!--") diff --git a/code/game/gamemodes/heist/heist.dm b/code/game/gamemodes/heist/heist.dm index 4277fc76916..a579a90273c 100644 --- a/code/game/gamemodes/heist/heist.dm +++ b/code/game/gamemodes/heist/heist.dm @@ -181,6 +181,7 @@ GLOBAL_LIST_EMPTY(cortical_stacks) //Stacks for 'leave nobody behind' objective. to_chat(raider.current, "Vox are cowardly and will flee from larger groups, but corner one or find them en masse and they are vicious.") to_chat(raider.current, "Use :V to voxtalk, :H to talk on your encrypted channel, and don't forget to turn on your nitrogen internals!") to_chat(raider.current, "Choose to accomplish your objectives by either raiding the crew and taking what you need, or by attempting to trade with them.") + to_chat(raider.current, "For more information, check the wiki page: ([config.wikiurl]/index.php/Vox_Raider)") spawn(25) show_objectives(raider) diff --git a/code/game/gamemodes/miniantags/abduction/abduction.dm b/code/game/gamemodes/miniantags/abduction/abduction.dm index 60de5ba4238..6587907cdbd 100644 --- a/code/game/gamemodes/miniantags/abduction/abduction.dm +++ b/code/game/gamemodes/miniantags/abduction/abduction.dm @@ -158,6 +158,7 @@ to_chat(abductor.current, "You are an agent of [team_name]!") to_chat(abductor.current, "With the help of your teammate, kidnap and experiment on station crew members!") to_chat(abductor.current, "Use your stealth technology and equipment to incapacitate humans for your scientist to retrieve.") + to_chat(abductor.current, "For more information, check the wiki page: ([config.wikiurl]/index.php/Abductor)") abductor.announce_objectives() @@ -170,6 +171,7 @@ to_chat(abductor.current, "You are a scientist of [team_name]!") to_chat(abductor.current, "With the help of your teammate, kidnap and experiment on station crew members!") to_chat(abductor.current, "Use your tool and ship consoles to support the agent and retrieve human specimens.") + to_chat(abductor.current, "For more information, check the wiki page: ([config.wikiurl]/index.php/Abductor)") abductor.announce_objectives() diff --git a/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm b/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm index d7354b87c5c..8cd86229ba6 100644 --- a/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm +++ b/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm @@ -30,7 +30,7 @@ if(target.has_buckled_mobs()) //mob attached to us to_chat(user, "[target] will not fit into [src] because [target.p_they()] [target.p_have()] a slime latched onto [target.p_their()] head.") return - visible_message("[user] puts [target] into the [src].") + visible_message("[user] puts [target] into [src].") target.forceMove(src) occupant = target @@ -187,12 +187,12 @@ if(isabductor(grabbed.affecting)) return if(occupant) - to_chat(user, "The [src] is already occupied!") + to_chat(user, "[src] is already occupied!") return if(grabbed.affecting.has_buckled_mobs()) //mob attached to us to_chat(user, "[grabbed.affecting] will not fit into [src] because [grabbed.affecting.p_they()] [grabbed.affecting.p_have()] a slime latched onto [grabbed.affecting.p_their()] head.") return - visible_message("[user] puts [grabbed.affecting] into the [src].") + visible_message("[user] puts [grabbed.affecting] into [src].") var/mob/living/carbon/human/H = grabbed.affecting H.forceMove(src) occupant = H diff --git a/code/game/gamemodes/miniantags/borer/borer.dm b/code/game/gamemodes/miniantags/borer/borer.dm index a0dcd826972..0342c1d4707 100644 --- a/code/game/gamemodes/miniantags/borer/borer.dm +++ b/code/game/gamemodes/miniantags/borer/borer.dm @@ -119,7 +119,7 @@ remove_from_all_data_huds() generation = gen add_language("Cortical Link") - notify_ghosts("A cortical borer has been created in [get_area(src)]!", enter_link = "(Click to enter)", source = src, action = NOTIFY_ATTACK) + notify_ghosts("A cortical borer has been created in [get_area(src)]!", enter_link = "(Click to enter)", source = src, action = NOTIFY_ATTACK, role = ROLE_BORER) real_name = "Cortical Borer [rand(1000,9999)]" truename = "[borer_names[min(generation, borer_names.len)]] [rand(1000,9999)]" GrantBorerActions() @@ -837,6 +837,7 @@ to_chat(src, "You are a brain slug that worms its way into the head of its victim. Use stealth, persuasion and your powers of mind control to keep you, your host and your eventual spawn safe and warm.") to_chat(src, "Sugar nullifies your abilities, avoid it at all costs!") to_chat(src, "You can speak to your fellow borers by prefixing your messages with ':bo'. Check out your Borer tab to see your abilities.") + to_chat(src, "For more information, check the wiki page: ([config.wikiurl]/index.php/Cortical_Borer)") /proc/create_borer_mind(key) var/datum/mind/M = new /datum/mind(key) diff --git a/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm b/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm index c434f130fd4..e597da7864f 100644 --- a/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm +++ b/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm @@ -21,7 +21,7 @@ roundstart = FALSE important_info = "Follow your objectives, do not make the station inhospitable or try and kill crew." flavour_text = "You are a swarmer, a weapon of a long dead civilization. Until further orders from your original masters are received, you must continue to consume and replicate." - description = {" Your goal is to create more of yourself by consuming the station. Clicking on any object will try to consume it, either deconstructing it into its components, destroying it, or integrating any materials it has into you if successful. Ctrl-Clicking on a mob will attempt to remove it from the area and place it in a safe environment for storage. + description = {"Your goal is to create more of yourself by consuming the station. Clicking on any object will try to consume it, either deconstructing it into its components, destroying it, or integrating any materials it has into you if successful. Ctrl-Clicking on a mob will attempt to remove it from the area and place it in a safe environment for storage. Objectives: 1. Consume resources and replicate until there are no more resources left. 2. Ensure that this location is fit for invasion at a later date; do not perform actions that would render it dangerous or inhospitable. @@ -63,12 +63,10 @@ mob_biotypes = MOB_ROBOTIC health = 40 maxHealth = 40 - status_flags = CANPUSH icon_state = "swarmer" icon_living = "swarmer" icon_dead = "swarmer_unactivated" - icon_gib = null - wander = 0 + wander = FALSE harm_intent_damage = 5 minbodytemp = 0 maxbodytemp = 500 @@ -86,22 +84,22 @@ friendly = "pinches" speed = 0 a_intent = INTENT_HARM - can_change_intents = 0 + can_change_intents = FALSE faction = list("swarmer") AIStatus = AI_OFF pass_flags = PASSTABLE + flags_2 = RAD_PROTECT_CONTENTS_2 | RAD_NO_CONTAMINATE_2 mob_size = MOB_SIZE_SMALL ventcrawler = VENTCRAWLER_ALWAYS - ranged = 1 + ranged = TRUE projectiletype = /obj/item/projectile/beam/disabler ranged_cooldown_time = 20 projectilesound = 'sound/weapons/taser2.ogg' loot = list(/obj/effect/decal/cleanable/robot_debris, /obj/item/stack/ore/bluespace_crystal) - del_on_death = 1 + del_on_death = TRUE deathmessage = "explodes with a sharp pop!" light_color = LIGHT_COLOR_CYAN - universal_speak = 0 - universal_understand = 0 + universal_understand = FALSE var/resources = 0 //Resource points, generated by consuming metal/glass var/max_resources = 100 @@ -114,6 +112,7 @@ to_chat(src, "1. Consume resources and replicate until there are no more resources left.") to_chat(src, "2. Ensure that the station is fit for invasion at a later date, do not perform actions that would render it dangerous or inhospitable.") to_chat(src, "3. Biological and sentient resources will be harvested at a later date, do not harm them.") + to_chat(src, "For more information, check the wiki page: ([config.wikiurl]/index.php/Swarmer)") /mob/living/simple_animal/hostile/swarmer/New() ..() @@ -333,6 +332,14 @@ to_chat(S, "An inhospitable area may be created as a result of destroying this object. Aborting.") return FALSE +/obj/structure/fans/tiny/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) + to_chat(S, "An inhospitable area may be created as a result of destroying this object. Aborting.") + return FALSE + +/obj/structure/holosign/barrier/atmos/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) + to_chat(S, "An inhospitable area may be created as a result of destroying this object. Aborting.") + return FALSE + /obj/machinery/tcomms/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) to_chat(S, "This communications relay should be preserved, it will be a useful resource to our masters in the future. Aborting.") return FALSE diff --git a/code/game/gamemodes/miniantags/guardian/guardian.dm b/code/game/gamemodes/miniantags/guardian/guardian.dm index c2a72b12b1e..db33bc355a8 100644 --- a/code/game/gamemodes/miniantags/guardian/guardian.dm +++ b/code/game/gamemodes/miniantags/guardian/guardian.dm @@ -343,6 +343,7 @@ to_chat(G, "You are capable of manifesting or recalling to your master with verbs in the Guardian tab. You will also find a verb to communicate with them privately there.") to_chat(G, "While personally invincible, you will die if [user.real_name] does, and any damage dealt to you will have a portion passed on to them as you feed upon them to sustain yourself.") to_chat(G, "[G.playstyle_string]") + to_chat(G, "For more information, check the wiki page: ([config.wikiurl]/index.php/Guardian)") G.faction = user.faction var/color = pick(color_list) diff --git a/code/game/gamemodes/miniantags/guardian/types/bomb.dm b/code/game/gamemodes/miniantags/guardian/types/bomb.dm index 67b99d91968..0a472e626f3 100644 --- a/code/game/gamemodes/miniantags/guardian/types/bomb.dm +++ b/code/game/gamemodes/miniantags/guardian/types/bomb.dm @@ -63,7 +63,7 @@ /obj/item/guardian_bomb/proc/detonate(mob/living/user) if(!istype(user)) return - to_chat(user, "The [src] was boobytrapped!") + to_chat(user, "[src] was boobytrapped!") if(istype(spawner, /mob/living/simple_animal/hostile/guardian)) var/mob/living/simple_animal/hostile/guardian/G = spawner if(user == G.summoner) diff --git a/code/game/gamemodes/miniantags/guardian/types/healer.dm b/code/game/gamemodes/miniantags/guardian/types/healer.dm index 64a6522833c..6411998eb1e 100644 --- a/code/game/gamemodes/miniantags/guardian/types/healer.dm +++ b/code/game/gamemodes/miniantags/guardian/types/healer.dm @@ -94,7 +94,7 @@ F.icon = 'icons/turf/floors.dmi' F.name = "bluespace recieving pad" F.desc = "A recieving zone for bluespace teleportations. Building a wall over it should disable it." - F.icon_state = "light_on-w" + F.icon_state = "light_on" to_chat(src, "Beacon placed! You may now warp targets to it, including your user, via Alt+Click. ") if(beacon) beacon.ChangeTurf(/turf/simulated/floor/plating) diff --git a/code/game/gamemodes/miniantags/guardian/types/ranged.dm b/code/game/gamemodes/miniantags/guardian/types/ranged.dm index dab7dfb1eca..184b4e625b5 100644 --- a/code/game/gamemodes/miniantags/guardian/types/ranged.dm +++ b/code/game/gamemodes/miniantags/guardian/types/ranged.dm @@ -10,6 +10,7 @@ melee_damage_lower = 10 melee_damage_upper = 10 damage_transfer = 0.9 + can_strip = TRUE projectiletype = /obj/item/projectile/guardian ranged_cooldown_time = 5 //fast! projectilesound = 'sound/effects/hit_on_shattered_glass.ogg' @@ -35,6 +36,7 @@ alpha = 255 range = 13 incorporeal_move = 0 + can_strip = TRUE to_chat(src, "You switch to combat mode.") toggle = FALSE else @@ -46,6 +48,7 @@ alpha = 60 range = 255 incorporeal_move = 1 + can_strip = FALSE //spiritual pickpocketting is forbidden to_chat(src, "You switch to scout mode.") toggle = TRUE else diff --git a/code/game/gamemodes/miniantags/morph/morph_event.dm b/code/game/gamemodes/miniantags/morph/morph_event.dm index dd1a198f6f8..f24166b1381 100644 --- a/code/game/gamemodes/miniantags/morph/morph_event.dm +++ b/code/game/gamemodes/miniantags/morph/morph_event.dm @@ -26,6 +26,7 @@ player_mind.special_role = SPECIAL_ROLE_MORPH SSticker.mode.traitors |= player_mind to_chat(S, S.playstyle_string) + to_chat(S, "For more information, check the wiki page: ([config.wikiurl]/index.php/Morph)") SEND_SOUND(S, sound('sound/magic/mutate.ogg')) message_admins("[key_of_morph] has been made into morph by an event.") log_game("[key_of_morph] was spawned as a morph by an event.") diff --git a/code/game/gamemodes/miniantags/revenant/revenant.dm b/code/game/gamemodes/miniantags/revenant/revenant.dm index fb46533b817..9373861798e 100644 --- a/code/game/gamemodes/miniantags/revenant/revenant.dm +++ b/code/game/gamemodes/miniantags/revenant/revenant.dm @@ -168,7 +168,7 @@ to_chat(src, "You are invincible and invisible to everyone but other ghosts. Most abilities will reveal you, rendering you vulnerable.") to_chat(src, "To function, you are to drain the life essence from humans. This essence is a resource, as well as your health, and will power all of your abilities.") to_chat(src, "You do not remember anything of your past lives, nor will you remember anything about this one after your death.") - to_chat(src, "Be sure to read the wiki page at http://www.paradisestation.org/wiki/index.php/Revenant to learn more.") + to_chat(src, "For more information, check the wiki page: ([config.wikiurl]/index.php/Revenant)") var/datum/objective/revenant/objective = new objective.owner = mind mind.objectives += objective diff --git a/code/game/gamemodes/miniantags/slaughter/slaughter.dm b/code/game/gamemodes/miniantags/slaughter/slaughter.dm index b488e0a826c..88ce7fbff99 100644 --- a/code/game/gamemodes/miniantags/slaughter/slaughter.dm +++ b/code/game/gamemodes/miniantags/slaughter/slaughter.dm @@ -92,6 +92,7 @@ mind.objectives += fluffObjective to_chat(src, "Objective #[1]: [objective.explanation_text]") to_chat(src, "Objective #[2]: [fluffObjective.explanation_text]") + to_chat(src, "For more information, check the wiki page: ([config.wikiurl]/index.php/Slaughter_Demon)") /obj/effect/decal/cleanable/blood/innards diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index 11b49f225bf..553b8d2f59e 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -108,18 +108,23 @@ var/agent_number = 1 var/spawnpos = 1 + var/obj/machinery/nuclearbomb/syndicate/the_bomb + if(nuke_spawn && length(synd_spawn)) + the_bomb = new /obj/machinery/nuclearbomb/syndicate(nuke_spawn.loc) + the_bomb.r_code = nuke_code + for(var/datum/mind/synd_mind in syndicates) if(spawnpos > synd_spawn.len) spawnpos = 2 synd_mind.current.loc = synd_spawn[spawnpos] synd_mind.offstation_role = TRUE forge_syndicate_objectives(synd_mind) - create_syndicate(synd_mind) + create_syndicate(synd_mind, the_bomb) greet_syndicate(synd_mind) equip_syndicate(synd_mind.current) if(!leader_selected) - prepare_syndicate_leader(synd_mind, nuke_code) + prepare_syndicate_leader(synd_mind, the_bomb) leader_selected = 1 else synd_mind.current.real_name = "[syndicate_name()] Operative #[agent_number]" @@ -131,9 +136,6 @@ scale_telecrystals() share_telecrystals() - if(nuke_spawn && synd_spawn.len > 0) - var/obj/machinery/nuclearbomb/syndicate/the_bomb = new /obj/machinery/nuclearbomb/syndicate(nuke_spawn.loc) - the_bomb.r_code = nuke_code return ..() @@ -160,7 +162,7 @@ U.hidden_uplink.uses++ remainder-- -/datum/game_mode/proc/create_syndicate(datum/mind/synd_mind) // So we don't have inferior species as ops - randomize a human +/datum/game_mode/proc/create_syndicate(datum/mind/synd_mind, obj/machinery/nuclearbomb/syndicate/the_bomb) // So we don't have inferior species as ops - randomize a human var/mob/living/carbon/human/M = synd_mind.current M.set_species(/datum/species/human, TRUE) @@ -186,7 +188,14 @@ M.regenerate_icons() M.update_body() -/datum/game_mode/proc/prepare_syndicate_leader(datum/mind/synd_mind, nuke_code) + if(!the_bomb) + the_bomb = locate(/obj/machinery/nuclearbomb/syndicate) in GLOB.poi_list + + if(the_bomb) + synd_mind.store_memory("Syndicate [the_bomb.name] Code: [the_bomb.r_code]") + to_chat(synd_mind.current, "The code for \the [the_bomb.name] is: [the_bomb.r_code]") + +/datum/game_mode/proc/prepare_syndicate_leader(datum/mind/synd_mind, obj/machinery/nuclearbomb/syndicate/the_bomb) var/leader_title = pick("Czar", "Boss", "Commander", "Chief", "Kingpin", "Director", "Overlord") synd_mind.current.real_name = "[syndicate_name()] Team [leader_title]" to_chat(synd_mind.current, "You are the Syndicate leader for this mission. You are responsible for the distribution of telecrystals and your ID is the only one who can open the launch bay doors.") @@ -198,11 +207,9 @@ update_syndicate_id(synd_mind, leader_title, TRUE) - if(nuke_code) - synd_mind.store_memory("Syndicate Nuclear Bomb Code: [nuke_code]", 0, 0) - to_chat(synd_mind.current, "The nuclear authorization code is: [nuke_code]") + if(the_bomb) var/obj/item/paper/P = new - P.info = "The nuclear authorization code is: [nuke_code]" + P.info = "The code for \the [the_bomb.name] is: [the_bomb.r_code]" P.name = "nuclear bomb code" var/obj/item/stamp/syndicate/stamp = new P.stamp(stamp) @@ -216,8 +223,6 @@ H.equip_to_slot_or_del(P, slot_r_store, 0) H.update_icons() - else - nuke_code = "code will be provided later" /datum/game_mode/proc/update_syndicate_id(datum/mind/synd_mind, is_leader = FALSE) var/list/found_ids = synd_mind.current.search_contents_for(/obj/item/card/id) @@ -245,6 +250,7 @@ for(var/datum/objective/objective in syndicate.objectives) to_chat(syndicate.current, "Objective #[obj_count]: [objective.explanation_text]") obj_count++ + to_chat(syndicate.current, "For more information, check the wiki page: ([config.wikiurl]/index.php/Nuclear_Agent)") return @@ -452,10 +458,9 @@ for(var/obj/machinery/nuclearbomb/nuke in GLOB.machines) if(nuke.r_code == "Nope") continue - var/turf/T = get_turf(nuke) - var/area/A = T.loc + var/area/A = get_area(nuke) - var/list/thousand_penalty = list(/area/wizard_station, /area/solar, /area) + var/list/thousand_penalty = list(/area/solar) var/list/fiftythousand_penalty = list(/area/security/main, /area/security/brig, /area/security/armoury, /area/security/checkpoint2) if(is_type_in_list(A, thousand_penalty)) diff --git a/code/game/gamemodes/nuclear/nuclear_challenge.dm b/code/game/gamemodes/nuclear/nuclear_challenge.dm index 5e11a78888d..be071fc80ad 100644 --- a/code/game/gamemodes/nuclear/nuclear_challenge.dm +++ b/code/game/gamemodes/nuclear/nuclear_challenge.dm @@ -55,6 +55,7 @@ for(var/obj/machinery/computer/shuttle/syndicate/S in GLOB.machines) S.challenge = TRUE + S.challenge_time = world.time // No. of player - Min. Player to dec, divided by player per bonus, then multipled by TC per bonus. Rounded. total_tc = CHALLENGE_TELECRYSTALS + round((((GLOB.player_list.len - CHALLENGE_MIN_PLAYERS)/CHALLENGE_SCALE_PLAYER) * CHALLENGE_SCALE_BONUS)) diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm index fa0ba2fbf0f..3b8649e26a5 100644 --- a/code/game/gamemodes/nuclear/nuclearbomb.dm +++ b/code/game/gamemodes/nuclear/nuclearbomb.dm @@ -359,8 +359,9 @@ GLOBAL_VAR(bomb_set) var/off_station = 0 var/turf/bomb_location = get_turf(src) + var/area/A = get_area(src) if( bomb_location && is_station_level(bomb_location.z) ) - if( (bomb_location.x < (128-NUKERANGE)) || (bomb_location.x > (128+NUKERANGE)) || (bomb_location.y < (128-NUKERANGE)) || (bomb_location.y > (128+NUKERANGE)) ) + if( (bomb_location.x < (128 - NUKERANGE)) || (bomb_location.x > (128 + NUKERANGE)) || (bomb_location.y < (128 - NUKERANGE)) || (bomb_location.y > (128 + NUKERANGE)) && (!(A in GLOB.the_station_areas))) off_station = 1 else off_station = 2 @@ -381,9 +382,9 @@ GLOBAL_VAR(bomb_set) else if(off_station == 2) to_chat(world, "A nuclear device was set off, but the device was not on the station!") else - to_chat(world, "The station was destoyed by the nuclear blast!") + to_chat(world, "The station was destroyed by the nuclear blast!") - SSticker.mode.station_was_nuked = (off_station<2) //offstation==1 is a draw. the station becomes irradiated and needs to be evacuated. + SSticker.mode.station_was_nuked = (off_station < 2) //offstation==1 is a draw. the station becomes irradiated and needs to be evacuated. //kinda shit but I couldn't get permission to do what I wanted to do. if(!SSticker.mode.check_finished())//If the mode does not deal with the nuke going off so just reboot because everyone is stuck as is @@ -399,12 +400,12 @@ GLOBAL_VAR(bomb_set) if(safety == 1) if(!is_syndicate) set_security_level(previous_level) - visible_message("The [src] quiets down.") + visible_message("[src] quiets down.") if(!lighthack) if(icon_state == "nuclearbomb2") icon_state = "nuclearbomb1" else - visible_message("The [src] emits a quiet whirling noise!") + visible_message("[src] emits a quiet whirling noise!") //==========DAT FUKKEN DISK=============== /obj/item/disk/nuclear diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm index c8a9d39e555..a89f12f06ce 100644 --- a/code/game/gamemodes/revolution/revolution.dm +++ b/code/game/gamemodes/revolution/revolution.dm @@ -110,6 +110,7 @@ to_chat(rev_mind.current, "Objective #[obj_count]: [objective.explanation_text]") rev_mind.special_role = SPECIAL_ROLE_HEAD_REV obj_count++ + to_chat(rev_mind.current, "For more information, check the wiki page: ([config.wikiurl]/index.php/Revolution)") ///////////////////////////////////////////////////////////////////////////////// //This are equips the rev heads with their gear, and makes the clown not clumsy// diff --git a/code/game/gamemodes/setupgame.dm b/code/game/gamemodes/setupgame.dm index 9ce71866e88..d749f8ef553 100644 --- a/code/game/gamemodes/setupgame.dm +++ b/code/game/gamemodes/setupgame.dm @@ -114,18 +114,21 @@ if(G.block) if(G.block in blocks_assigned) warning("DNA2: Gene [G.name] trying to use already-assigned block [G.block] (used by [english_list(blocks_assigned[G.block])])") - GLOB.dna_mutations.Add(G) + GLOB.dna_mutations[mutation_type] = G var/list/assignedToBlock[0] if(blocks_assigned[G.block]) - assignedToBlock=blocks_assigned[G.block] + assignedToBlock = blocks_assigned[G.block] assignedToBlock.Add(G.name) - blocks_assigned[G.block]=assignedToBlock + blocks_assigned[G.block] = assignedToBlock //testing("DNA2: Gene [G.name] assigned to block [G.block].") + else + qdel(G) // I WILL HAVE A LIST OF MUTATIONS THAT MATCHES THE RANDOMIZED BLOCKS GODDAMNIT! for(var/block in 1 to DNA_SE_LENGTH) var/name = GLOB.assigned_blocks[block] - for(var/datum/mutation/mutation in GLOB.dna_mutations) + for(var/mutation_type in GLOB.dna_mutations) + var/datum/mutation/mutation = GLOB.dna_mutations[mutation_type] if(mutation.name == name || mutation.block == block) if(mutation.block in GLOB.assigned_mutation_blocks) warning("DNA2: Mutation [mutation.name] trying to add to already assigned gene block list (used by [english_list(GLOB.assigned_mutation_blocks[block])])") diff --git a/code/game/gamemodes/shadowling/shadowling.dm b/code/game/gamemodes/shadowling/shadowling.dm index a017b6d9af0..67109419040 100644 --- a/code/game/gamemodes/shadowling/shadowling.dm +++ b/code/game/gamemodes/shadowling/shadowling.dm @@ -126,8 +126,7 @@ Made by Xhuis to_chat(shadow.current, "Currently, you are disguised as an employee aboard [world.name].") to_chat(shadow.current, "In your limited state, you have two abilities: Hatch and Shadowling Hivemind (:8).") to_chat(shadow.current, "Any other shadowlings are your allies. You must assist them as they shall assist you.") - to_chat(shadow.current, "If you are new to shadowling, or want to read about abilities, check the wiki page at https://www.paradisestation.org/wiki/index.php/Shadowling
    ") - + to_chat(shadow.current, "For more information, check the wiki page: ([config.wikiurl]/index.php/Shadowling)") /datum/game_mode/proc/process_shadow_objectives(datum/mind/shadow_mind) @@ -169,6 +168,7 @@ Made by Xhuis to_chat(new_thrall_mind.current, "Your body has been irreversibly altered. The attentive can see this - you may conceal it by wearing a mask.") to_chat(new_thrall_mind.current, "Though not nearly as powerful as your masters, you possess some weak powers. These can be found in the Thrall Abilities tab.") to_chat(new_thrall_mind.current, "You may communicate with your allies by speaking in the Shadowling Hivemind (:8).") + to_chat(new_thrall_mind.current, "For more information, check the wiki page: ([config.wikiurl]/index.php/Shadowling)") if(jobban_isbanned(new_thrall_mind.current, ROLE_SHADOWLING) || jobban_isbanned(new_thrall_mind.current, ROLE_SYNDICATE)) replace_jobbanned_player(new_thrall_mind.current, ROLE_SHADOWLING) if(!victory_warning_announced && (length(shadowling_thralls) >= warning_threshold))//are the slings very close to winning? diff --git a/code/game/gamemodes/shadowling/shadowling_abilities.dm b/code/game/gamemodes/shadowling/shadowling_abilities.dm index 4d93a601e9d..3b491765919 100644 --- a/code/game/gamemodes/shadowling/shadowling_abilities.dm +++ b/code/game/gamemodes/shadowling/shadowling_abilities.dm @@ -513,7 +513,7 @@ target_apc.operating = 0 target_apc.update() target_apc.update_icon() - target_apc.visible_message("The [target_apc] flickers and begins to grow dark.") + target_apc.visible_message("[target_apc] flickers and begins to grow dark.") to_chat(user, "You dim the APC's screen and carefully begin siphoning its power into the void.") if(!do_after(user, 200, target=target_apc)) @@ -522,7 +522,7 @@ target_apc.operating = 1 target_apc.update() target_apc.update_icon() - target_apc.visible_message("The [target_apc] begins glowing brightly!") + target_apc.visible_message("[target_apc] begins glowing brightly!") else //We did it! to_chat(user, "You sent the APC's power to the void while overloading all it's lights!") diff --git a/code/game/gamemodes/vampire/vampire.dm b/code/game/gamemodes/vampire/vampire.dm index 8a3628a1717..ff3a6152da1 100644 --- a/code/game/gamemodes/vampire/vampire.dm +++ b/code/game/gamemodes/vampire/vampire.dm @@ -193,8 +193,8 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha for(var/datum/objective/objective in vampire.objectives) to_chat(vampire.current, "Objective #[obj_count]: [objective.explanation_text]") obj_count++ + to_chat(vampire.current, "For more information, check the wiki page: ([config.wikiurl]/index.php/Vampire)") return - /datum/vampire var/bloodtotal = 0 // CHANGE TO ZERO WHEN PLAYTESTING HAPPENS var/bloodusable = 0 // CHANGE TO ZERO WHEN PLAYTESTING HAPPENS @@ -290,7 +290,7 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha draining = null return add_attack_logs(owner, H, "vampirebit & is draining their blood.", ATKLOG_ALMOSTALL) - owner.visible_message("[owner] grabs [H]'s neck harshly and sinks in [owner.p_their()] fangs!", "You sink your fangs into [H] and begin to drain [owner.p_their()] blood.", "You hear a soft puncture and a wet sucking noise.") + owner.visible_message("[owner] grabs [H]'s neck harshly and sinks in [owner.p_their()] fangs!", "You sink your fangs into [H] and begin to drain [H.p_their()] blood.", "You hear a soft puncture and a wet sucking noise.") if(!iscarbon(owner)) H.LAssailant = null else diff --git a/code/game/gamemodes/vampire/vampire_powers.dm b/code/game/gamemodes/vampire/vampire_powers.dm index 4e06cb02df1..d0d1bf81e71 100644 --- a/code/game/gamemodes/vampire/vampire_powers.dm +++ b/code/game/gamemodes/vampire/vampire_powers.dm @@ -9,6 +9,7 @@ action_background_icon_state = "bg_vampire" var/required_blood = 0 var/gain_desc = null + var/deduct_blood_on_cast = TRUE //Do we want to take the blood when this is cast, or at a later point? /obj/effect/proc_holder/spell/vampire/New() ..() @@ -99,6 +100,8 @@ var/datum/vampire/vampire = usr.mind.vampire if(required_blood <= vampire.bloodusable) + if(!deduct_blood_on_cast) //don't take the blood yet if this is false! + return vampire.bloodusable -= required_blood else // stop!! @@ -288,8 +291,10 @@ gain_desc = "You have gained the Enthrall ability which at a heavy blood cost allows you to enslave a human that is not loyal to any other for a random period of time." action_icon_state = "vampire_enthrall" required_blood = 300 + deduct_blood_on_cast = FALSE /obj/effect/proc_holder/spell/vampire/targetted/enthrall/cast(list/targets, mob/user = usr) + var/datum/vampire/vampire = user.mind.vampire for(var/mob/living/target in targets) user.visible_message("[user] bites [target]'s neck!", "You bite [target]'s neck and begin the flow of power.") to_chat(target, "You feel the tendrils of evil invade your mind.") @@ -299,6 +304,7 @@ if(do_mob(user, target, 50)) if(can_enthrall(user, target)) handle_enthrall(user, target) + vampire.bloodusable -= required_blood //we take the blood after enthralling, not before else revert_cast(user) to_chat(user, "You or your target either moved or you dont have enough usable blood.") diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm index af83abba66b..937dc11f61c 100644 --- a/code/game/gamemodes/wizard/artefact.dm +++ b/code/game/gamemodes/wizard/artefact.dm @@ -57,7 +57,7 @@ new /obj/effect/particle_effect/smoke(H.loc) var/mob/living/carbon/human/M = new/mob/living/carbon/human(H.loc) M.key = C.key - to_chat(M, "You are the [H.real_name]'s apprentice! You are bound by magic contract to follow [H.p_their()] orders and help [H.p_them()] in accomplishing their goals.") + to_chat(M, "You are [H.real_name]'s apprentice! You are bound by magic contract to follow [H.p_their()] orders and help [H.p_them()] in accomplishing their goals.") switch(href_list["school"]) if("destruction") M.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/projectile/magic_missile(null)) @@ -293,7 +293,7 @@ GLOBAL_LIST_EMPTY(multiverse) /obj/item/multisword/attack(mob/living/M as mob, mob/living/user as mob) //to prevent accidental friendly fire or out and out grief. if(M.real_name == user.real_name) - to_chat(user, "The [src] detects benevolent energies in your target and redirects your attack!") + to_chat(user, "[src] detects benevolent energies in your target and redirects your attack!") return ..() @@ -856,7 +856,7 @@ GLOBAL_LIST_EMPTY(multiverse) if(link) target = null link.loc = get_turf(src) - to_chat(user, "You remove the [link] from the doll.") + to_chat(user, "You remove [link] from the doll.") link = null update_targets() return diff --git a/code/game/gamemodes/wizard/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm index cd7c5d21546..37f1bbf4c6d 100644 --- a/code/game/gamemodes/wizard/soulstone.dm +++ b/code/game/gamemodes/wizard/soulstone.dm @@ -95,6 +95,10 @@ to_chat(user, "\"Come now, do not capture your fellow's soul.\"") return ..() + if(M.mind.offstation_role && M.mind.special_role != SPECIAL_ROLE_ERT) + to_chat(user, "This being's soul seems worthless. Not even the stone will absorb it.") + return ..() + if(optional) if(!M.ckey) to_chat(user, "They have no soul!") @@ -253,17 +257,18 @@ return ..() ////////////////////////////Proc for moving soul in and out off stone////////////////////////////////////// - +// this whole proc is pain /obj/item/soulstone/proc/transfer_soul(choice, target, mob/user) switch(choice) if("FORCE") var/mob/living/T = target - if(T.client != null) + T.grab_ghost(FALSE) // If they haven't DC'd or ahudded, put them back in their body + if(T.client) // If there's someone in the body init_shade(T, user) - else + else // Poll ghosts to_chat(user, "Capture failed! The soul has already fled its mortal frame. You attempt to bring it back...") T.Paralyse(20) - if(!get_cult_ghost(T, user)) + if(!get_cult_ghost(T, user, TRUE)) T.dust() //If we can't get a ghost, kill the sacrifice anyway. if("VICTIM") @@ -276,7 +281,7 @@ else if(T.client == null) to_chat(user, "Capture failed! The soul has already fled its mortal frame. You attempt to bring it back...") - get_cult_ghost(T, user) + get_cult_ghost(T, user, get_new_player = !T.ghost_can_reenter()) else if(length(contents)) to_chat(user, "Capture failed! The soul stone is full! Use or free an existing soul to make room.") @@ -312,9 +317,9 @@ "Wraith" = /mob/living/simple_animal/hostile/construct/wraith, "Artificer" = /mob/living/simple_animal/hostile/construct/builder) /// Custom construct icons for different cults - var/list/construct_icons = list("Juggernaut" = image(icon = 'icons/mob/mob.dmi', icon_state = SSticker.cultdat.get_icon("juggernaut")), - "Wraith" = image(icon = 'icons/mob/mob.dmi', icon_state = SSticker.cultdat.get_icon("wraith")), - "Artificer" = image(icon = 'icons/mob/mob.dmi', icon_state = SSticker.cultdat.get_icon("builder"))) + var/list/construct_icons = list("Juggernaut" = image(icon = 'icons/mob/cult.dmi', icon_state = SSticker.cultdat.get_icon("juggernaut")), + "Wraith" = image(icon = 'icons/mob/cult.dmi', icon_state = SSticker.cultdat.get_icon("wraith")), + "Artificer" = image(icon = 'icons/mob/cult.dmi', icon_state = SSticker.cultdat.get_icon("builder"))) if(shade) var/construct_choice = show_radial_menu(user, shell, construct_icons, custom_check = CALLBACK(src, .proc/radial_check, user), require_near = TRUE) @@ -323,6 +328,7 @@ var/mob/living/simple_animal/hostile/construct/C = new picked_class(shell.loc) C.init_construct(shade, src, shell) to_chat(C, C.playstyle_string) + to_chat(C, "For more information, check the wiki page: ([config.wikiurl]/index.php/Construct)") else to_chat(user, "Creation failed!: The soul stone is empty! Go kill someone!") @@ -339,13 +345,11 @@ if(shade.mind) shade.mind.transfer_to(src) if(SS.purified) - set_light(3, 5, LIGHT_COLOR_DARK_BLUE) - name = "Holy [name]" - real_name = "Holy [real_name]" - + make_holy() // Replace regular soulstone summoning with purified soulstones - RemoveSpell(/obj/effect/proc_holder/spell/aoe_turf/conjure/soulstone) - AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/conjure/soulstone/holy) + if(is_type_in_list(/obj/effect/proc_holder/spell/aoe_turf/conjure/soulstone, mob_spell_list)) + RemoveSpell(/obj/effect/proc_holder/spell/aoe_turf/conjure/soulstone) + AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/conjure/soulstone/holy) else if(iscultist(src)) // Re-grant cult actions, lost in the transfer var/datum/action/innate/cult/comm/CC = new @@ -414,13 +418,14 @@ return /mob/living/simple_animal/shade/holy return /mob/living/simple_animal/shade/cult -/obj/item/soulstone/proc/get_cult_ghost(mob/living/M, mob/user) +/obj/item/soulstone/proc/get_cult_ghost(mob/living/M, mob/user, get_new_player = FALSE) var/mob/dead/observer/chosen_ghost - for(var/mob/dead/observer/ghost in GLOB.player_list) // We put them back in their body - if(ghost.mind && ghost.mind.current == M && ghost.client) - chosen_ghost = ghost - break + if(!get_new_player) + for(var/mob/dead/observer/ghost in GLOB.player_list) // We put them back in their body + if(ghost.mind && ghost.mind.current == M && ghost.client) + chosen_ghost = ghost + break if(!chosen_ghost) // Failing that, we grab a ghost var/list/consenting_candidates diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm index b3c84d28ec4..67ad3a2ebae 100644 --- a/code/game/gamemodes/wizard/spellbook.dm +++ b/code/game/gamemodes/wizard/spellbook.dm @@ -88,7 +88,7 @@ if(!S) S = new spell_type() var/dat ="" - dat += "[initial(S.name)]" + dat += "[name]" if(S.charge_type == "recharge") dat += " Cooldown:[S.charge_max/10]" dat += " Cost:[cost]
    " @@ -172,18 +172,6 @@ log_name = "IG" category = "Offensive" -/datum/spellbook_entry/sacred_flame - name = "Sacred Flame" - spell_type = /obj/effect/proc_holder/spell/targeted/sacred_flame - cost = 1 - log_name = "SF" - refundable = 0 //You get fire immunity out of it, no. - -/datum/spellbook_entry/sacred_flame/LearnSpell(mob/living/carbon/human/user, obj/item/spellbook/book, obj/effect/proc_holder/spell/newspell) - ..() - user.dna.SetSEState(GLOB.coldblock, 1) - singlemutcheck(user, GLOB.coldblock, MUTCHK_FORCED) - //Defensive /datum/spellbook_entry/disabletech name = "Disable Tech" @@ -239,6 +227,25 @@ log_name = "TS" category = "Defensive" +/datum/spellbook_entry/sacred_flame + name = "Sacred Flame and Fire Immunity" + spell_type = /obj/effect/proc_holder/spell/targeted/sacred_flame + cost = 1 + log_name = "SF" + category = "Defensive" + +/datum/spellbook_entry/sacred_flame/LearnSpell(mob/living/carbon/human/user, obj/item/spellbook/book, obj/effect/proc_holder/spell/newspell) + to_chat(user, "You feel fireproof.") + ADD_TRAIT(user, TRAIT_RESISTHEAT, MAGIC_TRAIT) + ADD_TRAIT(user, TRAIT_RESISTHIGHPRESSURE, MAGIC_TRAIT) + return ..() + +/datum/spellbook_entry/sacred_flame/Refund(mob/living/carbon/human/user, obj/item/spellbook/book) + to_chat(user, "You no longer feel fireproof.") + REMOVE_TRAIT(user, TRAIT_RESISTHEAT, MAGIC_TRAIT) + REMOVE_TRAIT(user, TRAIT_RESISTHIGHPRESSURE, MAGIC_TRAIT) + return ..() + //Mobility /datum/spellbook_entry/knock name = "Knock" @@ -431,7 +438,7 @@ category = "Artefacts" /datum/spellbook_entry/item/voice_of_god - name = "Voice of god" + name = "Voice of God" desc = "A magical vocal cord that can be used to yell out with the voice of a god, be it to harm, help, or confuse the target." item_path = /obj/item/organ/internal/vocal_cords/colossus/wizard log_name = "VG" @@ -439,7 +446,7 @@ /datum/spellbook_entry/item/warp_cubes name = "Warp Cubes" - desc = "Two magic cubes, that when they are twisted in hand, teleports the user to the location of the other cube instantly. Great for silently teleporting to a fixed location, or teleporting you to an appretnance, or vice versa. Do not leave on the wizard den, it will not work." + desc = "Two magic cubes, that when they are twisted in hand, teleports the user to the location of the other cube instantly. Great for silently teleporting to a fixed location, or teleporting you to an apprentice, or vice versa. Do not leave on the wizard den, it will not work." item_path = /obj/item/warp_cube/red log_name = "WC" cost = 1 @@ -472,7 +479,7 @@ /datum/spellbook_entry/item/singularity_hammer name = "Singularity Hammer" - desc = "A hammer that creates an intensely powerful field of gravity where it strikes, pulling everthing nearby to the point of impact." + desc = "A hammer that creates an intensely powerful field of gravity where it strikes, pulling everything nearby to the point of impact." item_path = /obj/item/twohanded/singularityhammer log_name = "SI" category = "Weapons and Armors" @@ -776,7 +783,7 @@ owner = user return if(user != owner) - to_chat(user, "The [name] does not recognize you as it's owner and refuses to open!") + to_chat(user, "[src] does not recognize you as it's owner and refuses to open!") return user.set_machine(src) var/dat = "" diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm index 43e768a1ef2..d076afbaadb 100644 --- a/code/game/gamemodes/wizard/wizard.dm +++ b/code/game/gamemodes/wizard/wizard.dm @@ -108,6 +108,7 @@ for(var/datum/objective/objective in wizard.objectives) to_chat(wizard.current, "Objective #[obj_count]: [objective.explanation_text]") obj_count++ + to_chat(wizard.current, "For more information, check the wiki page: ([config.wikiurl]/index.php/Wizard)") return /*/datum/game_mode/proc/learn_basic_spells(mob/living/carbon/human/wizard_mob) diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm index 6eaaf03aaef..f2b28fea297 100644 --- a/code/game/jobs/access.dm +++ b/code/game/jobs/access.dm @@ -400,6 +400,9 @@ /proc/get_all_centcom_jobs() return list("VIP Guest","Custodian","Thunderdome Overseer","Emergency Response Team Member","Emergency Response Team Leader","Intel Officer","Medical Officer","Death Commando","Research Officer","Deathsquad Officer","Special Operations Officer","Nanotrasen Navy Representative","Nanotrasen Navy Officer","Nanotrasen Navy Captain","Supreme Commander") +/proc/get_all_solgov_jobs() + return list("Solar Federation Lieutenant","Solar Federation Specops Lieutenant","Solar Federation Marine","Solar Federation Specops Marine","Solar Federation Representative","Sol Trader") + //gets the actual job rank (ignoring alt titles) //this is used solely for sechuds /obj/proc/GetJobRealName() @@ -424,24 +427,6 @@ return "Unknown" -//gets the alt title, failing that the actual job rank -//this is unused -// THEN WHY IS IT STILL HERE?? -AA07, 2020-07-31 -/obj/proc/sdsdsd() //GetJobDisplayName - if(!istype(src, /obj/item/pda) && !istype(src,/obj/item/card/id)) - return - - var/assignment - if(istype(src, /obj/item/pda)) - if(src:id) - assignment = src:id:assignment - else if(istype(src, /obj/item/card/id)) - assignment = src:assignment - - if(assignment) - return assignment - - return "Unknown" /proc/GetIdCard(mob/living/carbon/human/H) if(H.wear_id) @@ -499,12 +484,18 @@ var/job_icons = get_all_job_icons() var/centcom = get_all_centcom_jobs() + var/solgov = get_all_solgov_jobs() if(assignmentName in centcom) //Return with the NT logo if it is a Centcom job return "Centcom" if(rankName in centcom) return "Centcom" + if(assignmentName in solgov) //Return with the SolGov logo if it is a SolGov job + return "solgov" + if(rankName in solgov) + return "solgov" + if(assignmentName in job_icons) //Check if the job has a hud icon return assignmentName if(rankName in job_icons) diff --git a/code/game/jobs/job/job.dm b/code/game/jobs/job/job.dm index fd3e1a0442b..8f313c185dc 100644 --- a/code/game/jobs/job/job.dm +++ b/code/game/jobs/job/job.dm @@ -225,7 +225,7 @@ to_chat(H, "Failed to locate a storage object on your mob, either you spawned with no hands free and no backpack or this is a bug.") qdel(G) - qdel(gear_leftovers) + gear_leftovers.Cut() return 1 diff --git a/code/game/machinery/PDApainter.dm b/code/game/machinery/PDApainter.dm index 332df41f086..b7aa437f9be 100644 --- a/code/game/machinery/PDApainter.dm +++ b/code/game/machinery/PDApainter.dm @@ -104,7 +104,7 @@ storedpda.desc = colorlist[P] else - to_chat(user, "The [src] is empty.") + to_chat(user, "[src] is empty.") /obj/machinery/pdapainter/verb/ejectpda() @@ -120,7 +120,7 @@ storedpda = null update_icon() else - to_chat(usr, "The [src] is empty.") + to_chat(usr, "[src] is empty.") /obj/machinery/pdapainter/power_change() diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm index 670e58247d4..05d16c49c6c 100644 --- a/code/game/machinery/adv_med.dm +++ b/code/game/machinery/adv_med.dm @@ -481,7 +481,7 @@ if(unknown_body || e.hidden) imp += "Unknown body present:" - if(!AN && !open && !infected & !imp) + if(!AN && !open && !infected && !imp) AN = "None:" dat += "[e.name][e.burn_dam][e.brute_dam][robot][bled][AN][splint][open][infected][imp][internal_bleeding][lung_ruptured][dead]" dat += "" diff --git a/code/game/machinery/ai_slipper.dm b/code/game/machinery/ai_slipper.dm index 45cd917c39b..a9cc35874bb 100644 --- a/code/game/machinery/ai_slipper.dm +++ b/code/game/machinery/ai_slipper.dm @@ -4,133 +4,66 @@ icon_state = "liquid_dispenser" layer = 3 plane = FLOOR_PLANE - anchored = 1.0 + anchored = TRUE max_integrity = 200 armor = list(melee = 50, bullet = 20, laser = 20, energy = 20, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 30) var/uses = 20 - var/disabled = TRUE - var/lethal = 0 - var/locked = TRUE - var/cooldown_time = 0 - var/cooldown_timeleft = 0 + var/cooldown_time = 10 SECONDS var/cooldown_on = FALSE req_access = list(ACCESS_AI_UPLOAD) +/obj/machinery/ai_slipper/examine(mob/user) + . = ..() + . += "A small counter shows it has: [uses] use\s remaining." + /obj/machinery/ai_slipper/power_change() - if(stat & BROKEN) - update_icon() + if(powered()) + stat &= ~NOPOWER else - if( powered() ) - stat &= ~NOPOWER - else - stat |= NOPOWER - disabled = TRUE - update_icon() - -/obj/machinery/ai_slipper/proc/setState(enabled, uses) - disabled = disabled - uses = uses - power_change() - -/obj/machinery/ai_slipper/attackby(obj/item/W, mob/user, params) - if(stat & (NOPOWER|BROKEN)) - return - if(istype(user, /mob/living/silicon)) - return attack_hand(user) - if(allowed(usr)) // trying to unlock the interface - locked = !locked - to_chat(user, "You [locked ? "lock" : "unlock"] the device.") - if(locked) - if(user.machine == src) - user.unset_machine() - user << browse(null, "window=ai_slipper") - else - if(user.machine == src) - attack_hand(usr) - return - return ..() - -/obj/machinery/ai_slipper/proc/ToggleOn() - if(stat & (NOPOWER|BROKEN)) - return - disabled = !disabled + stat |= NOPOWER update_icon() -/obj/machinery/ai_slipper/proc/Activate() +/obj/machinery/ai_slipper/attack_ai(mob/user) + add_hiddenprint(user) + return attack_hand(user) + +/obj/machinery/ai_slipper/attack_ghost(mob/user) + if(user.can_advanced_admin_interact()) + Activate(user) + +/obj/machinery/ai_slipper/attack_hand(mob/user) + if(stat & (NOPOWER|BROKEN)) + to_chat(user, "[src] has no power or is broken!") + return + if(!allowed(user)) + to_chat(user, "Access denied.") + return + Activate(user) + +/obj/machinery/ai_slipper/proc/Activate(mob/user) if(stat & (NOPOWER|BROKEN)) return - if(cooldown_on || disabled) + if(!uses) + to_chat(user, "[src] is empty!") + return + if(cooldown_on) + to_chat(user, "[src] is still recharging!") return else new /obj/effect/particle_effect/foam(loc) uses-- cooldown_on = TRUE - cooldown_time = world.timeofday + 100 - slip_process() + power_change() + addtimer(CALLBACK(src, .proc/recharge), cooldown_time) /obj/machinery/ai_slipper/update_icon() - if(stat & (NOPOWER|BROKEN) || disabled) + if(stat & (NOPOWER|BROKEN) || cooldown_on || !uses) icon_state = "liquid_dispenser" else icon_state = "liquid_dispenser_on" -/obj/machinery/ai_slipper/attack_ai(mob/user) - return attack_hand(user) - -/obj/machinery/ai_slipper/attack_ghost(mob/user) - return attack_hand(user) - -/obj/machinery/ai_slipper/attack_hand(mob/user) - if(stat & (NOPOWER|BROKEN)) +/obj/machinery/ai_slipper/proc/recharge() + if(!uses) return - - if(get_dist(src, user) > 1 && (!issilicon(user) && !user.can_admin_interact())) - to_chat(user, "Too far away.") - user.unset_machine() - user << browse(null, "window=ai_slipper") - return - - user.set_machine(src) - var/area/myarea = get_area(src) - var/t = "AI Liquid Dispenser ([myarea.name])
    " - - if(locked && (!issilicon(user) && !user.can_admin_interact())) - t += "(Swipe ID card to unlock control panel.)
    " - else - t += text("Dispenser [] - []?
    \n", disabled ? "deactivated" : "activated", disabled ? "Enable" : "Disable") - t += text("Uses Left: [uses]. Activate the dispenser?
    \n") - - user << browse(t, "window=computer;size=575x450") - onclose(user, "computer") - -/obj/machinery/ai_slipper/Topic(href, href_list) - if(..()) - return 1 - - if(locked && (!issilicon(usr) && !usr.can_admin_interact())) - to_chat(usr, "Control panel is locked!") - return 1 - - if(href_list["toggleOn"]) - ToggleOn() - - if(href_list["toggleUse"]) - Activate() - - attack_hand(usr) - -/obj/machinery/ai_slipper/proc/slip_process() - while(cooldown_time - world.timeofday > 0) - var/ticksleft = cooldown_time - world.timeofday - - if(ticksleft > 1e5) - cooldown_time = world.timeofday + 10 // midnight rollover - - - cooldown_timeleft = (ticksleft / 10) - sleep(5) - if(uses <= 0) - return - if(uses >= 0) - cooldown_on = FALSE + cooldown_on = FALSE power_change() diff --git a/code/game/machinery/camera/motion.dm b/code/game/machinery/camera/motion.dm index 8a32c6d6374..d5a5a76d0d5 100644 --- a/code/game/machinery/camera/motion.dm +++ b/code/game/machinery/camera/motion.dm @@ -54,7 +54,7 @@ return FALSE if(status) SSalarm.triggerAlarm("Motion", get_area(src), list(UID()), src) - visible_message("A red light flashes on the [src]!") + visible_message("A red light flashes on [src]!") detectTime = -1 return TRUE diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm index 73ef22b3616..2177c15d596 100644 --- a/code/game/machinery/computer/HolodeckControl.dm +++ b/code/game/machinery/computer/HolodeckControl.dm @@ -234,7 +234,7 @@ if(!silent) var/obj/oldobj = obj - visible_message("The [oldobj.name] fades away!") + visible_message("[oldobj] fades away!") qdel(obj) /obj/machinery/computer/HolodeckControl/proc/checkInteg(area/A) @@ -505,12 +505,12 @@ return G.affecting.loc = src.loc G.affecting.Weaken(5) - visible_message("[G.assailant] dunks [G.affecting] into the [src]!") + visible_message("[G.assailant] dunks [G.affecting] into [src]!") qdel(W) return else if(istype(W, /obj/item) && get_dist(src,user)<2) user.drop_item(src) - visible_message("[user] dunks [W] into the [src]!") + visible_message("[user] dunks [W] into [src]!") return /obj/structure/holohoop/CanPass(atom/movable/mover, turf/target, height=0) diff --git a/code/game/machinery/computer/atmos_control.dm b/code/game/machinery/computer/atmos_control.dm index db28dd16dc6..287cca55b41 100644 --- a/code/game/machinery/computer/atmos_control.dm +++ b/code/game/machinery/computer/atmos_control.dm @@ -59,10 +59,7 @@ return TRUE if("toggle_bolts" in href_list) bolts = !bolts - if(bolts) - visible_message("You hear a quite click as the [src] bolts to the floor", "You hear a quite click") - else - visible_message("You hear a quite click as the [src]'s floor bolts raise", "You hear a quite click") + visible_message("You hear a quiet click as [src][bolts ? " bolts to the floor" : "'s bolts raise"].", "You begin to unfasten \the [src]...") diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index a02c46524c5..6cba8733a2d 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -7,7 +7,6 @@ max_integrity = 100 var/state = 0 var/obj/item/circuitboard/circuit = null - var/base_mineral = /obj/item/stack/sheet/metal /obj/structure/computerframe/deconstruct(disassembled = TRUE) if(!(flags & NODECONSTRUCT)) @@ -18,7 +17,7 @@ deconstruct() /obj/structure/computerframe/proc/drop_computer_parts() - new base_mineral(loc, 5) + new /obj/item/stack/sheet/metal(loc, 5) if(circuit) circuit.forceMove(loc) circuit = null @@ -357,14 +356,6 @@ build_path = /obj/machinery/computer/turbine_computer origin_tech = "programming=4;engineering=4;powerstorage=4" -/obj/item/circuitboard/HONKputer - name = "Circuit board (HONKputer)" - build_path = /obj/machinery/computer/HONKputer - origin_tech = "programming=2" - icon = 'icons/obj/machines/HONKputer.dmi' - icon_state = "bananium_board" - board_type = "honkcomputer" - /obj/item/circuitboard/supplycomp/attackby(obj/item/I as obj, mob/user as mob, params) if(istype(I,/obj/item/multitool)) @@ -392,7 +383,7 @@ /obj/item/circuitboard/rdconsole/attackby(obj/item/I as obj, mob/user as mob, params) if(istype(I,/obj/item/card/id)||istype(I, /obj/item/pda)) if(allowed(user)) - user.visible_message("\the [user] waves [user.p_their()] ID past the [src]'s access protocol scanner.", "You swipe your ID past the [src]'s access protocol scanner.") + user.visible_message("[user] waves [user.p_their()] ID past [src]'s access protocol scanner.", "You swipe your ID past [src]'s access protocol scanner.") var/console_choice = input(user, "What do you want to configure the access to?", "Access Modification", "R&D Core") as null|anything in access_types if(console_choice == null) return @@ -477,11 +468,11 @@ return if(istype(P, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/C = P - if(C.amount >= 5) + if(C.get_amount() >= 5) playsound(loc, C.usesound, 50, 1) to_chat(user, "You start to add cables to the frame.") if(do_after(user, 20 * C.toolspeed, target = src)) - if(state == 2 && C.amount >= 5 && C.use(5)) + if(state == 2 && C.get_amount() >= 5 && C.use(5)) to_chat(user, "You add cables to the frame.") state = 3 icon_state = "3" @@ -502,11 +493,11 @@ return if(istype(P, /obj/item/stack/sheet/glass)) var/obj/item/stack/sheet/glass/G = P - if(G.amount >= 2) + if(G.get_amount() >= 2) playsound(loc, G.usesound, 50, 1) to_chat(user, "You start to add the glass panel to the frame.") if(do_after(user, 20 * G.toolspeed, target = src)) - if(state == 3 && G.amount >= 2 && G.use(2)) + if(state == 3 && G.get_amount() >= 2 && G.use(2)) to_chat(user, "You put in the glass panel.") state = 4 icon_state = "4" @@ -552,116 +543,3 @@ if(I.use_tool(src, user, 50, volume = I.tool_volume) && !state) to_chat(user, "You deconstruct [src].") deconstruct(TRUE) - - - -/obj/structure/computerframe/HONKputer - name = "Bananium Computer-frame" - icon = 'icons/obj/machines/HONKputer.dmi' - base_mineral = /obj/item/stack/sheet/mineral/bananium - -/obj/structure/computerframe/HONKputer/attackby(obj/item/P as obj, mob/user as mob, params) - switch(state) - if(0) - if(istype(P, /obj/item/wrench)) - playsound(loc, P.usesound, 50, 1) - if(do_after(user, 20, target = src)) - to_chat(user, "You wrench the frame into place.") - anchored = 1 - state = 1 - if(1) - if(istype(P, /obj/item/wrench)) - playsound(loc, P.usesound, 50, 1) - if(do_after(user, 20 * P.toolspeed, target = src)) - to_chat(user, "You unfasten the frame.") - anchored = 0 - state = 0 - if(istype(P, /obj/item/circuitboard) && !circuit) - var/obj/item/circuitboard/B = P - if(B.board_type == "honkcomputer") - playsound(loc, P.usesound, 50, 1) - to_chat(user, "You place the circuit board inside the frame.") - icon_state = "1" - circuit = P - user.drop_item() - P.loc = src - else - to_chat(user, "This frame does not accept circuit boards of this type!") - if(istype(P, /obj/item/screwdriver) && circuit) - playsound(loc, P.usesound, 50, 1) - to_chat(user, "You screw the circuit board into place.") - state = 2 - icon_state = "2" - if(istype(P, /obj/item/crowbar) && circuit) - playsound(loc, P.usesound, 50, 1) - to_chat(user, "You remove the circuit board.") - state = 1 - icon_state = "0" - circuit.loc = loc - circuit = null - return - if(2) - if(istype(P, /obj/item/screwdriver) && circuit) - playsound(loc, P.usesound, 50, 1) - to_chat(user, "You unfasten the circuit board.") - state = 1 - icon_state = "1" - if(istype(P, /obj/item/stack/cable_coil)) - var/obj/item/stack/cable_coil/C = P - if(C.amount >= 5) - playsound(loc, C.usesound, 50, 1) - to_chat(user, "You start to add cables to the frame.") - if(do_after(user, 20 * C.toolspeed, target = src)) - if(state == 2 && C.amount >= 5 && C.use(5)) - to_chat(user, "You add cables to the frame.") - state = 3 - icon_state = "3" - else - to_chat(user, "At some point during construction you lost some cable. Make sure you have five lengths before trying again.") - return - else - to_chat(user, "You need five lengths of cable to wire the frame.") - return - if(3) - if(istype(P, /obj/item/wirecutters)) - playsound(loc, P.usesound, 50, 1) - to_chat(user, "You remove the cables.") - state = 2 - icon_state = "2" - var/obj/item/stack/cable_coil/A = new /obj/item/stack/cable_coil( loc ) - A.amount = 5 - - if(istype(P, /obj/item/stack/sheet/glass)) - var/obj/item/stack/sheet/glass/G = P - if(G.amount >= 2) - playsound(loc, G.usesound, 50, 1) - to_chat(user, "You start to add the glass panel to the frame.") - if(do_after(user, 20 * G.toolspeed, target = src)) - if(state == 3 && G.amount >= 2 && G.use(2)) - to_chat(user, "You put in the glass panel.") - state = 4 - icon_state = "4" - else - to_chat(user, "At some point during construction you lost some glass. Make sure you have two sheets before trying again.") - return - else - to_chat(user, "You need two sheets of glass for this.") - return - if(4) - if(istype(P, /obj/item/crowbar)) - playsound(loc, P.usesound, 50, 1) - to_chat(user, "You remove the glass panel.") - state = 3 - icon_state = "3" - new /obj/item/stack/sheet/glass(loc, 2) - if(istype(P, /obj/item/screwdriver)) - playsound(loc, P.usesound, 50, 1) - to_chat(user, "You connect the monitor.") - var/B = new circuit.build_path (loc) - if(circuit.powernet) B:powernet = circuit.powernet - if(circuit.id) B:id = circuit.id - if(circuit.records) B:records = circuit.records - if(circuit.frequency) B:frequency = circuit.frequency - qdel(src) - return - return ..() diff --git a/code/game/machinery/computer/camera_advanced.dm b/code/game/machinery/computer/camera_advanced.dm index bc1bfe6135b..7a1dbdf91d9 100644 --- a/code/game/machinery/computer/camera_advanced.dm +++ b/code/game/machinery/computer/camera_advanced.dm @@ -75,7 +75,7 @@ for(var/obj/machinery/camera/C in GLOB.cameranet.cameras) if(!C.can_use()) continue - if(C.network&networks) + if(length(C.network & networks)) camera_location = get_turf(C) break if(camera_location) diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 054a6719aff..46da580a0d1 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -147,7 +147,7 @@ message_cooldown = world.time + 600 //One minute if("callshuttle") - var/input = clean_input("Please enter the reason for calling the shuttle.", "Shuttle Call Reason.","") + var/input = input("Please enter the reason for calling the shuttle.", "Shuttle Call Reason.") as null|message if(!input || ..() || !is_authenticated(usr)) return call_shuttle_proc(usr, input) @@ -410,7 +410,7 @@ else menu_state=value -/proc/call_shuttle_proc(mob/user, reason) +/proc/call_shuttle_proc(mob/user, reason, sanitized = FALSE) if(GLOB.sent_strike_team == 1) to_chat(user, "Central Command will not allow the shuttle to be called. Consider all contracts terminated.") return @@ -427,6 +427,9 @@ to_chat(user, "Under directive 7-10, [station_name()] is quarantined until further notice.") return + if(!sanitized) + reason = trim_strip_html_properly(reason, allow_lines = TRUE) + SSshuttle.requestEvac(user, reason) log_game("[key_name(user)] has called the shuttle.") message_admins("[key_name_admin(user)] has called the shuttle.", 1) diff --git a/code/game/machinery/computer/honkputer.dm b/code/game/machinery/computer/honkputer.dm deleted file mode 100644 index 6990e1c3dc8..00000000000 --- a/code/game/machinery/computer/honkputer.dm +++ /dev/null @@ -1,118 +0,0 @@ -/obj/machinery/computer/HONKputer - name = "\improper HONKputer Mark I" - desc = "A yellow computer used in case of critically low levels of HONK." - icon = 'icons/obj/machines/HONKputer.dmi' - icon_state = "honkputer" - icon_keyboard = "key_honk" - icon_screen = "honkcomms" - light_color = LIGHT_COLOR_PINK - req_access = list(ACCESS_CLOWN) - circuit = /obj/item/circuitboard/HONKputer - var/authenticated = 0 - var/message_cooldown = 0 - var/state = STATE_DEFAULT - var/const/STATE_DEFAULT = 1 - -/obj/machinery/computer/HONKputer/process() - if(..()) - src.updateDialog() - -/obj/machinery/computer/HONKputer/Topic(href, href_list) - if(..()) - return 1 - if(is_away_level(src.z)) - to_chat(usr, "Unable to establish a connection: You're too far away from the station!") - return - usr.set_machine(src) - - if(!href_list["operation"]) - return - switch(href_list["operation"]) - // main interface - if("main") - src.state = STATE_DEFAULT - if("login") - var/mob/M = usr - var/obj/item/card/id/I = M.get_active_hand() - if(istype(I, /obj/item/pda)) - var/obj/item/pda/pda = I - I = pda.id - if(I && istype(I)) - if(src.check_access(I) || src.emagged==1) - authenticated = 1 - if("logout") - authenticated = 0 - - if("MessageHonkplanet") - if(src.authenticated==1) - if(message_cooldown) - to_chat(usr, "Arrays recycling. Please stand by.") - return - var/input = stripped_input(usr, "Please choose a message to transmit to your HONKbrothers on the homeworld. Transmission does not guarantee a response.", "To abort, send an empty message.", "") - if(!input || !(usr in view(1,src))) - return - HONK_announce(input, usr) - to_chat(usr, "Message transmitted.") - log_game("[key_name(usr)] has made a HONKplanet announcement: [input]") - message_cooldown = 1 - spawn(6000)//10 minute cooldown - message_cooldown = 0 - - src.updateUsrDialog() - -/obj/machinery/computer/HONKputer/emag_act(user as mob) - if(!emagged) - src.emagged = 1 - to_chat(user, "You scramble the login circuits, allowing anyone to use the console!") - -/obj/machinery/computer/HONKputer/attack_hand(mob/user as mob) - if(..()) - return - if(is_away_level(src.z)) - to_chat(user, "Unable to establish a connection: You're too far away from the station!") - return - - user.set_machine(src) - var/dat = "HONKputer Interface" - - if(istype(user, /mob/living/silicon)) - to_chat(user, "This console is not networked to the rest of the grid.") - return - - switch(src.state) - if(STATE_DEFAULT) - if(src.authenticated) - dat += "
    \[ Log Out \]" - dat += "
    \[ Send an emergency message to Honkplanet \]" - else - dat += "
    \[ Log In \]" - - - dat += "
    \[ [(src.state != STATE_DEFAULT) ? "Main Menu | " : ""]Close \]" - user << browse(dat, "window=honkputer;size=400x500") - onclose(user, "honkputer") - - -/obj/machinery/computer/HONKputer/attackby(obj/I, mob/user, params) - if(istype(I, /obj/item/screwdriver) && circuit) - var/obj/item/screwdriver/S = I - playsound(src.loc, S.usesound, 50, 1) - if(do_after(user, 20 * S.toolspeed, target = src)) - var/obj/structure/computerframe/HONKputer/A = new /obj/structure/computerframe/HONKputer( src.loc ) - var/obj/item/circuitboard/M = new circuit( A ) - A.circuit = M - A.anchored = 1 - for(var/obj/C in src) - C.loc = src.loc - if(src.stat & BROKEN) - to_chat(user, "The broken glass falls out.") - new /obj/item/shard( src.loc ) - A.state = 3 - A.icon_state = "3" - else - to_chat(user, "You disconnect the monitor.") - A.state = 4 - A.icon_state = "4" - qdel(src) - else - return ..() diff --git a/code/game/machinery/computer/robot.dm b/code/game/machinery/computer/robot.dm index ffa434e7f2d..d0674e34049 100644 --- a/code/game/machinery/computer/robot.dm +++ b/code/game/machinery/computer/robot.dm @@ -225,5 +225,6 @@ log_game("[key_name(usr)] emagged [key_name(R)] using robotic console!") message_admins("[key_name_admin(usr)] emagged [key_name_admin(R)] using robotic console!") R.emagged = TRUE + R.module.rebuild_modules() to_chat(R, "Failsafe protocols overriden. New tools available.") . = TRUE diff --git a/code/game/machinery/computer/salvage_ship.dm b/code/game/machinery/computer/salvage_ship.dm deleted file mode 100644 index 917849101a5..00000000000 --- a/code/game/machinery/computer/salvage_ship.dm +++ /dev/null @@ -1,110 +0,0 @@ -#define SALVAGE_SHIP_MOVE_TIME 300 -#define SALVAGE_SHIP_COOLDOWN 800 - -/obj/machinery/computer/salvage_ship - name = "salvage ship terminal" - icon = 'icons/obj/computer.dmi' - icon_keyboard = "syndie_key" - icon_screen = "syndishuttle" - req_access = list(ACCESS_SALVAGE_CAPTAIN) - var/area/curr_location - var/moving = 0 - var/lastMove = 0 - - -/obj/machinery/computer/salvage_ship/New() - . = ..() - curr_location = locate(/area/shuttle/salvage/start) - - -/obj/machinery/computer/salvage_ship/proc/salvage_move_to(area/destination as area) - if(moving) return - if(lastMove + SALVAGE_SHIP_COOLDOWN > world.time) return - var/area/dest_location = locate(destination) - if(curr_location == dest_location) return - - moving = 1 - lastMove = world.time - - if(curr_location.z != dest_location.z) - var/area/transit_location = locate(/area/shuttle/salvage/transit) - curr_location.move_contents_to(transit_location) - curr_location = transit_location - sleep(SALVAGE_SHIP_MOVE_TIME) - - curr_location.move_contents_to(dest_location) - curr_location = dest_location - moving = 0 - return 1 - -/obj/machinery/computer/salvage_ship/attack_ai(mob/user as mob) - src.add_hiddenprint(user) - return attack_hand(user) - -/obj/machinery/computer/salvage_ship/attack_hand(mob/user as mob) - if(!allowed(user)) - to_chat(user, "Access Denied") - return - - user.set_machine(src) - - var/dat = {"Location: [curr_location]
    - Ready to move[max(lastMove + SALVAGE_SHIP_COOLDOWN - world.time, 0) ? " in [max(round((lastMove + SALVAGE_SHIP_COOLDOWN - world.time) * 0.1), 0)] seconds" : ": now"]
    - Middle of Nowhere
    - Station Auxiliary Docking | - North of the Station | - East of the Station | - South of the Station
    - Trading Post
    - Clown Asteroid | - Derelict Station | - Ruskie DJ Station
    - Communications Satellite | - Abandoned Ship
    - Close"} - - user << browse(dat, "window=computer;size=575x450") - onclose(user, "computer") - return - - -/obj/machinery/computer/salvage_ship/Topic(href, href_list) - if(..()) - return 1 - if(!isliving(usr)) return - var/mob/living/user = usr - - if(in_range(src, user) || istype(user, /mob/living/silicon)) - user.set_machine(src) - - if(href_list["salvage"]) - salvage_move_to(/area/shuttle/salvage/start) - else if(href_list["start"]) - salvage_move_to(/area/shuttle/salvage/start) - else if(href_list["arrivals"]) - salvage_move_to(/area/shuttle/salvage/arrivals) - else if(href_list["derelict"]) - salvage_move_to(/area/shuttle/salvage/derelict) - else if(href_list["djstation"]) - salvage_move_to(/area/shuttle/salvage/djstation) - else if(href_list["north"]) - salvage_move_to(/area/shuttle/salvage/north) - else if(href_list["east"]) - salvage_move_to(/area/shuttle/salvage/east) - else if(href_list["south"]) - salvage_move_to(/area/shuttle/salvage/south) - else if(href_list["commssat"]) - salvage_move_to(/area/shuttle/salvage/commssat) - else if(href_list["abandoned_ship"]) - salvage_move_to(/area/shuttle/salvage/abandoned_ship) - else if(href_list["clown_asteroid"]) - salvage_move_to(/area/shuttle/salvage/clown_asteroid) - else if(href_list["trading_post"]) - salvage_move_to(/area/shuttle/salvage/trading_post) - - add_fingerprint(usr) - updateUsrDialog() - return - -/obj/machinery/computer/salvage_ship/bullet_act(obj/item/projectile/Proj) - visible_message("[Proj] ricochets off [src]!") diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index ff1b403300d..692c10d9706 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -1,6 +1,5 @@ #define SEC_DATA_R_LIST 1 // Record list -#define SEC_DATA_MAINT 2 // Records maintenance -#define SEC_DATA_RECORD 3 // Record +#define SEC_DATA_RECORD 2 // Record #define SEC_FIELD(N, V, E, LB) list(field = N, value = V, edit = E, line_break = LB) @@ -166,7 +165,7 @@ if("page") // Select Page if(!logged_in) return - var/page_num = clamp(text2num(params["page"]), SEC_DATA_R_LIST, SEC_DATA_MAINT) // SEC_DATA_RECORD cannot be accessed through this act + var/page_num = clamp(text2num(params["page"]), SEC_DATA_R_LIST, SEC_DATA_R_LIST) // SEC_DATA_RECORD cannot be accessed through this act current_page = page_num record_general = null record_security = null @@ -247,30 +246,6 @@ QDEL_NULL(record_security) update_all_mob_security_hud() set_temp("Security record deleted.") - if("delete_security_all") // Delete All Security Records - var/datum/ui_login/state = ui_login_get() - if(!logged_in) - return - if((ACCESS_MAGISTRATE in state.access) || (ACCESS_ARMORY in state.access)) - for(var/datum/data/record/S in GLOB.data_core.security) - qdel(S) - message_admins("[key_name_admin(usr)] has deleted all security records at [ADMIN_COORDJMP(usr)]") - usr.create_log(MISC_LOG, "deleted all security records") - update_all_mob_security_hud() - set_temp("All security records deleted.") - else - set_temp("Insufficient permissions to delete all records!") - return - if("delete_cell_logs") // Delete All Cell Logs - if(!logged_in) - return - if(!length(GLOB.cell_logs)) - set_temp("There are no cell logs to delete.") - return - message_admins("[key_name_admin(usr)] has deleted all cell logs at [ADMIN_COORDJMP(usr)]") - usr.create_log(MISC_LOG, "deleted all cell logs") - GLOB.cell_logs.Cut() - set_temp("All cell logs deleted.") if("comment_delete") // Delete Comment if(!logged_in) return @@ -499,6 +474,5 @@ density = FALSE #undef SEC_DATA_R_LIST -#undef SEC_DATA_MAINT #undef SEC_DATA_RECORD #undef SEC_FIELD diff --git a/code/game/machinery/computer/specops_shuttle.dm b/code/game/machinery/computer/specops_shuttle.dm deleted file mode 100644 index 216c4fd8b67..00000000000 --- a/code/game/machinery/computer/specops_shuttle.dm +++ /dev/null @@ -1,338 +0,0 @@ -//Config stuff -#define SPECOPS_MOVETIME 600 //Time to station is milliseconds. 60 seconds, enough time for everyone to be on the shuttle before it leaves. -#define SPECOPS_STATION_AREATYPE "/area/shuttle/specops/station" //Type of the spec ops shuttle area for station -#define SPECOPS_DOCK_AREATYPE "/area/shuttle/specops/centcom" //Type of the spec ops shuttle area for dock -#define SPECOPS_RETURN_DELAY 6000 //Time between the shuttle is capable of moving. - -GLOBAL_VAR_INIT(specops_shuttle_moving_to_station, 0) -GLOBAL_VAR_INIT(specops_shuttle_moving_to_centcom, 0) -GLOBAL_VAR_INIT(specops_shuttle_at_station, 0) -GLOBAL_VAR_INIT(specops_shuttle_can_send, 1) -GLOBAL_VAR_INIT(specops_shuttle_time, 0) -GLOBAL_VAR_INIT(specops_shuttle_timeleft, 0) - -/obj/machinery/computer/specops_shuttle - name = "\improper Spec. Ops. shuttle console" - icon = 'icons/obj/computer.dmi' - icon_keyboard = "security_key" - icon_screen = "syndishuttle" - light_color = LIGHT_COLOR_PURE_CYAN - req_access = list(ACCESS_CENT_SPECOPS) -// req_access = list(ACCESS_CENT_SPECOPS) - var/temp = null - var/hacked = 0 - var/allowedtocall = 0 - var/specops_shuttle_timereset = 0 - -/proc/specops_return() - var/obj/item/radio/intercom/announcer = new /obj/item/radio/intercom(null)//We need a fake AI to announce some stuff below. Otherwise it will be wonky. - announcer.config(list("Response Team" = 0)) - - var/message_tracker[] = list(0,1,2,3,5,10,30,45)//Create a a list with potential time values. - var/message = "\"THE SPECIAL OPERATIONS SHUTTLE IS PREPARING TO RETURN\""//Initial message shown. - if(announcer) - announcer.autosay(message, "A.L.I.C.E.", "Response Team", list(1,2)) - - while(GLOB.specops_shuttle_time - world.timeofday > 0) - var/ticksleft = GLOB.specops_shuttle_time - world.timeofday - - if(ticksleft > 1e5) - GLOB.specops_shuttle_time = world.timeofday + 10 // midnight rollover - GLOB.specops_shuttle_timeleft = (ticksleft / 10) - - //All this does is announce the time before launch. - if(announcer) - var/rounded_time_left = round(GLOB.specops_shuttle_timeleft)//Round time so that it will report only once, not in fractions. - if(rounded_time_left in message_tracker)//If that time is in the list for message announce. - message = "\"ALERT: [rounded_time_left] SECOND[(rounded_time_left!=1)?"S":""] REMAIN\"" - if(rounded_time_left==0) - message = "\"ALERT: TAKEOFF\"" - announcer.autosay(message, "A.L.I.C.E.", "Response Team") - message_tracker -= rounded_time_left//Remove the number from the list so it won't be called again next cycle. - //Should call all the numbers but lag could mean some issues. Oh well. Not much I can do about that. - - sleep(5) - - GLOB.specops_shuttle_moving_to_station = 0 - GLOB.specops_shuttle_moving_to_centcom = 0 - - GLOB.specops_shuttle_at_station = 1 - - var/area/start_location = locate(/area/shuttle/specops/station) - var/area/end_location = locate(/area/shuttle/specops/centcom) - - var/list/dstturfs = list() - var/throwy = world.maxy - - for(var/turf/T in end_location) - dstturfs += T - if(T.y < throwy) - throwy = T.y - - // hey you, get out of the way! - for(var/turf/T in dstturfs) - // find the turf to move things to - var/turf/D = locate(T.x, throwy - 1, 1) - //var/turf/E = get_step(D, SOUTH) - for(var/atom/movable/AM as mob|obj in T) - AM.Move(D) - if(istype(T, /turf/simulated)) - qdel(T) - - for(var/mob/living/carbon/bug in end_location) // If someone somehow is still in the shuttle's docking area... - bug.gib() - - for(var/mob/living/simple_animal/pest in end_location) // And for the other kind of bug... - pest.gib() - - start_location.move_contents_to(end_location) - - for(var/turf/T in get_area_turfs(end_location) ) - var/mob/M = locate(/mob) in T - to_chat(M, "You have arrived at Central Command. Operation has ended!") - - GLOB.specops_shuttle_at_station = 0 - - for(var/obj/machinery/computer/specops_shuttle/S in GLOB.machines) - S.specops_shuttle_timereset = world.time + SPECOPS_RETURN_DELAY - - qdel(announcer) - -/proc/specops_process() - var/area/centcom/specops/special_ops = locate()//Where is the specops area located? - var/obj/item/radio/intercom/announcer = new /obj/item/radio/intercom(null)//We need a fake AI to announce some stuff below. Otherwise it will be wonky. - announcer.config(list("Response Team" = 0)) - - var/message_tracker[] = list(0,1,2,3,5,10,30,45)//Create a a list with potential time values. - var/message = "\"THE SPECIAL OPERATIONS SHUTTLE IS PREPARING FOR LAUNCH\""//Initial message shown. - if(announcer) - announcer.autosay(message, "A.L.I.C.E.", "Response Team") - //message = "ARMORED SQUAD TAKE YOUR POSITION ON GRAVITY LAUNCH PAD" - //announcer.autosay(message, "A.L.I.C.E.", "Response Team") - - while(GLOB.specops_shuttle_time - world.timeofday > 0) - var/ticksleft = GLOB.specops_shuttle_time - world.timeofday - - if(ticksleft > 1e5) - GLOB.specops_shuttle_time = world.timeofday + 10 // midnight rollover - GLOB.specops_shuttle_timeleft = (ticksleft / 10) - - //All this does is announce the time before launch. - if(announcer) - var/rounded_time_left = round(GLOB.specops_shuttle_timeleft)//Round time so that it will report only once, not in fractions. - if(rounded_time_left in message_tracker)//If that time is in the list for message announce. - message = "\"ALERT: [rounded_time_left] SECOND[(rounded_time_left!=1)?"S":""] REMAIN\"" - if(rounded_time_left==0) - message = "\"ALERT: TAKEOFF\"" - announcer.autosay(message, "A.L.I.C.E.", "Response Team") - message_tracker -= rounded_time_left//Remove the number from the list so it won't be called again next cycle. - //Should call all the numbers but lag could mean some issues. Oh well. Not much I can do about that. - - sleep(5) - - GLOB.specops_shuttle_moving_to_station = 0 - GLOB.specops_shuttle_moving_to_centcom = 0 - - GLOB.specops_shuttle_at_station = 1 - if(GLOB.specops_shuttle_moving_to_station || GLOB.specops_shuttle_moving_to_centcom) return - - if(!specops_can_move()) - to_chat(usr, "The Special Operations shuttle is unable to leave.") - return - - //Begin Marauder launchpad. - spawn(0)//So it parallel processes it. - for(var/obj/machinery/door/poddoor/M in special_ops) - switch(M.id_tag) - if("ASSAULT0") - spawn(10)//1 second delay between each. - M.open() - if("ASSAULT1") - spawn(20) - M.open() - if("ASSAULT2") - spawn(30) - M.open() - if("ASSAULT3") - spawn(40) - M.open() - - sleep(10) - - var/spawn_marauder[] = new() - for(var/thing in GLOB.landmarks_list) - var/obj/effect/landmark/L = thing - if(L.name == "Marauder Entry") - spawn_marauder.Add(L.loc) - for(var/thing in GLOB.landmarks_list) - var/obj/effect/landmark/L = thing - if(L.name == "Marauder Exit") - var/obj/effect/portal/P = new(L.loc, pick(spawn_marauder)) - //P.invisibility = 101//So it is not seen by anyone. - P.failchance = 0//So it has no fail chance when teleporting. - spawn_marauder.Remove(P.target) - - sleep(10) - - for(var/obj/machinery/mass_driver/M in special_ops) - switch(M.id_tag) - if("ASSAULT0") - spawn(10) - M.drive() - if("ASSAULT1") - spawn(20) - M.drive() - if("ASSAULT2") - spawn(30) - M.drive() - if("ASSAULT3") - spawn(40) - M.drive() - - sleep(50)//Doors remain open for 5 seconds. - - for(var/obj/machinery/door/poddoor/M in special_ops) - switch(M.id_tag)//Doors close at the same time. - if("ASSAULT0") - spawn(0) - M.close() - if("ASSAULT1") - spawn(0) - M.close() - if("ASSAULT2") - spawn(0) - M.close() - if("ASSAULT3") - spawn(0) - M.close() - //End Marauder launchpad. - - var/area/start_location = locate(/area/shuttle/specops/centcom) - var/area/end_location = locate(/area/shuttle/specops/station) - - var/list/dstturfs = list() - var/throwy = world.maxy - - for(var/turf/T in end_location) - dstturfs += T - if(T.y < throwy) - throwy = T.y - - // hey you, get out of the way! - for(var/turf/T in dstturfs) - // find the turf to move things to - var/turf/D = locate(T.x, throwy - 1, 1) - //var/turf/E = get_step(D, SOUTH) - for(var/atom/movable/AM as mob|obj in T) - AM.Move(D) - if(istype(T, /turf/simulated)) - qdel(T) - - start_location.move_contents_to(end_location) - - for(var/turf/T in get_area_turfs(end_location) ) - var/mob/M = locate(/mob) in T - to_chat(M, "You have arrived to [station_name()]. Commence operation!") - - for(var/obj/machinery/computer/specops_shuttle/S in GLOB.machines) - S.specops_shuttle_timereset = world.time + SPECOPS_RETURN_DELAY - - qdel(announcer) - -/proc/specops_can_move() - if(GLOB.specops_shuttle_moving_to_station || GLOB.specops_shuttle_moving_to_centcom) - return 0 - for(var/obj/machinery/computer/specops_shuttle/S in GLOB.machines) - if(world.timeofday <= S.specops_shuttle_timereset) - return 0 - return 1 - -/obj/machinery/computer/specops_shuttle/attack_ai(mob/user as mob) - to_chat(user, "Access Denied.") - return 1 - -/obj/machinery/computer/specops_shuttle/attackby(I as obj, user as mob, params) - if(istype(I,/obj/item/card/emag)) - to_chat(user, "The electronic systems in this console are far too advanced for your primitive hacking peripherals.") - else - return ..() - -/obj/machinery/computer/specops_shuttle/attack_hand(mob/user as mob) - if(!allowed(user)) - to_chat(user, "Access Denied.") - return - -//Commented out so admins can do shenanigans at their leisure. Also makes the force-spawned admin ERTs able to use the shuttle. -// if(sent_strike_team == 0 && send_emergency_team == 0) -// to_chat(usr, "The strike team has not yet deployed.") -// return - - if(..()) - return - - user.machine = src - var/dat - if(temp) - dat = temp - else - dat += {"
    Special Operations Shuttle
    - \nLocation: [GLOB.specops_shuttle_moving_to_station || GLOB.specops_shuttle_moving_to_centcom ? "Departing for [station_name()] in ([GLOB.specops_shuttle_timeleft] seconds.)":GLOB.specops_shuttle_at_station ? "Station":"Dock"]
    - [GLOB.specops_shuttle_moving_to_station || GLOB.specops_shuttle_moving_to_centcom ? "\n*The Special Ops. shuttle is already leaving.*
    \n
    ":GLOB.specops_shuttle_at_station ? "\nShuttle standing by...
    \n
    ":"\nDepart to [station_name()]
    \n
    "] - \nClose"} - - user << browse(dat, "window=computer;size=575x450") - onclose(user, "computer") - return - -/obj/machinery/computer/specops_shuttle/Topic(href, href_list) - if(..()) - return 1 - - if((usr.contents.Find(src) || (in_range(src, usr) && istype(loc, /turf))) || (istype(usr, /mob/living/silicon))) - usr.machine = src - - if(href_list["sendtodock"]) - if(!GLOB.specops_shuttle_at_station|| GLOB.specops_shuttle_moving_to_station || GLOB.specops_shuttle_moving_to_centcom) return - - if(!specops_can_move()) - to_chat(usr, "Central Command will not allow the Special Operations shuttle to return yet.") - if(world.timeofday <= specops_shuttle_timereset) - if(((world.timeofday - specops_shuttle_timereset)/10) > 60) - to_chat(usr, "[-((world.timeofday - specops_shuttle_timereset)/10)/60] minutes remain!") - to_chat(usr, "[-(world.timeofday - specops_shuttle_timereset)/10] seconds remain!") - return - - to_chat(usr, "The Special Operations shuttle will arrive at Central Command in [(SPECOPS_MOVETIME/10)] seconds.") - - temp += "Shuttle departing.

    OK" - updateUsrDialog() - - GLOB.specops_shuttle_moving_to_centcom = 1 - GLOB.specops_shuttle_time = world.timeofday + SPECOPS_MOVETIME - spawn(0) - specops_return() - - else if(href_list["sendtostation"]) - if(GLOB.specops_shuttle_at_station || GLOB.specops_shuttle_moving_to_station || GLOB.specops_shuttle_moving_to_centcom) return - - if(!specops_can_move()) - to_chat(usr, "The Special Operations shuttle is unable to leave.") - return - - to_chat(usr, "The Special Operations shuttle will arrive on [station_name()] in [(SPECOPS_MOVETIME/10)] seconds.") - - temp += "Shuttle departing.

    OK" - updateUsrDialog() - - GLOB.specops_shuttle_moving_to_station = 1 - - GLOB.specops_shuttle_time = world.timeofday + SPECOPS_MOVETIME - spawn(0) - specops_process() - - else if(href_list["mainmenu"]) - temp = null - - add_fingerprint(usr) - updateUsrDialog() - return diff --git a/code/game/machinery/computer/syndicate_specops_shuttle.dm b/code/game/machinery/computer/syndicate_specops_shuttle.dm deleted file mode 100644 index 6b72e5bbf5b..00000000000 --- a/code/game/machinery/computer/syndicate_specops_shuttle.dm +++ /dev/null @@ -1,254 +0,0 @@ -//Config stuff -#define SYNDICATE_ELITE_MOVETIME 600 //Time to station is milliseconds. 60 seconds, enough time for everyone to be on the shuttle before it leaves. -#define SYNDICATE_ELITE_STATION_AREATYPE "/area/shuttle/syndicate_elite/station" //Type of the spec ops shuttle area for station -#define SYNDICATE_ELITE_DOCK_AREATYPE "/area/shuttle/syndicate_elite/mothership" //Type of the spec ops shuttle area for dock - -GLOBAL_VAR_INIT(syndicate_elite_shuttle_moving_to_station, 0) -GLOBAL_VAR_INIT(syndicate_elite_shuttle_moving_to_mothership, 0) -GLOBAL_VAR_INIT(syndicate_elite_shuttle_at_station, 0) -GLOBAL_VAR_INIT(syndicate_elite_shuttle_can_send, 1) -GLOBAL_VAR_INIT(syndicate_elite_shuttle_time, 0) -GLOBAL_VAR_INIT(syndicate_elite_shuttle_timeleft, 0) - -/obj/machinery/computer/syndicate_elite_shuttle - name = "\improper Elite Syndicate Squad shuttle console" - icon = 'icons/obj/computer.dmi' - icon_keyboard = "syndie_key" - icon_screen = "syndishuttle" - light_color = LIGHT_COLOR_PURE_CYAN - req_access = list(ACCESS_SYNDICATE) - bubble_icon = "syndibot" - var/temp = null - var/hacked = 0 - var/allowedtocall = 0 - -/proc/syndicate_elite_process() - var/area/syndicate_mothership/control/syndicate_ship = locate()//To find announcer. This area should exist for this proc to work. - //var/area/syndicate_mothership/elite_squad/elite_squad = locate()//Where is the specops area located? - var/mob/living/silicon/decoy/announcer = locate() in syndicate_ship//We need a fake AI to announce some stuff below. Otherwise it will be wonky. - - var/message_tracker[] = list(0,1,2,3,5,10,30,45)//Create a a list with potential time values. - var/message = "THE SYNDICATE ELITE SHUTTLE IS PREPARING FOR LAUNCH"//Initial message shown. - if(announcer) - announcer.say(message) - // message = "ARMORED SQUAD TAKE YOUR POSITION ON GRAVITY LAUNCH PAD" - // announcer.say(message) - - while(GLOB.syndicate_elite_shuttle_time - world.timeofday > 0) - var/ticksleft = GLOB.syndicate_elite_shuttle_time - world.timeofday - - if(ticksleft > 1e5) - GLOB.syndicate_elite_shuttle_time = world.timeofday // midnight rollover - GLOB.syndicate_elite_shuttle_timeleft = (ticksleft / 10) - - //All this does is announce the time before launch. - if(announcer) - var/rounded_time_left = round(GLOB.syndicate_elite_shuttle_timeleft)//Round time so that it will report only once, not in fractions. - if(rounded_time_left in message_tracker)//If that time is in the list for message announce. - message = "ALERT: [rounded_time_left] SECOND[(rounded_time_left!=1)?"S":""] REMAIN" - if(rounded_time_left==0) - message = "ALERT: TAKEOFF" - announcer.say(message) - message_tracker -= rounded_time_left//Remove the number from the list so it won't be called again next cycle. - //Should call all the numbers but lag could mean some issues. Oh well. Not much I can do about that. - - sleep(5) - - GLOB.syndicate_elite_shuttle_moving_to_station = 0 - GLOB.syndicate_elite_shuttle_moving_to_mothership = 0 - - GLOB.syndicate_elite_shuttle_at_station = 1 - if(GLOB.syndicate_elite_shuttle_moving_to_station || GLOB.syndicate_elite_shuttle_moving_to_mothership) return - - if(!syndicate_elite_can_move()) - to_chat(usr, "The Syndicate Elite shuttle is unable to leave.") - return - -/* - //Begin Marauder launchpad. - spawn(0)//So it parallel processes it. - for(var/obj/machinery/door/poddoor/M in elite_squad) - switch(M.id) - if("ASSAULT0") - spawn(10)//1 second delay between each. - M.open() - if("ASSAULT1") - spawn(20) - M.open() - if("ASSAULT2") - spawn(30) - M.open() - if("ASSAULT3") - spawn(40) - M.open() - - sleep(10) - - var/spawn_marauder[] = new() - for(var/obj/effect/landmark/L in GLOB.landmarks_list) - if(L.name == "Marauder Entry") - spawn_marauder.Add(L) - for(var/obj/effect/landmark/L in GLOB.landmarks_list) - if(L.name == "Marauder Exit") - var/obj/effect/portal/P = new(L.loc) - P.invisibility = 101//So it is not seen by anyone. - P.failchance = 0//So it has no fail chance when teleporting. - P.target = pick(spawn_marauder)//Where the marauder will arrive. - spawn_marauder.Remove(P.target) - - sleep(10) - - for(var/obj/machinery/mass_driver/M in elite_squad) - switch(M.id) - if("ASSAULT0") - spawn(10) - M.drive() - if("ASSAULT1") - spawn(20) - M.drive() - if("ASSAULT2") - spawn(30) - M.drive() - if("ASSAULT3") - spawn(40) - M.drive() - - sleep(50)//Doors remain open for 5 seconds. - - for(var/obj/machinery/door/poddoor/M in elite_squad) - switch(M.id)//Doors close at the same time. - if("ASSAULT0") - spawn(0) - M.close() - if("ASSAULT1") - spawn(0) - M.close() - if("ASSAULT2") - spawn(0) - M.close() - if("ASSAULT3") - spawn(0) - M.close() - elite_squad.readyreset()//Reset firealarm after the team launched. - */ - //End Marauder launchpad. - - for(var/thing in GLOB.landmarks_list) - var/obj/effect/landmark/L = thing - if(L.name == "Syndicate Breach Area") - explosion(L.loc,4,6,8,10,0) - - sleep(40) - - - var/area/start_location = locate(/area/shuttle/syndicate_elite/mothership) - var/area/end_location = locate(/area/shuttle/syndicate_elite/station) - - var/list/dstturfs = list() - var/throwy = world.maxy - - for(var/turf/T in end_location) - dstturfs = T - if(T.y < throwy) - throwy = T.y - - // hey you, get out of the way! - for(var/turf/T in dstturfs) - // find the turf to move things to - var/turf/D = locate(T.x, throwy - 1, 1) - //var/turf/E = get_step(D, SOUTH) - for(var/atom/movable/AM as mob|obj in T) - AM.Move(D) - if(istype(T, /turf/simulated)) - qdel(T) - - for(var/mob/living/carbon/bug in end_location) // If someone somehow is still in the shuttle's docking area... - bug.gib() - - for(var/mob/living/simple_animal/pest in end_location) // And for the other kind of bug... - pest.gib() - - start_location.move_contents_to(end_location) - - for(var/turf/T in get_area_turfs(end_location) ) - var/mob/M = locate(/mob) in T - to_chat(M, "You have arrived to [station_name()]. Commence operation!") - -/proc/syndicate_elite_can_move() - if(GLOB.syndicate_elite_shuttle_moving_to_station || GLOB.syndicate_elite_shuttle_moving_to_mothership) return 0 - else return 1 - -/obj/machinery/computer/syndicate_elite_shuttle/attack_ai(mob/user as mob) - to_chat(user, "Access Denied.") - return 1 - -/obj/machinery/computer/syndicate_elite_shuttle/attackby(I as obj, user as mob, params) - if(istype(I,/obj/item/card/emag)) - to_chat(user, "The electronic systems in this console are far too advanced for your primitive hacking peripherals.") - else - return ..() - -/obj/machinery/computer/syndicate_elite_shuttle/attack_hand(mob/user as mob) - if(!allowed(user)) - to_chat(user, "Access Denied.") - return - -// if(sent_syndicate_strike_team == 0) -// to_chat(usr, "The strike team has not yet deployed.") -// return - - if(..()) - return - - user.set_machine(src) - var/dat - if(temp) - dat = temp - else - dat = {"
    Special Operations Shuttle
    - \nLocation: [GLOB.syndicate_elite_shuttle_moving_to_station || GLOB.syndicate_elite_shuttle_moving_to_mothership ? "Departing for [station_name()] in ([GLOB.syndicate_elite_shuttle_timeleft] seconds.)":GLOB.syndicate_elite_shuttle_at_station ? "Station":"Dock"]
    - [GLOB.syndicate_elite_shuttle_moving_to_station || GLOB.syndicate_elite_shuttle_moving_to_mothership ? "\n*The Syndicate Elite shuttle is already leaving.*
    \n
    ":GLOB.syndicate_elite_shuttle_at_station ? "\nShuttle Offline
    \n
    ":"\nDepart to [station_name()]
    \n
    "] - \nClose"} - - user << browse(dat, "window=computer;size=575x450") - onclose(user, "computer") - return - -/obj/machinery/computer/syndicate_elite_shuttle/Topic(href, href_list) - if(..()) - return 1 - - if((usr.contents.Find(src) || (in_range(src, usr) && istype(loc, /turf))) || (istype(usr, /mob/living/silicon))) - usr.set_machine(src) - - if(href_list["sendtodock"]) - if(!GLOB.syndicate_elite_shuttle_at_station|| GLOB.syndicate_elite_shuttle_moving_to_station || GLOB.syndicate_elite_shuttle_moving_to_mothership) return - - to_chat(usr, "The Syndicate will not allow the Elite Squad shuttle to return.") - return - - else if(href_list["sendtostation"]) - if(GLOB.syndicate_elite_shuttle_at_station || GLOB.syndicate_elite_shuttle_moving_to_station || GLOB.syndicate_elite_shuttle_moving_to_mothership) return - - if(!specops_can_move()) - to_chat(usr, "The Syndicate Elite shuttle is unable to leave.") - return - - to_chat(usr, "The Syndicate Elite shuttle will arrive on [station_name()] in [(SYNDICATE_ELITE_MOVETIME/10)] seconds.") - - temp = "Shuttle departing.

    OK" - updateUsrDialog() - - GLOB.syndicate_elite_shuttle_moving_to_station = 1 - - GLOB.syndicate_elite_shuttle_time = world.timeofday + SYNDICATE_ELITE_MOVETIME - spawn(0) - syndicate_elite_process() - - - else if(href_list["mainmenu"]) - temp = null - - add_fingerprint(usr) - updateUsrDialog() - return diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index 322141dee0a..a4879448aa0 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -75,11 +75,11 @@ if(1) if(istype(P, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/C = P - if(C.amount >= 5) + if(C.get_amount() >= 5) playsound(src.loc, C.usesound, 50, 1) to_chat(user, "You start to add cables to the frame.") if(do_after(user, 20 * C.toolspeed, target = src)) - if(state == 1 && C.amount >= 5 && C.use(5)) + if(state == 1 && C.get_amount() >= 5 && C.use(5)) to_chat(user, "You add cables to the frame.") state = 2 icon_state = "box_1" @@ -193,8 +193,8 @@ playsound(src.loc, P.usesound, 50, 1) if(istype(P, /obj/item/stack)) var/obj/item/stack/S = P - var/camt = min(S.amount, req_components[I]) - var/obj/item/stack/NS = new P.type(src) + var/camt = min(S.get_amount(), req_components[I]) + var/obj/item/stack/NS = new S.merge_type(src) NS.amount = camt NS.update_icon() S.use(camt) diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index 23f217bf32b..48e224c3d38 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -720,6 +720,10 @@ // Won't announce when used for cryoing. silent = TRUE +/obj/machinery/cryopod/offstation/right + orient_right = TRUE + icon_state = "body_scanner_0-r" + /obj/machinery/computer/cryopod/robot name = "robotic storage console" desc = "An interface between crew and the robotic storage systems" diff --git a/code/game/machinery/defib_mount.dm b/code/game/machinery/defib_mount.dm index fe012fdca75..fe333ebf4ef 100644 --- a/code/game/machinery/defib_mount.dm +++ b/code/game/machinery/defib_mount.dm @@ -52,7 +52,7 @@ else . += "Its locking clamps can be [clamps_locked ? "dis" : ""]engaged by swiping an ID with access." else - . += "There are a pair of bolts in the defib unit housing securing the [src] to the wall." + . += "There are a pair of bolts in the defibrillator unit housing, securing [src] to the wall." /obj/machinery/defibrillator_mount/process() if(defib && defib.cell && defib.cell.charge < defib.cell.maxcharge && is_operational()) @@ -117,7 +117,7 @@ /obj/machinery/defibrillator_mount/wrench_act(mob/user, obj/item/I) . = TRUE if(defib) - to_chat(user, "The [defib] is blocking access to the bolts!") + to_chat(user, "[defib] is blocking access to the bolts!") return if(!I.use_tool(src, user, 0, volume = I.tool_volume)) return diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm index 9b913dbf148..e23aa154d6d 100644 --- a/code/game/machinery/doors/airlock_types.dm +++ b/code/game/machinery/doors/airlock_types.dm @@ -532,6 +532,9 @@ L.throw_at(throwtarget, 5, 1,src) return FALSE +/obj/machinery/door/airlock/cult/screwdriver_act(mob/user, obj/item/I) + return + /obj/machinery/door/airlock/cult/cult_conceal() icon = stealth_icon overlays_file = stealth_overlays diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 59d839018bb..88dc39e568c 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -195,11 +195,6 @@ /obj/machinery/door/window/narsie_act() color = NARSIE_WINDOW_COLOUR -/obj/machinery/door/window/ratvar_act() - var/obj/machinery/door/window/clockwork/C = new(loc, dir) - C.name = name - qdel(src) - /obj/machinery/door/window/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) ..() if(exposed_temperature > T0C + (reinf ? 1600 : 800)) @@ -358,9 +353,6 @@ if(prob(80/severity)) open() -/obj/machinery/door/window/clockwork/ratvar_act() - obj_integrity = max_integrity - /obj/machinery/door/window/clockwork/hasPower() return TRUE //yup that's power all right diff --git a/code/game/machinery/dye_generator.dm b/code/game/machinery/dye_generator.dm index 920a111496e..32d59cf7485 100644 --- a/code/game/machinery/dye_generator.dm +++ b/code/game/machinery/dye_generator.dm @@ -43,7 +43,7 @@ if(istype(I, /obj/item/hair_dye_bottle)) var/obj/item/hair_dye_bottle/HD = I - user.visible_message("[user] fills the [HD] up with some dye.","You fill the [HD] up with some hair dye.") + user.visible_message("[user] fills [HD] up with some dye.","You fill [HD] up with some hair dye.") HD.dye_color = dye_color HD.update_dye_overlay() return @@ -52,7 +52,7 @@ //Hair Dye Bottle /obj/item/hair_dye_bottle - name = "Hair Dye Bottle" + name = "hair dye bottle" desc = "A refillable bottle used for holding hair dyes of all sorts of colors." icon = 'icons/obj/items.dmi' icon_state = "hairdyebottle" diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm index 541a544c02b..da1d105f145 100644 --- a/code/game/machinery/firealarm.dm +++ b/code/game/machinery/firealarm.dm @@ -69,7 +69,7 @@ FIRE ALARM if(!emagged) emagged = TRUE if(user) - user.visible_message("Sparks fly out of the [src]!", + user.visible_message("Sparks fly out of [src]!", "You emag [src], disabling its thermal sensors.") playsound(loc, 'sound/effects/sparks4.ogg', 50, 1) @@ -98,9 +98,8 @@ FIRE ALARM if(istype(I, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/coil = I if(!coil.use(5)) - to_chat(user, "You cut the wires!") + to_chat(user, "You need a total of five cables to wire [src]!") return - buildstage = FIRE_ALARM_READY playsound(get_turf(src), I.usesound, 50, 1) to_chat(user, "You wire [src]!") diff --git a/code/game/machinery/mass_driver.dm b/code/game/machinery/mass_driver.dm index cae3e78186e..a8e2cecb1d1 100644 --- a/code/game/machinery/mass_driver.dm +++ b/code/game/machinery/mass_driver.dm @@ -21,7 +21,7 @@ return 1 if(istype(W, /obj/item/screwdriver)) - to_chat(user, "You begin to unscrew the bolts off the [src]...") + to_chat(user, "You begin to unscrew the bolts off [src]...") playsound(get_turf(src), W.usesound, 50, 1) if(do_after(user, 30 * W.toolspeed, target = src)) var/obj/machinery/mass_driver_frame/F = new(get_turf(src)) @@ -126,7 +126,7 @@ var/obj/item/stack/cable_coil/C = W to_chat(user, "You start adding cables to \the [src]...") playsound(get_turf(src), C.usesound, 50, 1) - if(do_after(user, 20 * C.toolspeed, target = src) && (C.amount >= 2) && (build == 2)) + if(do_after(user, 20 * C.toolspeed, target = src) && (C.get_amount() >= 2) && (build == 2)) C.use(2) to_chat(user, "You've added cables to \the [src].") build++ @@ -146,7 +146,7 @@ var/obj/item/stack/rods/R = W to_chat(user, "You begin to complete \the [src]...") playsound(get_turf(src), R.usesound, 50, 1) - if(do_after(user, 20 * R.toolspeed, target = src) && (R.amount >= 2) && (build == 3)) + if(do_after(user, 20 * R.toolspeed, target = src) && (R.get_amount() >= 2) && (build == 3)) R.use(2) to_chat(user, "You've added the grille to \the [src].") build++ diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm index 69166311caa..fffdea3be1f 100644 --- a/code/game/machinery/pipe/construction.dm +++ b/code/game/machinery/pipe/construction.dm @@ -145,6 +145,8 @@ else if(our_rpd.mode == RPD_FLIP_MODE) flip() else if(our_rpd.mode == RPD_DELETE_MODE) + if(pipe_type == PIPE_CIRCULATOR) //Skip TEG heat circulators, they aren't really pipes + return ..() our_rpd.delete_single_pipe(user, src) else return ..() @@ -499,13 +501,11 @@ P.on_construction(dir, pipe_dir, color) user.visible_message( \ - "[user] fastens the [src].", \ - "You have fastened the [src].", \ - "You hear ratchet.") + "[user] fastens [src].", + "You fasten [src].", + "You hear a ratchet.") qdel(src) // remove the pipe item - return - /obj/item/pipe_meter name = "meter" desc = "A meter that can be laid on pipes" diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index 4f22d1c2bb2..a9be1649ff1 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -657,6 +657,7 @@ GLOBAL_LIST_EMPTY(turret_icons) qdel(flick_holder) set_raised_raising(FALSE, FALSE) + set_angle(0) update_icon() /obj/machinery/porta_turret/on_assess_perp(mob/living/carbon/human/perp) @@ -678,7 +679,8 @@ GLOBAL_LIST_EMPTY(turret_icons) last_target = target if(has_cover) popUp() //pop the turret up if it's not already up. - setDir(get_dir(src, target)) //even if you can't shoot, follow the target + // Set angle + set_angle(get_angle(src, target)) shootAt(target) return TRUE diff --git a/code/game/machinery/quantum_pad.dm b/code/game/machinery/quantum_pad.dm index f07e2e443e7..1836e149334 100644 --- a/code/game/machinery/quantum_pad.dm +++ b/code/game/machinery/quantum_pad.dm @@ -63,7 +63,7 @@ M.set_multitool_buffer(user, src) else linked_pad = M.buffer - to_chat(user, "You link the [src] to the one in the [I.name]'s buffer.") + to_chat(user, "You link [src] to the one in [I]'s buffer.") /obj/machinery/quantumpad/screwdriver_act(mob/user, obj/item/I) . = TRUE diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm index 9063a126317..6fa1e79e764 100644 --- a/code/game/machinery/rechargestation.dm +++ b/code/game/machinery/rechargestation.dm @@ -7,11 +7,18 @@ use_power = IDLE_POWER_USE idle_power_usage = 5 active_power_usage = 1000 + /// A reference to the occupant currently sitting inside the recharger. var/mob/occupant = null + /// What type of circuit board is required to build this machine. var/circuitboard = /obj/item/circuitboard/cyborgrecharger + /// How fast the recharger can give charge to the occupants energy cell. Based on capacitors and the cell the recharger has. var/recharge_speed + /// How much nutrition is given to the occupant. Based on capacitors and the cell the recharger has. Only relevent for IPCs. var/recharge_speed_nutrition + /// How much the occupant is repaired every cycle. Based on what manipulator the recharger has. var/repairs + /// How efficiently the recharger is able to recharge consumable items such as metal, glass, chemicals in sprays, welding tool fuel, etc. + var/consumable_recharge_coeff /obj/machinery/recharge_station/Destroy() go_out() @@ -42,6 +49,7 @@ recharge_speed = 0 recharge_speed_nutrition = 0 repairs = 0 + // The recharge_speed can be anywhere from 200 to 3200, depending on the capacitors and the cell. for(var/obj/item/stock_parts/capacitor/C in component_parts) recharge_speed += C.rating * 100 recharge_speed_nutrition += C.rating * 10 @@ -52,11 +60,14 @@ recharge_speed *= multiplier recharge_speed_nutrition *= multiplier + // This coefficient can be anywhere from 1, to 16. + consumable_recharge_coeff = max(1, recharge_speed / 200) + /obj/machinery/recharge_station/process() if(!(NOPOWER|BROKEN)) return - if(src.occupant) + if(occupant) process_occupant() for(var/mob/M as mob in src) // makes sure that simple mobs don't get stuck inside a sleeper when they resist out of occupant's grasp @@ -133,20 +144,20 @@ return TRUE /obj/machinery/recharge_station/proc/process_occupant() - if(src.occupant) - if(istype(occupant, /mob/living/silicon/robot)) - var/mob/living/silicon/robot/R = occupant - restock_modules() - if(repairs) - R.heal_overall_damage(repairs, repairs) - if(R.cell) - R.cell.charge = min(R.cell.charge + recharge_speed, R.cell.maxcharge) - else if(istype(occupant, /mob/living/carbon/human)) - var/mob/living/carbon/human/H = occupant - if(H.get_int_organ(/obj/item/organ/internal/cell) && H.nutrition < 450) - H.set_nutrition(min(H.nutrition + recharge_speed_nutrition, 450)) - if(repairs) - H.heal_overall_damage(repairs, repairs, TRUE, 0, 1) + if(isrobot(occupant)) + var/mob/living/silicon/robot/R = occupant + if(R.module) + R.module.recharge_consumables(R, consumable_recharge_coeff) // This will handle all of a cyborg's items. + if(repairs) + R.heal_overall_damage(repairs, repairs) + if(R.cell) + R.cell.charge = min(R.cell.charge + recharge_speed, R.cell.maxcharge) + else if(ishuman(occupant)) + var/mob/living/carbon/human/H = occupant + if(H.get_int_organ(/obj/item/organ/internal/cell) && H.nutrition < 450) + H.set_nutrition(min(H.nutrition + recharge_speed_nutrition, 450)) + if(repairs) + H.heal_overall_damage(repairs, repairs, TRUE, 0, 1) /obj/machinery/recharge_station/proc/go_out() if(!occupant) @@ -157,74 +168,6 @@ use_power = IDLE_POWER_USE return -/obj/machinery/recharge_station/proc/restock_modules() - if(src.occupant) - if(istype(occupant, /mob/living/silicon/robot)) - var/mob/living/silicon/robot/R = occupant - var/coeff = recharge_speed / 200 - if(R.module && R.module.modules) - var/list/um = R.contents|R.module.modules - // ^ makes sinle list of active (R.contents) and inactive modules (R.module.modules) - for(var/obj/O in um) - // Engineering - if(istype(O,/obj/item/stack/sheet)) - var/obj/item/stack/sheet/S = O - if(S.amount < S.max_amount) - S.amount += round(min(1 * coeff, S.max_amount - S.amount)) - // Security - if(istype(O,/obj/item/flash)) - var/obj/item/flash/F = O - if(F.broken) - F.broken = 0 - F.times_used = 0 - F.icon_state = "flash" - if(istype(O,/obj/item/gun/energy)) - var/obj/item/gun/energy/D = O - if(D.cell.charge < D.cell.maxcharge) - var/obj/item/ammo_casing/energy/E = D.ammo_type[D.select] - D.cell.give(E.e_cost) - D.on_recharge() - D.update_icon() - else - D.charge_tick = 0 - if(istype(O,/obj/item/melee/baton)) - var/obj/item/melee/baton/B = O - if(B.cell) - B.cell.charge = B.cell.maxcharge - //Service - if(istype(O,/obj/item/reagent_containers/food/condiment/enzyme)) - if(O.reagents.get_reagent_amount("enzyme") < 50) - O.reagents.add_reagent("enzyme", 2 * coeff) - //Janitor - if(istype(O, /obj/item/lightreplacer)) - var/obj/item/lightreplacer/LR = O - var/i = 1 - for(1, i <= coeff, i++) - LR.Charge(occupant) - //Fire extinguisher - if(istype(O, /obj/item/extinguisher)) - var/obj/item/extinguisher/ext = O - ext.reagents.check_and_add("water", ext.max_water, 5 * coeff) - //Welding tools - if(istype(O, /obj/item/weldingtool)) - var/obj/item/weldingtool/weld = O - weld.reagents.check_and_add("fuel", weld.maximum_fuel, 2 * coeff) - if(R) - if(R.module) - R.module.respawn_consumable(R) - - //Emagged items for janitor and medical borg - if(R.module.emag) - if(istype(R.module.emag, /obj/item/reagent_containers/spray)) - var/obj/item/reagent_containers/spray/S = R.module.emag - if(S.name == "polyacid spray") - S.reagents.add_reagent("facid", 2 * coeff) - if(S.name == "lube spray") - S.reagents.add_reagent("lube", 2 * coeff) - else if(S.name == "acid synthesizer") - S.reagents.add_reagent("facid", 2 * coeff) - S.reagents.add_reagent("sacid", 2 * coeff) - /obj/machinery/recharge_station/verb/move_eject() set category = "Object" set src in oview(1) diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm index 99e0b45a90b..3234001ec2f 100644 --- a/code/game/machinery/recycler.dm +++ b/code/game/machinery/recycler.dm @@ -77,7 +77,7 @@ emergency_mode = FALSE update_icon() playsound(src, "sparks", 75, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) - to_chat(user, "You use the cryptographic sequencer on the [name].") + to_chat(user, "You use the cryptographic sequencer on [src].") /obj/machinery/recycler/update_icon() ..() diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index 5535c8bbe90..467e77cdaf5 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -7,6 +7,7 @@ opacity = FALSE anchored = 1 resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF + flags_2 = RAD_NO_CONTAMINATE_2 max_integrity = 200 /obj/machinery/shield/New() @@ -125,7 +126,7 @@ return visible /obj/machinery/shieldgen - name = "Emergency shield projector" + name = "emergency shield projector" desc = "Used to seal minor hull breaches." icon = 'icons/obj/objects.dmi' icon_state = "shieldoff" @@ -159,7 +160,12 @@ for(var/turf/target_tile in range(2, src)) if(istype(target_tile,/turf/space) && !(locate(/obj/machinery/shield) in target_tile)) if(malfunction && prob(33) || !malfunction) - deployed_shields += new /obj/machinery/shield(target_tile) + var/obj/machinery/shield/new_shield = new(target_tile) + RegisterSignal(new_shield, COMSIG_PARENT_QDELETING, .proc/remove_shield) // Ensures they properly GC + deployed_shields += new_shield + +/obj/machinery/shieldgen/proc/remove_shield(obj/machinery/shield/S) + deployed_shields -= S /obj/machinery/shieldgen/proc/shields_down() if(!active) @@ -168,15 +174,12 @@ active = 0 update_icon() - for(var/obj/machinery/shield/shield_tile in deployed_shields) - qdel(shield_tile) + QDEL_LIST(deployed_shields) /obj/machinery/shieldgen/process() if(malfunction && active) - if(deployed_shields.len && prob(5)) - qdel(pick(deployed_shields)) - - return + if(length(deployed_shields) && prob(5)) + qdel(pick_n_take(deployed_shields)) /obj/machinery/shieldgen/proc/checkhp() if(health <= 30) @@ -250,7 +253,7 @@ health = max_health malfunction = TRUE playsound(loc, coil.usesound, 50, 1) - to_chat(user, "You repair the [src]!") + to_chat(user, "You repair [src]!") update_icon() else if(istype(I, /obj/item/card/id) || istype(I, /obj/item/pda)) @@ -406,7 +409,7 @@ active = 2 if(active >= 1) if(power == 0) - visible_message("The [name] shuts down due to lack of power!", \ + visible_message("[name] shuts down due to lack of power!", \ "You hear heavy droning fade out") icon_state = "Shield_Gen" active = 0 diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 9fe8c781c09..8ab3dd0b966 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -161,7 +161,7 @@ name = "syndicate suit storage unit" suit_type = /obj/item/clothing/suit/space/hardsuit/syndi mask_type = /obj/item/clothing/mask/gas/syndicate - storage_type = /obj/item/tank/jetpack/oxygen/harness + storage_type = /obj/item/tank/internals/oxygen/red req_access = list(ACCESS_SYNDICATE) safeties = FALSE //in a syndicate base, everything can be used as a murder weapon at a moment's notice. @@ -315,7 +315,7 @@ if(store_item(I, user)) update_icon() SStgui.update_uis(src) - to_chat(user, "You load the [I] into the storage compartment.") + to_chat(user, "You load [I] into the storage compartment.") else to_chat(user, "You can't fit [I] into [src]!") return @@ -382,10 +382,10 @@ return var/mob/living/target = A if(!state_open) - to_chat(user, "The [src]'s doors are shut!") + to_chat(user, "[src]'s doors are shut!") return if(!is_operational()) - to_chat(user, "The [src] is not operational!") + to_chat(user, "[src] is not operational!") return if(occupant || helmet || suit || storage) to_chat(user, "It's too cluttered inside to fit in!") diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm index ed196abc6dc..9294bb66804 100644 --- a/code/game/machinery/syndicatebomb.dm +++ b/code/game/machinery/syndicatebomb.dm @@ -540,7 +540,7 @@ to_chat(user, "You load [src] with [I].") I.loc = src else - to_chat(user, "The [I] wont fit! The [src] can only hold up to [max_beakers] containers.") + to_chat(user, "[I] won't fit! [src] can only hold up to [max_beakers] containers.") return else return ..() diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index 9b7af34349f..9ae9abe6249 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -56,7 +56,7 @@ return L.forceMove(src) locked = L - to_chat(user, "You insert the GPS device into the [src]'s slot.") + to_chat(user, "You insert the GPS device into [src]'s slot.") else return ..() @@ -313,7 +313,7 @@ name = "teleporter hub" desc = "It's the hub of a teleporting machine." icon_state = "tele0" - var/accurate = FALSE + var/accurate = 0 use_power = IDLE_POWER_USE idle_power_usage = 10 active_power_usage = 2000 @@ -353,6 +353,8 @@ for(var/obj/item/stock_parts/matter_bin/M in component_parts) A += M.rating accurate = A + if(accurate >= 3) + calibrated = TRUE /obj/machinery/teleport/hub/proc/link_power_station() if(power_station) @@ -401,12 +403,13 @@ if(!calibrated && com.cc_beacon) visible_message("Cannot lock on target. Please calibrate the teleporter before attempting long range teleportation.") else if(!calibrated && prob(25 - ((accurate) * 10)) && !com.cc_beacon) //oh dear a problem - var/list/target_z = levels_by_trait(REACHABLE) + var/list/target_z = levels_by_trait(SPAWN_RUINS) target_z -= M.z //Where to sir? Anywhere but here. . = do_teleport(M, locate(rand((2*TRANSITIONEDGE), world.maxx - (2*TRANSITIONEDGE)), rand((2*TRANSITIONEDGE), world.maxy - (2*TRANSITIONEDGE)), pick(target_z)), 2, bypass_area_flag = com.area_bypass) else . = do_teleport(M, com.target, bypass_area_flag = com.area_bypass) - calibrated = FALSE + if(accurate < 3) + calibrated = FALSE /obj/machinery/teleport/hub/update_icon() if(panel_open) diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 5be9f9996c4..15a69318610 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -290,7 +290,7 @@ return I.forceMove(src) coin = I - to_chat(user, "You insert [I] into the [src]") + to_chat(user, "You insert [I] into [src].") SStgui.update_uis(src) return if(refill_canister && istype(I, refill_canister)) @@ -1581,6 +1581,7 @@ products = list(/obj/item/storage/bag/tray = 8, /obj/item/kitchen/utensil/fork = 6, /obj/item/trash/plate = 20, + /obj/item/trash/bowl = 20, /obj/item/kitchen/knife = 3, /obj/item/kitchen/rollingpin = 2, /obj/item/kitchen/sushimat = 3, diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm index a5120327f4c..2c65b287ba9 100644 --- a/code/game/machinery/washing_machine.dm +++ b/code/game/machinery/washing_machine.dm @@ -309,7 +309,7 @@ crayon = null state = 1 if(5) - to_chat(user, "The [src] is busy.") + to_chat(user, "[src] is busy.") if(6) state = 7 if(7) diff --git a/code/game/mecha/equipment/mecha_equipment.dm b/code/game/mecha/equipment/mecha_equipment.dm index 17d1b0b3a4f..d40e9302541 100644 --- a/code/game/mecha/equipment/mecha_equipment.dm +++ b/code/game/mecha/equipment/mecha_equipment.dm @@ -33,7 +33,7 @@ /obj/item/mecha_parts/mecha_equipment/Destroy()//missiles detonating, teleporter creating singularity? if(chassis) - chassis.occupant_message("The [src] is destroyed!") + chassis.occupant_message("[src] is destroyed!") chassis.log_append_to_last("[src] is destroyed.",1) if(istype(src, /obj/item/mecha_parts/mecha_equipment/weapon)) chassis.occupant << sound(chassis.weapdestrsound, volume = 50) diff --git a/code/game/mecha/equipment/tools/medical_tools.dm b/code/game/mecha/equipment/tools/medical_tools.dm index 82f86db4a9f..98d3a2a2f13 100644 --- a/code/game/mecha/equipment/tools/medical_tools.dm +++ b/code/game/mecha/equipment/tools/medical_tools.dm @@ -468,7 +468,7 @@ occupant_message("Syringe loaded.") update_equip_info() return 1 - occupant_message("The [src] syringe chamber is full.") + occupant_message("[src] syringe chamber is full.") return 0 /obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/proc/analyze_reagents(atom/A) @@ -483,7 +483,7 @@ if(R.can_synth && add_known_reagent(R.id, R.name)) occupant_message("Reagent analyzed, identified as [R.name] and added to database.") send_byjax(chassis.occupant,"msyringegun.browser","reagents_form",get_reagents_form()) - occupant_message("Analyzis complete.") + occupant_message("Analysis complete.") return 1 /obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/proc/add_known_reagent(r_id,r_name) diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 2876527a526..00ddb73f497 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -469,14 +469,12 @@ //////////////////////////////////////// /obj/mecha/proc/get_armour_facing(relative_dir) - switch(relative_dir) - if(0) // BACKSTAB! + switch(abs(relative_dir)) + if(180) // BACKSTAB! return facing_modifiers[MECHA_BACK_ARMOUR] - if(45, 90, 270, 315) - return facing_modifiers[MECHA_SIDE_ARMOUR] - if(225, 180, 135) + if(0, 45) return facing_modifiers[MECHA_FRONT_ARMOUR] - return 1 //always return non-0 + return facing_modifiers[MECHA_SIDE_ARMOUR] //always return non-0 /obj/mecha/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir) . = ..() @@ -513,7 +511,7 @@ break if(attack_dir) - var/facing_modifier = get_armour_facing(dir2angle(attack_dir) - dir2angle(src)) + var/facing_modifier = get_armour_facing(dir2angle(attack_dir) - dir2angle(dir)) booster_damage_modifier /= facing_modifier booster_deflection_modifier *= facing_modifier if(prob(deflect_chance * booster_deflection_modifier)) @@ -699,7 +697,7 @@ else if(istype(W, /obj/item/stack/cable_coil)) if(state == 3 && hasInternalDamage(MECHA_INT_SHORT_CIRCUIT)) var/obj/item/stack/cable_coil/CC = W - if(CC.amount > 1) + if(CC.get_amount() > 1) CC.use(2) clearInternalDamage(MECHA_INT_SHORT_CIRCUIT) to_chat(user, "You replace the fused wires.") @@ -787,10 +785,10 @@ to_chat(user, "You close the hatch to the power unit") else // Since having maint protocols available is controllable by the MMI, I see this as a consensual way to remove an MMI without destroying the mech - user.visible_message("[user] begins levering out the MMI from the [src].", "You begin to lever out the MMI from the [src].") + user.visible_message("[user] begins levering out the MMI from [src].", "You begin to lever out the MMI from [src].") to_chat(occupant, "[user] is prying you out of the exosuit!") if(I.use_tool(src, user, 80, volume = I.tool_volume) && pilot_is_mmi()) - user.visible_message("[user] pries the MMI out of the [src]!", "You finish removing the MMI from the [src]!") + user.visible_message("[user] pries the MMI out of [src]!", "You finish removing the MMI from [src]!") go_out() /obj/mecha/screwdriver_act(mob/user, obj/item/I) @@ -1067,7 +1065,7 @@ return log_message("[user] tries to move in.") if(occupant) - to_chat(user, "The [src] is already occupied!") + to_chat(user, "[src] is already occupied!") log_append_to_last("Permission denied.") return var/passed @@ -1202,7 +1200,8 @@ /obj/mecha/Exited(atom/movable/M, atom/newloc) if(occupant && occupant == M) // The occupant exited the mech without calling go_out() - go_out(1, newloc) + if(!isAI(occupant)) //This causes carded AIS to gib, so we do not want this to be called during carding. + go_out(1, newloc) /obj/mecha/proc/go_out(forced, atom/newloc = loc) if(!occupant) @@ -1509,7 +1508,7 @@ if(internal_tank) WR.crowbar_salvage += internal_tank internal_tank.forceMove(WR) - cell = null + internal_tank = null . = ..() /obj/mecha/CtrlClick(mob/living/L) diff --git a/code/game/mecha/mecha_construction_paths.dm b/code/game/mecha/mecha_construction_paths.dm index 01ac7cf8d7d..13b5d6f1be2 100644 --- a/code/game/mecha/mecha_construction_paths.dm +++ b/code/game/mecha/mecha_construction_paths.dm @@ -14,7 +14,7 @@ return 0 else if(istype(used_atom, /obj/item/stack)) var/obj/item/stack/S = used_atom - if(S.amount < STANDARD_STACK_AMOUNT) + if(S.get_amount() < STANDARD_STACK_AMOUNT) to_chat(user, ("There's not enough material in this stack.")) return 0 else @@ -35,7 +35,7 @@ return 0 else if(istype(used_atom, /obj/item/stack)) var/obj/item/stack/S = used_atom - if(S.amount < STANDARD_STACK_AMOUNT) + if(S.get_amount() < STANDARD_STACK_AMOUNT) to_chat(user, ("There's not enough material in this stack.")) return 0 else diff --git a/code/game/mecha/mecha_wreckage.dm b/code/game/mecha/mecha_wreckage.dm index d061d2e2005..130b3689644 100644 --- a/code/game/mecha/mecha_wreckage.dm +++ b/code/game/mecha/mecha_wreckage.dm @@ -59,7 +59,7 @@ user.visible_message("[user] pries [S] from [src].", "You pry [S] from [src].") crowbar_salvage -= S return - to_chat(user, "You don't see anything that can be cut with [I]!") + to_chat(user, "You don't see anything that can be pried with [I]!") /obj/structure/mecha_wreckage/welder_act(mob/user, obj/item/I) . = TRUE diff --git a/code/game/objects/buckling.dm b/code/game/objects/buckling.dm index e3c14ff459c..6ef46e63d85 100644 --- a/code/game/objects/buckling.dm +++ b/code/game/objects/buckling.dm @@ -122,6 +122,10 @@ if(!in_range(user, src) || !isturf(user.loc) || user.incapacitated() || M.anchored) return FALSE + if (isguardian(user)) + if (M.loc == user.loc || user.alpha == 60) //Alpha is for detecting ranged guardians in scout mode + return //unmanifested guardians shouldn't be able to buckle mobs + add_fingerprint(user) . = buckle_mob(M, check_loc = check_loc) if(.) diff --git a/code/game/objects/effects/decals/cleanable.dm b/code/game/objects/effects/decals/cleanable.dm index ca92d2da319..6f18d7a9588 100644 --- a/code/game/objects/effects/decals/cleanable.dm +++ b/code/game/objects/effects/decals/cleanable.dm @@ -53,6 +53,9 @@ /obj/effect/decal/cleanable/proc/can_bloodcrawl_in() return FALSE +/obj/effect/decal/cleanable/is_cleanable() + return TRUE + /obj/effect/decal/cleanable/Initialize(mapload) . = ..() if(loc && isturf(loc)) diff --git a/code/game/objects/effects/effects.dm b/code/game/objects/effects/effects.dm index 9053786e554..247a29fa13f 100644 --- a/code/game/objects/effects/effects.dm +++ b/code/game/objects/effects/effects.dm @@ -25,6 +25,9 @@ /obj/effect/acid_act() return +/obj/effect/proc/is_cleanable() //Called when you want to clean something, and usualy delete it after + return FALSE + /obj/effect/mech_melee_attack(obj/mecha/M) return 0 diff --git a/code/game/objects/effects/portals.dm b/code/game/objects/effects/portals.dm index a2b084463a4..5bf804105a0 100644 --- a/code/game/objects/effects/portals.dm +++ b/code/game/objects/effects/portals.dm @@ -14,6 +14,7 @@ var/precision = TRUE // how close to the portal you will teleport. FALSE = on the portal, TRUE = adjacent var/can_multitool_to_remove = FALSE var/ignore_tele_proof_area_setting = FALSE + var/one_use = FALSE // Does this portal go away after one teleport? /obj/effect/portal/New(loc, turf/target, creator = null, lifespan = 300) ..() @@ -101,14 +102,17 @@ if(prob(failchance)) icon_state = fail_icon - if(!do_teleport(M, locate(rand(5, world.maxx - 5), rand(5, world.maxy -5), 3), 0, bypass_area_flag = ignore_tele_proof_area_setting)) // Try to send them to deep space. + var/list/target_z = levels_by_trait(SPAWN_RUINS) + target_z -= M.z + if(!do_teleport(M, locate(rand(5, world.maxx - 5), rand(5, world.maxy -5), pick(target_z)), 0, bypass_area_flag = ignore_tele_proof_area_setting)) // Try to send them to deep space. invalid_teleport() return FALSE else if(!do_teleport(M, target, precision, bypass_area_flag = ignore_tele_proof_area_setting)) // Try to send them to a turf adjacent to target. invalid_teleport() return FALSE - + if(one_use) + qdel(src) return TRUE /obj/effect/portal/proc/invalid_teleport() diff --git a/code/game/objects/effects/spawners/grouped_spawner.dm b/code/game/objects/effects/spawners/grouped_spawner.dm new file mode 100644 index 00000000000..c4e62db038a --- /dev/null +++ b/code/game/objects/effects/spawners/grouped_spawner.dm @@ -0,0 +1,128 @@ +/** + * Can be used to group spawners together so you ensure a certain amount of things are spawned but can be spawned on multiple locations. + * + * How to use: + * Either place the base grouped_spawner in the map and define the group_id to + * determine which spawners belong to one another. + * Or make a child instance of the grouped_spawner and define the values there. + * + * When using the base version be sure to define both total_amount and max_per_spawner on + * at least one of the spawners of the group. + * A mismatch between instances of the same group between these values will lead to a runtime. + * So either leave it empty for the rest or have the rest have the same values +**/ +/obj/effect/spawner/grouped_spawner + name = "grouped spawner" + icon = 'icons/mob/screen_gen.dmi' + icon_state = "x2" + /// Which path will be used to spawn. + var/path_to_spawn + /// How many will spawn. Set this in the map edit tool or in a child instance to set it for all the other instances. + var/total_amount + /// How many will spawn maximum per spawner. Set this in the map edit tool or in a child instance to set it for all the other instances. + var/max_per_spawner + /// The id of the group this spawner belongs to. If left empty it'll use the type as id. Define this for map instances if you want to link different spawners up or want to use the base version. + var/group_id + + /// The assoc list of grouped spawners. Key = group_id, value = list of spawners with that key + var/static/list/spawner_groups + /// Which spawners are chosen to spawn the objects + var/static/list/chosen_spawners + /// The list which holds the total_amount values for each spawner group + var/static/list/total_amount_for_spawners + /// The list which holds the max_per_spawner values for each spawner group + var/static/list/max_per_spawner_for_spawners + +/obj/effect/spawner/grouped_spawner/Initialize(mapload) + . = INITIALIZE_HINT_QDEL // For crash handling + if(!mapload) + CRASH("[src] of type [type] was made post mapload") + + var/turf/T = get_turf(src) + if(!T) + CRASH("Spawner placed in nullspace!") + + if(isnull(group_id)) // Set the group_id if null + group_id = type + + if(group_id == /obj/effect/spawner/grouped_spawner) // Not allowed to use the base type as group_id + CRASH("group_id was not set for [src] of type '[type]'") + + ..() + + save_spawn_values() + LAZYADDASSOC(spawner_groups, group_id, src) + + return INITIALIZE_HINT_LATELOAD + +/obj/effect/spawner/grouped_spawner/LateInitialize() + ..() + + if(LAZYACCESS(spawner_groups, group_id) && !LAZYACCESS(chosen_spawners, group_id)) // Not yet picked the spawners + pick_spawners() + var/list/CS = LAZYACCESS(chosen_spawners, group_id) + if(!LAZYACCESS(CS, src)) // I'm not one of the chosen ones ;( + qdel(src) + return + get_spawn_values() + + var/turf/T = get_turf(src) + spawn_objects(T, CS[src]) + qdel(src) + +/obj/effect/spawner/grouped_spawner/Destroy() + . = ..() + + LAZYREMOVEASSOC(chosen_spawners, group_id, src) + if(!LAZYACCESS(chosen_spawners, group_id)) // Last instance that uses these values + LAZYREMOVE(total_amount_for_spawners, group_id) + LAZYREMOVE(max_per_spawner_for_spawners, group_id) + +/** + * Saves the spawn values. Will only pick the first defined version of this group_id + */ +/obj/effect/spawner/grouped_spawner/proc/save_spawn_values() + if(!isnull(total_amount)) + if(LAZYACCESS(total_amount_for_spawners, group_id) && total_amount_for_spawners[group_id] != total_amount) + stack_trace("total_amount mismatch for type [type]. Possible duplicate total_amount definition in the map") + else + LAZYSET(total_amount_for_spawners, group_id, total_amount) + if(!isnull(max_per_spawner)) + if(LAZYACCESS(max_per_spawner_for_spawners, group_id) && max_per_spawner_for_spawners[group_id] != max_per_spawner) + stack_trace("max_per_spawner mismatch for type [type]. Possible duplicate total_amount definition in the map") + else + LAZYSET(max_per_spawner_for_spawners, group_id, max_per_spawner) + +/** + * Sets the spawn values to the values of the first defined instance of this group_id + */ +/obj/effect/spawner/grouped_spawner/proc/get_spawn_values() + total_amount = total_amount_for_spawners[group_id] + max_per_spawner = max_per_spawner_for_spawners[group_id] + +/obj/effect/spawner/grouped_spawner/proc/spawn_objects(turf/T, amount) + for(var/i in 1 to amount) + new path_to_spawn(T) + +/obj/effect/spawner/grouped_spawner/proc/pick_spawners() + var/list/pickable_spawners = spawner_groups[group_id] + LAZYSET(chosen_spawners, group_id, list()) + var/list/spawners = chosen_spawners[group_id] + + for(var/i in 1 to total_amount) + if(!length(pickable_spawners)) + return // No more to pick from + var/obj/effect/spawner/grouped_spawner/S = pick(pickable_spawners) + if(++spawners[S] >= max_per_spawner) + pickable_spawners -= S + + // Clean up + pickable_spawners.Cut() + LAZYREMOVE(spawner_groups, group_id) + +// Example grouped spawner +/obj/effect/spawner/grouped_spawner/duck_spawn + name = "grouped rubberducky spawner" + path_to_spawn = /obj/item/bikehorn/rubberducky + max_per_spawner = 2 + total_amount = 5 diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index d237c2c2c90..c4af2849947 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -258,7 +258,7 @@ /obj/item/assembly/signaler/anomaly/random = 50, // anomaly core /obj/item/mecha_parts/mecha_equipment/weapon/energy/xray = 25, // mecha x-ray laser /obj/item/mecha_parts/mecha_equipment/teleporter/precise = 25, // upgraded mecha teleporter - /obj/item/autosurgeon = 50, + /obj/item/autosurgeon/organ = 50, // Research / Experimentor /obj/item/paper/researchnotes = 150, // papers that give random R&D levels @@ -388,11 +388,11 @@ lootcount = 3 lootdoubles = FALSE var/soups = list( - /obj/item/reagent_containers/food/snacks/beetsoup, - /obj/item/reagent_containers/food/snacks/stew, - /obj/item/reagent_containers/food/snacks/hotchili, - /obj/item/reagent_containers/food/snacks/nettlesoup, - /obj/item/reagent_containers/food/snacks/meatballsoup) + /obj/item/reagent_containers/food/snacks/soup/beetsoup, + /obj/item/reagent_containers/food/snacks/soup/stew, + /obj/item/reagent_containers/food/snacks/soup/hotchili, + /obj/item/reagent_containers/food/snacks/soup/nettlesoup, + /obj/item/reagent_containers/food/snacks/soup/meatballsoup) var/salads = list( /obj/item/reagent_containers/food/snacks/herbsalad, /obj/item/reagent_containers/food/snacks/validsalad, diff --git a/code/game/objects/effects/temporary_visuals/miscellaneous.dm b/code/game/objects/effects/temporary_visuals/miscellaneous.dm index 27d5eafb677..298c6686df2 100644 --- a/code/game/objects/effects/temporary_visuals/miscellaneous.dm +++ b/code/game/objects/effects/temporary_visuals/miscellaneous.dm @@ -83,7 +83,7 @@ /obj/effect/temp_visual/dir_setting/wraith name = "blood" - icon = 'icons/mob/mob.dmi' + icon = 'icons/mob/cult.dmi' icon_state = "phase_shift2" duration = 12 diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index f22fb5cbb81..138708f4f81 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -288,6 +288,9 @@ GLOBAL_DATUM_INIT(fire_overlay, /image, image("icon" = 'icons/goonstation/effect if(!user.unEquip(src, silent = TRUE)) return 0 + if(flags & ABSTRACT) + return 0 + else if(isliving(loc)) return 0 @@ -728,3 +731,6 @@ GLOBAL_DATUM_INIT(fire_overlay, /image, image("icon" = 'icons/goonstation/effect if(flags & SLOT_PDA) owner.update_inv_wear_pda() +/// Called on cyborg items that need special charging behavior. Override as needed for specific items. +/obj/item/proc/cyborg_recharge(coeff = 1, emagged = FALSE) + return diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm index 69ae7f6d77a..a0ac1d735bc 100644 --- a/code/game/objects/items/blueprints.dm +++ b/code/game/objects/items/blueprints.dm @@ -28,10 +28,10 @@ [fluffnotice]
    " switch(get_area_type()) if(AREA_SPACE) - text += "

    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.

    \

    Mark this place as new area.

    " 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) . += "

    View structural data

    " 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

    Name of Deceased: [dead_name]

    Rank of Deceased: [dead_rank]

    Time of Death: [dead_tod]

    Cause of Death: [dead_cause]

    Trace Chemicals: [dead_chems]

    Additional Coroner's Notes: [dead_notes]

    Coroner's Signature: " + R.info = "[SSmapping.map_datum.fluff_name] - Coroner's Report

    Name of Deceased: [dead_name]

    Rank of Deceased: [dead_rank]

    Time of Death: [dead_tod]

    Cause of Death: [dead_cause]

    Trace Chemicals: [dead_chems]

    Additional Coroner's Notes: [dead_notes]

    Coroner's Signature: " playsound(loc, 'sound/goonstation/machines/printer_thermal.ogg', 50, 1) sleep(10) user.put_in_hands(R) @@ -169,7 +169,7 @@ if(!S) to_chat(user, "You can't scan this body part.") return - M.visible_message("[user] scans the wounds on [M]'s [S] with [src]") + M.visible_message("[user] scans the wounds on [M]'s [S.name] with [src]") add_data(S) return 1 diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm index 26bfb6c816d..aa637dc0332 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -26,19 +26,19 @@ return 0 return 1 -/obj/item/flash/attackby(obj/item/W, mob/user, params) +/obj/item/flash/attackby(obj/item/I, mob/user, params) if(can_overcharge) - if(istype(W, /obj/item/screwdriver)) + if(istype(I, /obj/item/screwdriver)) if(battery_panel) - to_chat(user, "You close the battery compartment on the [src].") + to_chat(user, "You close the battery compartment on [src].") battery_panel = 0 else - to_chat(user, "You open the battery compartment on the [src].") + to_chat(user, "You open the battery compartment on [src].") battery_panel = 1 if(battery_panel && !overcharged) - if(istype(W, /obj/item/stock_parts/cell)) - to_chat(user, "You jam the cell into battery compartment on the [src].") - qdel(W) + if(istype(I, /obj/item/stock_parts/cell)) + to_chat(user, "You jam [I] into the battery compartment on [src].") + qdel(I) overcharged = 1 overlays += "overcharge" @@ -51,7 +51,7 @@ /obj/item/flash/proc/burn_out() //Made so you can override it if you want to have an invincible flash from R&D or something. broken = 1 icon_state = "[initial(icon_state)]burnt" - visible_message("The [src.name] burns out!") + visible_message("[src] burns out!") /obj/item/flash/proc/flash_recharge(mob/user) @@ -119,15 +119,15 @@ add_attack_logs(user, M, "Flashed with [src]") if(M.flash_eyes(affect_silicon = 1)) M.Weaken(rand(5,10)) - user.visible_message("[user] overloads [M]'s sensors with the [src.name]!", "You overload [M]'s sensors with the [src.name]!") + user.visible_message("[user] overloads [M]'s sensors with [src]!", "You overload [M]'s sensors with [src]!") return 1 - user.visible_message("[user] fails to blind [M] with the [src.name]!", "You fail to blind [M] with the [src.name]!") + user.visible_message("[user] fails to blind [M] with [src]!", "You fail to blind [M] with [src]!") /obj/item/flash/attack_self(mob/living/carbon/user, flag = 0, emp = 0) if(!try_use_flash(user)) return 0 - user.visible_message("[user]'s [src.name] emits a blinding light!", "Your [src.name] emits a blinding light!") + user.visible_message("[user]'s [src] emits a blinding light!", "Your [src] emits a blinding light!") for(var/mob/living/carbon/M in oviewers(3, null)) flash_carbon(M, user, 3, 0) @@ -158,7 +158,7 @@ resisted = 1 if(resisted) - to_chat(user, "This mind seems resistant to the [name]!") + to_chat(user, "This mind seems resistant to [src]!") else to_chat(user, "They must be conscious before you can convert [M.p_them()]!") else @@ -176,6 +176,12 @@ ..() new /obj/effect/temp_visual/borgflash(get_turf(src)) +/obj/item/flash/cyborg/cyborg_recharge(coeff, emagged) + if(broken) + broken = FALSE + times_used = 0 + icon_state = "flash" + /obj/item/flash/cameraflash name = "camera" icon = 'icons/obj/items.dmi' diff --git a/code/game/objects/items/devices/laserpointer.dm b/code/game/objects/items/devices/laserpointer.dm index da8ad829b9b..d8ea4209cb1 100644 --- a/code/game/objects/items/devices/laserpointer.dm +++ b/code/game/objects/items/devices/laserpointer.dm @@ -52,13 +52,13 @@ user.drop_item() W.loc = src diode = W - to_chat(user, "You install a [diode.name] in [src].") + to_chat(user, "You install [diode] in [src].") else to_chat(user, "[src] already has a cell.") else if(istype(W, /obj/item/screwdriver)) if(diode) - to_chat(user, "You remove the [diode.name] from the [src].") + to_chat(user, "You remove [diode] from [src].") diode.loc = get_turf(src.loc) diode = null return diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm index 4ed9b335584..85e650412f6 100644 --- a/code/game/objects/items/devices/lightreplacer.dm +++ b/code/game/objects/items/devices/lightreplacer.dm @@ -262,6 +262,10 @@ /obj/item/lightreplacer/cyborg/janicart_insert(mob/user, obj/structure/janitorialcart/J) return +/obj/item/lightreplacer/cyborg/cyborg_recharge(coeff, emagged) + for(var/I in 1 to coeff) + Charge() + #undef LIGHT_OK #undef LIGHT_EMPTY #undef LIGHT_BROKEN diff --git a/code/game/objects/items/devices/pizza_bomb.dm b/code/game/objects/items/devices/pizza_bomb.dm index ceb52db9076..dc5a70ab468 100644 --- a/code/game/objects/items/devices/pizza_bomb.dm +++ b/code/game/objects/items/devices/pizza_bomb.dm @@ -50,10 +50,10 @@ /obj/item/pizza_bomb/proc/go_boom() if(disarmed) - visible_message("[bicon(src)] Sparks briefly jump out of the [correct_wire] wire on \the [src], but it's disarmed!") + visible_message("[bicon(src)] Sparks briefly jump out of the [correct_wire] wire on [src], but it's disarmed!") return atom_say("Enjoy the pizza!") - src.visible_message("\The [src] violently explodes!") + visible_message("[src] violently explodes!") explosion(src.loc,1,2,4,flame_range = 2) //Identical to a minibomb qdel(src) diff --git a/code/game/objects/items/devices/radio/beacon.dm b/code/game/objects/items/devices/radio/beacon.dm index 5027676e1d3..87f402939dc 100644 --- a/code/game/objects/items/devices/radio/beacon.dm +++ b/code/game/objects/items/devices/radio/beacon.dm @@ -50,6 +50,10 @@ /obj/item/radio/beacon/bacon/proc/digest_delay() QDEL_IN(src, 600) +/obj/item/radio/beacon/emagged + syndicate = TRUE + emagged = TRUE + // SINGULO BEACON SPAWNER /obj/item/radio/beacon/syndicate name = "suspicious beacon" @@ -71,6 +75,18 @@ user.drop_item() qdel(src) +/obj/item/radio/beacon/syndicate/power_sink + name = "suspicious beacon" + desc = "A label on it reads: Warning: Activating this device will send a power sink to your location." + +/obj/item/radio/beacon/syndicate/power_sink/attack_self(mob/user) + if(user) + to_chat(user, "Locked In") + new /obj/item/powersink(user.loc) + playsound(src, 'sound/effects/pop.ogg', 100, TRUE, 1) + user.drop_item() + qdel(src) + /obj/item/radio/beacon/syndicate/bomb name = "suspicious beacon" desc = "A label on it reads: Warning: Activating this device will send a high-ordinance explosive to your location." diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 5a493904839..235750a2b48 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -190,14 +190,14 @@ ks2type = /obj/item/encryptionkey/heads/captain /obj/item/radio/headset/heads/captain/alt - name = "\proper the captain's bowman headset" + name = "captain's bowman headset" desc = "The headset of the boss. Protects ears from flashbangs." flags = EARBANGPROTECT icon_state = "com_headset_alt" item_state = "com_headset_alt" /obj/item/radio/headset/heads/rd - name = "Research Director's headset" + name = "research director's headset" desc = "Headset of the researching God." icon_state = "com_headset" item_state = "headset" @@ -211,7 +211,7 @@ ks2type = /obj/item/encryptionkey/heads/hos /obj/item/radio/headset/heads/hos/alt - name = "\proper the head of security's bowman headset" + name = "head of security's bowman headset" desc = "The headset of the man in charge of keeping order and protecting the station. Protects ears from flashbangs." flags = EARBANGPROTECT icon_state = "com_headset_alt" @@ -272,7 +272,7 @@ ks2type = /obj/item/encryptionkey/heads/magistrate /obj/item/radio/headset/heads/magistrate/alt - name = "\proper magistrate's bowman headset" + name = "magistrate's bowman headset" desc = "The headset of the Magistrate. Protects ears from flashbangs." flags = EARBANGPROTECT icon_state = "com_headset_alt" @@ -286,7 +286,7 @@ ks2type = /obj/item/encryptionkey/heads/blueshield /obj/item/radio/headset/heads/blueshield/alt - name = "\proper blueshield's bowman headset" + name = "blueshield's bowman headset" desc = "The headset of the Blueshield. Protects ears from flashbangs." flags = EARBANGPROTECT icon_state = "com_headset_alt" @@ -314,7 +314,7 @@ instant = TRUE /obj/item/radio/headset/centcom - name = "\proper centcom officer's bowman headset" + name = "centcom officer's bowman headset" desc = "The headset of final authority. Protects ears from flashbangs. Can transmit even if telecomms are down." flags = EARBANGPROTECT icon_state = "com_headset_alt" diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index d1d4e900543..2cd43506990 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -132,7 +132,7 @@ return else if(iscoil(W) && buildstage == 1) var/obj/item/stack/cable_coil/coil = W - if(coil.amount < 5) + if(coil.get_amount() < 5) to_chat(user, "You need more cable for this!") return if(do_after(user, 10 * coil.toolspeed, target = src) && buildstage == 1) diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 2bb6125b5ed..5d447675c49 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -100,9 +100,9 @@ REAGENT SCANNER /obj/item/healthanalyzer/attack(mob/living/M, mob/living/user) if((HAS_TRAIT(user, TRAIT_CLUMSY) || user.getBrainLoss() >= 60) && prob(50)) user.visible_message("[user] analyzes the floor's vitals!", "You stupidly try to analyze the floor's vitals!") - to_chat(user, "Analyzing results for The floor:\n\tOverall status: Healthy") - to_chat(user, "Key: Suffocation/Toxin/Burn/Brute") - to_chat(user, "\tDamage specifics: 0-0-0-0") + to_chat(user, "Analyzing results for The floor:\n\tOverall status: Healthy") + to_chat(user, "Key: Suffocation/Toxin/Burn/Brute") + to_chat(user, "\tDamage specifics: 0 - 0 - 0 - 0") to_chat(user, "Body temperature: ???") return @@ -130,19 +130,29 @@ REAGENT SCANNER var/TX = H.getToxLoss() > 50 ? "[H.getToxLoss()]" : H.getToxLoss() var/BU = H.getFireLoss() > 50 ? "[H.getFireLoss()]" : H.getFireLoss() var/BR = H.getBruteLoss() > 50 ? "[H.getBruteLoss()]" : H.getBruteLoss() - if(HAS_TRAIT(H, TRAIT_FAKEDEATH)) - OX = fake_oxy > 50 ? "[fake_oxy]" : fake_oxy - to_chat(user, "Analyzing Results for [H]:\n\t Overall Status: dead") - else - to_chat(user, "Analyzing Results for [H]:\n\t Overall Status: [H.stat > 1 ? "dead" : "[H.health]% healthy"]") + + var/status = "Dead" // Dead by default to make it simpler + var/DNR = !H.ghost_can_reenter() // If the ghost can't reenter + if(H.stat == DEAD) + if(DNR) + status = "Dead \[DNR]" + else // Alive or unconscious + if(HAS_TRAIT(H, TRAIT_FAKEDEATH)) // status still shows as "Dead" + OX = fake_oxy > 50 ? "[fake_oxy]" : fake_oxy + else + status = "[H.health]% Healthy" + + to_chat(user, "Analyzing Results for [H]:\n\t Overall Status: [status]") to_chat(user, "\t Key: Suffocation/Toxin/Burns/Brute") to_chat(user, "\t Damage Specifics: [OX] - [TX] - [BU] - [BR]") to_chat(user, "Body Temperature: [H.bodytemperature-T0C]°C ([H.bodytemperature*1.8-459.67]°F)") if(H.timeofdeath && (H.stat == DEAD || (HAS_TRAIT(H, TRAIT_FAKEDEATH)))) to_chat(user, "Time of Death: [station_time_timestamp("hh:mm:ss", H.timeofdeath)]") var/tdelta = round(world.time - H.timeofdeath) - if(tdelta < DEFIB_TIME_LIMIT) + if(tdelta < DEFIB_TIME_LIMIT && !DNR) to_chat(user, "Subject died [DisplayTimeText(tdelta)] ago, defibrillation may be possible!") + else + to_chat(user, "Subject died [DisplayTimeText(tdelta)] ago.") if(mode == 1) var/list/damaged = H.get_damaged_organs(1,1) @@ -812,7 +822,7 @@ REAGENT SCANNER if(unknown_body || e.hidden) imp += "Unknown body present:" - if(!AN && !open && !infected & !imp) + if(!AN && !open && !infected && !imp) AN = "None:" dat += "[e.name][e.burn_dam][e.brute_dam][robot][bled][AN][splint][open][infected][imp][internal_bleeding][lung_ruptured]" dat += "" diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm index 63c8e404b89..e6c7c40999c 100644 --- a/code/game/objects/items/devices/taperecorder.dm +++ b/code/game/objects/items/devices/taperecorder.dm @@ -305,7 +305,7 @@ if(ruined) return - to_chat(usr, "You erase the data from the [src]") + to_chat(usr, "You erase the data from [src].") clear() /obj/item/tape/proc/clear() diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm index ea9f7200177..ca9de14fe7c 100644 --- a/code/game/objects/items/devices/traitordevices.dm +++ b/code/game/objects/items/devices/traitordevices.dm @@ -162,7 +162,7 @@ effective or pretty fucking useless. return ..() /obj/item/jammer/attack_self(mob/user) - to_chat(user,"You [active ? "deactivate" : "activate"] the [src].") + to_chat(user, "You [active ? "deactivate" : "activate"] [src].") active = !active if(active) GLOB.active_jammers |= src @@ -170,7 +170,7 @@ effective or pretty fucking useless. GLOB.active_jammers -= src /obj/item/teleporter - name = "Syndicate teleporter" + name = "\improper Syndicate teleporter" desc = "A strange syndicate version of a cult veil shifter. Warrenty voided if exposed to EMP." icon = 'icons/obj/device.dmi' icon_state = "syndi-tele" @@ -211,17 +211,17 @@ effective or pretty fucking useless. if(prob(50 / severity)) if(istype(loc, /mob/living/carbon/human)) var/mob/living/carbon/human/user = loc - to_chat(user, "The [src] buzzes and activates!") + to_chat(user, "[src] buzzes and activates!") attempt_teleport(user, TRUE) else - visible_message(" The [src] activates and blinks out of existence!") + visible_message("[src] activates and blinks out of existence!") do_sparks(2, 1, src) qdel(src) /obj/item/teleporter/proc/attempt_teleport(mob/user, EMP_D = FALSE) dir_correction(user) if(!charges) - to_chat(user, "The [src] is recharging still.") + to_chat(user, "[src] is still recharging.") return var/mob/living/carbon/C = user @@ -247,7 +247,7 @@ effective or pretty fucking useless. if(found_turf) if(user.loc != mobloc) // No locker / mech / sleeper teleporting, that breaks stuff - to_chat(C, "The [src] will not work here!") + to_chat(C, "[src] will not work here!") charges-- var/turf/destination = pick(turfs) if(tile_check(destination) || flawless) // Why is there so many bloody floor types @@ -264,7 +264,7 @@ effective or pretty fucking useless. else // Emp activated? Bag of holding? No saving throw for you get_fragged(user, destination) else - to_chat(C, "The [src] will not work here!") + to_chat(C, "[src] will not work here!") /obj/item/teleporter/proc/tile_check(turf/T) if(istype(T, /turf/simulated/floor) || istype(T, /turf/space)) @@ -273,20 +273,20 @@ effective or pretty fucking useless. /obj/item/teleporter/proc/dir_correction(mob/user) //Direction movement, screws with teleport distance and saving throw, and thus must be removed first var/temp_direction = user.dir switch(temp_direction) - if(NORTHEAST || SOUTHEAST) + if(NORTHEAST, SOUTHEAST) user.dir = EAST - if(NORTHWEST || SOUTHWEST) + if(NORTHWEST, SOUTHWEST) user.dir = WEST /obj/item/teleporter/proc/panic_teleport(mob/user, turf/destination, direction = NORTH) var/saving_throw switch(direction) - if(NORTH || SOUTH) + if(NORTH, SOUTH) if(prob(50)) saving_throw = EAST else saving_throw = WEST - if(EAST || WEST) + if(EAST, WEST) if(prob(50)) saving_throw = NORTH else @@ -345,7 +345,7 @@ effective or pretty fucking useless. M.apply_damage(20, BRUTE) M.Stun(3) M.Weaken(3) - to_chat(M, " [user] teleports into you, knocking you to the floor with the bluespace wave!") + to_chat(M, "[user] teleports into you, knocking you to the floor with the bluespace wave!") /obj/item/paper/teleporter name = "Teleporter Guide" diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm index 869fc1620cc..d52f38c79cd 100644 --- a/code/game/objects/items/devices/transfer_valve.dm +++ b/code/game/objects/items/devices/transfer_valve.dm @@ -59,7 +59,7 @@ user.remove_from_mob(A) attached_device = A A.forceMove(src) - to_chat(user, "You attach the [A] to the valve controls and secure it.") + to_chat(user, "You attach [A] to the valve controls and secure it.") A.holder = src A.toggle_secure() //this calls update_icon(), which calls update_icon() on the holder (i.e. the bomb). if(istype(attached_device, /obj/item/assembly/prox_sensor)) diff --git a/code/game/objects/items/flag.dm b/code/game/objects/items/flag.dm index 0dda06d3e5c..fb7f913df3b 100644 --- a/code/game/objects/items/flag.dm +++ b/code/game/objects/items/flag.dm @@ -50,22 +50,22 @@ icon_state = initial(icon_state) /obj/item/flag/nt - name = "Nanotrasen flag" + name = "\improper Nanotrasen flag" desc = "A flag proudly boasting the logo of NT." icon_state = "ntflag" /obj/item/flag/clown - name = "Clown Planet flag" + name = "\improper Clown Planet flag" desc = "The banner of His Majesty, King Squiggles the Eighth." icon_state = "clownflag" /obj/item/flag/mime - name = "Mime Revolution flag" + name = "\improper Mime Revolution flag" desc = "The banner of the glorious revolutionary forces fighting the oppressors on Clown Planet." icon_state = "mimeflag" /obj/item/flag/ian - name = "Ian flag" + name = "\improper Ian flag" desc = "The banner of Ian, because SQUEEEEE." icon_state = "ianflag" @@ -73,128 +73,128 @@ //Species flags /obj/item/flag/species/slime - name = "Slime People flag" + name = "\improper Slime People flag" desc = "A flag proudly proclaiming the superior heritage of Slime People." icon_state = "slimeflag" /obj/item/flag/species/skrell - name = "Skrell flag" + name = "\improper Skrell flag" desc = "A flag proudly proclaiming the superior heritage of Skrell." icon_state = "skrellflag" /obj/item/flag/species/vox - name = "Vox flag" + name = "\improper Vox flag" desc = "A flag proudly proclaiming the superior heritage of Vox." icon_state = "voxflag" /obj/item/flag/species/machine - name = "Synthetics flag" + name = "\improper Synthetics flag" desc = "A flag proudly proclaiming the superior heritage of Synthetics." icon_state = "machineflag" /obj/item/flag/species/diona - name = "Diona flag" + name = "\improper Diona flag" desc = "A flag proudly proclaiming the superior heritage of Dionae." icon_state = "dionaflag" /obj/item/flag/species/human - name = "Human flag" + name = "\improper Human flag" desc = "A flag proudly proclaiming the superior heritage of Humans." icon_state = "humanflag" /obj/item/flag/species/greys - name = "Greys flag" + name = "\improper Greys flag" desc = "A flag proudly proclaiming the superior heritage of Greys." icon_state = "greysflag" /obj/item/flag/species/kidan - name = "Kidan flag" + name = "\improper Kidan flag" desc = "A flag proudly proclaiming the superior heritage of Kidan." icon_state = "kidanflag" /obj/item/flag/species/taj - name = "Tajaran flag" + name = "\improper Tajaran flag" desc = "A flag proudly proclaiming the superior heritage of Tajaran." icon_state = "tajflag" /obj/item/flag/species/unathi - name = "Unathi flag" + name = "\improper Unathi flag" desc = "A flag proudly proclaiming the superior heritage of Unathi." icon_state = "unathiflag" /obj/item/flag/species/vulp - name = "Vulpkanin flag" + name = "\improper Vulpkanin flag" desc = "A flag proudly proclaiming the superior heritage of Vulpkanin." icon_state = "vulpflag" /obj/item/flag/species/drask - name = "Drask flag" + name = "\improper Drask flag" desc = "A flag proudly proclaiming the superior heritage of Drask." icon_state = "draskflag" /obj/item/flag/species/plasma - name = "Plasmaman flag" + name = "\improper Plasmaman flag" desc = "A flag proudly proclaiming the superior heritage of Plasmamen." icon_state = "plasmaflag" //Department Flags /obj/item/flag/cargo - name = "Cargonia flag" + name = "\improper Cargonia flag" desc = "The flag of the independent, sovereign nation of Cargonia." icon_state = "cargoflag" /obj/item/flag/med - name = "Medistan flag" + name = "\improper Medistan flag" desc = "The flag of the independent, sovereign nation of Medistan." icon_state = "medflag" /obj/item/flag/sec - name = "Brigston flag" + name = "\improper Brigston flag" desc = "The flag of the independent, sovereign nation of Brigston." icon_state = "secflag" /obj/item/flag/rnd - name = "Scientopia flag" + name = "\improper Scientopia flag" desc = "The flag of the independent, sovereign nation of Scientopia." icon_state = "rndflag" /obj/item/flag/atmos - name = "Atmosia flag" + name = "\improper Atmosia flag" desc = "The flag of the independent, sovereign nation of Atmosia." icon_state = "atmosflag" /obj/item/flag/command - name = "Command flag" + name = "\improper Command flag" desc = "The flag of the independent, sovereign nation of Command." icon_state = "ntflag" //Antags /obj/item/flag/grey - name = "Greytide flag" + name = "\improper Greytide flag" desc = "A banner made from an old grey jumpsuit." icon_state = "greyflag" /obj/item/flag/syndi - name = "Syndicate flag" + name = "\improper Syndicate flag" desc = "A flag proudly boasting the logo of the Syndicate, in defiance of NT." icon_state = "syndiflag" /obj/item/flag/wiz - name = "Wizard Federation flag" + name = "\improper Wizard Federation flag" desc = "A flag proudly boasting the logo of the Wizard Federation, sworn enemies of NT." icon_state = "wizflag" /obj/item/flag/cult - name = "Nar'Sie Cultist flag" + name = "\improper Nar'Sie Cultist flag" desc = "A flag proudly boasting the logo of the cultists, sworn enemies of NT." icon_state = "cultflag" //Chameleon /obj/item/flag/chameleon - name = "Chameleon flag" + name = "chameleon flag" desc = "A poor recreation of the official NT flag. It seems to shimmer a little." icon_state = "ntflag" origin_tech = "syndicate=1;magnets=4" @@ -239,17 +239,17 @@ boobytrap = I trapper = user I.forceMove(src) - to_chat(user, "You hide [I] in the [src]. It will detonate some time after the flag is lit on fire.") + to_chat(user, "You hide [I] in [src]. It will detonate some time after the flag is lit on fire.") var/turf/bombturf = get_turf(src) var/area/A = get_area(bombturf) - log_game("[key_name(user)] has hidden [I] in the [src] ready for detonation at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z]).") - investigate_log("[key_name(user)] has hidden [I] in the [src] ready for detonation at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z]).", INVESTIGATE_BOMB) + log_game("[key_name(user)] has hidden [I] in [src] ready for detonation at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z]).") + investigate_log("[key_name(user)] has hidden [I] in [src] ready for detonation at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z]).", INVESTIGATE_BOMB) add_attack_logs(user, src, "has hidden [I] ready for detonation in", ATKLOG_MOST) else if(is_hot(I) && !(resistance_flags & ON_FIRE) && boobytrap && trapper) var/turf/bombturf = get_turf(src) var/area/A = get_area(bombturf) - log_game("[key_name_admin(user)] has lit the [src] trapped with [boobytrap] by [key_name_admin(trapper)] at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z]).") - investigate_log("[key_name_admin(user)] has lit the [src] trapped with [boobytrap] by [key_name_admin(trapper)] at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z]).", INVESTIGATE_BOMB) + log_game("[key_name_admin(user)] has lit [src] trapped with [boobytrap] by [key_name_admin(trapper)] at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z]).") + investigate_log("[key_name_admin(user)] has lit [src] trapped with [boobytrap] by [key_name_admin(trapper)] at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z]).", INVESTIGATE_BOMB) add_attack_logs(user, src, "has lit (booby trapped with [boobytrap]", ATKLOG_FEW) burn() else diff --git a/code/game/objects/items/hand_item.dm b/code/game/objects/items/hand_item.dm index 7f378aa6cdc..fe0d198e266 100644 --- a/code/game/objects/items/hand_item.dm +++ b/code/game/objects/items/hand_item.dm @@ -42,75 +42,3 @@ table_smacks_left-- if(table_smacks_left <= 0) qdel(src) - -/obj/item/kisser - name = "kiss" - desc = "I want you all to know, everyone and anyone, to seal it with a kiss." - icon = 'icons/mob/animal.dmi' - icon_state = "heart" - item_state = "nothing" - force = 0 - throwforce = 0 - flags = DROPDEL | ABSTRACT - /// The kind of projectile this version of the kiss blower fires - var/kiss_type = /obj/item/projectile/kiss - -/obj/item/kisser/afterattack(atom/target, mob/user, flag, params) - var/turf/user_turf = get_turf(user) - var/obj/item/projectile/blown_kiss = new kiss_type(user_turf) - user.visible_message("[user] blows \a [blown_kiss] at [target]!", "You blow \a [blown_kiss] at [target]!") - - //Shooting Code: - blown_kiss.spread = 0 - blown_kiss.original = target - blown_kiss.firer = user // don't hit ourself that would be really annoying - blown_kiss.preparePixelProjectile(target, user_turf, user, params) - blown_kiss.fire() - qdel(src) - -/obj/item/kisser/death - name = "kiss of death" - desc = "If looks could kill, they'd be this." - color = COLOR_BLACK - kiss_type = /obj/item/projectile/kiss/death - -/obj/item/projectile/kiss - name = "kiss" - icon = 'icons/mob/animal.dmi' - icon_state = "heart" - hitsound = 'sound/effects/kiss.ogg' - hitsound_wall = 'sound/effects/kiss.ogg' - pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE - speed = 1.6 - damage_type = BRUTE - damage = 0 - nodamage = TRUE // love can't actually hurt you - armour_penetration = 100 // but if it could, it would cut through even the thickest plate - flag = "magic" // and most importantly, love is magic~ - -/obj/item/projectile/kiss/fire(angle) - if(firer) - name = "[name] blown by [firer]" - return ..() - -/obj/item/projectile/kiss/on_hit(atom/target, blocked, hit_zone) - def_zone = BODY_ZONE_HEAD // let's keep it PG, people - . = ..() - -/obj/item/projectile/kiss/death - name = "kiss of death" - nodamage = FALSE // okay i kinda lied about love not being able to hurt you - damage = 35 - sharp = TRUE - color = COLOR_BLACK - -/obj/item/projectile/kiss/death/on_hit(atom/target, blocked, pierce_hit) - . = ..() - if(!iscarbon(target)) - return - var/mob/living/carbon/heartbreakee = target - var/obj/item/organ/internal/heart/dont_go_breakin_my_heart = heartbreakee.get_organ_slot("heart") - if(dont_go_breakin_my_heart) - dont_go_breakin_my_heart.receive_damage(999) - else // You're probably a snowflakey species or Xenomorph - heartbreakee.adjustFireLoss(1000) // the sickest of burns diff --git a/code/game/objects/items/mixing_bowl.dm b/code/game/objects/items/mixing_bowl.dm index 1e1a39d49d0..0e3aaba0c06 100644 --- a/code/game/objects/items/mixing_bowl.dm +++ b/code/game/objects/items/mixing_bowl.dm @@ -31,7 +31,7 @@ return 1 if(istype(I, /obj/item/stack)) var/obj/item/stack/S = I - if(S.amount > 1) + if(S.get_amount() > 1) var/obj/item/stack/to_add = S.split(user, 1) to_add.forceMove(src) user.visible_message("[user] adds one of [S] to [src].", "You add one of [S] to [src].") @@ -104,7 +104,7 @@ dat += {"[display_name]: [R.volume] unit\s
    "} if(items_counts.len==0 && reagents.reagent_list.len==0) - dat = {"The [src] is empty
    "} + dat = {"[src] is empty
    "} else dat = {"Ingredients:
    [dat]"} dat += {"

    Eject ingredients!
    "} diff --git a/code/game/objects/items/mountable_frames/apc_frame.dm b/code/game/objects/items/mountable_frames/apc_frame.dm index 548b77b85fe..8cabb9c6921 100644 --- a/code/game/objects/items/mountable_frames/apc_frame.dm +++ b/code/game/objects/items/mountable_frames/apc_frame.dm @@ -28,5 +28,5 @@ return TRUE /obj/item/mounted/frame/apc_frame/do_build(turf/on_wall, mob/user) - new /obj/machinery/power/apc(get_turf(src), get_dir(user, on_wall), 1) + new /obj/machinery/power/apc(get_turf(src), get_dir(user, on_wall), TRUE) qdel(src) diff --git a/code/game/objects/items/random_items.dm b/code/game/objects/items/random_items.dm index b20a505212e..305d896a791 100644 --- a/code/game/objects/items/random_items.dm +++ b/code/game/objects/items/random_items.dm @@ -267,7 +267,7 @@ /mob/living/simple_animal/hostile/creature,/mob/living/simple_animal/hostile/pirate/ranged, /mob/living/simple_animal/hostile/hivebot,/mob/living/simple_animal/hostile/viscerator,/mob/living/simple_animal/hostile/pirate) - visible_message("Something falls out of the [src]!") + visible_message("Something falls out of [src]!") var/obj/item/grenade/clusterbuster/C = new(src.loc) C.prime() sleep(10) diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm index b8987dda5bb..c758e109e81 100644 --- a/code/game/objects/items/robot/robot_parts.dm +++ b/code/game/objects/items/robot/robot_parts.dm @@ -251,7 +251,7 @@ return if(M.brainmob.mind in SSticker.mode.head_revolutionaries) - to_chat(user, "The frame's firmware lets out a shrill sound, and flashes 'Abnormal Memory Engram'. It refuses to accept the [M].") + to_chat(user, "The frame's firmware lets out a shrill sound, and flashes 'Abnormal Memory Engram'. It refuses to accept [M].") return diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index 81733bd91e7..1ca3b421f55 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -7,19 +7,72 @@ icon = 'icons/obj/module.dmi' icon_state = "cyborg_upgrade" origin_tech = "programming=2" - var/locked = 0 - var/installed = 0 + /// Whether or not the cyborg needs to have a chosen module before they can recieve this upgrade. var/require_module = FALSE + /// The type of module this upgrade is compatible with: Engineering, Medical, etc. var/module_type = null + /// A list of items, and their replacements that this upgrade should replace on installation, in the format of `item_type_to_replace = replacement_item_type`. + var/list/items_to_replace = list() + /// A list of replacement items will need to be placed into a cyborg module's `special_rechargable` list after this upgrade is installed. + var/list/special_rechargables = list() +/** + * Called when someone clicks on a borg with an upgrade in their hand. + * + * Arguments: + * * R - the cyborg that was clicked on with an upgrade. + */ /obj/item/borg/upgrade/proc/action(mob/living/silicon/robot/R) + if(!pre_install_checks(R)) + return + if(!do_install(R)) + return + after_install(R) + return TRUE + +/** + * Checks if the upgrade is able to be applied to the cyborg, before actually applying it. + * + * Arguments: + * * R - the cyborg that was clicked on with an upgrade. + */ +/obj/item/borg/upgrade/proc/pre_install_checks(mob/living/silicon/robot/R) if(R.stat == DEAD) - to_chat(usr, "[src] will not function on a deceased cyborg.") - return TRUE + to_chat(usr, "[src] will not function on a deceased cyborg.") + return FALSE if(module_type && !istype(R.module, module_type)) - to_chat(R, "Upgrade mounting error! No suitable hardpoint detected!") - to_chat(usr, "There's no mounting point for the module!") - return TRUE + to_chat(R, "Upgrade mounting error! No suitable hardpoint detected!") + to_chat(usr, "There's no mounting point for the module!") + return FALSE + return TRUE + +/** + * Executes code that will modify the cyborg or its module. + * + * Arguments: + * * R - the cyborg we're applying the upgrade to. + */ +/obj/item/borg/upgrade/proc/do_install(mob/living/silicon/robot/R) + return TRUE + +/** + * Executes code after the module has been installed and the cyborg has been modified in some way. + * + * Arguments: + * * R - the cyborg that we've applied the upgrade to. + */ +/obj/item/borg/upgrade/proc/after_install(mob/living/silicon/robot/R) + for(var/item in items_to_replace) + var/replacement_type = items_to_replace[item] + var/obj/item/replacement = new replacement_type(R.module) + R.module.remove_item_from_lists(item) + R.module.basic_modules += replacement + + if(replacement_type in special_rechargables) + R.module.special_rechargables += replacement + + R.module?.rebuild_modules() + return TRUE /obj/item/borg/upgrade/reset name = "cyborg module reset board" @@ -27,14 +80,13 @@ icon_state = "cyborg_upgrade1" require_module = TRUE -/obj/item/borg/upgrade/reset/action(mob/living/silicon/robot/R) - if(..()) - return - +/obj/item/borg/upgrade/reset/do_install(mob/living/silicon/robot/R) R.reset_module() - return TRUE +/obj/item/borg/upgrade/reset/after_install(mob/living/silicon/robot/R) + return // We don't need to give them replacement items, or rebuild their module list. It's going to be a blank borg. + /obj/item/borg/upgrade/rename name = "cyborg reclassification board" desc = "Used to rename a cyborg." @@ -44,9 +96,7 @@ /obj/item/borg/upgrade/rename/attack_self(mob/user) heldname = stripped_input(user, "Enter new robot name", "Cyborg Reclassification", heldname, MAX_NAME_LEN) -/obj/item/borg/upgrade/rename/action(mob/living/silicon/robot/R) - if(..()) - return +/obj/item/borg/upgrade/rename/do_install(mob/living/silicon/robot/R) if(!R.allow_rename) to_chat(R, "Internal diagnostic error: incompatible upgrade module detected.") return 0 @@ -63,7 +113,7 @@ desc = "Used to force a reboot of a disabled-but-repaired cyborg, bringing it back online." icon_state = "cyborg_upgrade1" -/obj/item/borg/upgrade/restart/action(mob/living/silicon/robot/R) +/obj/item/borg/upgrade/restart/do_install(mob/living/silicon/robot/R) if(R.health < 0) to_chat(usr, "You have to repair the cyborg before using this module!") return 0 @@ -88,9 +138,7 @@ require_module = TRUE origin_tech = "engineering=4;materials=5;programming=4" -/obj/item/borg/upgrade/vtec/action(mob/living/silicon/robot/R) - if(..()) - return +/obj/item/borg/upgrade/vtec/do_install(mob/living/silicon/robot/R) if(R.speed < 0) to_chat(R, "A VTEC unit is already installed!") to_chat(usr, "There's no room for another VTEC unit!") @@ -108,10 +156,7 @@ require_module = TRUE module_type = /obj/item/robot_module/security -/obj/item/borg/upgrade/disablercooler/action(mob/living/silicon/robot/R) - if(..()) - return - +/obj/item/borg/upgrade/disablercooler/do_install(mob/living/silicon/robot/R) var/obj/item/gun/energy/disabler/cyborg/T = locate() in R.module.modules if(!T) to_chat(usr, "There's no disabler in this unit!") @@ -131,10 +176,7 @@ icon_state = "cyborg_upgrade3" origin_tech = "engineering=4;powerstorage=4" -/obj/item/borg/upgrade/thrusters/action(mob/living/silicon/robot/R) - if(..()) - return - +/obj/item/borg/upgrade/thrusters/do_install(mob/living/silicon/robot/R) if(R.ionpulse) to_chat(usr, "This unit already has ion thrusters installed!") return @@ -149,20 +191,9 @@ origin_tech = "engineering=4;materials=5" require_module = TRUE module_type = /obj/item/robot_module/miner - -/obj/item/borg/upgrade/ddrill/action(mob/living/silicon/robot/R) - if(..()) - return - - for(var/obj/item/pickaxe/drill/cyborg/D in R.module.modules) - qdel(D) - for(var/obj/item/shovel/S in R.module.modules) - qdel(S) - - R.module.modules += new /obj/item/pickaxe/drill/cyborg/diamond(R.module) - R.module.rebuild() - - return TRUE + items_to_replace = list( + /obj/item/pickaxe/drill/cyborg = /obj/item/pickaxe/drill/cyborg/diamond + ) /obj/item/borg/upgrade/soh name = "mining cyborg satchel of holding" @@ -171,18 +202,9 @@ origin_tech = "engineering=4;materials=4;bluespace=4" require_module = TRUE module_type = /obj/item/robot_module/miner - -/obj/item/borg/upgrade/soh/action(mob/living/silicon/robot/R) - if(..()) - return - - for(var/obj/item/storage/bag/ore/cyborg/S in R.module.modules) - qdel(S) - - R.module.modules += new /obj/item/storage/bag/ore/holding(R.module) - R.module.rebuild() - - return TRUE + items_to_replace = list( + /obj/item/storage/bag/ore/cyborg = /obj/item/storage/bag/ore/holding + ) /obj/item/borg/upgrade/abductor_engi name = "engineering cyborg abductor upgrade" @@ -191,33 +213,17 @@ origin_tech = "engineering=6;materials=6;abductor=3" require_module = TRUE module_type = /obj/item/robot_module/engineering - -/obj/item/borg/upgrade/abductor_engi/action(mob/living/silicon/robot/R) - if(..()) - return - - for(var/obj/item/weldingtool/largetank/cyborg/W in R.module.modules) - qdel(W) - for(var/obj/item/screwdriver/cyborg/S in R.module.modules) - qdel(S) - for(var/obj/item/wrench/cyborg/E in R.module.modules) - qdel(E) - for(var/obj/item/crowbar/cyborg/C in R.module.modules) - qdel(C) - for(var/obj/item/wirecutters/cyborg/I in R.module.modules) - qdel(I) - for(var/obj/item/multitool/cyborg/M in R.module.modules) - qdel(M) - - R.module.modules += new /obj/item/weldingtool/abductor(R.module) - R.module.modules += new /obj/item/wrench/abductor(R.module) - R.module.modules += new /obj/item/screwdriver/abductor(R.module) - R.module.modules += new /obj/item/crowbar/abductor(R.module) - R.module.modules += new /obj/item/wirecutters/abductor(R.module) - R.module.modules += new /obj/item/multitool/abductor(R.module) - R.module.rebuild() - - return TRUE + items_to_replace = list( + /obj/item/weldingtool = /obj/item/weldingtool/abductor, + /obj/item/wrench = /obj/item/wrench/abductor, + /obj/item/screwdriver = /obj/item/screwdriver/abductor, + /obj/item/crowbar = /obj/item/crowbar/abductor, + /obj/item/wirecutters = /obj/item/wirecutters/abductor, + /obj/item/multitool = /obj/item/multitool/abductor + ) + special_rechargables = list( + /obj/item/weldingtool/abductor + ) /obj/item/borg/upgrade/abductor_medi name = "medical cyborg abductor upgrade" @@ -226,39 +232,16 @@ origin_tech = "biotech=6;materials=6;abductor=3" require_module = TRUE module_type = /obj/item/robot_module/medical - -/obj/item/borg/upgrade/abductor_medi/action(mob/living/silicon/robot/R) - if(..()) - return - - for(var/obj/item/scalpel/laser/laser1/L in R.module.modules) - qdel(L) - for(var/obj/item/hemostat/H in R.module.modules) - qdel(H) - for(var/obj/item/retractor/E in R.module.modules) - qdel(E) - for(var/obj/item/bonegel/B in R.module.modules) - qdel(B) - for(var/obj/item/FixOVein/F in R.module.modules) - qdel(F) - for(var/obj/item/bonesetter/S in R.module.modules) - qdel(S) - for(var/obj/item/circular_saw/C in R.module.modules) - qdel(C) - for(var/obj/item/surgicaldrill/D in R.module.modules) - qdel(D) - - R.module.modules += new /obj/item/scalpel/laser/laser3(R.module) //no abductor laser scalpel, so next best thing. - R.module.modules += new /obj/item/hemostat/alien(R.module) - R.module.modules += new /obj/item/retractor/alien(R.module) - R.module.modules += new /obj/item/bonegel/alien(R.module) - R.module.modules += new /obj/item/FixOVein/alien(R.module) - R.module.modules += new /obj/item/bonesetter/alien(R.module) - R.module.modules += new /obj/item/circular_saw/alien(R.module) - R.module.modules += new /obj/item/surgicaldrill/alien(R.module) - R.module.rebuild() - - return TRUE + items_to_replace = list( + /obj/item/scalpel/laser/laser1 = /obj/item/scalpel/laser/laser3, // No abductor laser scalpel, so next best thing. + /obj/item/hemostat = /obj/item/hemostat/alien, + /obj/item/retractor = /obj/item/retractor/alien, + /obj/item/bonegel = /obj/item/bonegel/alien, + /obj/item/FixOVein = /obj/item/FixOVein/alien, + /obj/item/bonesetter = /obj/item/bonesetter/alien, + /obj/item/circular_saw = /obj/item/circular_saw/alien, + /obj/item/surgicaldrill = /obj/item/surgicaldrill/alien + ) /obj/item/borg/upgrade/syndicate name = "safety override module" @@ -267,13 +250,11 @@ origin_tech = "combat=6;materials=6" require_module = TRUE -/obj/item/borg/upgrade/syndicate/action(mob/living/silicon/robot/R) - if(..()) - return +/obj/item/borg/upgrade/syndicate/do_install(mob/living/silicon/robot/R) if(R.weapons_unlock) - to_chat(R, "Warning: Safety Overide Protocols have be disabled.") - return - R.weapons_unlock = 1 + return // They already had the safety override upgrade, or they're a cyborg type which has this by default. + R.weapons_unlock = TRUE + to_chat(R, "Warning: Safety Overide Protocols have be disabled.") return TRUE /obj/item/borg/upgrade/lavaproof @@ -284,9 +265,7 @@ require_module = TRUE module_type = /obj/item/robot_module/miner -/obj/item/borg/upgrade/lavaproof/action(mob/living/silicon/robot/R) - if(..()) - return +/obj/item/borg/upgrade/lavaproof/do_install(mob/living/silicon/robot/R) if(istype(R)) R.weather_immunities += "lava" return TRUE @@ -303,10 +282,7 @@ var/powercost = 10 var/mob/living/silicon/robot/cyborg -/obj/item/borg/upgrade/selfrepair/action(mob/living/silicon/robot/R) - if(..()) - return - +/obj/item/borg/upgrade/selfrepair/do_install(mob/living/silicon/robot/R) var/obj/item/borg/upgrade/selfrepair/U = locate() in R if(U) to_chat(usr, "This unit is already equipped with a self-repair module.") diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index f9d02c8f515..a0bd2a3f708 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -17,13 +17,18 @@ var/healverb = "bandage" /obj/item/stack/medical/attack(mob/living/M, mob/user) + if(get_amount() <= 0) + if(is_cyborg) + to_chat(user, "You don't have enough energy to dispense more [singular_name]\s!") + return TRUE + if(!iscarbon(M) && !isanimal(M)) to_chat(user, "[src] cannot be applied to [M]!") - return 1 + return TRUE if(!user.IsAdvancedToolUser()) to_chat(user, "You don't have the dexterity to do this!") - return 1 + return TRUE if(ishuman(M)) @@ -167,7 +172,12 @@ heal_brute = 25 stop_bleeding = 0 +/obj/item/stack/medical/bruise_pack/advanced/cyborg + energy_type = /datum/robot_energy_storage/medical/adv_brute_kit + is_cyborg = TRUE +/obj/item/stack/medical/bruise_pack/advanced/cyborg/syndicate + energy_type = /datum/robot_energy_storage/medical/adv_brute_kit/syndicate //Ointment// @@ -208,6 +218,13 @@ icon_state = "burnkit" heal_burn = 25 +/obj/item/stack/medical/ointment/advanced/cyborg + energy_type = /datum/robot_energy_storage/medical/adv_burn_kit + is_cyborg = TRUE + +/obj/item/stack/medical/ointment/advanced/cyborg/syndicate + energy_type = /datum/robot_energy_storage/medical/adv_burn_kit/syndicate + //Medical Herbs// /obj/item/stack/medical/bruise_pack/comfrey name = "\improper Comfrey leaf" @@ -283,6 +300,13 @@ H.handle_splints() use(1) +/obj/item/stack/medical/splint/cyborg + energy_type = /datum/robot_energy_storage/medical/splint + is_cyborg = TRUE + +/obj/item/stack/medical/splint/cyborg/syndicate + energy_type = /datum/robot_energy_storage/medical/splint/syndicate + /obj/item/stack/medical/splint/tribal name = "tribal splints" icon_state = "tribal_splint" diff --git a/code/game/objects/items/stacks/nanopaste.dm b/code/game/objects/items/stacks/nanopaste.dm index ff469ba3c59..11a5dc4c39c 100644 --- a/code/game/objects/items/stacks/nanopaste.dm +++ b/code/game/objects/items/stacks/nanopaste.dm @@ -63,3 +63,16 @@ to_chat(user, "Nothing to fix here.") else to_chat(user, "[src] won't work on that.") + +/obj/item/stack/nanopaste/cyborg + energy_type = /datum/robot_energy_storage/medical/nanopaste + is_cyborg = TRUE + +/obj/item/stack/nanopaste/cyborg/attack(mob/living/M, mob/user) + if(get_amount() <= 0) + to_chat(user, "You don't have enough energy to dispense more [name]!") + else + return ..() + +/obj/item/stack/nanopaste/cyborg/syndicate + energy_type = /datum/robot_energy_storage/medical/nanopaste/syndicate diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm index 3911ab51cc7..f9ec5cff198 100644 --- a/code/game/objects/items/stacks/rods.dm +++ b/code/game/objects/items/stacks/rods.dm @@ -21,10 +21,16 @@ GLOBAL_LIST_INIT(rod_recipes, list ( \ hitsound = 'sound/weapons/grenadelaunch.ogg' toolspeed = 1 usesound = 'sound/items/deconstruct.ogg' + merge_type = /obj/item/stack/rods /obj/item/stack/rods/cyborg + energy_type = /datum/robot_energy_storage/rods + is_cyborg = TRUE materials = list() +/obj/item/stack/rods/cyborg/update_icon() + return // icon_state should always be a full stack of rods. + /obj/item/stack/rods/ten amount = 10 diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index 0e0bb55df85..26af8fd9ac2 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -19,7 +19,7 @@ GLOBAL_LIST_INIT(glass_recipes, list ( \ new/datum/stack_recipe/window("fulltile window", /obj/structure/window/full/basic, 2, time = 0, on_floor = TRUE, window_checks = TRUE), \ new/datum/stack_recipe("fishbowl", /obj/machinery/fishtank/bowl, 1, time = 10), \ new/datum/stack_recipe("fish tank", /obj/machinery/fishtank/tank, 3, time = 20, on_floor = TRUE), \ - new/datum/stack_recipe("wall aquariam", /obj/machinery/fishtank/wall, 4, time = 40, on_floor = TRUE) \ + new/datum/stack_recipe("wall aquarium", /obj/machinery/fishtank/wall, 4, time = 40, on_floor = TRUE) \ )) /obj/item/stack/sheet/glass @@ -40,6 +40,8 @@ GLOBAL_LIST_INIT(glass_recipes, list ( \ amount = 50 /obj/item/stack/sheet/glass/cyborg + energy_type = /datum/robot_energy_storage/glass + is_cyborg = TRUE materials = list() /obj/item/stack/sheet/glass/New(loc, amount) @@ -48,15 +50,15 @@ GLOBAL_LIST_INIT(glass_recipes, list ( \ /obj/item/stack/sheet/glass/attackby(obj/item/W, mob/user, params) ..() - if(istype(W,/obj/item/stack/cable_coil)) + if(istype(W, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/CC = W - if(CC.amount < 5) + if(CC.get_amount() < 5) to_chat(user, "There is not enough wire in this coil. You need 5 lengths.") return CC.use(5) - to_chat(user, "You attach wire to the [name].") + to_chat(user, "You attach wire to [src].") new /obj/item/stack/light_w(user.loc) - src.use(1) + use(1) else if( istype(W, /obj/item/stack/rods) ) var/obj/item/stack/rods/V = W var/obj/item/stack/sheet/rglass/RG = new (user.loc) @@ -97,9 +99,6 @@ GLOBAL_LIST_INIT(reinforced_glass_recipes, list ( \ merge_type = /obj/item/stack/sheet/rglass point_value = 4 -/obj/item/stack/sheet/rglass/cyborg - materials = list() - /obj/item/stack/sheet/rglass/New(loc, amount) recipes = GLOB.reinforced_glass_recipes ..() @@ -109,6 +108,11 @@ GLOBAL_LIST_INIT(pglass_recipes, list ( \ new/datum/stack_recipe/window("fulltile window", /obj/structure/window/full/plasmabasic, 2, time = 0, on_floor = TRUE, window_checks = TRUE) \ )) +/obj/item/stack/sheet/rglass/cyborg + energy_type = /datum/robot_energy_storage/rglass + is_cyborg = TRUE + materials = list() + /obj/item/stack/sheet/plasmaglass name = "plasma glass" desc = "A very strong and very resistant sheet of a plasma-glass alloy." diff --git a/code/game/objects/items/stacks/sheets/light.dm b/code/game/objects/items/stacks/sheets/light.dm index 4eadda37c32..ddbe453a324 100644 --- a/code/game/objects/items/stacks/sheets/light.dm +++ b/code/game/objects/items/stacks/sheets/light.dm @@ -13,25 +13,16 @@ flags = CONDUCT max_amount = 60 -/obj/item/stack/light_w/attackby(obj/item/O as obj, mob/user as mob, params) +/obj/item/stack/light_w/attackby(obj/item/I, mob/user, params) ..() - if(istype(O,/obj/item/wirecutters)) - var/obj/item/stack/cable_coil/CC = new/obj/item/stack/cable_coil(user.loc) + if(istype(I, /obj/item/wirecutters)) + var/obj/item/stack/cable_coil/CC = new(user.loc) CC.amount = 5 - amount-- new/obj/item/stack/sheet/glass(user.loc) - if(amount <= 0) - user.unEquip(src, 1) - qdel(src) + use(1) - if(istype(O,/obj/item/stack/sheet/metal)) - var/obj/item/stack/sheet/metal/M = O - M.amount-- - if(M.amount <= 0) - user.unEquip(src, 1) - qdel(M) - amount-- - new/obj/item/stack/tile/light(user.loc) - if(amount <= 0) - user.unEquip(src, 1) - qdel(src) + if(istype(I, /obj/item/stack/sheet/metal)) + var/obj/item/stack/sheet/metal/M = I + M.use(1) + new /obj/item/stack/tile/light(user.loc) + use(1) diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm index d7567ce575c..14250f49674 100644 --- a/code/game/objects/items/stacks/sheets/mineral.dm +++ b/code/game/objects/items/stacks/sheets/mineral.dm @@ -83,7 +83,6 @@ GLOBAL_LIST_INIT(bananium_recipes, list ( \ null, \ new/datum/stack_recipe("Clown Statue", /obj/structure/statue/bananium/clown, 5, one_per_turf = 1, on_floor = 1), \ null, \ - new/datum/stack_recipe("bananium computer frame", /obj/structure/computerframe/HONKputer, 50, time = 25, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("bananium grenade casing", /obj/item/grenade/bananade/casing, 4, on_floor = 1), \ )) diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index a004cfd0de8..99dee4e4961 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -110,15 +110,13 @@ GLOBAL_LIST_INIT(metal_recipes, list( point_value = 2 /obj/item/stack/sheet/metal/cyborg + energy_type = /datum/robot_energy_storage/metal + is_cyborg = TRUE materials = list() /obj/item/stack/sheet/metal/fifty amount = 50 -/obj/item/stack/sheet/metal/ratvar_act() - new /obj/item/stack/tile/brass(loc, amount) - qdel(src) - /obj/item/stack/sheet/metal/narsie_act() new /obj/item/stack/sheet/runed_metal(loc, amount) qdel(src) @@ -162,6 +160,10 @@ GLOBAL_LIST_INIT(plasteel_recipes, list( recipes = GLOB.plasteel_recipes return ..() +/obj/item/stack/sheet/wood/cyborg + energy_type = /datum/robot_energy_storage/wood + is_cyborg = TRUE + /* * Wood */ @@ -372,10 +374,6 @@ GLOBAL_LIST_INIT(cult_recipes, list ( \ . = ..() icon_state = SSticker.cultdat?.runed_metal_icon_state -/obj/item/stack/sheet/runed_metal/ratvar_act() - new /obj/item/stack/tile/brass(loc, amount) - qdel(src) - /obj/item/stack/sheet/runed_metal/attack_self(mob/living/user) if(!iscultist(user)) to_chat(user, "Only one with forbidden knowledge could hope to work this metal...") diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index b57c3435132..7e331206016 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -10,7 +10,16 @@ */ /obj/item/stack origin_tech = "materials=1" - var/list/recipes = list() // /datum/stack_recipe + /// Whether this stack is a `/cyborg` subtype or not. + var/is_cyborg = FALSE + /// The energy storage datum that will be used with this stack. Used only with `/cyborg` type stacks. + var/datum/robot_energy_storage/source + /// Which `robot_energy_storage` to choose when this stack is created in cyborgs. Used only with `/cyborg` type stacks. + var/energy_type + /// How much energy using 1 sheet from the stack costs. Used only with `/cyborg` type stacks. + var/cost = 1 + /// A list of recipes buildable with this stack. + var/list/recipes = list() var/singular_name var/amount = 1 var/to_transfer = 0 @@ -52,15 +61,27 @@ /obj/item/stack/examine(mob/user) . = ..() - if(in_range(user, src)) + if(!in_range(user, src)) + return + + if(is_cyborg) if(singular_name) - . += "There are [amount] [singular_name]\s in the stack." + . += "There is enough energy for [get_amount()] [singular_name]\s." else - . += "There are [amount] [name]\s in the stack." - . +="Alt-click to take a custom amount." + . += "There is enough energy for [get_amount()]." + return + + if(singular_name) + . += "There are [amount] [singular_name]\s in the stack." + else + . += "There are [amount] [name]\s in the stack." + . +="Alt-click to take a custom amount." /obj/item/stack/proc/add(newamount) - amount += newamount + if(is_cyborg) + source.add_charge(newamount * cost) + else + amount += newamount update_icon() /obj/item/stack/attack_self(mob/user) @@ -87,8 +108,10 @@ if(!recipes) return - if(amount <= 0) + if(get_amount() <= 0) user << browse(null, "window=stack") + if(is_cyborg) + to_chat(user, "You don't have enough energy to dispense more [name]!") return user.set_machine(src) //for correct work of onclose @@ -98,7 +121,7 @@ var/datum/stack_recipe_list/srl = recipe_list[recipes_sublist] recipe_list = srl.recipes - var/t1 = "Amount Left: [amount]
    " + var/t1 = "Amount Left: [get_amount()]
    " for(var/i in 1 to recipe_list.len) var/E = recipe_list[i] if(isnull(E)) @@ -114,7 +137,7 @@ if(istype(E, /datum/stack_recipe)) var/datum/stack_recipe/R = E - var/max_multiplier = round(amount / R.req_amount) + var/max_multiplier = round(get_amount() / R.req_amount) var/title var/can_build = 1 can_build = can_build && (max_multiplier > 0) @@ -154,7 +177,7 @@ list_recipes(usr, text2num(href_list["sublist"])) if(href_list["make"]) - if(amount < 1) + if(amount < 0 && !is_cyborg) qdel(src) //Never should happen var/list/recipes_list = recipes @@ -167,15 +190,15 @@ if(!multiplier || multiplier <= 0 || multiplier > 50) // Href exploit checks multiplier = 1 - if(amount < R.req_amount * multiplier) - if(R.req_amount * multiplier>1) + if(get_amount() < R.req_amount * multiplier) + if(R.req_amount * multiplier > 1) to_chat(usr, "You haven't got enough [src] to build \the [R.req_amount * multiplier] [R.title]\s!") else to_chat(usr, "You haven't got enough [src] to build \the [R.title]!") return FALSE if(R.window_checks && !valid_window_location(usr.loc, usr.dir)) - to_chat(usr, "The [R.title] won't fit here!") + to_chat(usr, "\The [R.title] won't fit here!") return FALSE if(R.one_per_turf && (locate(R.result_type) in usr.drop_location())) @@ -195,7 +218,7 @@ if(!do_after(usr, R.time, target = usr)) return 0 - if(amount < R.req_amount * multiplier) + if(get_amount() < R.req_amount * multiplier) return var/atom/O @@ -205,6 +228,7 @@ O = new R.result_type(usr.drop_location()) O.setDir(usr.dir) use(R.req_amount * multiplier) + updateUsrDialog() R.post_build(src, O) @@ -231,6 +255,8 @@ /obj/item/stack/use(used, check = TRUE) if(check && zero_amount()) return FALSE + if(is_cyborg) + return source.use_charge(used * cost) if(amount < used) return FALSE amount -= used @@ -240,6 +266,8 @@ return TRUE /obj/item/stack/proc/get_amount() + if(is_cyborg) + return round(source.energy / cost) return amount /obj/item/stack/proc/get_max_amount() @@ -258,7 +286,7 @@ return F /obj/item/stack/attack_hand(mob/user) - if(user.is_in_inactive_hand(src) && amount > 1) + if(user.is_in_inactive_hand(src) && get_amount() > 1) change_stack(user, 1) if(src && usr.machine == src) spawn(0) @@ -272,6 +300,8 @@ return if(!in_range(src, user)) return + if(is_cyborg) + return if(!ishuman(usr)) return if(amount < 1) @@ -305,11 +335,9 @@ // Returns TRUE if the stack amount is zero. // Also qdels the stack gracefully if it is. /obj/item/stack/proc/zero_amount() + if(is_cyborg) + return source.energy < cost if(amount < 1) - if(isrobot(loc)) - var/mob/living/silicon/robot/R = loc - if(locate(src) in R.module.modules) - R.module.modules -= src if(ismob(loc)) var/mob/living/L = loc // At this stage, stack code is so horrible and atrocious, I wouldn't be all surprised ghosts can somehow have stacks. If this happens, then the world deserves to burn. L.unEquip(src, TRUE) @@ -325,7 +353,10 @@ if(QDELETED(S) || QDELETED(src) || S == src) //amusingly this can cause a stack to consume itself, let's not allow that. return FALSE var/transfer = get_amount() - transfer = min(transfer, S.max_amount - S.amount) + if(S.is_cyborg) + transfer = min(transfer, round((S.source.max_energy - S.source.energy) / S.cost)) + else + transfer = min(transfer, S.max_amount - S.amount) if(transfer <= 0) return if(pulledby) @@ -333,6 +364,7 @@ S.copy_evidences(src) S.add(transfer) use(transfer) + return transfer /obj/item/stack/proc/copy_evidences(obj/item/stack/from) blood_DNA = from.blood_DNA diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index 007be9d3535..d148123be94 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -61,8 +61,13 @@ icon_state = "tile-wood" origin_tech = "biotech=1" turf_type = /turf/simulated/floor/wood + merge_type = /obj/item/stack/tile/wood resistance_flags = FLAMMABLE +/obj/item/stack/tile/wood/cyborg + energy_type = /datum/robot_energy_storage/wood_tile + is_cyborg = TRUE + //Carpets /obj/item/stack/tile/carpet name = "carpet" @@ -101,13 +106,17 @@ armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 70) resistance_flags = FIRE_PROOF +/obj/item/stack/tile/plasteel/cyborg + energy_type = /datum/robot_energy_storage/metal_tile + is_cyborg = TRUE + //Light /obj/item/stack/tile/light name = "light tiles" gender = PLURAL singular_name = "light floor tile" - desc = "A floor tile, made out off glass. Use a multitool on it to change its color." - icon_state = "tile_light blue" + desc = "A floor tile made of glass, with an integrated light. Use a multitool on it to change its color." + icon_state = "tile_white" force = 3 throwforce = 5 attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "smashed") diff --git a/code/game/objects/items/tools/crowbar.dm b/code/game/objects/items/tools/crowbar.dm index c90315ffbeb..9374c68fdd5 100644 --- a/code/game/objects/items/tools/crowbar.dm +++ b/code/game/objects/items/tools/crowbar.dm @@ -9,7 +9,6 @@ slot_flags = SLOT_BELT force = 5 throwforce = 7 - item_state = "crowbar" w_class = WEIGHT_CLASS_SMALL materials = list(MAT_METAL=50) drop_sound = 'sound/items/handling/crowbar_drop.ogg' diff --git a/code/game/objects/items/tools/multitool.dm b/code/game/objects/items/tools/multitool.dm index 7acee5352a3..61f512eff2e 100644 --- a/code/game/objects/items/tools/multitool.dm +++ b/code/game/objects/items/tools/multitool.dm @@ -24,7 +24,6 @@ toolspeed = 1 tool_behaviour = TOOL_MULTITOOL hitsound = 'sound/weapons/tap.ogg' - var/shows_wire_information = FALSE // shows what a wire does if set to TRUE var/obj/machinery/buffer // simple machine buffer for device linkage /obj/item/multitool/proc/IsBufferA(typepath) @@ -95,7 +94,10 @@ /obj/item/multitool/ai_detect/admin desc = "Used for pulsing wires to test which to cut. Not recommended by doctors. Has a strange tag that says 'Grief in Safety'" //What else should I say for a meme item? track_delay = 5 - shows_wire_information = TRUE + +/obj/item/multitool/ai_detect/admin/Initialize(mapload) + . = ..() + ADD_TRAIT(src, TRAIT_SHOW_WIRE_INFO, ROUNDSTART_TRAIT) /obj/item/multitool/ai_detect/admin/multitool_detect() var/turf/our_turf = get_turf(src) @@ -112,6 +114,12 @@ desc = "Optimised and stripped-down version of a regular multitool." toolspeed = 0.5 +/obj/item/multitool/cyborg/drone + +/obj/item/multitool/cyborg/drone/Initialize(mapload) + . = ..() + ADD_TRAIT(src, TRAIT_SHOW_WIRE_INFO, ROUNDSTART_TRAIT) // Drones are linked to the station + /obj/item/multitool/abductor name = "alien multitool" desc = "An omni-technological interface." @@ -119,4 +127,7 @@ icon_state = "multitool" toolspeed = 0.1 origin_tech = "magnets=5;engineering=5;abductor=3" - shows_wire_information = TRUE + +/obj/item/multitool/abductor/Initialize(mapload) + . = ..() + ADD_TRAIT(src, TRAIT_SHOW_WIRE_INFO, ROUNDSTART_TRAIT) diff --git a/code/game/objects/items/tools/tool_behaviour.dm b/code/game/objects/items/tools/tool_behaviour.dm index 136bea77e6a..8770c1d6383 100644 --- a/code/game/objects/items/tools/tool_behaviour.dm +++ b/code/game/objects/items/tools/tool_behaviour.dm @@ -57,4 +57,8 @@ // Used in a callback that is passed by use_tool into do_after call. Do not override, do not call manually. /obj/item/proc/tool_check_callback(mob/living/user, atom/target, amount, datum/callback/extra_checks) - return tool_use_check(user, amount) && (extra_checks && !extra_checks.Invoke()) + if(!tool_use_check(user, amount)) + return TRUE + if(extra_checks && !extra_checks.Invoke()) + return TRUE + return FALSE diff --git a/code/game/objects/items/tools/welder.dm b/code/game/objects/items/tools/welder.dm index 41801fe0287..6feb76fa8df 100644 --- a/code/game/objects/items/tools/welder.dm +++ b/code/game/objects/items/tools/welder.dm @@ -16,7 +16,7 @@ w_class = WEIGHT_CLASS_SMALL armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 30) resistance_flags = FIRE_PROOF - materials = list(MAT_METAL=70, MAT_GLASS=30) + materials = list(MAT_METAL = 70, MAT_GLASS = 20) origin_tech = "engineering=1;plasmatech=1" tool_behaviour = TOOL_WELDER toolspeed = 1 @@ -131,7 +131,7 @@ /obj/item/weldingtool/tool_check_callback(mob/living/user, amount, datum/callback/extra_checks) . = ..() - if(. && user) + if(!. && user) if(progress_flash_divisor == 0) user.flash_eyes(min(light_intensity, 1)) progress_flash_divisor = initial(progress_flash_divisor) @@ -177,6 +177,9 @@ update_torch() ..() +/obj/item/weldingtool/cyborg_recharge(coeff, emagged) + if(reagents.check_and_add("fuel", maximum_fuel, 2 * coeff)) + update_icon() /obj/item/weldingtool/largetank name = "industrial welding tool" diff --git a/code/game/objects/items/tools/wirecutters.dm b/code/game/objects/items/tools/wirecutters.dm index 12da212f4f3..17f4167868a 100644 --- a/code/game/objects/items/tools/wirecutters.dm +++ b/code/game/objects/items/tools/wirecutters.dm @@ -62,11 +62,21 @@ origin_tech = "materials=5;engineering=4;abductor=3" random_color = FALSE +/obj/item/wirecutters/abductor/Initialize(mapload) + . = ..() + ADD_TRAIT(src, TRAIT_SHOW_WIRE_INFO, ROUNDSTART_TRAIT) + /obj/item/wirecutters/cyborg name = "wirecutters" desc = "This cuts wires." toolspeed = 0.5 +/obj/item/wirecutters/cyborg/drone + +/obj/item/wirecutters/cyborg/drone/Initialize(mapload) + . = ..() + ADD_TRAIT(src, TRAIT_SHOW_WIRE_INFO, ROUNDSTART_TRAIT) // Drones are linked to the station + /obj/item/wirecutters/power name = "jaws of life" desc = "A set of jaws of life, the magic of science has managed to fit it down into a device small enough to fit in a tool belt. It's fitted with a cutting head." diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index a2d2aeac16d..9515c51a054 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -71,7 +71,7 @@ if(istype(O, /obj/item/reagent_containers/glass) || istype(O, /obj/item/reagent_containers/food/drinks/drinkingglass)) if(O.reagents) if(O.reagents.total_volume < 1) - to_chat(user, "The [O] is empty.") + to_chat(user, "[O] is empty.") else if(O.reagents.total_volume >= 1) if(O.reagents.has_reagent("facid", 1)) to_chat(user, "The acid chews through the balloon!") @@ -86,7 +86,7 @@ /obj/item/toy/balloon/throw_impact(atom/hit_atom) if(reagents.total_volume >= 1) - visible_message("The [src] bursts!","You hear a pop and a splash.") + visible_message("[src] bursts!","You hear a pop and a splash.") reagents.reaction(get_turf(hit_atom)) for(var/atom/A in get_turf(hit_atom)) reagents.reaction(A) @@ -256,7 +256,7 @@ ..() do_sparks(3, 1, src) new /obj/effect/decal/cleanable/ash(src.loc) - visible_message("The [name] explodes!","You hear a bang!") + visible_message("[src] explodes!","You hear a bang!") playsound(src, 'sound/effects/snap.ogg', 50, 1) qdel(src) @@ -970,7 +970,7 @@ /obj/item/toy/plushie/attack_self(mob/user as mob) var/cuddle_verb = pick("hugs","cuddles","snugs") - user.visible_message("[user] [cuddle_verb] the [src].") + user.visible_message("[user] [cuddle_verb] [src].") playsound(get_turf(src), poof_sound, 50, 1, -1) return ..() @@ -1253,7 +1253,7 @@ /obj/item/toy/owl/attack_self(mob/user) if(!cooldown) //for the sanity of everyone var/message = pick("You won't get away this time, Griffin!", "Stop right there, criminal!", "Hoot! Hoot!", "I am the night!") - to_chat(user, "You pull the string on the [src].") + to_chat(user, "You pull the string on [src].") playsound(user, 'sound/creatures/hoot.ogg', 25, 1) visible_message("[bicon(src)] [message]") cooldown = 1 @@ -1272,7 +1272,7 @@ /obj/item/toy/griffin/attack_self(mob/user) if(!cooldown) //for the sanity of everyone var/message = pick("You can't stop me, Owl!", "My plan is flawless! The vault is mine!", "Caaaawwww!", "You will never catch me!") - to_chat(user, "You pull the string on the [src].") + to_chat(user, "You pull the string on [src].") playsound(user, 'sound/creatures/caw.ogg', 25, 1) visible_message("[bicon(src)] [message]") cooldown = 1 @@ -1580,7 +1580,7 @@ /obj/item/toy/figure/attack_self(mob/user as mob) if(cooldown < world.time) cooldown = (world.time + 30) //3 second cooldown - user.visible_message("[bicon(src)] The [src] says \"[toysay]\".") + user.visible_message("[bicon(src)] [src] says \"[toysay]\".") playsound(user, 'sound/machines/click.ogg', 20, 1) /obj/item/toy/figure/cmo @@ -1804,7 +1804,7 @@ ////////////////////////////////////////////////////// /obj/item/toy/eight_ball - name = "Magic 8-Ball" + name = "\improper Magic 8-Ball" desc = "Mystical! Magical! Ages 8+!" icon = 'icons/obj/toy.dmi' icon_state = "eight-ball" @@ -1816,13 +1816,13 @@ if(!cooldown) var/answer = pick(possible_answers) user.visible_message("[user] focuses on [user.p_their()] question and [use_action]...") - user.visible_message("[bicon(src)] The [src] says \"[answer]\"") + user.visible_message("[bicon(src)] [src] says \"[answer]\"") spawn(30) cooldown = 0 return /obj/item/toy/eight_ball/conch - name = "Magic Conch Shell" + name = "\improper Magic Conch Shell" desc = "All hail the Magic Conch!" icon_state = "conch" use_action = "pulls the string" diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index 80dd45d1b02..c2ff3879968 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -52,12 +52,12 @@ icon_state = "waffles" /obj/item/trash/plate - name = "Plate" + name = "plate" icon_state = "plate" resistance_flags = NONE /obj/item/trash/snack_bowl - name = "Snack bowl" + name = "snack bowl" icon_state = "snack_bowl" /obj/item/trash/fried_vox diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm index 92d13337766..c12809ca160 100644 --- a/code/game/objects/items/weapons/RCD.dm +++ b/code/game/objects/items/weapons/RCD.dm @@ -428,6 +428,8 @@ if(iswallturf(A)) if(istype(A, /turf/simulated/wall/r_wall) && !canRwall) return FALSE + if(istype(A, /turf/simulated/wall/indestructible)) + return FALSE if(checkResource(5, user)) to_chat(user, "Deconstructing Wall...") playsound(loc, 'sound/machines/click.ogg', 50, 1) diff --git a/code/game/objects/items/weapons/RCL.dm b/code/game/objects/items/weapons/RCL.dm index 27583a7edd3..3a9d7507ae2 100644 --- a/code/game/objects/items/weapons/RCL.dm +++ b/code/game/objects/items/weapons/RCL.dm @@ -29,13 +29,13 @@ return else if(loaded.amount < max_amount) - var/amount = min(loaded.amount + C.amount, max_amount) + var/amount = min(loaded.amount + C.get_amount(), max_amount) C.use(amount - loaded.amount) loaded.amount = amount else return update_icon() - to_chat(user, "You add the cables to the [src]. It now contains [loaded.amount].") + to_chat(user, "You add the cables to [src]. It now contains [loaded.amount].") else ..() diff --git a/code/game/objects/items/weapons/alien_specific.dm b/code/game/objects/items/weapons/alien_specific.dm index 8f6f0b2a82f..f78232653a8 100644 --- a/code/game/objects/items/weapons/alien_specific.dm +++ b/code/game/objects/items/weapons/alien_specific.dm @@ -29,6 +29,7 @@ desc = "squirts smokey liquids." icon = 'icons/mob/alien.dmi' icon_state = "borg-spray-smoke" + list_reagents = list("water" = 50) /obj/item/reagent_containers/spray/alien/smoke/afterattack(atom/A as mob|obj, mob/user as mob) if(istype(A, /obj/structure/reagent_dispensers) && get_dist(src,A) <= 1) @@ -45,17 +46,29 @@ smoke.start() playsound(user.loc, 'sound/effects/bamf.ogg', 50, 2) +/obj/item/reagent_containers/spray/alien/smoke/cyborg_recharge(coeff, emagged) + reagents.check_and_add("water", volume, 2 * coeff) + /obj/item/reagent_containers/spray/alien/acid name = "acid synthesizer" desc = "squirts burny liquids." icon = 'icons/mob/alien.dmi' icon_state = "borg-spray-acid" + list_reagents = list("facid" = 125, "sacid" = 125) + +/obj/item/reagent_containers/spray/alien/acid/cyborg_recharge(coeff, emagged) + reagents.check_and_add("facid", volume / 2, 2 * coeff) // Volume / 2 here becuase there should be an even amount of both chems. + reagents.check_and_add("sacid", volume / 2, 2 * coeff) /obj/item/reagent_containers/spray/alien/stun name = "paralytic toxin synthesizer" desc = "squirts viagra." icon = 'icons/mob/alien.dmi' icon_state = "borg-spray-stun" + list_reagents = list("ether" = 250) + +/obj/item/reagent_containers/spray/alien/stun/cyborg_recharge(coeff, emagged) + reagents.check_and_add("ether", volume, 2 * coeff) //SKREEEEEEEEEEEE tool diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index 797932190ed..f181233e9ba 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -363,7 +363,7 @@ /obj/item/card/id/syndicate/attack_self(mob/user as mob) if(!src.registered_name) - var/t = reject_bad_name(input(user, "What name would you like to use on this card?", "Agent Card name", ishuman(user) ? user.real_name : user.name)) + var/t = reject_bad_name(input(user, "What name would you like to use on this card?", "Agent Card name", ishuman(user) ? user.real_name : user.name), TRUE) if(!t) to_chat(user, "Invalid name.") return diff --git a/code/game/objects/items/weapons/caution.dm b/code/game/objects/items/weapons/caution.dm index b84f8eba6f4..96d39b367c0 100644 --- a/code/game/objects/items/weapons/caution.dm +++ b/code/game/objects/items/weapons/caution.dm @@ -49,7 +49,7 @@ if(istype(AM, /mob/living/carbon) && !istype(AM, /mob/living/carbon/brain)) var/mob/living/carbon/C = AM if(C.m_intent != MOVE_INTENT_WALK) - src.visible_message("The [src.name] beeps, \"Running on wet floors is hazardous to your health.\"") + src.visible_message("[src] beeps, \"Running on wet floors is hazardous to your health.\"") explosion(src.loc,-1,0,2) if(ishuman(C)) dead_legs(C) diff --git a/code/game/objects/items/weapons/cigs.dm b/code/game/objects/items/weapons/cigs.dm index e4433fdb270..42b2f957987 100644 --- a/code/game/objects/items/weapons/cigs.dm +++ b/code/game/objects/items/weapons/cigs.dm @@ -56,7 +56,7 @@ LIGHTERS ARE IN LIGHTERS.DM if(istype(M) && M.on_fire) user.changeNext_move(CLICK_CD_MELEE) user.do_attack_animation(M) - light("[user] coldly lights the [name] with the burning body of [M]. Clearly, [user.p_they()] offer[user.p_s()] the warmest of regards...") + light("[user] coldly lights [src] with the burning body of [M]. Clearly, [user.p_they()] offer[user.p_s()] the warmest of regards...") return TRUE else return ..() @@ -68,12 +68,12 @@ LIGHTERS ARE IN LIGHTERS.DM /obj/item/clothing/mask/cigarette/catch_fire() if(!lit) - light("The [name] is lit by the flames!") + light("[src] is lit by the flames!") /obj/item/clothing/mask/cigarette/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/clothing/mask/cigarette/attackby(obj/item/I, mob/user, params) ..() diff --git a/code/game/objects/items/weapons/courtroom.dm b/code/game/objects/items/weapons/courtroom.dm index 4a9e3c2b7cf..07bdaddbc52 100644 --- a/code/game/objects/items/weapons/courtroom.dm +++ b/code/game/objects/items/weapons/courtroom.dm @@ -14,7 +14,7 @@ resistance_flags = FLAMMABLE /obj/item/gavelhammer/suicide_act(mob/user) - user.visible_message("[user] has sentenced [user.p_them()]self to death with the [src.name]! It looks like [user.p_theyre()] trying to commit suicide.") + user.visible_message("[user] has sentenced [user.p_them()]self to death with [src]! It looks like [user.p_theyre()] trying to commit suicide.") playsound(loc, 'sound/items/gavel.ogg', 50, 1, -1) return BRUTELOSS diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm index 72de464a096..1c59c8da830 100644 --- a/code/game/objects/items/weapons/defib.dm +++ b/code/game/objects/items/weapons/defib.dm @@ -106,7 +106,7 @@ cell.update_icon() cell.loc = get_turf(loc) cell = null - to_chat(user, "You remove the cell from the [src].") + to_chat(user, "You remove the cell from [src].") update_icon() return @@ -406,7 +406,7 @@ if(do_after(user, 30 * toolspeed, target = M)) //beginning to place the paddles on patient's chest to allow some time for people to move away to stop the process user.visible_message("[user] places [src] on [M.name]'s chest.", "You place [src] on [M.name]'s chest.") playsound(get_turf(src), 'sound/machines/defib_charge.ogg', 50, 0) - var/mob/dead/observer/ghost = H.get_ghost() + var/mob/dead/observer/ghost = H.get_ghost(TRUE) if(ghost && !ghost.client) // In case the ghost's not getting deleted for some reason H.key = ghost.key @@ -489,10 +489,13 @@ else if(total_burn >= 180 || total_brute >= 180) user.visible_message("[defib] buzzes: Resuscitation failed - Severe tissue damage detected.") else if(ghost) - user.visible_message("[defib] buzzes: Resuscitation failed: Patient's brain is unresponsive. Further attempts may succeed.") - to_chat(ghost, "Your heart is being defibrillated. Return to your body if you want to be revived! (Verbs -> Ghost -> Re-enter corpse)") - window_flash(ghost.client) - ghost << sound('sound/effects/genetics.ogg') + if(!ghost.can_reenter_corpse) // DNR or AntagHUD + user.visible_message("[defib] buzzes: Resucitation failed: No electrical brain activity detected.") + else + user.visible_message("[defib] buzzes: Resuscitation failed: Patient's brain is unresponsive. Further attempts may succeed.") + to_chat(ghost, "Your heart is being defibrillated. Return to your body if you want to be revived! (Verbs -> Ghost -> Re-enter corpse)") + window_flash(ghost.client) + ghost << sound('sound/effects/genetics.ogg') else user.visible_message("[defib] buzzes: Resuscitation failed.") playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0) diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm index 259ccad7ff6..5b2fc0c851b 100644 --- a/code/game/objects/items/weapons/explosives.dm +++ b/code/game/objects/items/weapons/explosives.dm @@ -31,7 +31,7 @@ A.master = src A.loc = src assemblyattacher = user.ckey - to_chat(user, "You add [A] to the [name].") + to_chat(user, "You add [A] to [src].") playsound(src, 'sound/weapons/tap.ogg', 20, 1) update_icon() return @@ -71,7 +71,7 @@ return if (istype(AM, /mob/living/carbon)) return - to_chat(user, "You start planting the [src]. The timer is set to [det_time]...") + to_chat(user, "You start planting [src]. The timer is set to [det_time]...") if(do_after(user, 50 * toolspeed, target = AM)) if(!user.unEquip(src)) @@ -90,7 +90,7 @@ /obj/item/grenade/plastic/suicide_act(mob/user) message_admins("[key_name_admin(user)]([ADMIN_QUE(user,"?")]) ([ADMIN_FLW(user,"FLW")]) suicided with [src.name] at ([user.x],[user.y],[user.z] - JMP)",0,1) log_game("[key_name(user)] suicided with [name] at ([user.x],[user.y],[user.z])") - user.visible_message("[user] activates the [name] and holds it above [user.p_their()] head! It looks like [user.p_theyre()] going out with a bang!") + user.visible_message("[user] activates [src] and holds it above [user.p_their()] head! It looks like [user.p_theyre()] going out with a bang!") var/message_say = "FOR NO RAISIN!" if(user.mind) if(user.mind.special_role) diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm index ecc485737a4..0a3e8cd4a70 100644 --- a/code/game/objects/items/weapons/extinguisher.dm +++ b/code/game/objects/items/weapons/extinguisher.dm @@ -180,3 +180,6 @@ sleep(2) else return ..() + +/obj/item/extinguisher/cyborg_recharge(coeff, emagged) + reagents.check_and_add("water", max_water, 5 * coeff) diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm index 60239b0e6fd..64889624a55 100644 --- a/code/game/objects/items/weapons/flamethrower.dm +++ b/code/game/objects/items/weapons/flamethrower.dm @@ -68,7 +68,15 @@ . = ..() if(flag) return // too close - if(user && user.get_active_hand() == src) // Make sure our user is still holding us + if(!user) + return + if(user.mind?.martial_art?.no_guns) + to_chat(user, "[user.mind.martial_art.no_guns_message]") + return + if(HAS_TRAIT(user, TRAIT_CHUNKYFINGERS)) + to_chat(user, "Your meaty finger is far too large for the trigger guard!") + return + if(user.get_active_hand() == src) // Make sure our user is still holding us var/turf/target_turf = get_turf(target) if(target_turf) var/turflist = getline(user, target_turf) diff --git a/code/game/objects/items/weapons/garrote.dm b/code/game/objects/items/weapons/garrote.dm index e3c145e790b..46f563b4507 100644 --- a/code/game/objects/items/weapons/garrote.dm +++ b/code/game/objects/items/weapons/garrote.dm @@ -39,8 +39,8 @@ /obj/item/twohanded/garrote/wield(mob/living/carbon/user) if(strangling) - user.visible_message("[user] removes the [src] from [strangling]'s neck.", \ - "You remove the [src] from [strangling]'s neck.") + user.visible_message("[user] removes [src] from [strangling]'s neck.", + "You remove [src] from [strangling]'s neck.") strangling = null update_icon() @@ -103,8 +103,8 @@ playsound(src.loc, 'sound/weapons/cablecuff.ogg', 15, 1, -1) - M.visible_message("[U] comes from behind and begins garroting [M] with the [src]!", \ - "[U] begins garroting you with the [src]![improvised ? "" : " You are unable to speak!"]", \ + M.visible_message("[U] comes from behind and begins garroting [M] with [src]!", \ + "[U] begins garroting you with [src]![improvised ? "" : " You are unable to speak!"]", \ "You hear struggling and wire strain against flesh!") return @@ -166,6 +166,6 @@ /obj/item/twohanded/garrote/suicide_act(mob/user) - user.visible_message("[user] is wrapping the [src] around [user.p_their()] neck and pulling the handles! It looks like [user.p_theyre()] trying to commit suicide.") + user.visible_message("[user] is wrapping [src] around [user.p_their()] neck and pulling the handles! It looks like [user.p_theyre()] trying to commit suicide.") playsound(src.loc, 'sound/weapons/cablecuff.ogg', 15, 1, -1) return OXYLOSS diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index 570cc603155..7d2eb0b41cd 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -104,7 +104,7 @@ log_game("[key_name(usr)] has primed a [name] for detonation at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z]) [contained].") investigate_log("[key_name(usr)] has primed a [name] for detonation at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z])[contained].", INVESTIGATE_BOMB) add_attack_logs(user, src, "has primed (contained [contained])", ATKLOG_FEW) - to_chat(user, "You prime the [name]! [det_time / 10] second\s!") + to_chat(user, "You prime [src]! [det_time / 10] second\s!") playsound(user.loc, 'sound/weapons/armbomb.ogg', 60, 1) active = 1 update_icon() diff --git a/code/game/objects/items/weapons/grenades/ghettobomb.dm b/code/game/objects/items/weapons/grenades/ghettobomb.dm index c2303dd2937..1a7f4f07c02 100644 --- a/code/game/objects/items/weapons/grenades/ghettobomb.dm +++ b/code/game/objects/items/weapons/grenades/ghettobomb.dm @@ -40,7 +40,7 @@ /obj/item/grenade/iedcasing/attack_self(mob/user) // if(!active) if(clown_check(user)) - to_chat(user, "You light the [name]!") + to_chat(user, "You light [src]!") active = TRUE overlays -= "improvised_grenade_filled" icon_state = initial(icon_state) + "_active" diff --git a/code/game/objects/items/weapons/grenades/grenade.dm b/code/game/objects/items/weapons/grenades/grenade.dm index 288c098a38b..a3bcb841476 100644 --- a/code/game/objects/items/weapons/grenades/grenade.dm +++ b/code/game/objects/items/weapons/grenades/grenade.dm @@ -64,7 +64,7 @@ /obj/item/grenade/attack_self(mob/user as mob) if(!active) if(clown_check(user)) - to_chat(user, "You prime the [name]! [det_time/10] seconds!") + to_chat(user, "You prime [src]! [det_time/10] seconds!") active = 1 icon_state = initial(icon_state) + "_active" add_fingerprint(user) @@ -94,16 +94,16 @@ switch(det_time) if("1") det_time = 10 - to_chat(user, "You set the [name] for 1 second detonation time.") + to_chat(user, "You set [src] for 1 second detonation time.") if("10") det_time = 30 - to_chat(user, "You set the [name] for 3 second detonation time.") + to_chat(user, "You set [src] for 3 second detonation time.") if("30") det_time = 50 - to_chat(user, "You set the [name] for 5 second detonation time.") + to_chat(user, "You set [src] for 5 second detonation time.") if("50") det_time = 1 - to_chat(user, "You set the [name] for instant detonation.") + to_chat(user, "You set [src] for instant detonation.") add_fingerprint(user) ..() diff --git a/code/game/objects/items/weapons/holy_weapons.dm b/code/game/objects/items/weapons/holy_weapons.dm index a9cfbbbe36b..5e39e85d1f0 100644 --- a/code/game/objects/items/weapons/holy_weapons.dm +++ b/code/game/objects/items/weapons/holy_weapons.dm @@ -366,6 +366,15 @@ w_class = WEIGHT_CLASS_HUGE sharp = TRUE +/obj/item/nullrod/armblade/mining + flags = NODROP + reskin_selectable = FALSE //So 2 of the same nullrod doesnt show up. + +/obj/item/nullrod/armblade/mining/pickup(mob/living/user) + ..() + flags += ABSTRACT + return FALSE + /obj/item/nullrod/carp name = "carp-sie plushie" desc = "An adorable stuffed toy that resembles the god of all carp. The teeth look pretty sharp. Activate it to recieve the blessing of Carp-Sie." @@ -471,7 +480,7 @@ if(target.mind) if(iscultist(target)) - SSticker.mode.remove_cultist(target.mind) // This proc will handle message generation. + SSticker.mode.remove_cultist(target.mind, TRUE, TRUE) // This proc will handle message generation. praying = FALSE return diff --git a/code/game/objects/items/weapons/implants/implant_explosive.dm b/code/game/objects/items/weapons/implants/implant_explosive.dm index 52262ac8edb..a776cbce2aa 100644 --- a/code/game/objects/items/weapons/implants/implant_explosive.dm +++ b/code/game/objects/items/weapons/implants/implant_explosive.dm @@ -3,6 +3,7 @@ desc = "And boom goes the weasel." icon_state = "explosive" origin_tech = "materials=2;combat=3;biotech=4;syndicate=4" + actions_types = list(/datum/action/item_action/hands_free/activate/always) var/weak = 2 var/medium = 0.8 var/heavy = 0.4 @@ -135,6 +136,7 @@ desc = "An alarm which monitors host vital signs, transmitting a radio message and dusting the corpse on death." icon = 'icons/effects/blood.dmi' icon_state = "remains" + actions_types = list(/datum/action/item_action/hands_free/activate/always) /obj/item/implant/dust/get_data() var/dat = {"Implant Specifications:
    diff --git a/code/game/objects/items/weapons/implants/implantchair.dm b/code/game/objects/items/weapons/implants/implantchair.dm index 00a72f3401b..88c3e58629e 100644 --- a/code/game/objects/items/weapons/implants/implantchair.dm +++ b/code/game/objects/items/weapons/implants/implantchair.dm @@ -96,10 +96,10 @@ /obj/machinery/implantchair/proc/put_mob(mob/living/carbon/M) if(!iscarbon(M)) - to_chat(usr, "The [src.name] cannot hold this!") + to_chat(usr, "[src] cannot hold this!") return if(src.occupant) - to_chat(usr, "The [src.name] is already occupied!") + to_chat(usr, "[src] is already occupied!") return M.stop_pulling() M.forceMove(src) @@ -110,18 +110,19 @@ /obj/machinery/implantchair/proc/implant(mob/M) - if(!istype(M, /mob/living/carbon)) + if(!iscarbon(M)) + return + if(!length(implant_list)) return - if(!implant_list.len) return for(var/obj/item/implant/mindshield/imp in implant_list) - if(!imp) continue + if(!imp) + continue if(istype(imp, /obj/item/implant/mindshield)) - M.visible_message("[M] has been implanted by the [src.name].") + visible_message("[src] implants [M].") if(imp.implant(M)) implant_list -= imp break - return /obj/machinery/implantchair/proc/add_implants() diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm index a9fa08b9271..0cf57c7b7a4 100644 --- a/code/game/objects/items/weapons/kitchen.dm +++ b/code/game/objects/items/weapons/kitchen.dm @@ -118,9 +118,9 @@ var/bayonet = FALSE //Can this be attached to a gun? /obj/item/kitchen/knife/suicide_act(mob/user) - user.visible_message(pick("[user] is slitting [user.p_their()] wrists with the [src.name]! It looks like [user.p_theyre()] trying to commit suicide.", \ - "[user] is slitting [user.p_their()] throat with the [src.name]! It looks like [user.p_theyre()] trying to commit suicide.", \ - "[user] is slitting [user.p_their()] stomach open with the [name]! It looks like [user.p_theyre()] trying to commit seppuku.")) + user.visible_message(pick("[user] is slitting [user.p_their()] wrists with [src]! It looks like [user.p_theyre()] trying to commit suicide.", \ + "[user] is slitting [user.p_their()] throat with [src]! It looks like [user.p_theyre()] trying to commit suicide.", \ + "[user] is slitting [user.p_their()] stomach open with [src]! It looks like [user.p_theyre()] trying to commit seppuku.")) return BRUTELOSS /obj/item/kitchen/knife/plastic diff --git a/code/game/objects/items/weapons/legcuffs.dm b/code/game/objects/items/weapons/legcuffs.dm index cc090ac6978..56b9c61b35c 100644 --- a/code/game/objects/items/weapons/legcuffs.dm +++ b/code/game/objects/items/weapons/legcuffs.dm @@ -33,7 +33,7 @@ return ..() /obj/item/restraints/legcuffs/beartrap/suicide_act(mob/user) - user.visible_message("[user] is sticking [user.p_their()] head in the [name]! It looks like [user.p_theyre()] trying to commit suicide.") + user.visible_message("[user] is sticking [user.p_their()] head in [src]! It looks like [user.p_theyre()] trying to commit suicide.") playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1) return BRUTELOSS @@ -72,18 +72,18 @@ return user.drop_item() I.forceMove(src) - to_chat(user, "You sneak the [sig] underneath the pressure plate and connect the trigger wire.") + to_chat(user, "You sneak [sig] underneath the pressure plate and connect the trigger wire.") desc = "A trap used to catch bears and other legged creatures. There is a remote signaler hooked up to it." if(istype(I, /obj/item/screwdriver)) if(IED) IED.forceMove(get_turf(src)) IED = null - to_chat(user, "You remove the IED from the [src].") + to_chat(user, "You remove the IED from [src].") return if(sig) sig.forceMove(get_turf(src)) sig = null - to_chat(user, "You remove the signaler from the [src].") + to_chat(user, "You remove the signaler from [src].") return ..() @@ -129,6 +129,7 @@ icon_state = "e_snare" trap_damage = 0 flags = DROPDEL + breakouttime = 6 SECONDS /obj/item/restraints/legcuffs/beartrap/energy/New() ..() @@ -192,7 +193,7 @@ /obj/item/restraints/legcuffs/bola/energy/throw_impact(atom/hit_atom) if(iscarbon(hit_atom)) - var/obj/item/restraints/legcuffs/beartrap/B = new /obj/item/restraints/legcuffs/beartrap/energy/cyborg(get_turf(hit_atom)) + var/obj/item/restraints/legcuffs/beartrap/B = new /obj/item/restraints/legcuffs/beartrap/energy(get_turf(hit_atom)) B.Crossed(hit_atom, null) qdel(src) ..() diff --git a/code/game/objects/items/weapons/lighters.dm b/code/game/objects/items/weapons/lighters.dm index 1bfeeabae03..713988c0a01 100644 --- a/code/game/objects/items/weapons/lighters.dm +++ b/code/game/objects/items/weapons/lighters.dm @@ -82,9 +82,9 @@ cig.attackby(src, user) else if(istype(src, /obj/item/lighter/zippo)) - cig.light("[user] whips the [name] out and holds it for [M]. [user.p_their(TRUE)] arm is as steady as the unflickering flame [user.p_they()] light[user.p_s()] \the [cig] with.") + cig.light("[user] whips [src] out and holds it for [M]. [user.p_their(TRUE)] arm is as steady as the unflickering flame [user.p_they()] light[user.p_s()] \the [cig] with.") else - cig.light("[user] holds the [name] out for [M], and lights the [cig.name].") + cig.light("[user] holds [src] out for [M], and lights [cig].") M.update_inv_wear_mask() else ..() diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm index b1903ea8eda..3cc7c989ebf 100644 --- a/code/game/objects/items/weapons/melee/energy.dm +++ b/code/game/objects/items/weapons/melee/energy.dm @@ -33,8 +33,8 @@ force -= faction_bonus_force /obj/item/melee/energy/suicide_act(mob/user) - user.visible_message(pick("[user] is slitting [user.p_their()] stomach open with the [name]! It looks like [user.p_theyre()] trying to commit seppuku.", \ - "[user] is falling on the [name]! It looks like [user.p_theyre()] trying to commit suicide.")) + user.visible_message(pick("[user] is slitting [user.p_their()] stomach open with [src]! It looks like [user.p_theyre()] trying to commit seppuku.", \ + "[user] is falling on [src]! It looks like [user.p_theyre()] trying to commit suicide.")) return BRUTELOSS|FIRELOSS /obj/item/melee/energy/attack_self(mob/living/carbon/user) @@ -100,7 +100,7 @@ light_color = LIGHT_COLOR_WHITE /obj/item/melee/energy/axe/suicide_act(mob/user) - user.visible_message("[user] swings the [name] towards [user.p_their()] head! It looks like [user.p_theyre()] trying to commit suicide.") + user.visible_message("[user] swings [src] towards [user.p_their()] head! It looks like [user.p_theyre()] trying to commit suicide.") return BRUTELOSS|FIRELOSS /obj/item/melee/energy/sword diff --git a/code/game/objects/items/weapons/melee/misc.dm b/code/game/objects/items/weapons/melee/misc.dm index fbc8c1031bd..b3642eff146 100644 --- a/code/game/objects/items/weapons/melee/misc.dm +++ b/code/game/objects/items/weapons/melee/misc.dm @@ -24,7 +24,7 @@ /obj/item/melee/chainofcommand/suicide_act(mob/user) - to_chat(viewers(user), "[user] is strangling [user.p_them()]self with the [src.name]! It looks like [user.p_theyre()] trying to commit suicide.") + to_chat(viewers(user), "[user] is strangling [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide.") return OXYLOSS /obj/item/melee/rapier @@ -97,7 +97,7 @@ if(proximity_flag) if(is_type_in_typecache(target, strong_against)) new /obj/effect/decal/cleanable/insectguts(target.drop_location()) - to_chat(user, "You easily splat the [target].") + to_chat(user, "You easily splat [target].") if(istype(target, /mob/living/)) var/mob/living/bug = target bug.death(1) diff --git a/code/game/objects/items/weapons/mop.dm b/code/game/objects/items/weapons/mop.dm index 419df51bbd4..3221f0f637c 100644 --- a/code/game/objects/items/weapons/mop.dm +++ b/code/game/objects/items/weapons/mop.dm @@ -28,7 +28,7 @@ if(reagents.has_reagent("water", 1) || reagents.has_reagent("cleaner", 1) || reagents.has_reagent("holywater", 1)) A.clean_blood() for(var/obj/effect/O in A) - if(is_cleanable(O)) + if(O.is_cleanable()) qdel(O) reagents.reaction(A, REAGENT_TOUCH, 10) //10 is the multiplier for the reaction effect. probably needed to wet the floor properly. reagents.remove_any(1) //reaction() doesn't use up the reagents diff --git a/code/game/objects/items/weapons/rpd.dm b/code/game/objects/items/weapons/rpd.dm index bb499d96753..258caf8b424 100644 --- a/code/game/objects/items/weapons/rpd.dm +++ b/code/game/objects/items/weapons/rpd.dm @@ -142,6 +142,8 @@ /obj/item/rpd/proc/delete_all_pipes(mob/user, turf/T) //Delete all pipes on a turf var/eaten for(var/obj/item/pipe/P in T) + if(P.pipe_type == PIPE_CIRCULATOR) //Skip TEG heat circulators, they aren't really pipes + continue QDEL_NULL(P) eaten = TRUE for(var/obj/item/pipe_gsensor/G in T) @@ -274,7 +276,7 @@ for(var/obj/O in T) if(O.rpd_blocksusage() == TRUE) - to_chat(user, "[O] blocks the [src]!") + to_chat(user, "[O] blocks [src]!") return // If we get here, then we're effectively acting on the turf, probably placing a pipe. diff --git a/code/game/objects/items/weapons/soap.dm b/code/game/objects/items/weapons/soap.dm index fbe7e9b370e..8f199f6f398 100644 --- a/code/game/objects/items/weapons/soap.dm +++ b/code/game/objects/items/weapons/soap.dm @@ -25,7 +25,7 @@ else if(target == user && user.a_intent == INTENT_GRAB && ishuman(target)) var/mob/living/carbon/human/muncher = user if(muncher && isdrask(muncher)) - to_chat(user, "You take a bite of the [name]. Delicious!") + to_chat(user, "You take a bite of [src]. Delicious!") playsound(user.loc, 'sound/items/eatfood.ogg', 50, 0) user.adjust_nutrition(2) else if(istype(target, /obj/effect/decal/cleanable) || istype(target, /obj/effect/rune)) @@ -52,7 +52,7 @@ /obj/item/soap/proc/clean_turf(turf/simulated/T) T.clean_blood() for(var/obj/effect/O in T) - if(is_cleanable(O)) + if(O.is_cleanable()) qdel(O) /obj/item/soap/attack(mob/target as mob, mob/user as mob) diff --git a/code/game/objects/items/weapons/stock_parts.dm b/code/game/objects/items/weapons/stock_parts.dm index ea01683133a..cc063f84fc7 100644 --- a/code/game/objects/items/weapons/stock_parts.dm +++ b/code/game/objects/items/weapons/stock_parts.dm @@ -104,7 +104,7 @@ /obj/item/stock_parts/matter_bin name = "matter bin" - desc = "A container for hold compressed matter awaiting re-construction." + desc = "A container used to hold compressed matter awaiting re-construction." icon_state = "matter_bin" origin_tech = "materials=1" materials = list(MAT_METAL=80) @@ -145,7 +145,7 @@ /obj/item/stock_parts/matter_bin/adv name = "advanced matter bin" - desc = "A container for hold compressed matter awaiting re-construction." + desc = "A container used to hold compressed matter awaiting re-construction." icon_state = "advanced_matter_bin" origin_tech = "materials=3" rating = 2 @@ -187,7 +187,7 @@ /obj/item/stock_parts/matter_bin/super name = "super matter bin" - desc = "A container for hold compressed matter awaiting re-construction." + desc = "A container used to hold compressed matter awaiting re-construction." icon_state = "super_matter_bin" origin_tech = "materials=4;engineering=4" rating = 3 @@ -229,7 +229,7 @@ /obj/item/stock_parts/matter_bin/bluespace name = "bluespace matter bin" - desc = "A container for hold compressed matter awaiting re-construction." + desc = "A container used to hold compressed matter awaiting re-construction." icon_state = "bluespace_matter_bin" origin_tech = "materials=6;programming=4;engineering=4" rating = 4 diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index 3466773007b..b142d5cb7e5 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -340,7 +340,7 @@ /obj/item/storage/backpack/duffel/syndie name = "suspicious looking duffelbag" desc = "A large duffelbag for holding extra tactical supplies." - icon_state = "duffel-syndie" + icon_state = "duffel-syndimed" item_state = "duffel-syndimed" origin_tech = "syndicate=1" silent = TRUE @@ -350,8 +350,6 @@ /obj/item/storage/backpack/duffel/syndie/med name = "suspicious duffelbag" desc = "A black and red duffelbag with a red and white cross sewn onto it." - icon_state = "duffel-syndimed" - item_state = "duffel-syndimed" /obj/item/storage/backpack/duffel/syndie/ammo name = "suspicious duffelbag" diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm index f2b0b475e30..c89fd8aeb0d 100644 --- a/code/game/objects/items/weapons/storage/bags.dm +++ b/code/game/objects/items/weapons/storage/bags.dm @@ -41,7 +41,7 @@ cant_hold = list(/obj/item/disk/nuclear) /obj/item/storage/bag/trash/suicide_act(mob/user) - user.visible_message("[user] puts the [name] over [user.p_their()] head and starts chomping at the insides! Disgusting!") + user.visible_message("[user] puts [src] over [user.p_their()] head and starts chomping at the insides! Disgusting!") playsound(loc, 'sound/items/eatfood.ogg', 50, 1, -1) return TOXLOSS @@ -314,7 +314,7 @@ //Therefore, make a new stack internally that has the remainder. // -Sayu - if(S.amount > S.max_amount) + if(S.get_amount() > S.max_amount) var/obj/item/stack/sheet/temp = new S.type(src) temp.amount = S.amount - S.max_amount S.amount = S.max_amount diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index 301b43403f6..870ebe470cd 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -230,7 +230,9 @@ /obj/item/flashlight/seclite, /obj/item/holosign_creator/security, /obj/item/melee/classic_baton/telescopic, - /obj/item/restraints/legcuffs/bola) + /obj/item/restraints/legcuffs/bola, + /obj/item/clothing/mask/gas/sechailer, + /obj/item/spacepod_key) /obj/item/storage/belt/security/sec/populate_contents() new /obj/item/flashlight/seclite(src) @@ -366,6 +368,22 @@ item_state = "assault" storage_slots = 6 +/obj/item/storage/belt/military/assault/marines/full/populate_contents() + new /obj/item/ammo_box/magazine/m12g(src) + new /obj/item/ammo_box/magazine/m12g(src) + new /obj/item/ammo_box/magazine/m12g(src) + new /obj/item/ammo_box/magazine/m12g(src) + new /obj/item/ammo_box/magazine/m45(src) + new /obj/item/ammo_box/magazine/m45(src) + update_icon() + +/obj/item/storage/belt/military/assault/marines/elite/full/populate_contents() + new /obj/item/ammo_box/magazine/m556/arg(src) + new /obj/item/ammo_box/magazine/m556/arg(src) + new /obj/item/ammo_box/magazine/m556/arg(src) + new /obj/item/ammo_box/magazine/m45(src) + new /obj/item/ammo_box/magazine/m45(src) + update_icon() /obj/item/storage/belt/janitor name = "janibelt" desc = "A belt used to hold most janitorial supplies." @@ -431,6 +449,7 @@ item_state = "bandolier" storage_slots = 8 can_hold = list(/obj/item/ammo_casing/shotgun) + display_contents_with_number = TRUE /obj/item/storage/belt/bandolier/Initialize(mapload) . = ..() diff --git a/code/game/objects/items/weapons/storage/bible.dm b/code/game/objects/items/weapons/storage/bible.dm index 384dc250901..9200a58d65a 100644 --- a/code/game/objects/items/weapons/storage/bible.dm +++ b/code/game/objects/items/weapons/storage/bible.dm @@ -84,7 +84,7 @@ return if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50)) - to_chat(user, "The [src] slips out of your hand and hits your head.") + to_chat(user, "[src] slips out of your hand and hits your head.") user.take_organ_damage(10) user.Paralyse(20) return diff --git a/code/game/objects/items/weapons/storage/briefcase.dm b/code/game/objects/items/weapons/storage/briefcase.dm index 952da94ff73..f3801b5aa6d 100644 --- a/code/game/objects/items/weapons/storage/briefcase.dm +++ b/code/game/objects/items/weapons/storage/briefcase.dm @@ -52,16 +52,16 @@ to_chat(user, "There's already something in the false bottom!") return if(I.w_class > WEIGHT_CLASS_NORMAL) - to_chat(user, "The [I] is too big to fit in the false bottom!") + to_chat(user, "[I] is too big to fit in the false bottom!") return if(!user.drop_item(I)) - to_chat(user, "The [I] is stuck to your hands!") + to_chat(user, "[I] is stuck to your hands!") return stored_item = I max_w_class = WEIGHT_CLASS_NORMAL - stored_item.w_class I.forceMove(null) //null space here we go - to stop it showing up in the briefcase - to_chat(user, "You place the [I] into the false bottom of the briefcase.") + to_chat(user, "You place [I] into the false bottom of the briefcase.") else return ..() @@ -72,7 +72,7 @@ if(!I.use_tool(src, user, 0, volume = I.tool_volume)) return if(!bottom_open) - to_chat(user, "You begin to hunt around the rim of the [src]...") + to_chat(user, "You begin to hunt around the rim of [src]...") busy_hunting = TRUE if(do_after(user, 20, target = src)) if(user) @@ -80,13 +80,13 @@ bottom_open = TRUE busy_hunting = FALSE else - to_chat(user, "You push the false bottom down and close it with a click[stored_item ? ", with the [stored_item] snugly inside." : "."]") + to_chat(user, "You push the false bottom down and close it with a click[stored_item ? ", with [stored_item] snugly inside." : "."]") bottom_open = FALSE /obj/item/storage/briefcase/false_bottomed/attack_hand(mob/user) if(bottom_open && stored_item) user.put_in_hands(stored_item) - to_chat(user, "You pull out the [stored_item] from the [src]'s false bottom.") + to_chat(user, "You pull out [stored_item] from [src]'s false bottom.") stored_item = null max_w_class = initial(max_w_class) else diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm index 71852c60541..8cc8f5729f2 100644 --- a/code/game/objects/items/weapons/storage/fancy.dm +++ b/code/game/objects/items/weapons/storage/fancy.dm @@ -121,19 +121,21 @@ icon = 'icons/obj/crayons.dmi' icon_state = "crayonbox" w_class = WEIGHT_CLASS_SMALL - storage_slots = 6 + storage_slots = 8 icon_type = "crayon" can_hold = list( /obj/item/toy/crayon ) /obj/item/storage/fancy/crayons/populate_contents() + new /obj/item/toy/crayon/white(src) new /obj/item/toy/crayon/red(src) new /obj/item/toy/crayon/orange(src) new /obj/item/toy/crayon/yellow(src) new /obj/item/toy/crayon/green(src) new /obj/item/toy/crayon/blue(src) new /obj/item/toy/crayon/purple(src) + new /obj/item/toy/crayon/black(src) update_icon() /obj/item/storage/fancy/crayons/update_icon() diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm index d1548eb2305..61b3cdfedd7 100644 --- a/code/game/objects/items/weapons/storage/storage.dm +++ b/code/game/objects/items/weapons/storage/storage.dm @@ -163,7 +163,7 @@ /obj/item/storage/proc/show_to(mob/user) if(!user.client) return - if(user.s_active != src) // Switching from another container + if(user.s_active != src && !isobserver(user)) for(var/obj/item/I in src) if(I.on_found(user)) // For mouse traps and such return // If something triggered, don't open the UI diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index f8104a2d9ea..64cab3bef7a 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -25,16 +25,30 @@ update_icon() /obj/item/melee/baton/loaded/Initialize(mapload) //this one starts with a cell pre-installed. - if(isrobot(loc.loc)) // First loc would be the module + link_new_cell() + return ..() + +/obj/item/melee/baton/Destroy() + if(cell?.loc == src) + QDEL_NULL(cell) + return ..() + +/** + * Updates the linked power cell on the baton. + * + * If the baton is held by a cyborg, link it to their internal cell. + * Else, spawn a new cell and use that instead. + * Arguments: + * * unlink - If TRUE, sets the `cell` variable to `null` rather than linking it to a new one. + */ +/obj/item/melee/baton/proc/link_new_cell(unlink = FALSE) + if(unlink) + cell = null + else if(isrobot(loc.loc)) // First loc is the module var/mob/living/silicon/robot/R = loc.loc cell = R.cell else cell = new(src) - return ..() - -/obj/item/melee/baton/Destroy() - QDEL_NULL(cell) - return ..() /obj/item/melee/baton/suicide_act(mob/user) user.visible_message("[user] is putting the live [name] in [user.p_their()] mouth! It looks like [user.p_theyre()] trying to commit suicide.") @@ -76,6 +90,10 @@ if(!cell) return cell.use(amount) + if(cell.rigged) + cell = null + turned_on = FALSE + update_icon() if(cell.charge < (hitcost)) // If after the deduction the baton doesn't have enough charge for a stun hit it turns off. turned_on = FALSE update_icon() diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm index be1e8e48feb..df6c3a4c988 100644 --- a/code/game/objects/items/weapons/tanks/tanks.dm +++ b/code/game/objects/items/weapons/tanks/tanks.dm @@ -102,6 +102,7 @@ descriptive = "furiously hot" . += "\The [bicon(icon)][src] feels [descriptive]" + . += "The pressure gauge displays [round(air_contents.return_pressure())] kPa" /obj/item/tank/blob_act(obj/structure/blob/B) if(B && B.loc == loc) diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index a7ac1d632c7..d5c41c9772d 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -81,14 +81,14 @@ user.update_inv_r_hand() user.update_inv_l_hand() if(isrobot(user)) - to_chat(user, "You dedicate your module to [name].") + to_chat(user, "You dedicate your module to [src].") else - to_chat(user, "You grab the [name] with both hands.") + to_chat(user, "You grab [src] with both hands.") if(wieldsound) playsound(loc, wieldsound, 50, 1) var/obj/item/twohanded/offhand/O = new(user) ////Let's reserve his other hand~ O.name = "[name] - offhand" - O.desc = "Your second grip on the [name]" + O.desc = "Your second grip on [src]" user.put_in_inactive_hand(O) return TRUE @@ -306,7 +306,7 @@ return ..() if(HAS_TRAIT(user, TRAIT_CLUMSY) && (wielded) && prob(40)) - to_chat(user, "You twirl around a bit before losing your balance and impaling yourself on the [src].") + to_chat(user, "You twirl around a bit before losing your balance and impaling yourself on [src].") user.take_organ_damage(20, 25) return if((wielded) && prob(50)) @@ -670,6 +670,8 @@ /obj/item/twohanded/singularityhammer/proc/vortex(turf/pull, mob/wielder) for(var/atom/movable/X in orange(5, pull)) + if(X.move_resist == INFINITY) + continue if(X == wielder) continue if((X) && (!X.anchored) && (!ishuman(X))) @@ -717,9 +719,9 @@ /obj/item/twohanded/mjollnir/proc/shock(mob/living/target) do_sparks(5, 1, target.loc) - target.visible_message("[target.name] was shocked by the [name]!", \ - "You feel a powerful shock course through your body sending you flying!", \ - "You hear a heavy electrical crack!") + target.visible_message("[target] was shocked by [src]!", + "You feel a powerful shock course through your body sending you flying!", + "You hear a heavy electrical crack!") var/atom/throw_target = get_edge_target_turf(target, get_dir(src, get_step_away(target, src))) target.throw_at(throw_target, 200, 4) @@ -783,15 +785,15 @@ if(isliving(A)) var/mob/living/Z = A if(Z.health >= 1) - Z.visible_message("[Z.name] was sent flying by a blow from the [name]!", \ - "You feel a powerful blow connect with your body and send you flying!", \ + Z.visible_message("[Z.name] was sent flying by a blow from [src]!", + "You feel a powerful blow connect with your body and send you flying!", "You hear something heavy impact flesh!.") var/atom/throw_target = get_edge_target_turf(Z, get_dir(src, get_step_away(Z, src))) Z.throw_at(throw_target, 200, 4) playsound(user, 'sound/weapons/marauder.ogg', 50, 1) else if(wielded && Z.health < 1) - Z.visible_message("[Z.name] was blown to pieces by the power of [name]!", \ - "You feel a powerful blow rip you apart!", \ + Z.visible_message("[Z.name] was blown to pieces by the power of [src]!", + "You feel a powerful blow rip you apart!", "You hear a heavy impact and the sound of ripping flesh!.") Z.gib() playsound(user, 'sound/weapons/marauder.ogg', 50, 1) diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm index 3a4278d05ed..48b0d4b883f 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/code/game/objects/items/weapons/weaponry.dm @@ -17,7 +17,7 @@ resistance_flags = FIRE_PROOF /obj/item/banhammer/suicide_act(mob/user) - to_chat(viewers(user), "[user] is hitting [user.p_them()]self with the [src.name]! It looks like [user.p_theyre()] trying to ban [user.p_them()]self from life.") + visible_message("[user] is hitting [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to ban [user.p_them()]self from life.") return BRUTELOSS|FIRELOSS|TOXLOSS|OXYLOSS /obj/item/banhammer/attack(mob/M, mob/user) @@ -61,7 +61,7 @@ resistance_flags = FIRE_PROOF /obj/item/claymore/suicide_act(mob/user) - user.visible_message("[user] is falling on the [name]! It looks like [user.p_theyre()] trying to commit suicide.") + user.visible_message("[user] is falling on [src]! It looks like [user.p_theyre()] trying to commit suicide.") return BRUTELOSS /obj/item/claymore/ceremonial @@ -203,7 +203,7 @@ if(I.w_class <= WEIGHT_CLASS_NORMAL || istype(I, /obj/item/beach_ball)) // baseball bat deflecting if(deflectmode) if(prob(10)) - visible_message("[owner] Deflects [I] directly back at the thrower! It's a home run!", "You deflect the [I] directly back at the thrower! It's a home run!") + visible_message("[owner] Deflects [I] directly back at the thrower! It's a home run!", "You deflect [I] directly back at the thrower! It's a home run!") playsound(get_turf(owner), 'sound/weapons/homerun.ogg', 100, 1) do_attack_animation(I, ATTACK_EFFECT_DISARM) I.throw_at(I.thrownby, 20, 20, owner) @@ -220,7 +220,7 @@ lastdeflect = world.time + 3000 return FALSE else - visible_message("[owner] swings and deflects [I]!", "You swing and deflect the [I]!") + visible_message("[owner] swings and deflects [I]!", "You swing and deflect [I]!") playsound(get_turf(owner), 'sound/weapons/baseball_hit.ogg', 50, 1, -1) do_attack_animation(I, ATTACK_EFFECT_DISARM) I.throw_at(get_edge_target_turf(owner, pick(GLOB.cardinal)), rand(8,10), 14, owner) diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index 16c5f626b84..1ca64c8de37 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -363,6 +363,7 @@ a { /obj/proc/cult_reveal() //Called by cult reveal spell and chaplain's bible return + /obj/proc/force_eject_occupant(mob/target) // This proc handles safely removing occupant mobs from the object if they must be teleported out (due to being SSD/AFK, by admin teleport, etc) or transformed. // In the event that the object doesn't have an overriden version of this proc to do it, log a runtime so one can be added. diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 741afa2738b..8a979bd18a7 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -27,7 +27,7 @@ // Please dont override this unless you absolutely have to /obj/structure/closet/Initialize(mapload) . = ..() - if(!opened) + if(mapload && !opened) // Youre probably asking, why is this a 0 seconds timer AA? // Well, I will tell you. One day, all /obj/effect/spawner will use Initialize // This includes maint loot spawners. The problem with that is if a closet loads before a spawner, @@ -327,7 +327,7 @@ //okay, so the closet is either welded or locked... resist!!! to_chat(L, "You lean on the back of \the [src] and start pushing the door open. (this will take about [breakout_time] minutes)") for(var/mob/O in viewers(usr.loc)) - O.show_message("The [src] begins to shake violently!", 1) + O.show_message("[src] begins to shake violently!", 1) spawn(0) diff --git a/code/game/objects/structures/crates_lockers/closets/fireaxe.dm b/code/game/objects/structures/crates_lockers/closets/fireaxe.dm index ed16e8d338e..91a335ed918 100644 --- a/code/game/objects/structures/crates_lockers/closets/fireaxe.dm +++ b/code/game/objects/structures/crates_lockers/closets/fireaxe.dm @@ -102,7 +102,7 @@ if(localopened) if(fireaxe) user.put_in_hands(fireaxe) - to_chat(user, "You take \the [fireaxe] from the [src].") + to_chat(user, "You take \the [fireaxe] from [src].") fireaxe = null add_fingerprint(user) @@ -157,12 +157,12 @@ if(localopened) if(fireaxe) usr.put_in_hands(fireaxe) - to_chat(usr, "You take \the [fireaxe] from the [src].") + to_chat(usr, "You take \the [fireaxe] from [src].") fireaxe = null else - to_chat(usr, "The [src] is empty.") + to_chat(usr, "[src] is empty.") else - to_chat(usr, "The [src] is closed.") + to_chat(usr, "[src] is closed.") update_icon() /obj/structure/closet/fireaxecabinet/attack_ai(mob/user as mob) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/chaplain.dm b/code/game/objects/structures/crates_lockers/closets/secure/chaplain.dm index ef80d50371a..55e44163a06 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/chaplain.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/chaplain.dm @@ -22,6 +22,7 @@ new /obj/item/storage/backpack/cultpack(src) new /obj/item/clothing/head/helmet/riot/knight/templar(src) new /obj/item/clothing/suit/armor/riot/knight/templar(src) + new /obj/item/clothing/suit/storage/labcoat(src) new /obj/item/soulstone/anybody/purified/chaplain(src) new /obj/item/storage/fancy/candle_box/eternal(src) new /obj/item/storage/fancy/candle_box/eternal(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/depot.dm b/code/game/objects/structures/crates_lockers/closets/secure/depot.dm index 18cdb50d685..eaed06a2c29 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/depot.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/depot.dm @@ -32,13 +32,13 @@ /obj/structure/closet/secure_closet/syndicate/depot/attack_animal(mob/M) if(isanimal(M) && ("syndicate" in M.faction)) - to_chat(M, "The [src] resists your attack!") + to_chat(M, "[src] resists your attack!") return return ..() /obj/structure/closet/secure_closet/syndicate/depot/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/rcs)) - to_chat(user, "Bluespace interference prevents the [W] from locking onto [src]!") + to_chat(user, "Bluespace interference prevents [W] from locking onto [src]!") return return ..() diff --git a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm index 8c878cd6c59..2bf2b03b4a2 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm @@ -69,7 +69,8 @@ togglelock(user) /obj/structure/closet/secure_closet/AltClick(mob/user) - ..() + if(opened) + return ..() if(Adjacent(user)) togglelock(user) @@ -79,7 +80,7 @@ locked = FALSE icon_state = icon_off flick(icon_broken, src) - to_chat(user, "You break the lock on \the [src].") + to_chat(user, "You break the lock on [src].") /obj/structure/closet/secure_closet/attack_hand(mob/user) add_fingerprint(user) @@ -126,7 +127,7 @@ //okay, so the closet is either welded or locked... resist!!! to_chat(L, "You lean on the back of \the [src] and start pushing the door open. (this will take about [breakout_time] minutes)") for(var/mob/O in viewers(src)) - O.show_message("The [src] begins to shake violently!", 1) + O.show_message("[src] begins to shake violently!", 1) spawn(0) diff --git a/code/game/objects/structures/crates_lockers/closets/syndicate.dm b/code/game/objects/structures/crates_lockers/closets/syndicate.dm index ccc27c18589..b33b9fa24e4 100644 --- a/code/game/objects/structures/crates_lockers/closets/syndicate.dm +++ b/code/game/objects/structures/crates_lockers/closets/syndicate.dm @@ -23,7 +23,7 @@ /obj/structure/closet/syndicate/suits/populate_contents() new /obj/item/clothing/mask/gas/syndicate(src) new /obj/item/clothing/suit/space/hardsuit/syndi(src) - new /obj/item/tank/jetpack/oxygen/harness(src) + new /obj/item/tank/internals/oxygen/red(src) /obj/structure/closet/syndicate/nuclear desc = "It's a storage unit for a Syndicate boarding party." @@ -37,6 +37,7 @@ new /obj/item/storage/box/teargas(src) new /obj/item/storage/box/flashbangs(src) new /obj/item/storage/backpack/duffel/syndie/med(src) + new /obj/item/tank/jetpack/oxygen/harness(src) new /obj/item/gun/projectile/automatic/shotgun/bulldog(src) new /obj/item/gun/projectile/automatic/shotgun/bulldog(src) new /obj/item/gun/projectile/automatic/shotgun/bulldog(src) @@ -50,7 +51,7 @@ /obj/structure/closet/syndicate/sst/populate_contents() new /obj/item/ammo_box/magazine/mm556x45(src) new /obj/item/gun/projectile/automatic/l6_saw(src) - new /obj/item/tank/jetpack/oxygen/harness(src) + new /obj/item/tank/internals/oxygen/red(src) new /obj/item/storage/belt/military/sst(src) new /obj/item/clothing/glasses/thermal(src) new /obj/item/clothing/shoes/magboots/syndie/advance(src) diff --git a/code/game/objects/structures/depot.dm b/code/game/objects/structures/depot.dm index 29ba8882bd7..992b874154d 100644 --- a/code/game/objects/structures/depot.dm +++ b/code/game/objects/structures/depot.dm @@ -50,7 +50,7 @@ . = TRUE if(!I.use_tool(src, user, 0, volume = I.tool_volume)) return - to_chat(user, "The [src] is too well secured to the floor.") + to_chat(user, "[src] is too well secured to the floor.") /obj/structure/fusionreactor/proc/overload(containment_failure = FALSE, skip_qdel = FALSE) if(has_overloaded) diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm index 6219fe7cfeb..c1aa16efc99 100644 --- a/code/game/objects/structures/displaycase.dm +++ b/code/game/objects/structures/displaycase.dm @@ -35,10 +35,19 @@ QDEL_NULL(showpiece) return ..() +/obj/structure/displaycase/emag_act(mob/user) + if(!emagged) + to_chat(user, "You override the ID lock on [src].") + trigger_alarm() + + emagged = TRUE + /obj/structure/displaycase/examine(mob/user) . = ..() if(alert) . += "Hooked up with an anti-theft system." + if(emagged) + . += "The ID lock has been shorted out." if(showpiece) . += "There's [showpiece] inside." if(trophy_message) @@ -100,7 +109,7 @@ /obj/structure/displaycase/attackby(obj/item/I, mob/user, params) if(I.GetID() && !broken && openable) - if(allowed(user)) + if(allowed(user) || emagged) to_chat(user, "You [open ? "close":"open"] [src].") toggle_lock(user) else diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm index 02cad716d3d..161f507158c 100644 --- a/code/game/objects/structures/door_assembly.dm +++ b/code/game/objects/structures/door_assembly.dm @@ -226,7 +226,7 @@ return if(mineral) var/obj/item/stack/sheet/mineral/mineral_path = text2path("/obj/item/stack/sheet/mineral/[mineral]") - visible_message("[user] welds the [mineral] plating off [src].",\ + user.visible_message("[user] welds the [mineral] plating off [src].",\ "You start to weld the [mineral] plating off [src]...",\ "You hear welding.") if(!I.use_tool(src, user, 40, volume = I.tool_volume)) @@ -236,7 +236,7 @@ var/obj/structure/door_assembly/PA = new previous_assembly(loc) transfer_assembly_vars(src, PA) else if(glass) - visible_message("[user] welds the glass panel out of [src].",\ + user.visible_message("[user] welds the glass panel out of [src].",\ "You start to weld the glass panel out of the [src]...",\ "You hear welding.") if(!I.use_tool(src, user, 40, volume = I.tool_volume)) diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm index 8217a86e505..c52338b9e7d 100644 --- a/code/game/objects/structures/false_walls.dm +++ b/code/game/objects/structures/false_walls.dm @@ -51,10 +51,6 @@ if(0 to 40) return "It looks heavily damaged." -/obj/structure/falsewall/ratvar_act() - new /obj/structure/falsewall/brass(loc) - qdel(src) - /obj/structure/falsewall/Destroy() density = 0 air_update_turf(1) diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index 68025f98fce..b3bc69cbaea 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -55,13 +55,6 @@ if(!anchored) . += "The anchoring screws are unscrewed. The rods look like they could be cut through." -/obj/structure/grille/ratvar_act() - if(broken) - new /obj/structure/grille/ratvar/broken(loc) - else - new /obj/structure/grille/ratvar(loc) - qdel(src) - /obj/structure/grille/Bumped(atom/user) if(ismob(user)) if(!(shockcooldown <= world.time)) @@ -133,11 +126,12 @@ return ..() /obj/structure/grille/proc/repair(mob/user, obj/item/stack/rods/R) - user.visible_message("[user] rebuilds the broken grille.", - "You rebuild the broken grille.") - new grille_type(loc) - R.use(1) - qdel(src) + if(R.get_amount() >= 1) + user.visible_message("[user] rebuilds the broken grille.", + "You rebuild the broken grille.") + new grille_type(loc) + R.use(1) + qdel(src) /obj/structure/grille/wirecutter_act(mob/user, obj/item/I) . = TRUE @@ -190,7 +184,7 @@ W.update_nearby_icons() W.state = WINDOW_OUT_OF_FRAME S.use(2) - to_chat(user, "You place the [W] on [src].") + to_chat(user, "You place [W] on [src].") /obj/structure/grille/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0) @@ -289,9 +283,6 @@ color = "#960000" animate(src, color = previouscolor, time = 8) -/obj/structure/grille/ratvar/ratvar_act() - return - /obj/structure/grille/ratvar/broken icon_state = "brokenratvargrille" density = FALSE diff --git a/code/game/objects/structures/guillotine.dm b/code/game/objects/structures/guillotine.dm index 9184d739a5f..be3fe496bc5 100644 --- a/code/game/objects/structures/guillotine.dm +++ b/code/game/objects/structures/guillotine.dm @@ -216,7 +216,7 @@ /obj/structure/guillotine/buckle_mob(mob/living/M, force = FALSE, check_loc = TRUE) if(!anchored) - to_chat(usr, "The [src] needs to be wrenched to the floor!") + to_chat(usr, "[src] needs to be wrenched to the floor!") return FALSE if(!ishuman(M)) diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm index d84c1f39728..3561bd1f239 100644 --- a/code/game/objects/structures/lattice.dm +++ b/code/game/objects/structures/lattice.dm @@ -61,18 +61,6 @@ /obj/structure/lattice/clockwork/Initialize(mapload) . = ..() - ratvar_act() - -/obj/structure/lattice/clockwork/ratvar_act() - if((x + y) % 2 != 0) - icon = 'icons/obj/smooth_structures/lattice_clockwork_large.dmi' - pixel_x = -9 - pixel_y = -9 - else - icon = 'icons/obj/smooth_structures/lattice_clockwork.dmi' - pixel_x = 0 - pixel_y = 0 - return TRUE /obj/structure/lattice/catwalk name = "catwalk" @@ -109,18 +97,6 @@ /obj/structure/lattice/catwalk/clockwork/Initialize(mapload) . = ..() - ratvar_act() if(!mapload) new /obj/effect/temp_visual/ratvar/floor/catwalk(loc) new /obj/effect/temp_visual/ratvar/beam/catwalk(loc) - -/obj/structure/lattice/catwalk/clockwork/ratvar_act() - if((x + y) % 2 != 0) - icon = 'icons/obj/smooth_structures/catwalk_clockwork_large.dmi' - pixel_x = -9 - pixel_y = -9 - else - icon = 'icons/obj/smooth_structures/catwalk_clockwork.dmi' - pixel_x = 0 - pixel_y = 0 - return TRUE diff --git a/code/game/objects/structures/loom.dm b/code/game/objects/structures/loom.dm index 4742a2c3c0c..1687478e6b4 100644 --- a/code/game/objects/structures/loom.dm +++ b/code/game/objects/structures/loom.dm @@ -45,12 +45,12 @@ if(W.amount < FABRIC_PER_SHEET) user.show_message("You need at least [FABRIC_PER_SHEET] units of fabric before using this.", 1) return FALSE - user.show_message("You start weaving \the [W.name] through the loom..", 1) + user.show_message("You start weaving [W] through the loom...", 1) if(do_after(user, W.pull_effort, target = src)) if(W.amount >= FABRIC_PER_SHEET) new W.loom_result(drop_location()) W.use(FABRIC_PER_SHEET) - user.show_message("You weave \the [W.name] into a workable fabric.", 1) + user.show_message("You weave [W] into a workable fabric.", 1) return TRUE #undef FABRIC_PER_SHEET diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm index 5bfe4e8a880..4266d6ef254 100644 --- a/code/game/objects/structures/safe.dm +++ b/code/game/objects/structures/safe.dm @@ -402,7 +402,7 @@ GLOBAL_LIST_EMPTY(safes) for(var/safe in GLOB.safes) var/obj/structure/safe/S = safe if(owner in S.known_by) - info += "
    The combination for the safe located in the [get_area(S).name] is: [S.get_combination()]
    " + info += "
    The combination for the safe located in the [get_area_name(S, TRUE)] is: [S.get_combination()]
    " info_links = info update_icon() diff --git a/code/game/objects/structures/spirit_board.dm b/code/game/objects/structures/spirit_board.dm index 647f0a53c6e..7ee9097aac5 100644 --- a/code/game/objects/structures/spirit_board.dm +++ b/code/game/objects/structures/spirit_board.dm @@ -74,7 +74,7 @@ users_in_range++ if(users_in_range < 2) - to_chat(M, "There aren't enough people to use the [src.name]!") + to_chat(M, "There aren't enough people to use [src]!") return 0 return 1 diff --git a/code/game/objects/structures/statues.dm b/code/game/objects/structures/statues.dm index 2c7ffbe2e90..15874e0c812 100644 --- a/code/game/objects/structures/statues.dm +++ b/code/game/objects/structures/statues.dm @@ -46,9 +46,6 @@ user.visible_message("[user] rubs some dust off from the [name]'s surface.", \ "You rub some dust off from the [name]'s surface.") -/obj/structure/statue/CanAtmosPass() - return !density - /obj/structure/statue/deconstruct(disassembled = TRUE) if(!(flags & NODECONSTRUCT)) if(material_drop_type) diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm index 256376d30a7..d12dc172b0c 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -24,11 +24,6 @@ W.setDir(dir) qdel(src) -/obj/structure/chair/ratvar_act() - var/obj/structure/chair/brass/B = new(get_turf(src)) - B.setDir(dir) - qdel(src) - /obj/structure/chair/Move(atom/newloc, direct) ..() handle_rotation() @@ -441,9 +436,6 @@ if(turns >= 8) STOP_PROCESSING(SSfastprocess, src) -/obj/structure/chair/brass/ratvar_act() - return - /obj/structure/chair/brass/AltClick(mob/living/user) turns = 0 if(!istype(user) || user.incapacitated() || !in_range(src, user)) diff --git a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm index 9def5542c76..1a162c250fa 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm @@ -156,3 +156,6 @@ else . = 1 + +/obj/structure/chair/wheelchair/bike/wrench_act(mob/user, obj/item/I) + return diff --git a/code/game/objects/structures/table_frames.dm b/code/game/objects/structures/table_frames.dm index 575f666848a..966c3f313b4 100644 --- a/code/game/objects/structures/table_frames.dm +++ b/code/game/objects/structures/table_frames.dm @@ -91,10 +91,6 @@ new /obj/structure/table_frame/wood(loc) qdel(src) -/obj/structure/table_frame/ratvar_act() - new /obj/structure/table_frame/brass(loc) - qdel(src) - /* * Wooden Frames */ diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 5bce42875fe..63db6501f74 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -84,10 +84,6 @@ new /obj/structure/table/wood(loc) qdel(src) -/obj/structure/table/ratvar_act() - new /obj/structure/table/reinforced/brass(loc) - qdel(src) - /obj/structure/table/do_climb(mob/living/user) . = ..() item_placed(user) @@ -112,25 +108,27 @@ /obj/structure/table/CanPass(atom/movable/mover, turf/target, height=0) if(height == 0) - return 1 + return TRUE if(istype(mover,/obj/item/projectile)) return (check_cover(mover,target)) if(ismob(mover)) var/mob/M = mover if(M.flying) - return 1 + return TRUE if(istype(mover) && mover.checkpass(PASSTABLE)) - return 1 + return TRUE if(mover.throwing) - return 1 + return TRUE if(length(get_atoms_of_type(get_turf(mover), /obj/structure/table) - mover)) - return 1 + var/obj/structure/table/T = locate(/obj/structure/table) in get_turf(mover) + if(!T.flipped) + return TRUE if(flipped) if(get_dir(loc, target) == dir) return !density else - return 1 - return 0 + return TRUE + return FALSE /obj/structure/table/CanAStarPass(ID, dir, caller) . = !density @@ -571,9 +569,6 @@ color = "#960000" animate(src, color = previouscolor, time = 8) -/obj/structure/table/reinforced/brass/ratvar_act() - obj_integrity = max_integrity - /obj/structure/table/tray name = "surgical tray" desc = "A small metal tray with wheels." @@ -637,9 +632,6 @@ /obj/structure/table/tray/narsie_act() return 0 -/obj/structure/table/tray/ratvar_act() - return 0 - /* * Racks */ diff --git a/code/game/objects/structures/transit_tubes/station.dm b/code/game/objects/structures/transit_tubes/station.dm index bb53368ee4b..131351aaa2f 100644 --- a/code/game/objects/structures/transit_tubes/station.dm +++ b/code/game/objects/structures/transit_tubes/station.dm @@ -79,7 +79,7 @@ if(ismob(G.affecting) && G.state >= GRAB_AGGRESSIVE) var/mob/GM = G.affecting for(var/obj/structure/transit_tube_pod/pod in loc) - pod.visible_message("[user] starts putting [GM] into the [pod]!") + pod.visible_message("[user] starts putting [GM] into [pod]!") if(do_after(user, 30, target = GM) && GM && G && G.affecting == GM) GM.Weaken(5) Bumped(GM) diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index d513b4e2920..7a235c4001a 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -275,6 +275,9 @@ /obj/machinery/shower/Destroy() QDEL_NULL(soundloop) + var/obj/effect/mist/mist = locate() in loc + if(!QDELETED(mist)) + QDEL_IN(mist, 25 SECONDS) return ..() //add heat controls? when emagged, you can freeze to death in it? @@ -401,7 +404,7 @@ tile.water_act(100, convertHeat(), src) tile.clean_blood(radiation_clean = TRUE) for(var/obj/effect/E in tile) - if(is_cleanable(E)) + if(E.is_cleanable()) qdel(E) for(var/A in loc) wash(A) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index b0d9464a0a3..1e260cf9e92 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -72,13 +72,6 @@ /obj/structure/window/narsie_act() color = NARSIE_WINDOW_COLOUR -/obj/structure/window/ratvar_act() - if(!fulltile) - new/obj/structure/window/reinforced/clockwork(get_turf(src), dir) - else - new/obj/structure/window/reinforced/clockwork/fulltile(get_turf(src)) - qdel(src) - /obj/structure/window/rpd_act() return @@ -243,6 +236,7 @@ if(!I.use_tool(src, user, decon_speed, volume = I.tool_volume, extra_checks = CALLBACK(src, .proc/check_state_and_anchored, state, anchored))) return anchored = !anchored + air_update_turf(TRUE) update_nearby_icons() to_chat(user, "You [anchored ? "fasten the frame to":"unfasten the frame from"] the floor.") @@ -397,7 +391,8 @@ return TRUE /obj/structure/window/AltClick(mob/user) - + if(fulltile) // Can't rotate these. + return ..() if(user.incapacitated()) to_chat(user, "You can't do that right now!") return @@ -415,7 +410,7 @@ if(!valid_window_location(loc, target_dir)) target_dir = turn(dir, 90) if(!valid_window_location(loc, target_dir)) - to_chat(user, "There is no room to rotate the [src]") + to_chat(user, "There is no room to rotate [src].") return FALSE setDir(target_dir) @@ -725,10 +720,6 @@ made_glow = TRUE ..() -/obj/structure/window/reinforced/clockwork/ratvar_act() - obj_integrity = max_integrity - update_nearby_icons() - /obj/structure/window/reinforced/clockwork/narsie_act() take_damage(rand(25, 75), BRUTE) if(src) diff --git a/code/game/shuttle_engines.dm b/code/game/shuttle_engines.dm index 3e40186623d..6b3ff950dbe 100644 --- a/code/game/shuttle_engines.dm +++ b/code/game/shuttle_engines.dm @@ -6,10 +6,7 @@ armor = list(melee = 100, bullet = 10, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 70) //default + ignores melee /obj/structure/shuttle/shuttleRotate(rotation) - ..() - var/matrix/M = transform - M.Turn(rotation) - transform = M + return //This override is needed to properly rotate the object when on a shuttle that is rotated. /obj/structure/shuttle/engine name = "engine" @@ -30,14 +27,11 @@ opacity = 1 /obj/structure/shuttle/engine/propulsion/burst - name = "burst" /obj/structure/shuttle/engine/propulsion/burst/left - name = "left" icon_state = "burst_l" /obj/structure/shuttle/engine/propulsion/burst/right - name = "right" icon_state = "burst_r" /obj/structure/shuttle/engine/router diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm index 3ba2e638099..24fcba648f2 100644 --- a/code/game/turfs/simulated/floor.dm +++ b/code/game/turfs/simulated/floor.dm @@ -1,12 +1,9 @@ //This is so damaged or burnt tiles or platings don't get remembered as the default tile GLOBAL_LIST_INIT(icons_to_ignore_at_floor_init, list("damaged1","damaged2","damaged3","damaged4", "damaged5","panelscorched","floorscorched1","floorscorched2","platingdmg1","platingdmg2", - "platingdmg3","plating","light_on","light_on_flicker1","light_on_flicker2", - "warnplate", "warnplatecorner","metalfoam", "ironfoam", - "light_on_clicker3","light_on_clicker4","light_on_clicker5","light_broken", - "light_on_broken","light_off","wall_thermite","grass1","grass2","grass3","grass4", - "asteroid","asteroid_dug", - "asteroid0","asteroid1","asteroid2","asteroid3","asteroid4", + "platingdmg3","plating","light_on","warnplate", "warnplatecorner","metalfoam", "ironfoam", + "light_off","wall_thermite","grass1","grass2","grass3","grass4", + "asteroid","asteroid_dug","asteroid0","asteroid1","asteroid2","asteroid3","asteroid4", "asteroid5","asteroid6","asteroid7","asteroid8","asteroid9","asteroid10","asteroid11","asteroid12", "oldburning","light-on-r","light-on-y","light-on-g","light-on-b", "wood", "wood-broken", "carpet", "carpetcorner", "carpetside", "carpet", "ironsand1", "ironsand2", "ironsand3", "ironsand4", "ironsand5", @@ -234,11 +231,6 @@ GLOBAL_LIST_INIT(icons_to_ignore_at_floor_init, list("damaged1","damaged2","dama if(prob(20)) ChangeTurf(/turf/simulated/floor/engine/cult) -/turf/simulated/floor/ratvar_act(force, ignore_mobs) - . = ..() - if(.) - ChangeTurf(/turf/simulated/floor/clockwork) - /turf/simulated/floor/acid_melt() ChangeTurf(baseturf) diff --git a/code/game/turfs/simulated/floor/chasm.dm b/code/game/turfs/simulated/floor/chasm.dm index 7c1464b92a4..1b5539e001a 100644 --- a/code/game/turfs/simulated/floor/chasm.dm +++ b/code/game/turfs/simulated/floor/chasm.dm @@ -178,7 +178,7 @@ qdel(AM) if(AM && !QDELETED(AM)) //It's indestructible - visible_message("[src] spits out the [AM]!") + visible_message("[src] spits out [AM]!") AM.alpha = oldalpha AM.color = oldcolor AM.transform = oldtransform diff --git a/code/game/turfs/simulated/floor/indestructible.dm b/code/game/turfs/simulated/floor/indestructible.dm index cd7abaeb188..67e3f3f5ecd 100644 --- a/code/game/turfs/simulated/floor/indestructible.dm +++ b/code/game/turfs/simulated/floor/indestructible.dm @@ -15,9 +15,6 @@ /turf/simulated/floor/indestructible/narsie_act() return -/turf/simulated/floor/indestructible/ratvar_act(force, ignore_mobs) - return - /turf/simulated/floor/indestructible/burn_down() return diff --git a/code/game/turfs/simulated/floor/light_floor.dm b/code/game/turfs/simulated/floor/light_floor.dm index 0d27e02537f..4c4e3e44a15 100644 --- a/code/game/turfs/simulated/floor/light_floor.dm +++ b/code/game/turfs/simulated/floor/light_floor.dm @@ -1,23 +1,14 @@ -#define LIGHTFLOOR_ON 1 -#define LIGHTFLOOR_WHITE 2 -#define LIGHTFLOOR_RED 3 -#define LIGHTFLOOR_GREEN 4 -#define LIGHTFLOOR_YELLOW 5 -#define LIGHTFLOOR_BLUE 6 -#define LIGHTFLOOR_PURPLE 7 - -#define LIGHTFLOOR_GENERICCYCLE 8 -#define LIGHTFLOOR_CYCLEA 9 -#define LIGHTFLOOR_CYCLEB 10 - /turf/simulated/floor/light name = "\improper light floor" light_range = 5 icon_state = "light_on" floor_tile = /obj/item/stack/tile/light - broken_states = list("light_broken") + broken_states = list("light_off") + /// Are we on var/on = TRUE - var/state = LIGHTFLOOR_ON + /// Are we broken + var/light_broken = FALSE + /// Can we modify a colour var/can_modify_colour = TRUE /turf/simulated/floor/light/Initialize(mapload) @@ -27,43 +18,11 @@ /turf/simulated/floor/light/update_icon() ..() if(on) - switch(state) - if(LIGHTFLOOR_ON) - icon_state = "light_on" - set_light(5, null,LIGHT_COLOR_LIGHTBLUE) - if(LIGHTFLOOR_WHITE) - icon_state = "light_on-w" - set_light(5, null,LIGHT_COLOR_WHITE) - if(LIGHTFLOOR_RED) - icon_state = "light_on-r" - set_light(5, null,LIGHT_COLOR_RED) - if(LIGHTFLOOR_GREEN) - icon_state = "light_on-g" - set_light(5, null,LIGHT_COLOR_PURE_GREEN) - if(LIGHTFLOOR_YELLOW) - icon_state = "light_on-y" - set_light(5, null,"#FFFF00") - if(LIGHTFLOOR_BLUE) - icon_state = "light_on-b" - set_light(5, null,LIGHT_COLOR_DARKBLUE) - if(LIGHTFLOOR_PURPLE) - icon_state = "light_on-p" - set_light(5, null,LIGHT_COLOR_PURPLE) - if(LIGHTFLOOR_GENERICCYCLE) - icon_state = "light_on-cycle_all" - set_light(5, null,LIGHT_COLOR_WHITE) - if(LIGHTFLOOR_CYCLEA) - icon_state = "light_on-dancefloor_A" - set_light(5,null,LIGHT_COLOR_RED) - if(LIGHTFLOOR_CYCLEB) - icon_state = "light_on-dancefloor_B" - set_light(5, null,LIGHT_COLOR_DARKBLUE) - else - icon_state = "light_off" - set_light(0) + icon_state = "light_on" + set_light(5, null, color) else - set_light(0) icon_state = "light_off" + set_light(0) /turf/simulated/floor/light/BeforeChange() set_light(0) @@ -76,9 +35,9 @@ /turf/simulated/floor/light/attackby(obj/item/C, mob/user, params) if(istype(C, /obj/item/light/bulb)) //only for light tiles - if(!state) + if(!light_broken) qdel(C) - state = LIGHTFLOOR_ON + light_broken = FALSE update_icon() to_chat(user, "You replace the light bulb.") else @@ -92,11 +51,21 @@ return if(!I.use_tool(src, user, 0, volume = I.tool_volume)) return - if(state != 0) - if(state < LIGHTFLOOR_PURPLE) - state++ - else - state = LIGHTFLOOR_ON + if(!light_broken) + var/new_color = input(user, "Select a bulb color", "Select a bulb color", color) as color|null + if(!new_color) + return + + // Cancel if they walked away + if(!Adjacent(user, src)) + return + + // Now lets make sure it cant go fully black. Yes I know this is more dense than my skull. + var/list/hsl = rgb2hsl(hex2num(copytext(new_color, 2, 4)), hex2num(copytext(new_color, 4, 6)), hex2num(copytext(new_color, 6, 8))) + hsl[3] = max(hsl[3], 0.4) + var/list/rgb = hsl2rgb(arglist(hsl)) + color = "#[num2hex(rgb[1], 2)][num2hex(rgb[2], 2)][num2hex(rgb[3], 2)]" + to_chat(user, "You change [src]'s light bulb color.") update_icon() else @@ -112,32 +81,7 @@ toggle_light(FALSE) visible_message("[src] flickers and falls dark.") -//Cycles through all of the colours -/turf/simulated/floor/light/colour_cycle - state = LIGHTFLOOR_GENERICCYCLE - can_modify_colour = FALSE - -//Two different "dancefloor" types so that you can have a checkered pattern -// (also has a longer delay than colour_cycle between cycling colours) -/turf/simulated/floor/light/colour_cycle/dancefloor_a - name = "dancefloor" - desc = "Funky floor." - state = LIGHTFLOOR_CYCLEA - -/turf/simulated/floor/light/colour_cycle/dancefloor_b - name = "dancefloor" - desc = "Funky floor." - state = LIGHTFLOOR_CYCLEB - - -#undef LIGHTFLOOR_ON -#undef LIGHTFLOOR_WHITE -#undef LIGHTFLOOR_RED -#undef LIGHTFLOOR_GREEN -#undef LIGHTFLOOR_YELLOW -#undef LIGHTFLOOR_BLUE -#undef LIGHTFLOOR_PURPLE - -#undef LIGHTFLOOR_GENERICCYCLE -#undef LIGHTFLOOR_CYCLEA -#undef LIGHTFLOOR_CYCLEB +/turf/simulated/floor/light/clean(floor_only) + var/color_save = color + ..() + color = color_save diff --git a/code/game/turfs/simulated/floor/misc_floor.dm b/code/game/turfs/simulated/floor/misc_floor.dm index 2876378eb06..96b79588793 100644 --- a/code/game/turfs/simulated/floor/misc_floor.dm +++ b/code/game/turfs/simulated/floor/misc_floor.dm @@ -176,11 +176,6 @@ QDEL_NULL(realappearence) return ..() -/turf/simulated/floor/clockwork/ReplaceWithLattice() - . = ..() - for(var/obj/structure/lattice/L in src) - L.ratvar_act() - /turf/simulated/floor/clockwork/crowbar_act(mob/user, obj/item/I) . = TRUE if(!I.tool_use_check(user, 0)) diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm index 94d95c2af86..d0805cf5099 100644 --- a/code/game/turfs/simulated/floor/plating.dm +++ b/code/game/turfs/simulated/floor/plating.dm @@ -187,13 +187,6 @@ /turf/simulated/floor/engine/cult/narsie_act() return -/turf/simulated/floor/engine/cult/ratvar_act() - . = ..() - if(istype(src, /turf/simulated/floor/engine/cult)) //if we haven't changed type - var/previouscolor = color - color = "#FAE48C" - animate(src, color = previouscolor, time = 8) - //air filled floors; used in atmos pressure chambers /turf/simulated/floor/engine/n20 diff --git a/code/game/turfs/simulated/minerals.dm b/code/game/turfs/simulated/minerals.dm index 026eef852d8..d2109bee2f0 100644 --- a/code/game/turfs/simulated/minerals.dm +++ b/code/game/turfs/simulated/minerals.dm @@ -20,7 +20,7 @@ var/mineralType = null var/mineralAmt = 3 var/spread = 0 //will the seam spread? - var/spreadChance = 0 //the percentual chance of an ore spreading to the neighbouring tiles + var/spreadChance = 0 //the percentile chance of an ore spreading to the neighboring tiles var/last_act = 0 var/scan_state = "" //Holder for the image we display when we're pinged by a mining scanner var/defer_change = 0 diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm index 02035e17f95..1eb89e6a238 100644 --- a/code/game/turfs/simulated/walls.dm +++ b/code/game/turfs/simulated/walls.dm @@ -4,7 +4,7 @@ /turf/simulated/wall name = "wall" - desc = "A huge chunk of metal used to seperate rooms." + desc = "A huge chunk of metal used to separate rooms." icon = 'icons/turf/walls/wall.dmi' icon_state = "wall" var/rotting = FALSE diff --git a/code/game/turfs/simulated/walls_indestructible.dm b/code/game/turfs/simulated/walls_indestructible.dm index 56feb811745..37208cd0b81 100644 --- a/code/game/turfs/simulated/walls_indestructible.dm +++ b/code/game/turfs/simulated/walls_indestructible.dm @@ -27,9 +27,6 @@ /turf/simulated/wall/indestructible/narsie_act() return -/turf/simulated/wall/indestructible/ratvar_act(force, ignore_mobs) - return - /turf/simulated/wall/indestructible/burn_down() return diff --git a/code/game/turfs/simulated/walls_mineral.dm b/code/game/turfs/simulated/walls_mineral.dm index f49863ca141..6e8891f64e0 100644 --- a/code/game/turfs/simulated/walls_mineral.dm +++ b/code/game/turfs/simulated/walls_mineral.dm @@ -7,6 +7,9 @@ canSmoothWith = null smooth = SMOOTH_TRUE +/turf/simulated/wall/mineral/shuttleRotate(rotation) + return //This override is needed to properly rotate the object when on a shuttle that is rotated. + /turf/simulated/wall/mineral/gold name = "gold wall" desc = "A wall with gold plating. Swag!" @@ -82,7 +85,7 @@ /turf/simulated/wall/mineral/plasma name = "plasma wall" - desc = "A wall with plasma plating. This is definately a bad idea." + desc = "A wall with plasma plating. This is definitely a bad idea." icon = 'icons/turf/walls/plasma_wall.dmi' icon_state = "plasma" sheet_type = /obj/item/stack/sheet/mineral/plasma diff --git a/code/game/turfs/simulated/walls_misc.dm b/code/game/turfs/simulated/walls_misc.dm index 89122891702..a841f06665e 100644 --- a/code/game/turfs/simulated/walls_misc.dm +++ b/code/game/turfs/simulated/walls_misc.dm @@ -11,7 +11,7 @@ /turf/simulated/wall/cult/Initialize(mapload) . = ..() - if(SSticker.mode)//game hasn't started offically don't do shit.. + if(SSticker.mode)//game hasn't started officially don't do shit.. new /obj/effect/temp_visual/cult/turf(src) icon_state = SSticker.cultdat.cult_wall_icon_state @@ -69,11 +69,6 @@ QDEL_NULL(realappearance) return ..() -/turf/simulated/wall/clockwork/ReplaceWithLattice() - ..() - for(var/obj/structure/lattice/L in src) - L.ratvar_act() - /turf/simulated/wall/clockwork/narsie_act() ..() if(istype(src, /turf/simulated/wall/clockwork)) //if we haven't changed type @@ -122,19 +117,3 @@ to_chat(M.occupant, "The wall's intense heat completely reflects your [M.name]'s attack!") M.take_damage(20, BURN) -/turf/simulated/wall/clockwork/proc/turn_up_the_heat() - if(!heated) - name = "superheated [name]" - visible_message("[src] sizzles with heat!") - playsound(src, 'sound/machines/fryer/deep_fryer_emerge.ogg', 50, TRUE) - heated = TRUE - hardness = -100 //Lower numbers are tougher, so this makes the wall essentially impervious to smashing - slicing_duration = 150 - animate(realappearance, color = "#FFC3C3", time = 5) - else - name = initial(name) - visible_message("[src] cools down.") - heated = FALSE - hardness = initial(hardness) - slicing_duration = initial(slicing_duration) - animate(realappearance, color = initial(realappearance.color), time = 25) diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 4678bd94ce4..938e2f8a851 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -179,7 +179,7 @@ // override for space turfs, since they should never hide anything /turf/space/levelupdate() for(var/obj/O in src) - if(O.level == 1) + if(O.level == 1 && O.initialized) // Only do this if the object has initialized O.hide(FALSE) // Removes all signs of lattice on the pos of the turf -Donkieyo @@ -330,6 +330,20 @@ /turf/proc/Bless() flags |= NOJAUNT +/turf/proc/clean(floor_only) + for(var/obj/effect/decal/cleanable/C in src) + var/obj/effect/decal/cleanable/blood/B = C + if(istype(B) && B.off_floor) + floor_only = FALSE + else + qdel(C) + color = initial(color) + if(floor_only) + clean_blood() + + for(var/mob/living/simple_animal/slime/M in src) + M.adjustToxLoss(rand(5, 10)) + // Defined here to avoid runtimes /turf/proc/MakeDry(wet_setting = TURF_WET_WATER) return @@ -508,15 +522,6 @@ /turf/proc/can_lay_cable() return can_have_cabling() & !intact -/turf/ratvar_act(force, ignore_mobs, probability = 40) - . = (prob(probability) || force) - for(var/I in src) - var/atom/A = I - if(ignore_mobs && ismob(A)) - continue - if(ismob(A) || .) - A.ratvar_act() - /turf/proc/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir) underlay_appearance.icon = icon underlay_appearance.icon_state = icon_state diff --git a/code/game/verbs/who.dm b/code/game/verbs/who.dm index 4a0429dd576..4c21afebdd2 100644 --- a/code/game/verbs/who.dm +++ b/code/game/verbs/who.dm @@ -1,63 +1,98 @@ - /client/verb/who() set name = "Who" set category = "OOC" - var/msg = "Current Players:\n" + var/list/lines = list() + var/list/temp = list() + for(var/client/C in GLOB.clients) + if(C.holder && C.holder.big_brother) // BB doesn't show up at all + continue + + if(C.holder && C.holder.fakekey) + temp += C.holder.fakekey + else + temp += C.key + + temp = sortList(temp) // Sort it. We dont do this above because fake keys would be out of order, which would be a giveaway + + var/list/output_players = list() + + // Now go over it again to apply colours. + for(var/p in temp) + var/client/C = GLOB.directory[ckey(p)] + if(!C) + // This should NEVER happen, but better to be safe + continue + // Get the colour + var/colour = client2rankcolour(C) + var/out = "[p]" + if(C.holder) + out = "[out]" + if(colour) + out = "[out]" + + output_players += out + + lines += "Current Players ([length(output_players)]): " + lines += output_players.Join(", ") // Turn players into a comma separated list + + if(check_rights(R_ADMIN, FALSE)) + lines += "Click here for detailed (old) who." + + var/msg = lines.Join("\n") + + to_chat(src, msg) + +// Advanced version of `who` to show player age, antag status and more. Lags the chat when loading, so its in its own proc +/client/proc/who_advanced() + if(!check_rights(R_ADMIN)) + return var/list/Lines = list() - if(check_rights(R_ADMIN,0)) - for(var/client/C in GLOB.clients) - if(C.holder && C.holder.big_brother && !check_rights(R_PERMISSIONS, 0)) // need PERMISSIONS to see BB - continue + for(var/client/C in GLOB.clients) + if(C.holder && C.holder.big_brother && !check_rights(R_PERMISSIONS, FALSE)) // need PERMISSIONS to see BB + continue - var/entry = "\t[C.key]" - if(C.holder && C.holder.fakekey) - entry += " (as [C.holder.fakekey])" - entry += " - Playing as [C.mob.real_name]" - switch(C.mob.stat) - if(UNCONSCIOUS) - entry += " - Unconscious" - if(DEAD) - if(isobserver(C.mob)) - var/mob/dead/observer/O = C.mob - if(O.started_as_observer) - entry += " - Observing" - else - entry += " - DEAD" - else if(isnewplayer(C.mob)) - entry += " - New Player" + var/entry = "\t[C.key]" + if(C.holder && C.holder.fakekey) + entry += " (as [C.holder.fakekey])" + entry += " - Playing as [C.mob.real_name]" + switch(C.mob.stat) + if(UNCONSCIOUS) + entry += " - Unconscious" + if(DEAD) + if(isobserver(C.mob)) + var/mob/dead/observer/O = C.mob + if(O.started_as_observer) + entry += " - Observing" else entry += " - DEAD" + else if(isnewplayer(C.mob)) + entry += " - New Player" + else + entry += " - DEAD" - var/age - if(isnum(C.player_age)) - age = C.player_age - else - age = 0 + var/age + if(isnum(C.player_age)) + age = C.player_age + else + age = 0 - if(age <= 1) - age = "[age]" - else if(age < 10) - age = "[age]" + if(age <= 1) + age = "[age]" + else if(age < 10) + age = "[age]" - entry += " - [age]" + entry += " - [age]" - if(is_special_character(C.mob)) - entry += " - Antagonist" - entry += " ([ADMIN_QUE(C.mob,"?")])" - Lines += entry - else - for(var/client/C in GLOB.clients) - if(C.holder && C.holder.big_brother) // BB doesn't show up at all - continue + if(is_special_character(C.mob)) + entry += " - Antagonist" + entry += " ([ADMIN_QUE(C.mob, "?")])" + Lines += entry - if(C.holder && C.holder.fakekey) - Lines += C.holder.fakekey - else - Lines += C.key + var/msg = "" for(var/line in sortList(Lines)) msg += "[line]\n" @@ -83,7 +118,12 @@ if(C.holder.big_brother && !check_rights(R_PERMISSIONS, 0)) // normal admins can't see BB continue - msg += "\t[C] is a [C.holder.rank]" + // Their rank may not have a defined colour, only set colour if so + var/rank_colour = client2rankcolour(C) + if(rank_colour) + msg += "[C] is a [C.holder.rank]" + else + msg += "[C] is a [C.holder.rank]" if(C.holder.fakekey) msg += " (as [C.holder.fakekey])" @@ -102,7 +142,12 @@ num_admins_online++ else if(check_rights(R_MENTOR|R_MOD, 0, C.mob)) - modmsg += "\t[C] is a [C.holder.rank]" + // Their rank may not have a defined colour, only set colour if so + var/rank_colour = client2rankcolour(C) + if(rank_colour) + modmsg += "[C] is a [C.holder.rank]" + else + modmsg += "[C] is a [C.holder.rank]" if(isobserver(C.mob)) modmsg += " - Observing" @@ -120,10 +165,20 @@ if(check_rights(R_ADMIN, 0, C.mob)) if(!C.holder.fakekey) - msg += "\t[C] is a [C.holder.rank]\n" + var/rank_colour = client2rankcolour(C) + if(rank_colour) + msg += "[C] is a [C.holder.rank]" + else + msg += "[C] is a [C.holder.rank]" + msg += "\n" num_admins_online++ else if(check_rights(R_MOD|R_MENTOR, 0, C.mob) && !check_rights(R_ADMIN, 0, C.mob)) - modmsg += "\t[C] is a [C.holder.rank]\n" + var/rank_colour = client2rankcolour(C) + if(rank_colour) + modmsg += "[C] is a [C.holder.rank]" + else + modmsg += "[C] is a [C.holder.rank]" + modmsg += "\n" num_mods_online++ var/noadmins_info = "\nIf no admins or mentors are online, make a ticket anyways. Adminhelps and mentorhelps will be relayed to discord, and staff will still be informed." diff --git a/code/game/world.dm b/code/game/world.dm index 5ba97917661..0e654fb6e01 100644 --- a/code/game/world.dm +++ b/code/game/world.dm @@ -1,4 +1,4 @@ -GLOBAL_LIST_INIT(map_transition_config, MAP_TRANSITION_CONFIG) +GLOBAL_LIST_INIT(map_transition_config, list(CC_TRANSITION_CONFIG)) /world/New() // IMPORTANT @@ -142,11 +142,11 @@ GLOBAL_LIST_EMPTY(world_topic_handlers) return #endif - // If we had an update or pending TM, set a 60 second timeout + // If the server has been gracefully shutdown in TGS, have a 60 seconds grace period for SQL updates and stuff var/secs_before_auto_reconnect = 10 - if(GLOB.pending_server_update) + if(GLOB.slower_restart) secs_before_auto_reconnect = 60 - to_chat(world, "Reboot will take a little longer, due to pending updates.") + server_announce_global("Reboot will take a little longer due to pending backend changes.") // Send the reboot banner to all players for(var/client/C in GLOB.clients) @@ -190,6 +190,7 @@ GLOBAL_LIST_EMPTY(world_topic_handlers) config.load("config/game_options.txt","game_options") config.loadsql("config/dbconfig.txt") config.loadoverflowwhitelist("config/ofwhitelist.txt") + config.load_rank_colour_map() // apply some settings from config.. /world/proc/update_status() @@ -247,10 +248,10 @@ GLOBAL_LIST_EMPTY(world_topic_handlers) GLOB.world_href_log = "[GLOB.log_directory]/hrefs.log" GLOB.world_runtime_log = "[GLOB.log_directory]/runtime.log" GLOB.world_qdel_log = "[GLOB.log_directory]/qdel.log" - GLOB.world_asset_log = "[GLOB.log_directory]/asset.log" GLOB.tgui_log = "[GLOB.log_directory]/tgui.log" GLOB.http_log = "[GLOB.log_directory]/http.log" GLOB.sql_log = "[GLOB.log_directory]/sql.log" + GLOB.chat_debug_log = "[GLOB.log_directory]/chat_debug.log" start_log(GLOB.world_game_log) start_log(GLOB.world_href_log) start_log(GLOB.world_runtime_log) @@ -258,6 +259,7 @@ GLOBAL_LIST_EMPTY(world_topic_handlers) start_log(GLOB.tgui_log) start_log(GLOB.http_log) start_log(GLOB.sql_log) + start_log(GLOB.chat_debug_log) // This log follows a special format and this path should NOT be used for anything else GLOB.runtime_summary_log = "data/logs/runtime_summary.log" diff --git a/code/modules/admin/IsBanned.dm b/code/modules/admin/IsBanned.dm index e160ee3838d..e70fa4acac8 100644 --- a/code/modules/admin/IsBanned.dm +++ b/code/modules/admin/IsBanned.dm @@ -1,5 +1,5 @@ //Blocks an attempt to connect before even creating our client datum thing. -/world/IsBanned(key, address, computer_id, type, check_ipintel = TRUE) +/world/IsBanned(key, address, computer_id, type, check_ipintel = TRUE, check_2fa = TRUE) if(!key || !address || !computer_id) log_adminwarn("Failed Login (invalid data): [key] [address]-[computer_id]") @@ -44,6 +44,49 @@ return list("reason"="using proxy or vpn", "desc"="\nReason: Proxies/VPNs are not allowed here. [mistakemessage]") + // If 2FA is enabled, makes sure they were authed within the last minute + if(check_2fa && config._2fa_auth_host) + // First see if they exist at all + var/datum/db_query/check_query = SSdbcore.NewQuery("SELECT 2fa_status, ip FROM [format_table_name("player")] WHERE ckey=:ckey", list("ckey" = ckey(key))) + + if(!check_query.warn_execute()) + message_admins("Failed to do a DB 2FA check for [key]. You have been warned.") + qdel(check_query) + return + + + // If a row is returned, the player exists + var/_2fa_enabled = FALSE + var/always_check = FALSE + var/last_ip + if(check_query.NextRow()) + if(check_query.item[1] != _2FA_DISABLED) + _2fa_enabled = TRUE + if(check_query.item[1] == _2FA_ENABLED_ALWAYS) + always_check = TRUE + last_ip = check_query.item[2] + qdel(check_query) + + // If client has 2FA enabled, and they either: + // Have it set to always check, or their IP is different + if(_2fa_enabled && (always_check || (address != last_ip))) + // They have 2FA enabled, lets make sure they have authed within the last minute + var/datum/db_query/verify_query = SSdbcore.NewQuery("SELECT ckey FROM [format_table_name("2fa_secrets")] WHERE (last_time BETWEEN NOW() - INTERVAL 1 MINUTE AND NOW()) AND ckey=:ckey LIMIT 1", list( + "ckey" = ckey(key) + )) + + if(!verify_query.warn_execute()) + message_admins("Failed to do a DB 2FA check for [key]. You have been warned.") + qdel(verify_query) + return + + if(!verify_query.NextRow()) + // If no row was returned, fail 2FA + qdel(verify_query) + return list("reason"="2fa check failed", "desc"="You have 2FA enabled but did not properly authenticate.") + + qdel(verify_query) + if(config.ban_legacy_system) //Ban Checking . = CheckBan(ckey(key), computer_id, address) diff --git a/code/modules/admin/NewBan.dm b/code/modules/admin/NewBan.dm index 4169ca380ab..c0233a4c544 100644 --- a/code/modules/admin/NewBan.dm +++ b/code/modules/admin/NewBan.dm @@ -138,7 +138,6 @@ GLOBAL_PROTECT(banlist_savefile) // Obvious reasons log_admin("Ban Expired: [key]") message_admins("Ban Expired: [key]") else - ban_unban_log_save("[key_name_admin(usr)] unbanned [key]") log_admin("[key_name_admin(usr)] unbanned [key]") message_admins("[key_name_admin(usr)] unbanned: [key]") usr.client.holder.DB_ban_unban( ckey(key), BANTYPE_ANY_FULLBAN) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index f63473216a9..f0421838546 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -137,7 +137,8 @@ GLOBAL_LIST_INIT(admin_verbs_server, list( /client/proc/toggle_antagHUD_restrictions, /client/proc/set_ooc, /client/proc/reset_ooc, - /client/proc/toggledrones + /client/proc/toggledrones, + /client/proc/set_next_map )) GLOBAL_LIST_INIT(admin_verbs_debug, list( /client/proc/cmd_admin_list_open_jobs, @@ -263,6 +264,8 @@ GLOBAL_LIST_INIT(admin_verbs_ticket, list( verbs += GLOB.admin_verbs_proccall if(holder.rights & R_VIEWRUNTIMES) verbs += /client/proc/view_runtimes + verbs += /client/proc/cmd_display_del_log + verbs += /client/proc/cmd_display_del_log_simple spawn(1) // This setting exposes the profiler for people with R_VIEWRUNTIMES. They must still have it set in cfg/admin.txt control_freak = 0 @@ -505,7 +508,6 @@ GLOBAL_LIST_INIT(admin_verbs_ticket, list( return if(++D.warns >= MAX_WARNS) //uh ohhhh...you'reee iiiiin trouuuubble O:) - ban_unban_log_save("[ckey] warned [warned_ckey], resulting in a [AUTOBANTIME] minute autoban.") if(C) message_admins("[key_name_admin(src)] has warned [key_name_admin(C)] resulting in a [AUTOBANTIME] minute ban") log_admin("[key_name(src)] has warned [key_name(C)] resulting in a [AUTOBANTIME] minute ban") diff --git a/code/modules/admin/banjob.dm b/code/modules/admin/banjob.dm index 51b1299079b..fe7c4196488 100644 --- a/code/modules/admin/banjob.dm +++ b/code/modules/admin/banjob.dm @@ -118,10 +118,6 @@ GLOBAL_DATUM_INIT(jobban_regex, /regex, regex("(\[\\S]+) - (\[^#]+\[^# ])(?: ## /proc/jobban_unban_client(ckey, rank) jobban_remove("[ckey] - [rank]") -/proc/ban_unban_log_save(formatted_log) - text2file(formatted_log,"data/ban_unban_log.txt") - - /proc/jobban_remove(X) for(var/i = 1; i <= length(GLOB.jobban_keylist); i++) if( findtext(GLOB.jobban_keylist[i], "[X]") ) diff --git a/code/modules/admin/db_ban/functions.dm b/code/modules/admin/db_ban/functions.dm index 24c2c558e2e..9d0be1f83b5 100644 --- a/code/modules/admin/db_ban/functions.dm +++ b/code/modules/admin/db_ban/functions.dm @@ -414,6 +414,7 @@ qdel(query_update) message_admins("[key_name_admin(usr)] has lifted [pckey]'s ban.") + log_admin("[key_name(usr)] has lifted [pckey]'s ban.") flag_account_for_forum_sync(pckey) diff --git a/code/modules/admin/secrets.dm b/code/modules/admin/secrets.dm index 5cfd50a5ce9..16cd1084805 100644 --- a/code/modules/admin/secrets.dm +++ b/code/modules/admin/secrets.dm @@ -70,7 +70,6 @@ Send SIT - Syndicate Infiltration Team   Send in a Syndie Strike Team  
    Send in the Deathsquad   - Send in a HONKsquad
    Send in a Gimmick Team
    Change Security Level
    Security Level - Green   diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 26fa05cebfb..492d4b7831d 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -487,7 +487,6 @@ if(!reason) return log_admin("[key_name(usr)] edited [banned_key]'s ban. Reason: [reason] Duration: [duration]") - ban_unban_log_save("[key_name(usr)] edited [banned_key]'s ban. Reason: [reason] Duration: [duration]") message_admins("[key_name_admin(usr)] edited [banned_key]'s ban. Reason: [reason] Duration: [duration]", 1) GLOB.banlist_savefile.cd = "/base/[banfolder]" to_chat(GLOB.banlist_savefile["reason"], reason) @@ -519,7 +518,6 @@ return */ switch(alert("Reason: '[banreason]' Remove appearance ban?","Please Confirm","Yes","No")) if("Yes") - ban_unban_log_save("[key_name(usr)] removed [key_name(M)]'s appearance ban") log_admin("[key_name(usr)] removed [key_name(M)]'s appearance ban") DB_ban_unban(M.ckey, BANTYPE_APPEARANCE) appearance_unban(M) @@ -532,7 +530,6 @@ if(!reason) return M = admin_ban_mobsearch(M, ban_ckey_param, usr) - ban_unban_log_save("[key_name(usr)] appearance banned [key_name(M)]. reason: [reason]") log_admin("[key_name(usr)] appearance banned [key_name(M)]. \nReason: [reason]") DB_ban_record(BANTYPE_APPEARANCE, M, -1, reason) appearance_fullban(M, "[reason]; By [usr.ckey] on [time2text(world.realtime)]") @@ -893,7 +890,6 @@ var/msg M = admin_ban_mobsearch(M, ban_ckey_param, usr) for(var/job in notbannedlist) - ban_unban_log_save("[key_name(usr)] temp-jobbanned [key_name(M)] from [job] for [mins] minutes. reason: [reason]") log_admin("[key_name(usr)] temp-jobbanned [key_name(M)] from [job] for [mins] minutes") DB_ban_record(BANTYPE_JOB_TEMP, M, mins, reason, job) jobban_fullban(M, job, "[reason]; By [usr.ckey] on [time2text(world.realtime)]") //Legacy banning does not support temporary jobbans. @@ -914,7 +910,6 @@ var/msg M = admin_ban_mobsearch(M, ban_ckey_param, usr) for(var/job in notbannedlist) - ban_unban_log_save("[key_name(usr)] perma-jobbanned [key_name(M)] from [job]. reason: [reason]") log_admin("[key_name(usr)] perma-banned [key_name(M)] from [job]") DB_ban_record(BANTYPE_JOB_PERMA, M, -1, reason, job) jobban_fullban(M, job, "[reason]; By [usr.ckey] on [time2text(world.realtime)]") @@ -943,7 +938,6 @@ if(!reason) continue //skip if it isn't jobbanned anyway switch(alert("Job: '[job]' Reason: '[reason]' Un-jobban?","Please Confirm","Yes","No")) if("Yes") - ban_unban_log_save("[key_name(usr)] unjobbanned [key_name(M)] from [job]") log_admin("[key_name(usr)] unbanned [key_name(M)] from [job]") DB_ban_unban(M.ckey, BANTYPE_JOB_PERMA, job) jobban_unban(M, job) @@ -1068,7 +1062,6 @@ return M = admin_ban_mobsearch(M, ban_ckey_param, usr) AddBan(M.ckey, M.computer_id, reason, usr.ckey, 1, mins) - ban_unban_log_save("[usr.client.ckey] has banned [M.ckey]. - Reason: [reason] - This will be removed in [mins] minutes.") to_chat(M, "You have been banned by [usr.client.ckey].\nReason: [reason].") to_chat(M, "This is a temporary ban, it will be removed in [mins] minutes.") DB_ban_record(BANTYPE_TEMP, M, mins, reason) @@ -1095,7 +1088,6 @@ to_chat(M, "To try to resolve this matter head to [config.banappeals]") else to_chat(M, "No ban appeals URL has been set.") - ban_unban_log_save("[usr.client.ckey] has permabanned [M.ckey]. - Reason: [reason] - This ban does not expire automatically and must be appealed.") log_admin("[key_name(usr)] has banned [M.ckey].\nReason: [reason]\nThis ban does not expire automatically and must be appealed.") message_admins("[key_name_admin(usr)] has banned [M.ckey].\nReason: [reason]\nThis ban does not expire automatically and must be appealed.") DB_ban_record(BANTYPE_PERMA, M, -1, reason) @@ -2341,7 +2333,7 @@ P.name = "Central Command - paper" var/stypes = list("Handle it yourselves!","Illegible fax","Fax not signed","Not Right Now","You are wasting our time", "Keep up the good work", "ERT Instructions") var/stype = input(src.owner, "Which type of standard reply do you wish to send to [H]?","Choose your paperwork", "") as null|anything in stypes - var/tmsg = "



    Nanotrasen Science Station [GLOB.using_map.station_short]


    NAS Trurl Communications Department Report


    " + var/tmsg = "



    [SSmapping.map_datum.fluff_name]


    NAS Trurl Communications Department Report


    " if(stype == "Handle it yourselves!") tmsg += "Greetings, esteemed crewmember. Your fax has been DECLINED automatically by NAS Trurl Fax Registration.

    Please proceed in accordance with Standard Operating Procedure and/or Space Law. You are fully trained to handle this situation without Central Command intervention.

    This is an automatic message." else if(stype == "Illegible fax") @@ -2630,7 +2622,7 @@ fax_panel(usr) else if(href_list["getplaytimewindow"]) - if(!check_rights(R_ADMIN)) + if(!check_rights(R_ADMIN | R_MOD | R_MENTOR)) return var/mob/M = locateUID(href_list["getplaytimewindow"]) if(!istype(M, /mob)) @@ -2810,7 +2802,7 @@ if(R.module) R.module.modules += I I.loc = R.module - R.module.rebuild() + R.module.rebuild_modules() R.activate_module(I) R.module.fix_modules() @@ -2894,9 +2886,6 @@ spawn(0) H.corgize() ok = 1 - if("honksquad") - if(usr.client.honksquad()) - SSblackbox.record_feedback("tally", "admin_secrets_fun_used", 1, "Send Team - HONKsquad") if("striketeam") if(usr.client.strike_team()) SSblackbox.record_feedback("tally", "admin_secrets_fun_used", 1, "Send Team - Deathsquad") @@ -3556,6 +3545,8 @@ var/datum/browser/popup = new(usr, "view_karma", "Karma stats for [target_ckey]", 600, 300) popup.set_content(dat) popup.open(FALSE) + else if(href_list["who_advanced"]) + usr.client.who_advanced() /client/proc/create_eventmob_for(mob/living/carbon/human/H, killthem = 0) if(!check_rights(R_EVENT)) diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index b09941d0f06..c24eaddf19e 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -790,7 +790,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention) set name = "Display del() Log" set desc = "Display del's log of everything that's passed through it." - if(!check_rights(R_DEBUG)) + if(!check_rights(R_DEBUG|R_VIEWRUNTIMES)) return var/list/dellog = list("List of things that have gone through qdel this round

      ") @@ -822,7 +822,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention) set name = "Display Simple del() Log" set desc = "Display a compacted del's log." - if(!check_rights(R_DEBUG)) + if(!check_rights(R_DEBUG|R_VIEWRUNTIMES)) return var/dat = "List of things that failed to GC this round

      " diff --git a/code/modules/admin/verbs/honksquad.dm b/code/modules/admin/verbs/honksquad.dm deleted file mode 100644 index 485f25ab757..00000000000 --- a/code/modules/admin/verbs/honksquad.dm +++ /dev/null @@ -1,142 +0,0 @@ -//HONKsquad - -#define HONKSQUAD_POSSIBLE 6 //if more Commandos are needed in the future -GLOBAL_VAR_INIT(sent_honksquad, 0) - -/client/proc/honksquad() - if(!SSticker) - to_chat(usr, "The game hasn't started yet!") - return - if(world.time < 6000) - to_chat(usr, "There are [(6000-world.time)/10] seconds remaining before it may be called.") - return - if(GLOB.sent_honksquad == 1) - to_chat(usr, "Clown Planet has already dispatched a HONKsquad.") - return - if(alert("Do you want to send in the HONKsquad? Once enabled, this is irreversible.",,"Yes","No")!="Yes") - return - alert("This 'mode' will go on until proper levels of HONK have been restored. You may also admin-call the evac shuttle when appropriate. Assigning the team's detailed task is recommended from there. While you will be able to manually pick the candidates from active ghosts, their assignment in the squad will be random.") - - var/input = null - while(!input) - input = sanitize(copytext(input(src, "Please specify which mission the HONKsquad shall undertake.", "Specify Mission", ""),1,MAX_MESSAGE_LEN)) - if(!input) - if(alert("Error, no mission set. Do you want to exit the setup process?",,"Yes","No")=="Yes") - return - - if(GLOB.sent_honksquad) - to_chat(usr, "Looks like someone beat you to it. HONK.") - return - - GLOB.sent_honksquad = 1 - - - var/honksquad_number = HONKSQUAD_POSSIBLE //for selecting a leader - var/honk_leader_selected = 0 //when the leader is chosen. The last person spawned. - - -//Generates a list of HONKsquad from active ghosts. Then the user picks which characters to respawn as the commandos. - var/list/candidates = list() //candidates for being a commando out of all the active ghosts in world. - var/list/commandos = list() //actual commando ghosts as picked by the user. - for(var/mob/dead/observer/G in GLOB.player_list) - if(!G.client.holder && !G.client.is_afk()) //Whoever called/has the proc won't be added to the list. - if(!(G.mind && G.mind.current && G.mind.current.stat != DEAD)) - candidates += G.key - for(var/i=HONKSQUAD_POSSIBLE,(i>0&&candidates.len),i--)//Decrease with every commando selected. - var/candidate = input("Pick characters to spawn as the HONKsquad. This will go on until there either no more ghosts to pick from or the slots are full.", "Active Players") as null|anything in candidates //It will auto-pick a person when there is only one candidate. - candidates -= candidate //Subtract from candidates. - commandos += candidate//Add their ghost to commandos. - -//Spawns HONKsquad and equips them. - for(var/thing in GLOB.landmarks_list) - var/obj/effect/landmark/L = thing - if(honksquad_number<=0) break - if(L.name == "HONKsquad") - honk_leader_selected = honksquad_number == 1?1:0 - - var/mob/living/carbon/human/new_honksquad = create_honksquad(L, honk_leader_selected) - - if(commandos.len) - new_honksquad.key = pick(commandos) - commandos -= new_honksquad.key - new_honksquad.internal = new_honksquad.s_store - new_honksquad.update_action_buttons_icon() - - //So they don't forget their code or mission. - new_honksquad.mind.store_memory("Mission: [input].") - - to_chat(new_honksquad, "You are a HONKsquad. [!honk_leader_selected ? "commando" : "LEADER"] in the service of Clown Planet. You are called in cases of exteme low levels of HONK. You are NOT authorized to kill.\nYour current mission is: [input]") - - honksquad_number-- - - - message_admins("[key_name_admin(usr)] has spawned a HONKsquad.", 1) - log_admin("[key_name(usr)] used Spawn HONKsquad.") - return 1 - -/client/proc/create_honksquad(obj/spawn_location, honk_leader_selected = 0) - var/mob/living/carbon/human/new_honksquad = new(spawn_location.loc) - var/honksquad_leader_rank = pick("Lieutenant", "Captain", "Major") - var/honksquad_rank = pick("Corporal", "Sergeant", "Staff Sergeant", "Sergeant 1st Class", "Master Sergeant", "Sergeant Major") - var/honksquad_name = pick(GLOB.clown_names) - - var/datum/preferences/A = new()//Randomize appearance for the commando. - if(honk_leader_selected) - A.age = rand(35,45) - A.real_name = "[honksquad_leader_rank] [honksquad_name]" - else - A.real_name = "[honksquad_rank] [honksquad_name]" - A.copy_to(new_honksquad) - - new_honksquad.dna.ready_dna(new_honksquad)//Creates DNA. - - //Creates mind stuff. - new_honksquad.mind_initialize() - new_honksquad.mind.assigned_role = SPECIAL_ROLE_HONKSQUAD - new_honksquad.mind.special_role = SPECIAL_ROLE_HONKSQUAD - new_honksquad.mind.offstation_role = TRUE - new_honksquad.add_language("Clownish") - SSticker.mode.traitors |= new_honksquad.mind//Adds them to current traitor list. Which is really the extra antagonist list. - new_honksquad.equip_honksquad(honk_leader_selected) - return new_honksquad - -/mob/living/carbon/human/proc/equip_honksquad(honk_leader_selected = 0) - - var/obj/item/radio/R = new /obj/item/radio/headset(src) - R.set_frequency(1442) - equip_to_slot_or_del(R, slot_l_ear) - equip_to_slot_or_del(new /obj/item/storage/backpack/clown(src), slot_back) - equip_to_slot_or_del(new /obj/item/storage/box/survival(src), slot_in_backpack) - if(src.gender == FEMALE) - equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clown_hat/sexy(src), slot_wear_mask) - equip_to_slot_or_del(new /obj/item/clothing/under/rank/clown/sexy(src), slot_w_uniform) - else - equip_to_slot_or_del(new /obj/item/clothing/under/rank/clown(src), slot_w_uniform) - equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clown_hat(src), slot_wear_mask) - equip_to_slot_or_del(new /obj/item/clothing/shoes/clown_shoes(src), slot_shoes) - equip_to_slot_or_del(new /obj/item/pda/clown(src), slot_wear_pda) - equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clown_hat(src), slot_wear_mask) - equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/grown/banana(src), slot_in_backpack) - equip_to_slot_or_del(new /obj/item/bikehorn(src), slot_in_backpack) - equip_to_slot_or_del(new /obj/item/stamp/clown(src), slot_in_backpack) - equip_to_slot_or_del(new /obj/item/toy/crayon/rainbow(src), slot_in_backpack) - equip_to_slot_or_del(new /obj/item/reagent_containers/spray/waterflower(src), slot_in_backpack) - equip_to_slot_or_del(new /obj/item/reagent_containers/food/pill/patch/jestosterone(src), slot_r_store) - if(prob(50)) - equip_to_slot_or_del(new /obj/item/gun/energy/clown(src), slot_in_backpack) - else - equip_to_slot_or_del(new /obj/item/gun/throw/piecannon(src), slot_in_backpack) - dna.SetSEState(GLOB.clumsyblock, TRUE) - singlemutcheck(src, GLOB.clumsyblock, MUTCHK_FORCED) - - - - var/obj/item/card/id/W = new(src) - W.name = "[real_name]'s ID Card" - W.icon_state = "centcom_old" - W.access = list(ACCESS_CLOWN)//They get full station access. - W.assignment = "HONKsquad" - W.registered_name = real_name - equip_to_slot_or_del(W, slot_wear_id) - - return 1 diff --git a/code/modules/admin/verbs/mapping.dm b/code/modules/admin/verbs/mapping.dm index 43b806b86f5..90b0fb912ae 100644 --- a/code/modules/admin/verbs/mapping.dm +++ b/code/modules/admin/verbs/mapping.dm @@ -179,3 +179,28 @@ GLOBAL_VAR_INIT(intercom_range_display_status, 0) to_chat(world, "There are [count] objects of type [type_path] in the game world.") SSblackbox.record_feedback("tally", "admin_verb", 1, "Count Objects (Global)") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + +/client/proc/set_next_map() + set category = "Server" + set name = "Set Next Map" + + if(!check_rights(R_SERVER)) + return + + var/list/map_datums = list() + for(var/x in subtypesof(/datum/map)) + var/datum/map/M = x + map_datums["[initial(M.fluff_name)] ([initial(M.technical_name)])"] = M // Put our map in + + var/target_map_name = input(usr, "Select target map", "Next map", null) as null|anything in map_datums + + if(!target_map_name) + return + + var/datum/map/TM = map_datums[target_map_name] + SSmapping.next_map = new TM + var/announce_to_players = alert(usr, "Do you wish to tell the playerbase about your choice?", "Announce", "Yes", "No") + message_admins("[key_name_admin(usr)] has set the next map to [SSmapping.next_map.fluff_name] ([SSmapping.next_map.technical_name])") + log_admin("[key_name(usr)] has set the next map to [SSmapping.next_map.fluff_name] ([SSmapping.next_map.technical_name])") + if(announce_to_players == "Yes") + to_chat(world, "[key] has chosen the following map for next round: [SSmapping.next_map.fluff_name] ([SSmapping.next_map.technical_name])") diff --git a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm index 5bb640ed8ea..8055c5e7a03 100644 --- a/code/modules/admin/verbs/pray.dm +++ b/code/modules/admin/verbs/pray.dm @@ -59,15 +59,6 @@ if(X.prefs.sound & SOUND_ADMINHELP) SEND_SOUND(X, sound('sound/effects/adminhelp.ogg')) -/proc/HONK_announce(text, mob/Sender) - var/msg = sanitize(copytext(text, 1, MAX_MESSAGE_LEN)) - msg = "HONK: [key_name(Sender, 1)] ([ADMIN_PP(Sender,"PP")]) ([ADMIN_VV(Sender,"VV")]) ([ADMIN_TP(Sender,"TP")]) ([ADMIN_SM(Sender,"SM")]) ([admin_jump_link(Sender)]) ([ADMIN_BSA(Sender,"BSA")]) (RPLY): [msg]" - for(var/client/X in GLOB.admins) - if(R_EVENT & X.holder.rights) - to_chat(X, msg) - if(X.prefs.sound & SOUND_ADMINHELP) - SEND_SOUND(X, sound('sound/effects/adminhelp.ogg')) - /proc/ERT_Announce(text, mob/Sender, repeat_warning) var/msg = sanitize(copytext(text, 1, MAX_MESSAGE_LEN)) msg = "ERT REQUEST: [key_name(Sender, 1)] ([ADMIN_PP(Sender,"PP")]) ([ADMIN_VV(Sender,"VV")]) ([ADMIN_TP(Sender,"TP")]) ([ADMIN_SM(Sender,"SM")]) ([admin_jump_link(Sender)]) ([ADMIN_BSA(Sender,"BSA")]) (RESPOND): [msg]" diff --git a/code/modules/admin/verbs/striketeam_syndicate.dm b/code/modules/admin/verbs/striketeam_syndicate.dm index 3910a6e0b28..0c359e532b6 100644 --- a/code/modules/admin/verbs/striketeam_syndicate.dm +++ b/code/modules/admin/verbs/striketeam_syndicate.dm @@ -153,7 +153,7 @@ GLOBAL_VAR_INIT(sent_syndicate_strike_team, 0) equip_to_slot_or_del(new /obj/item/clothing/suit/space/hardsuit/syndi/elite/sst(src), slot_wear_suit) equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal(src), slot_glasses) equip_to_slot_or_del(new /obj/item/storage/belt/military/sst(src), slot_belt) - equip_to_slot_or_del(new /obj/item/tank/jetpack/oxygen/harness(src), slot_s_store) + equip_to_slot_or_del(new /obj/item/tank/internals/oxygen/red(src), slot_s_store) equip_to_slot_or_del(new /obj/item/clothing/shoes/magboots/syndie/advance(src), slot_shoes) equip_to_slot_or_del(new /obj/item/gun/projectile/automatic/l6_saw(src), slot_r_hand) equip_to_slot_or_del(new /obj/item/ammo_box/magazine/mm556x45(src), slot_in_backpack) diff --git a/code/modules/antagonists/traitor/contractor/datums/contractor_hub.dm b/code/modules/antagonists/traitor/contractor/datums/contractor_hub.dm index aefe73f6258..913225a6f1e 100644 --- a/code/modules/antagonists/traitor/contractor/datums/contractor_hub.dm +++ b/code/modules/antagonists/traitor/contractor/datums/contractor_hub.dm @@ -28,6 +28,7 @@ /datum/rep_purchase/item/pinpointer, /datum/rep_purchase/item/baton, /datum/rep_purchase/item/fulton, + /datum/rep_purchase/item/flare, /datum/rep_purchase/blackout, /datum/rep_purchase/item/zippo, /datum/rep_purchase/item/balloon, diff --git a/code/modules/antagonists/traitor/contractor/datums/rep_purchases/flare.dm b/code/modules/antagonists/traitor/contractor/datums/rep_purchases/flare.dm new file mode 100644 index 00000000000..005a6f60c34 --- /dev/null +++ b/code/modules/antagonists/traitor/contractor/datums/rep_purchases/flare.dm @@ -0,0 +1,9 @@ +/** + * # Rep Purchase - Emergency escape flare + */ +/datum/rep_purchase/item/flare + name = "Emergency extraction kit" + description = "A kit that comes with an emergency escape flare, which will allow you to teleport to any beacon after a short activation delay. Also comes with a Syndicate teleporter beacon that only these flares and emagged teleporters can target." + cost = 2 + stock = 3 + item_type = /obj/item/storage/box/syndie_kit/escape_flare diff --git a/code/modules/antagonists/traitor/contractor/datums/syndicate_contract.dm b/code/modules/antagonists/traitor/contractor/datums/syndicate_contract.dm index 210f2cb01fd..d3847a6629b 100644 --- a/code/modules/antagonists/traitor/contractor/datums/syndicate_contract.dm +++ b/code/modules/antagonists/traitor/contractor/datums/syndicate_contract.dm @@ -301,7 +301,7 @@ else if(!ismob(contract.target.current)) invalidate() return - U.message_holder("Extraction signal received, agent. [GLOB.using_map.full_name]'s bluespace transport jamming systems have been sabotaged. "\ + U.message_holder("Extraction signal received, agent. [SSmapping.map_datum.fluff_name]'s bluespace transport jamming systems have been sabotaged. "\ + "We have opened a temporary portal at your flare location - proceed to the target's extraction by inserting them into the portal.", 'sound/effects/confirmdropoff.ogg') // Open a portal var/obj/effect/portal/redspace/contractor/P = new(get_turf(F), pick(GLOB.syndieprisonwarp), null, 0) @@ -363,6 +363,9 @@ // Greys get to keep their implant if(isgrey(H) && istype(I, /obj/item/organ/internal/cyberimp/brain/speech_translator)) continue + // IPCs keep this implant, free of charge! + if(ismachineperson(H) && istype(I, /obj/item/organ/internal/cyberimp/arm/power_cord)) + continue // Try removing it I = I.remove(H) if(I) @@ -528,7 +531,7 @@ var/datum/feed_message/FM = new FM.author = "Nyx Daily" FM.admin_locked = TRUE - FM.body = "Suspected Syndicate activity was reported in the system. Rumours have surfaced about a [R?.fields["rank"] || M?.mind.assigned_role || DEFAULT_RANK] aboard the [GLOB.using_map.full_name] being the victim of a kidnapping.\n\n" +\ + FM.body = "Suspected Syndicate activity was reported in the system. Rumours have surfaced about a [R?.fields["rank"] || M?.mind.assigned_role || DEFAULT_RANK] aboard the [SSmapping.map_datum.fluff_name] being the victim of a kidnapping.\n\n" +\ "A reliable source said the following: There was a note with the victim's initials which were \"[initials]\" and a scribble saying \"[fluff_message]\"" GLOB.news_network.get_channel_by_name("Nyx Daily")?.add_message(FM) @@ -539,7 +542,7 @@ var/datum/feed_message/FM2 = new FM2.author = "Nyx Daily" FM2.admin_locked = TRUE - FM2.body = "Nanotrasen's Asset Management board has resigned today after a series of kidnappings aboard the [GLOB.using_map.full_name]." +\ + FM2.body = "Nanotrasen's Asset Management board has resigned today after a series of kidnappings aboard the [SSmapping.map_datum.fluff_name]." +\ "One former member of the board was heard saying: \"I can't do this anymore. How does a single shift on this cursed station manage to cost us over ten million Credits in ransom payments? Is there no security aboard?!\"" GLOB.news_network.get_channel_by_name("Nyx Daily")?.add_message(FM2) diff --git a/code/modules/antagonists/traitor/datum_traitor.dm b/code/modules/antagonists/traitor/datum_traitor.dm index b4d9db4817f..c1905917c9d 100644 --- a/code/modules/antagonists/traitor/datum_traitor.dm +++ b/code/modules/antagonists/traitor/datum_traitor.dm @@ -248,6 +248,7 @@ owner.announce_objectives() if(should_give_codewords) give_codewords() + to_chat(owner.current, "For more information, check the wiki page: ([config.wikiurl]/index.php/Traitor)") /datum/antagonist/traitor/proc/update_traitor_icons_added(datum/mind/traitor_mind) diff --git a/code/modules/arcade/mob_hunt/mob_type_datums.dm b/code/modules/arcade/mob_hunt/mob_type_datums.dm index 0ae84b1b764..c042a9c7cfc 100644 --- a/code/modules/arcade/mob_hunt/mob_type_datums.dm +++ b/code/modules/arcade/mob_hunt/mob_type_datums.dm @@ -133,7 +133,6 @@ area_whitelist = list(/area/medical/virology, /area/toxins, /area/medical/research, - /area/medical/research_shuttle_dock, /area/crew_quarters/hor, /area/maintenance/asmaint2) @@ -164,7 +163,6 @@ TYPE_PSYCHIC) area_blacklist = list(/area/toxins, /area/medical/research, - /area/medical/research_shuttle_dock, /area/crew_quarters/hor, /area/maintenance/asmaint2, /area/teleporter, diff --git a/code/modules/assembly/health.dm b/code/modules/assembly/health.dm index a0a7c43a7a9..2517e91848b 100644 --- a/code/modules/assembly/health.dm +++ b/code/modules/assembly/health.dm @@ -72,7 +72,7 @@ /obj/item/assembly/health/interact(mob/user)//TODO: Change this to the wires thingy if(!secured) - user.show_message("The [name] is unsecured!") + user.show_message("[src] is unsecured!") return FALSE var/dat = text("Health Sensor [scanning?"On":"Off"]") if(scanning && health_scan) diff --git a/code/modules/assembly/igniter.dm b/code/modules/assembly/igniter.dm index b81acbbe2b0..7d88bbafd4a 100644 --- a/code/modules/assembly/igniter.dm +++ b/code/modules/assembly/igniter.dm @@ -1,6 +1,6 @@ /obj/item/assembly/igniter name = "igniter" - desc = "A small electronic device able to ignite combustable substances." + desc = "A small electronic device able to ignite combustible substances." icon_state = "igniter" materials = list(MAT_METAL=500, MAT_GLASS=50) origin_tech = "magnets=1" diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm index ced9fbca932..9568543e912 100644 --- a/code/modules/assembly/proximity.dm +++ b/code/modules/assembly/proximity.dm @@ -97,7 +97,7 @@ /obj/item/assembly/prox_sensor/interact(mob/user)//TODO: Change this to the wires thingy if(!secured) - user.show_message("The [name] is unsecured!") + user.show_message("[src] is unsecured!") return FALSE var/second = time % 60 var/minute = (time - second) / 60 diff --git a/code/modules/assembly/timer.dm b/code/modules/assembly/timer.dm index 67be53979d8..11907e84d78 100644 --- a/code/modules/assembly/timer.dm +++ b/code/modules/assembly/timer.dm @@ -64,7 +64,7 @@ /obj/item/assembly/timer/interact(mob/user as mob)//TODO: Have this use the wires if(!secured) - user.show_message("The [name] is unsecured!") + user.show_message("[src] is unsecured!") return FALSE var/second = time % 60 var/minute = (time - second) / 60 diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm index 13e2d7bcb16..c314850e549 100644 --- a/code/modules/atmospherics/machinery/airalarm.dm +++ b/code/modules/atmospherics/machinery/airalarm.dm @@ -936,7 +936,7 @@ if(!emagged) emagged = TRUE if(user) - user.visible_message("Sparks fly out of the [src]!", "You emag the [src], disabling its safeties.") + user.visible_message("Sparks fly out of \the [src]!", "You emag \the [src], disabling its safeties.") playsound(src.loc, 'sound/effects/sparks4.ogg', 50, TRUE) return @@ -961,15 +961,13 @@ if(1) if(iscoil(I)) var/obj/item/stack/cable_coil/coil = I - if(coil.amount < 5) + if(coil.get_amount() < 5) to_chat(user, "You need more cable for this!") return to_chat(user, "You wire \the [src]!") playsound(get_turf(src), coil.usesound, 50, 1) - coil.amount -= 5 - if(!coil.amount) - qdel(coil) + coil.use(5) buildstage = 2 update_icon() diff --git a/code/modules/awaymissions/maploader/reader.dm b/code/modules/awaymissions/maploader/reader.dm index 9f3e629d6b0..48aa90651a5 100644 --- a/code/modules/awaymissions/maploader/reader.dm +++ b/code/modules/awaymissions/maploader/reader.dm @@ -237,6 +237,11 @@ GLOBAL_DATUM_INIT(_preloader, /datum/dmm_suite/preloader, new()) full_def = copytext(full_def, variables_start + 1, length(full_def)) // removing the last '}' fields = readlist(full_def, ";") + for(var/I in fields) + var/value = fields[I] + if(istext(value)) + fields[I] = apply_text_macros(value) + // then fill the members_attributes list with the corresponding variables members_attributes.len++ members_attributes[index++] = fields @@ -353,61 +358,69 @@ GLOBAL_DATUM_INIT(_preloader, /datum/dmm_suite/preloader, new()) /datum/dmm_suite/proc/readlist(text, delimiter = ",") var/list/to_return = list() - var/position + var/delimiter_position var/old_position = 1 do // find next delimiter that is not within "..." - position = find_next_delimiter_position(text, old_position, delimiter) + delimiter_position = find_next_delimiter_position(text, old_position, delimiter) // check if this is a simple variable (as in list(var1, var2)) or an associative one (as in list(var1="foo", var2=7)) - var/equal_position = findtext(text, "=", old_position, position) + var/equal_position = findtext(text, "=", old_position, delimiter_position) - var/trim_left = trim_text(copytext(text, old_position, (equal_position ? equal_position : position)), 1) // the name of the variable, must trim quotes to build a BYOND compliant associatives list - old_position = position + 1 + // Take the left value of the association or just the value if it isn't an association + var/left_value = copytext(text, old_position, (equal_position ? equal_position : delimiter_position)) + old_position = delimiter_position + 1 if(equal_position) // associative var, so do the association - var/trim_right = trim_text(copytext(text, equal_position + 1, position)) // the content of the variable + left_value = trim_text(left_value, TRUE) // the name of the variable, must trim quotes to build a BYOND compliant associatives list + var/trim_right = trim_text(copytext(text, equal_position + 1, delimiter_position)) // the content of the variable - // Check for string - // Make it read to the next delimiter, instead of the quote - if(findtext(trim_right, quote, 1, 2)) - var/endquote = findtext(trim_right, quote, -1) - if(!endquote) - log_runtime(EXCEPTION("Terminating quote not found!"), src) - // Our map writer escapes quotes and curly brackets to avoid - // letting our simple parser choke on meanly-crafted names/etc - // - so we decode it here so it's back to good ol' legibility - trim_right = dmm_decode(copytext(trim_right, 2, endquote)) - - // Check for number - else if(isnum(text2num(trim_right))) - trim_right = text2num(trim_right) - - // Check for null - else if(trim_right == "null") - trim_right = null - - // Check for list - else if(copytext(trim_right, 1, 5) == "list") - trim_right = readlist(copytext(trim_right, 6, length(trim_right))) - - // Check for file - else if(copytext(trim_right, 1, 2) == "'") - trim_right = file(copytext(trim_right, 2, length(trim_right))) - - // Check for path - else if(ispath(text2path(trim_right))) - trim_right = text2path(trim_right) - - to_return[trim_left] = trim_right + to_return[left_value] = parse_value(trim_right) else// simple var - to_return[trim_left] = null + to_return += parse_value(trim_text(left_value)) // Don't trim the quotes - while(position != 0) + while(delimiter_position != 0) return to_return +/** + * Tries to parse the given value_text. Will fallback on the value_text as a string if it fails + */ +/datum/dmm_suite/proc/parse_value(value_text) + // Check for string + // Make it read to the next delimiter, instead of the quote + if(findtext(value_text, quote, 1, 2)) + var/endquote = findtext(value_text, quote, -1) + if(!endquote) + stack_trace("Terminating quote not found!") + // Our map writer escapes quotes and curly brackets to avoid + // letting our simple parser choke on meanly-crafted names/etc + // - so we decode it here so it's back to good ol' legibility + . = dmm_decode(copytext(value_text, 2, endquote)) + + // Check for number + else if(isnum(text2num(value_text))) + . = text2num(value_text) + + // Check for null + else if(value_text == "null") + . = null + + // Check for list + else if(copytext(value_text, 1, 5) == "list") + . = readlist(copytext(value_text, 6, length(value_text))) + + // Check for file + else if(copytext(value_text, 1, 2) == "'") + . = file(copytext(value_text, 2, length(value_text))) + + // Check for path + else if(ispath(text2path(value_text))) + . = text2path(value_text) + + else + . = value_text // Assume it is a string without quotes /datum/dmm_suite/Destroy() ..() @@ -470,7 +483,9 @@ GLOBAL_DATUM_INIT(_preloader, /datum/dmm_suite/preloader, new()) if(initial(A.there_can_be_many)) area_list[A] = new A else - area_list[A] = locate(A) + if(!GLOB.all_unique_areas[A]) + GLOB.all_unique_areas[A] = new A // No locate here else it will find a subtype of the one we're looking for + area_list[A] = GLOB.all_unique_areas[A] return area_list[A] diff --git a/code/modules/awaymissions/mission_code/wildwest.dm b/code/modules/awaymissions/mission_code/wildwest.dm index d943da48997..2377deca844 100644 --- a/code/modules/awaymissions/mission_code/wildwest.dm +++ b/code/modules/awaymissions/mission_code/wildwest.dm @@ -129,13 +129,10 @@ /obj/effect/meatgrinder name = "Meat Grinder" desc = "What is that thing?" - density = 1 - anchored = 1 - layer = 3 + density = TRUE icon = 'icons/mob/blob.dmi' icon_state = "blobpod" - var/triggerproc = "triggerrad1" //name of the proc thats called when the mine is triggered - var/triggered = 0 + var/triggered = FALSE /obj/effect/meatgrinder/Crossed(AM as mob|obj, oldloc) Bumped(AM) @@ -145,10 +142,9 @@ if(triggered) return if(istype(M, /mob/living/carbon/human)) - for(var/mob/O in viewers(world.view, src.loc)) - to_chat(O, "[M] triggered the [bicon(src)] [src]") - triggered = 1 - call(src,triggerproc)(M) + visible_message("[M] triggers [src]!") + triggered = TRUE + triggerrad1(M) /obj/effect/meatgrinder/proc/triggerrad1(mob) for(var/mob/O in viewers(world.view, src.loc)) diff --git a/code/modules/client/2fa.dm b/code/modules/client/2fa.dm new file mode 100644 index 00000000000..9de8ef73476 --- /dev/null +++ b/code/modules/client/2fa.dm @@ -0,0 +1,131 @@ +// This is in its own file as it has so much stuff to contend with +/client/proc/edit_2fa() + if(!config._2fa_auth_host) + alert(usr, "This server does not have 2FA enabled.") + return + // Client does not have 2FA enabled. Set it up. + if(prefs._2fa_status == _2FA_DISABLED) + // Get us an auth token + var/datum/http_response/qrcr = wrap_http_get("[config._2fa_auth_host]/generateQR?ckey=[ckey]") + // If this fails, shits gone bad + if(qrcr.errored) + alert(usr, "Something has gone VERY wrong ingame. Please inform the server host.\nError details: [qrcr.error]") + return + + if(qrcr.status_code != 200) + alert(usr, "2FA QR code generation returned a non-200 code. Please inform the server host.\nError code: [qrcr.status_code]\nError details: [qrcr.body]") + return + + var/list/data = json_decode(qrcr.body) + var/qr_img_src = data["qr_image"] + var/datum/browser/B = new(usr, "2fa_qrc", "2FA QR Code", 600, 400) + var/title_text = "

      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 = "
      " + B.set_content("[title_text][img_data]") + B.open(FALSE) + + var/entered_code = input(usr, "Please enter a code from your auth app. Failure to enter the code correctly will abort 2FA setup.", "2FA Validation") + if(!entered_code) + // Cleanup so they can start again + var/datum/db_query/dbq = SSdbcore.NewQuery("DELETE FROM [format_table_name("2fa_secrets")] WHERE ckey=:ckey", list("ckey" = ckey)) + dbq.warn_execute() + alert(usr, "2FA Setup aborted!") + B.close() + return + + var/datum/http_response/vr = wrap_http_get("[config._2fa_auth_host]/validateCode?ckey=[ckey]&code=[entered_code]") + // If this fails, shits gone bad + if(vr.errored) + alert(usr, "Something has gone VERY wrong ingame. Please inform the server host.\nError details: [vr.error]") + B.close() + return + + if(vr.status_code != 200) + // Cleanup so they can start again + var/datum/db_query/dbq = SSdbcore.NewQuery("DELETE FROM [format_table_name("2fa_secrets")] WHERE ckey=:ckey", list("ckey" = ckey)) + dbq.warn_execute() + + // See if its unauthorised. I used 400 for that dont at me + if(vr.status_code == 400) + alert(usr, "Invalid code entered. 2FA Setup aborted!") + B.close() + else + alert(usr, "2FA validation returned a non-200 code. Please inform the server host.\nError code: [vr.status_code]\nError details: [vr.body]") + B.close() + return + + // If we are here, they authed successfully + alert(usr, "Congratulations. 2FA is now setup properly for your account. In preferences, you can change whether you want it to ask for a code on every connection or only when your IP changes") + B.close() + // Default to IP change only + prefs._2fa_status = _2FA_ENABLED_IP + prefs.save_preferences(src) + prefs.ShowChoices(usr) + return + + + // If we are here, they just want to change the mode + var/option = alert(usr, "Would you like to change 2FA mode or disable it entirely?", "2FA Mode", "Enable (Always)", "Enable (On IP Change)", "Deactivate") + switch(option) + if("Enable (Always)") + prefs._2fa_status = _2FA_ENABLED_ALWAYS + prefs.save_preferences(src) + prefs.ShowChoices(usr) + if("Enable (On IP Change)") + prefs._2fa_status = _2FA_ENABLED_IP + prefs.save_preferences(src) + prefs.ShowChoices(usr) + if("Deactivate") + var/confirm = alert(usr, "Are you SURE you want to deactivate 2FA?", "WARNING", "Yes", "No") + if(confirm != "Yes") + return + + // Prompt them for a code to make sure they know what they are doing + var/entered_code = input(usr, "Please enter a code from your auth app", "2FA Validation") + if(!entered_code) + alert(usr, "2FA deactivation aborted!") + return + + var/datum/http_response/vr = wrap_http_get("[config._2fa_auth_host]/validateCode?ckey=[ckey]&code=[entered_code]") + // If this fails, shits gone bad + if(vr.errored) + alert(usr, "Something has gone VERY wrong ingame. Please inform the server host.\nError details: [vr.error]") + return + + if(vr.status_code != 200) + // See if its unauthorised. I used 400 for that dont at me + if(vr.status_code == 400) + alert(usr, "Invalid code entered. 2FA deactivation aborted!") + else + alert(usr, "2FA validation returned non-200 code. Please inform the server host.\nError code: [vr.status_code]\nError details: [vr.body]") + return + + // If we are here, they authed properly + var/datum/db_query/dbq = SSdbcore.NewQuery("DELETE FROM [format_table_name("2fa_secrets")] WHERE ckey=:ckey", list("ckey" = ckey)) + dbq.warn_execute() + prefs._2fa_status = _2FA_DISABLED + prefs.save_preferences(src) + prefs.ShowChoices(usr) + alert(usr, "2FA disabled successfully") + +/datum/preferences/proc/_2fastatus_to_text() + switch(_2fa_status) + if(_2FA_DISABLED) + return "Disabled" + if(_2FA_ENABLED_IP) + return "Enabled (Will prompt on IP changes)" + if(_2FA_ENABLED_ALWAYS) + return "Enabled (Will prompt every time)" + + +// Proc to wrap HTTP requests properly, without needing SShttp firing +/proc/wrap_http_get(url) + var/datum/http_request/req = new() + req.prepare(RUSTG_HTTP_METHOD_GET, url) + req.begin_async() + // Check if we are complete + UNTIL(req.is_complete()) + var/datum/http_response/res = req.into_response() + + return res + diff --git a/code/modules/client/asset_cache.dm b/code/modules/client/asset_cache.dm index ce32a9c28b4..0e302252116 100644 --- a/code/modules/client/asset_cache.dm +++ b/code/modules/client/asset_cache.dm @@ -44,7 +44,6 @@ You can set verify to TRUE if you want send() to sleep until the client has the if(client.cache.Find(asset_name) || client.sending.Find(asset_name)) return 0 - log_asset("Sending asset [asset_name] to client [client]") client << browse_rsc(SSassets.cache[asset_name], asset_name) if(!verify) // Can't access the asset cache browser, rip. client.cache += asset_name @@ -93,7 +92,6 @@ You can set verify to TRUE if you want send() to sleep until the client has the to_chat(client, "Sending Resources...") for(var/asset in unreceived) if(asset in SSassets.cache) - log_asset("Sending asset [asset] to client [client]") client << browse_rsc(SSassets.cache[asset], asset) if(!verify) // Can't access the asset cache browser, rip. diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index fe1799b5048..801bc69f383 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -421,6 +421,7 @@ GLOB.admins -= src GLOB.directory -= ckey GLOB.clients -= src + QDEL_NULL(chatOutput) if(movingmob) movingmob.client_mobs_in_contents -= mob UNSETEMPTY(movingmob.client_mobs_in_contents) @@ -680,7 +681,7 @@ if(query_find_link.NextRow()) if(query_find_link.item[1]) if(!fromban) - to_chat(src, "Your forum account is already set. (" + query_find_link.item[1] + ")") + to_chat(src, "Your forum account is already set. ([query_find_link.item[1]])") qdel(query_find_link) return qdel(query_find_link) diff --git a/code/modules/client/preference/loadout/loadout_donor.dm b/code/modules/client/preference/loadout/loadout_donor.dm index 7d43bd6b86a..cc84053806b 100644 --- a/code/modules/client/preference/loadout/loadout_donor.dm +++ b/code/modules/client/preference/loadout/loadout_donor.dm @@ -63,10 +63,6 @@ display_name = "Fur Cap" path = /obj/item/clothing/head/furcap -/datum/gear/donor/mouse - display_name = "Mouse Headband" - path = /obj/item/clothing/head/kitty/mouse - /datum/gear/donor/fawkes display_name = "Guy Fawkes mask" path = /obj/item/clothing/mask/fawkes diff --git a/code/modules/client/preference/preferences.dm b/code/modules/client/preference/preferences.dm index 5a838c3ac9a..12d7bc62237 100644 --- a/code/modules/client/preference/preferences.dm +++ b/code/modules/client/preference/preferences.dm @@ -205,6 +205,8 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts var/gear_tab = "General" // Parallax var/parallax = PARALLAX_HIGH + /// 2FA status + var/_2fa_status = _2FA_DISABLED /// Do we want to force our runechat colour to be white? var/force_white_runechat = FALSE @@ -448,6 +450,7 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts // LEFT SIDE OF THE PAGE dat += "
      " dat += "

      General Settings

      " + dat += "2FA Setup: [_2fastatus_to_text()]
      " if(user.client.holder) dat += "Adminhelp sound: [(sound & SOUND_ADMINHELP)?"On":"Off"]
      " dat += "AFK Cryoing: [(toggles2 & PREFTOGGLE_2_AFKWATCH) ? "Yes" : "No"]
      " @@ -1434,7 +1437,8 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts if(S.autohiss_basic_map) var/list/autohiss_choice = list("Off" = AUTOHISS_OFF, "Basic" = AUTOHISS_BASIC, "Full" = AUTOHISS_FULL) var/new_autohiss_pref = input(user, "Choose your character's auto-accent level:", "Character Preference") as null|anything in autohiss_choice - autohiss_mode = autohiss_choice[new_autohiss_pref] + if(new_autohiss_pref) + autohiss_mode = autohiss_choice[new_autohiss_pref] if("metadata") var/new_metadata = input(user, "Enter any information you'd like others to see, such as Roleplay-preferences:", "Game Preference" , metadata) as message|null @@ -2042,7 +2046,8 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts if("UIalpha") var/UI_style_alpha_new = input(user, "Select a new alpha(transparence) parameter for UI, between 50 and 255", UI_style_alpha) as num - if(!UI_style_alpha_new | !(UI_style_alpha_new <= 255 && UI_style_alpha_new >= 50)) return + if(!UI_style_alpha_new || !(UI_style_alpha_new <= 255 && UI_style_alpha_new >= 50)) + return UI_style_alpha = UI_style_alpha_new if(ishuman(usr)) //mid-round preference changes, for aesthetics @@ -2142,6 +2147,11 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts if(parent && parent.mob && parent.mob.hud_used) parent.mob.hud_used.update_parallax_pref() + if("edit_2fa") + // Do this async so we arent holding up a topic() call + INVOKE_ASYNC(user.client, /client.proc/edit_2fa) + return // We return here to avoid focus being lost + ShowChoices(user) return 1 diff --git a/code/modules/client/preference/preferences_mysql.dm b/code/modules/client/preference/preferences_mysql.dm index 509a5402eaa..bcb5823af6a 100644 --- a/code/modules/client/preference/preferences_mysql.dm +++ b/code/modules/client/preference/preferences_mysql.dm @@ -16,7 +16,8 @@ clientfps, atklog, fuid, - parallax + parallax, + 2fa_status FROM [format_table_name("player")] WHERE ckey=:ckey"}, list( "ckey" = C.ckey @@ -45,12 +46,13 @@ atklog = text2num(query.item[14]) fuid = text2num(query.item[15]) parallax = text2num(query.item[16]) + _2fa_status = query.item[17] qdel(query) //Sanitize ooccolor = sanitize_hexcolor(ooccolor, initial(ooccolor)) - UI_style = sanitize_inlist(UI_style, list("White", "Midnight"), initial(UI_style)) + UI_style = sanitize_inlist(UI_style, list("White", "Midnight", "Plasmafire", "Retro", "Slimecore", "Operative"), initial(UI_style)) default_slot = sanitize_integer(default_slot, 1, max_save_slots, initial(default_slot)) toggles = sanitize_integer(toggles, 0, TOGGLES_TOTAL, initial(toggles)) toggles2 = sanitize_integer(toggles2, 0, TOGGLES_2_TOTAL, initial(toggles2)) @@ -93,7 +95,8 @@ volume_mixer=:volume_mixer, lastchangelog=:lastchangelog, clientfps=:clientfps, - parallax=:parallax + parallax=:parallax, + 2fa_status=:_2fa_status WHERE ckey=:ckey"}, list( // OH GOD THE PARAMETERS "ooccolour" = ooccolor, @@ -111,7 +114,8 @@ "lastchangelog" = lastchangelog, "clientfps" = clientfps, "parallax" = parallax, - "ckey" = C.ckey + "_2fa_status" = _2fa_status, + "ckey" = C.ckey, ) ) @@ -440,7 +444,7 @@ "f_style" = f_style, "markingstyleslist" = markingstyleslist, "ha_style" = ha_style, - "alt_head" = alt_head || "", + "alt_head" = (alt_head ? alt_head : ""), // This it intentional. It wont work without it! "e_colour" = e_colour, "underwear" = underwear, "undershirt" = undershirt, diff --git a/code/modules/client/preference/preferences_toggles.dm b/code/modules/client/preference/preferences_toggles.dm index d3ac6cc874b..2bb7b7529e2 100644 --- a/code/modules/client/preference/preferences_toggles.dm +++ b/code/modules/client/preference/preferences_toggles.dm @@ -348,3 +348,11 @@ prefs.toggles2 ^= PREFTOGGLE_2_FORCE_WHITE_RUNECHAT prefs.save_preferences(src) to_chat(src, "Your runechats will [(prefs.toggles2 & PREFTOGGLE_2_FORCE_WHITE_RUNECHAT) ? "no longer" : "now"] be forced to be white.") + +/client/verb/toggle_simple_stat_panel() + set name = "Toggle Simple Status Panel" + set category = "Preferences" + set desc = "Toggles detailed information on the status panel" + prefs.toggles2 ^= PREFTOGGLE_2_SIMPLE_STAT_PANEL + prefs.save_preferences(src) + to_chat(src, "You will [(prefs.toggles2 & PREFTOGGLE_2_SIMPLE_STAT_PANEL) ? "no longer" : "now"] get detailed information on the status panel.") diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm index c34e17943cb..5e872075da7 100644 --- a/code/modules/clothing/chameleon.dm +++ b/code/modules/clothing/chameleon.dm @@ -509,8 +509,8 @@ chameleon_action.emp_randomise(INFINITY) /obj/item/storage/belt/chameleon - name = "toolbelt" - desc = "Holds tools." + name = "tool-belt" + desc = "Can hold various tools." var/datum/action/item_action/chameleon/change/chameleon_action /obj/item/storage/belt/chameleon/Initialize(mapload) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 9baf6c46079..42797896e23 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -457,10 +457,10 @@ BLIND // can't see anything if(istype(I, /obj/item/match) && src.loc == user) var/obj/item/match/M = I if(M.matchignite()) // Match isn't lit, but isn't burnt. - user.visible_message("[user] strikes a [M] on the bottom of [src], lighting it.","You strike the [M] on the bottom of [src] to light it.") + user.visible_message("[user] strikes a [M] on the bottom of [src], lighting it.","You strike [M] on the bottom of [src] to light it.") playsound(user.loc, 'sound/goonstation/misc/matchstick_light.ogg', 50, 1) else - user.visible_message("[user] crushes the [M] into the bottom of [src], extinguishing it.","You crush the [M] into the bottom of [src], extinguishing it.") + user.visible_message("[user] crushes [M] into the bottom of [src], extinguishing it.","You crush [M] into the bottom of [src], extinguishing it.") M.dropped() return diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index d07b95d18eb..2f3fcca395f 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -424,9 +424,9 @@ ..() /obj/item/clothing/glasses/thermal/monocle - name = "thermoncle" + name = "thermonocle" desc = "A thermal monocle." - icon_state = "thermoncle" + icon_state = "thermonocle" flags_cover = null //doesn't protect eyes because it's a monocle, duh /obj/item/clothing/glasses/thermal/eyepatch diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm index 146ca3cf25e..b889246f73d 100644 --- a/code/modules/clothing/gloves/color.dm +++ b/code/modules/clothing/gloves/color.dm @@ -78,7 +78,7 @@ desc = "These gloves are fire-resistant." icon_state = "black" item_state = "bgloves" - item_color="brown" + item_color="black" cold_protection = HANDS min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT heat_protection = HANDS diff --git a/code/modules/clothing/gloves/rings.dm b/code/modules/clothing/gloves/rings.dm index 29e5af2121a..acae9edbea9 100644 --- a/code/modules/clothing/gloves/rings.dm +++ b/code/modules/clothing/gloves/rings.dm @@ -29,13 +29,13 @@ if(istype(I, /obj/item/stack/sheet/mineral/diamond)) var/obj/item/stack/sheet/mineral/diamond/D = I if(stud) - to_chat(usr, "The [src] already has a gem.") + to_chat(usr, "[src] already has a gem.") else if(D.amount >= 1) D.use(1) stud = 1 update_icon() - to_chat(usr, "You socket the diamond into the [src].") + to_chat(usr, "You socket the diamond into [src].") // s'pensive /obj/item/clothing/gloves/ring/silver diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index db5da84af68..dd99bba3211 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -195,6 +195,22 @@ dog_fashion = /datum/dog_fashion/head/surgery /obj/item/clothing/head/surgery/black - desc = "A cap coroners wear during autopsies. Keeps their hair from falling into the cadavers. It is as dark than the coroner's humor." + desc = "A cap coroners wear during autopsies. Keeps their hair from falling into the cadavers. It is as dark as the coroner's humor." icon_state = "surgcap_black" dog_fashion = /datum/dog_fashion/head/surgery + +//Special Roles +/obj/item/clothing/head/beret/solgov/command + name = "\improper Trans-Solar Federation Lieutenant's beret" + desc = "A beret worn by marines of the Trans-Solar Federation. The insignia signifies the wearer bears the rank of a Lieutenant." + icon_state = "solgovcberet" + item_color = "solgovc" + dog_fashion = null + armor = list("melee" = 40, "bullet" = 30, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 10, "rad" = 0, "fire" = 50, "acid" = 60) + strip_delay = 80 + +/obj/item/clothing/head/beret/solgov/command/elite + name = "\improper Trans-Solar Federation Specops Lieutenant's beret" + desc = "A beret worn by marines of the Trans-Solar Federation Psiops division. The insignia signifies the wearer bears the rank of a Lieutenant." + icon_state = "solgovceliteberet" + item_color = "solgovcelite" diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm index dd2c70692f5..ca0e6d5aad5 100644 --- a/code/modules/clothing/head/soft_caps.dm +++ b/code/modules/clothing/head/soft_caps.dm @@ -124,9 +124,29 @@ item_color = "solgov" dog_fashion = null -/obj/item/clothing/head/soft/solgov/command +/obj/item/clothing/head/soft/solgov/marines + armor = list("melee" = 35, "bullet" = 30, "laser" = 30,"energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 20, "acid" = 50) + strip_delay = 60 + icon_state = "solgovsoft_flipped" + flipped = TRUE + +/obj/item/clothing/head/soft/solgov/marines/elite + name = "\improper Trans-Solar Federation Specops marine cap" + desc = "A soft cap worn by marines of the Trans-Solar Federation Specops division." + icon_state = "solgovelitesoft_flipped" + item_color = "solgovelite" + +/obj/item/clothing/head/soft/solgov/marines/command name = "\improper Trans-Solar Federation lieutenant's cap" desc = "A soft cap worn by marines of the Trans-Solar Federation. The insignia signifies the wearer bears the rank of a Lieutenant." - icon_state = "solgovcsoft" + icon_state = "solgovcsoft_flipped" item_color = "solgovc" dog_fashion = null + armor = list("melee" = 40, "bullet" = 30, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 10, "rad" = 0, "fire" = 50, "acid" = 60) + strip_delay = 80 + +/obj/item/clothing/head/soft/solgov/marines/command/elite + name = "\improper Trans-Solar Federation Specops Lieutenant's cap" + desc = "A soft cap worn by marines of the Trans-Solar Federation Specops division. The insignia signifies the wearer bears the rank of a Lieutenant." + icon_state = "solgovcelitesoft" + item_color = "solgovcelite" diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index d9a3c6030d1..d8cba5290b7 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -58,6 +58,9 @@ "Grey" = 'icons/mob/species/grey/mask.dmi' ) +/obj/item/clothing/mask/gas/explorer/marines + name = "military gas mask" + /obj/item/clothing/mask/gas/explorer/attack_self(mob/user) adjustmask(user) diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm index 8514c038a58..e663856e3c5 100644 --- a/code/modules/clothing/masks/miscellaneous.dm +++ b/code/modules/clothing/masks/miscellaneous.dm @@ -129,7 +129,7 @@ /obj/item/clothing/mask/muzzle/safety/shock name = "shock muzzle" - desc = "A muzzle designed to prevent biting. This one is fitted with a behavior correction system." + desc = "A muzzle designed to prevent biting. This one is fitted with a behavior correction system." var/obj/item/assembly/trigger = null origin_tech = "materials=1;engineering=1" materials = list(MAT_METAL=500, MAT_GLASS=50) @@ -147,7 +147,7 @@ trigger.master = src trigger.holder = src AddComponent(/datum/component/proximity_monitor) - to_chat(user, "You attach the [W] to [src].") + to_chat(user, "You attach [W] to [src].") return TRUE else if(istype(W, /obj/item/assembly)) to_chat(user, "That won't fit in [src]. Perhaps a signaler or voice analyzer would?") diff --git a/code/modules/clothing/spacesuits/alien.dm b/code/modules/clothing/spacesuits/alien.dm index 51d06aec017..e546d67f485 100644 --- a/code/modules/clothing/spacesuits/alien.dm +++ b/code/modules/clothing/spacesuits/alien.dm @@ -213,21 +213,20 @@ return var/mob/living/carbon/human/H = user if(H.shoes != src) - to_chat(user, "You will have to put on the [src] before you can do that.") + to_chat(user, "The [src] blocks the [attack_text], sending out jets of flame!") + owner.visible_message("[src] blocks [attack_text], sending out jets of flame!") for(var/mob/living/carbon/C in range(6, owner)) if(C != owner) C.fire_stacks += 8 C.IgniteMob() - owner.fire_stacks = -20 return TRUE return FALSE @@ -387,10 +391,12 @@ E.Goto(owner, E.move_to_delay, E.minimum_distance) owner.alpha = 0 owner.visible_message("[owner] is hit by [attack_text] in the chest!") //We pretend to be hit, since blocking it would stop the message otherwise - spawn(40) - owner.alpha = initial(owner.alpha) + addtimer(CALLBACK(owner, /mob/living/.proc/reset_alpha), 4 SECONDS) return TRUE +/mob/living/proc/reset_alpha(mob/living/carbon/human/owner) + alpha = initial(alpha) + /obj/item/clothing/suit/armor/reactive/tesla name = "reactive tesla armor" desc = "This armor uses the power of a flux anomaly core to protect the user in shocking ways." @@ -399,7 +405,7 @@ if(!active) return FALSE if(reaction_check(hitby)) - owner.visible_message("The [src] blocks the [attack_text], sending out arcs of lightning!") + owner.visible_message("[src] blocks [attack_text], sending out arcs of lightning!") for(var/mob/living/M in view(6, owner)) if(M == owner) continue @@ -416,35 +422,37 @@ var/repulse_power = 3 /// How far away are we finding things to throw var/repulse_range = 5 + /// What the sparkles looks like + var/sparkle_path = /obj/effect/temp_visual/gravpush /obj/item/clothing/suit/armor/reactive/repulse/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) if(!active) return FALSE if(reaction_check(hitby)) owner.visible_message("[src] blocks [attack_text], converting the attack into a wave of force!") - var/list/thrownatoms = list() + var/list/thrown_atoms = list() for(var/turf/T in range(repulse_range, owner)) //Done this way so things don't get thrown all around hilariously. for(var/atom/movable/AM in T) - thrownatoms += AM + thrown_atoms += AM - for(var/am in thrownatoms) + for(var/am in thrown_atoms) var/atom/movable/AM = am if(AM == owner || AM.anchored) continue - var/throwtarget = get_edge_target_turf(owner, get_dir(owner, get_step_away(AM, owner))) - var/distfromuser = get_dist(owner, AM) - if(distfromuser == 0) + var/throw_target = get_edge_target_turf(owner, get_dir(owner, get_step_away(AM, owner))) + var/dist_from_user = get_dist(owner, AM) + if(dist_from_user == 0) if(isliving(AM)) var/mob/living/M = AM M.Weaken(3) to_chat(M, "You're slammed into the floor by [owner]'s reactive armor!") else + new sparkle_path(get_turf(AM), get_dir(owner, AM)) if(isliving(AM)) var/mob/living/M = AM - to_chat(M, "You're thrown back by the [owner]'s reactive armor!") - spawn(0) - AM.throw_at(throwtarget, ((clamp((repulse_power - (clamp(distfromuser - 2, 0, distfromuser))), 3, repulse_power))), 1)//So stuff gets tossed around at the same time. + to_chat(M, "You're thrown back by [owner]'s reactive armor!") + INVOKE_ASYNC(AM, /atom/movable/.proc/throw_at, throw_target, ((clamp((repulse_power - (clamp(dist_from_user - 2, 0, dist_from_user))), 3, repulse_power))), 1) //So stuff gets tossed around at the same time. disable(rand(2, 5)) return TRUE diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm index 5e286ccb7e5..ea0a76b4427 100644 --- a/code/modules/clothing/suits/labcoat.dm +++ b/code/modules/clothing/suits/labcoat.dm @@ -7,7 +7,7 @@ suit_adjusted = 1 blood_overlay_type = "coat" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS - allowed = list(/obj/item/analyzer,/obj/item/stack/medical,/obj/item/dnainjector,/obj/item/reagent_containers/dropper,/obj/item/reagent_containers/syringe,/obj/item/reagent_containers/hypospray,/obj/item/reagent_containers/applicator,/obj/item/healthanalyzer,/obj/item/flashlight/pen,/obj/item/reagent_containers/glass/bottle,/obj/item/reagent_containers/glass/beaker,/obj/item/reagent_containers/food/pill,/obj/item/storage/pill_bottle,/obj/item/paper,/obj/item/rad_laser) + allowed = list(/obj/item/analyzer, /obj/item/stack/medical, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/applicator, /obj/item/healthanalyzer, /obj/item/flashlight/pen, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/food/pill, /obj/item/storage/pill_bottle, /obj/item/paper, /obj/item/rad_laser, /obj/item/robotanalyzer) armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 50, "rad" = 0, "fire" = 50, "acid" = 50) species_exception = list(/datum/species/golem) sprite_sheets = list( diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index 33563eabe29..53b53f54f48 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -141,7 +141,7 @@ user.visible_message("[user] places \the [src] against [M]'s chest and listens attentively.", "You place \the [src] against [M]'s chest...") var/obj/item/organ/internal/H = M.get_int_organ(/obj/item/organ/internal/heart) var/obj/item/organ/internal/L = M.get_int_organ(/obj/item/organ/internal/lungs) - if((H && M.pulse) || (L && !HAS_TRAIT(M, TRAIT_NOBREATH))) + if(M.pulse && (H || (L && !HAS_TRAIT(M, TRAIT_NOBREATH)))) var/color = "notice" if(H) var/heart_sound diff --git a/code/modules/clothing/under/accessories/holster.dm b/code/modules/clothing/under/accessories/holster.dm index d7d55a478e8..c06f2285a7c 100644 --- a/code/modules/clothing/under/accessories/holster.dm +++ b/code/modules/clothing/under/accessories/holster.dm @@ -40,32 +40,32 @@ var/obj/item/gun/W = I if(!can_holster(W)) - to_chat(user, "This [W] won't fit in the [src]!") + to_chat(user, "This [W.name] won't fit in [src]!") return if(!user.canUnEquip(W, 0)) - to_chat(user, "You can't let go of the [W]!") + to_chat(user, "You can't let go of [W]!") return holstered = W user.unEquip(holstered) holstered.loc = src holstered.add_fingerprint(user) - user.visible_message("[user] holsters the [holstered].", "You holster the [holstered].") + user.visible_message("[user] holsters [holstered].", "You holster [holstered].") /obj/item/clothing/accessory/holster/proc/unholster(mob/user as mob) if(!holstered) return if(istype(user.get_active_hand(),/obj) && istype(user.get_inactive_hand(),/obj)) - to_chat(user, "You need an empty hand to draw the [holstered]!") + to_chat(user, "You need an empty hand to draw [holstered]!") else if(user.a_intent == INTENT_HARM) - usr.visible_message("[user] draws the [holstered], ready to shoot!", \ - "You draw the [holstered], ready to shoot!") + usr.visible_message("[user] draws [holstered], ready to shoot!", \ + "You draw [holstered], ready to shoot!") else - user.visible_message("[user] draws the [holstered], pointing it at the ground.", \ - "You draw the [holstered], pointing it at the ground.") + user.visible_message("[user] draws [holstered], pointing it at the ground.", \ + "You draw [holstered], pointing it at the ground.") user.put_in_hands(holstered) holstered.add_fingerprint(user) holstered = null diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index f4a16283fac..e91942e8e5f 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -68,14 +68,25 @@ item_color = "solgov" armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 30) displays_id = 0 +/obj/item/clothing/under/solgov/elite + name = "\improper Trans-Solar Federation Specops marine uniform" + desc = "A comfortable and durable combat uniform worn by Trans-Solar Federation Specops Marine Forces." + icon_state = "solgovelite" + item_color = "solgovelite" /obj/item/clothing/under/solgov/command name = "\improper Trans-Solar Federation Lieutenant's uniform" - desc = "A comfortable and durable combat uniform worn by Trans-Solar Federation Marine Forces. This one has additional insignia on its shoulders." + desc = "A comfortable and durable combat uniform worn by Trans-Solar Federation Marine Forces. This one has additional insignia on its shoulders and cuffs." icon_state = "solgovc" item_color = "solgovc" armor = list("melee" = 10, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 30) +/obj/item/clothing/under/solgov/command/elite + name = "\improper Trans-Solar Federation Specops Lieutenant's uniform" + desc = "A comfortable and durable combat uniform worn by Trans-Solar Federation Specops Marine Forces. This one has additional insignia on its shoulders and cuffs." + icon_state = "solgovcelite" + item_color = "solgovcelite" + /obj/item/clothing/under/solgov/rep name = "\improper Trans-Solar Federation representative's uniform" desc = "A formal uniform worn by the diplomatic representatives of the Trans-Solar Federation." diff --git a/code/modules/crafting/craft.dm b/code/modules/crafting/craft.dm index f6dbb48ed63..0fc71ecf4c9 100644 --- a/code/modules/crafting/craft.dm +++ b/code/modules/crafting/craft.dm @@ -245,7 +245,7 @@ var/obj/item/stack/SD while(amt > 0) S = locate(A) in surroundings - if(S.amount >= amt) + if(S.get_amount() >= amt) if(!locate(S.type) in Deletion) SD = new S.type() Deletion += SD diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index e49e063b59d..cbcdf2ef43b 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -34,12 +34,12 @@ /obj/item/fluff/tattoo_gun/attack(mob/living/carbon/M as mob, mob/user as mob) if(user.a_intent == INTENT_HARM) - user.visible_message("[user] stabs [M] with the [src]!", "You stab [M] with the [src]!") - to_chat(M, "[user] stabs you with the [src]!
      You feel a tiny prick!") + user.visible_message("[user] stabs [M] with [src]!", "You stab [M] with [src]!") + to_chat(M, "[user] stabs you with [src]!
      You feel a tiny prick!") return if(used) - to_chat(user, "The [src] is out of ink.") + to_chat(user, "[src] is out of ink.") return if(!istype(M, /mob/living/carbon/human)) @@ -62,10 +62,10 @@ return if(target == user) - to_chat(user, "You use the [src] to apply a [tattoo_name] to yourself!") + to_chat(user, "You use [src] to apply a [tattoo_name] to yourself!") else - user.visible_message("[user] begins to apply a [tattoo_name] [target] with the [src].", "You begin to tattoo [target] with the [src]!") + user.visible_message("[user] begins to apply a [tattoo_name] [target] with [src].", "You begin to tattoo [target] with [src]!") if(!do_after(user, 30 * toolspeed, target = M)) return user.visible_message("[user] finishes the [tattoo_name] on [target].", "You finish the [tattoo_name].") @@ -108,12 +108,12 @@ tattoo_g = color2G(ink_color) tattoo_b = color2B(ink_color) - to_chat(user, "You change the color setting on the [src].") + to_chat(user, "You change the color setting on [src].") update_icon() else - to_chat(user, "The [src] is out of ink!") + to_chat(user, "[src] is out of ink!") /obj/item/fluff/bird_painter // BirdtTalon: Kahkiri name = "Orb of Onyx" @@ -292,7 +292,7 @@ return if(target.change_body_accessory("Jay Wingler Tail")) - to_chat(target, "You comb your tail with the [src].") + to_chat(target, "You comb your tail with [src].") used = 1 /obj/item/fluff/desolate_coat_kit //DesolateG: Micheal Smith @@ -460,7 +460,7 @@ var/obj/item/clothing/suit/storage/S = target var/obj/item/clothing/suit/storage/fluff/k3_webbing/webbing = new(get_turf(target)) webbing.allowed = S.allowed - to_chat(user, "You modify the [S] with [src].") + to_chat(user, "You modify [S] with [src].") H.update_inv_wear_suit() qdel(S) qdel(src) @@ -580,10 +580,6 @@ to_chat(user, "You can't modify [target]!") -#undef USED_MOD_HELM -#undef USED_MOD_SUIT - - ////////////////////////////////// //////////// Clothing //////////// ////////////////////////////////// @@ -961,7 +957,7 @@ for(var/X in actions) var/datum/action/A = X A.UpdateButtonIcon() - to_chat(user, "You turn the [src]'s lighting system [flavour].") + to_chat(user, "You turn [src]'s lighting system [flavour].") user.update_inv_wear_suit() /obj/item/clothing/suit/hooded/hoodie/fluff/xantholne // Xantholne: Meex Zwichsnicrur @@ -1491,6 +1487,57 @@ displays_id = FALSE +/obj/item/fluff/lighty_plasman_modkit // LightFire53: Ikelos + name = "plasmaman suit modkit" + desc = "A kit containing nanites that are able to modify the look of a plasmaman suit and helmet without exposing the wearer to hostile environments." + icon_state = "modkit" + w_class = WEIGHT_CLASS_SMALL + +/obj/item/fluff/lighty_plasman_modkit/afterattack(atom/target, mob/user, proximity, params) + if(!proximity || !ishuman(user) || user.incapacitated() || !isitem(target)) + return + var/mob/living/carbon/human/H = user + + if(istype(target, /obj/item/clothing/head/helmet/space/plasmaman)) + if(used & USED_MOD_HELM) + to_chat(H, "The kit's helmet modifier has already been used!") + return + + var/obj/item/clothing/head/helmet/space/plasmaman/P = target + used |= USED_MOD_HELM + to_chat(H, "You modify the appearance of [P].") + playsound(src, 'sound/effects/spray.ogg', 5, TRUE, 5) + var/obj/item/clothing/head/helmet/space/plasmaman/lf53_fluff/F = new(P.loc) + if(P == H.head) + H.unEquip(P, TRUE, TRUE) + H.equip_to_slot(F, slot_head, TRUE) + H.update_inv_head() + qdel(P) + + else if(istype(target, /obj/item/clothing/under/plasmaman)) + if(used & USED_MOD_SUIT) + to_chat(user, "The kit's suit modifier has already been used!") + return + + var/obj/item/clothing/under/plasmaman/P = target + used |= USED_MOD_SUIT + to_chat(H, "You modify the appearance of [P].") + playsound(src, 'sound/effects/spray.ogg', 5, TRUE, 5) + P.icon_state = "ikelos_envirosuit" + P.item_color = "ikelos_envirosuit" + P.icon = 'icons/obj/custom_items.dmi' + + if(P == H.w_uniform) + H.update_inv_w_uniform() + + else + to_chat(user, "You can't modify [target]!") + +/obj/item/clothing/head/helmet/space/plasmaman/lf53_fluff // LightFire53: Ikelos + icon_state = "ikelos_envirohelm" // New item needed because `initial(icon_state)` is used. + icon = 'icons/obj/custom_items.dmi' + + /obj/item/fluff/decemviri_spacepod_kit //Decemviri: Sylus Cain name = "Spacepod mod kit" desc = "a kit on tools and a blueprint detailing how to reconfigure a spacepod" @@ -1664,3 +1711,6 @@ item_color = "kikeridress" body_parts_covered = UPPER_TORSO|LOWER_TORSO species_restricted = list("Vox") + +#undef USED_MOD_HELM +#undef USED_MOD_SUIT diff --git a/code/modules/detective_work/footprints_and_rag.dm b/code/modules/detective_work/footprints_and_rag.dm index bfc9d0aa824..526be9fe66f 100644 --- a/code/modules/detective_work/footprints_and_rag.dm +++ b/code/modules/detective_work/footprints_and_rag.dm @@ -25,7 +25,7 @@ /obj/item/reagent_containers/glass/rag/attack(atom/target as obj|turf|area, mob/user as mob , flag) if(ismob(target) && target.reagents && reagents.total_volume) - user.visible_message("[user] has smothered \the [target] with \the [src]!", "You smother \the [target] with \the [src]!", "You hear some struggling and muffled cries of surprise") + user.visible_message("[user] has smothered [target] with [src]!", "You smother [target] with [src]!", "You hear some struggling and muffled cries of surprise") src.reagents.reaction(target, REAGENT_TOUCH) src.reagents.clear_reagents() return @@ -35,8 +35,8 @@ /obj/item/reagent_containers/glass/rag/afterattack(atom/A as obj|turf|area, mob/user as mob,proximity) if(!proximity) return if(istype(A) && (src in user)) - user.visible_message("[user] starts to wipe down [A] with [src]!") + user.visible_message("[user] starts to wipe down [A] with [src]!") if(do_after(user, wipespeed, target = A)) - user.visible_message("[user] finishes wiping off the [A]!") + user.visible_message("[user] finishes wiping off [A]!") A.clean_blood() return diff --git a/code/modules/economy/ATM.dm b/code/modules/economy/ATM.dm index e2733ba2446..b8d610252c9 100644 --- a/code/modules/economy/ATM.dm +++ b/code/modules/economy/ATM.dm @@ -244,22 +244,17 @@ log transactions if(amount <= 0) to_chat(usr, "[bicon(src)]That is not a valid amount.") else if(authenticated_account && amount > 0) - if(amount <= authenticated_account.money) + if(amount > 100000) // Prevent crashes + to_chat(usr, "[bicon(src)]The ATM's screen flashes, 'Maximum single withdrawal limit reached, defaulting to 100,000.'") + amount = 100000 + if(authenticated_account.charge(amount, null, "Credit withdrawal", machine_id, authenticated_account.owner_name)) playsound(src, 'sound/machines/chime.ogg', 50, TRUE) - - //remove the money - if(amount > 100000) // prevent crashes - to_chat(usr, "The ATM's screen flashes, 'Maximum single withdrawl limit reached, defaulting to 100,000.'") - amount = 100000 withdraw_arbitrary_sum(amount) - authenticated_account.charge(amount, null, "Credit withdrawal", machine_id, authenticated_account.owner_name) - else - to_chat(usr, "[bicon(src)]You don't have enough funds to do that!") if("balance_statement") if(authenticated_account) if(world.timeofday < lastprint + PRINT_DELAY) - to_chat(usr, "The [name] flashes an error on its display.") + to_chat(usr, "[src] flashes an error on its display.") return lastprint = world.timeofday playsound(loc, 'sound/goonstation/machines/printer_thermal.ogg', 50, TRUE) diff --git a/code/modules/economy/EFTPOS.dm b/code/modules/economy/EFTPOS.dm index 55a6541dfaf..a5b76b3ebfe 100644 --- a/code/modules/economy/EFTPOS.dm +++ b/code/modules/economy/EFTPOS.dm @@ -38,7 +38,11 @@ R.stamped += /obj/item/stamp R.overlays += stampoverlay R.stamps += "
      This paper has been stamped by the EFTPOS device." - var/obj/item/smallDelivery/D = new(R.loc) + var/obj/item/smallDelivery/D = new(get_turf(loc)) + if(istype(loc, /mob/living/carbon/human)) + var/mob/living/carbon/human/H = loc + if(H.back) + D.forceMove(H.back) R.forceMove(D) D.wrapped = R D.name = "small parcel - 'EFTPOS access code'" @@ -186,6 +190,6 @@ var/transSuccess = D.charge(transaction_amount, linked_account, transaction_purpose, machine_name, D.owner_name) if(transSuccess == TRUE) playsound(src, 'sound/machines/chime.ogg', 50, 1) - visible_message("[bicon(src)] The [src] chimes.") + visible_message("[src] chimes!") transaction_paid = 1 //emag? diff --git a/code/modules/events/apc_short.dm b/code/modules/events/apc_short.dm index 9560140c2d8..759b443e2bf 100644 --- a/code/modules/events/apc_short.dm +++ b/code/modules/events/apc_short.dm @@ -46,6 +46,7 @@ // skip any APCs that are too critical to disable var/list/skipped_areas_apc = list( /area/engine/engineering, + /area/engine/supermatter, /area/turret_protected/ai) if(announce) GLOB.event_announcement.Announce("Overload detected in [station_name()]'s powernet. Engineering, please repair shorted APCs.", "Systems Power Failure", new_sound = 'sound/AI/attention.ogg') diff --git a/code/modules/events/blob.dm b/code/modules/events/blob.dm index eb5dfc6a738..8282cc11317 100644 --- a/code/modules/events/blob.dm +++ b/code/modules/events/blob.dm @@ -30,5 +30,6 @@ SSticker.mode.update_blob_icons_added(B.mind) to_chat(B, "You are now a mouse, infected with blob spores. Find somewhere isolated... before you burst and become the blob! Use ventcrawl (alt-click on vents) to move around.") + to_chat(B, "For more information, check the wiki page: ([config.wikiurl]/index.php/Blob)") notify_ghosts("Infected Mouse has appeared in [get_area(B)].", source = B) successSpawn = TRUE diff --git a/code/modules/events/spider_terror.dm b/code/modules/events/spider_terror.dm index 36a8d452248..019ef568908 100644 --- a/code/modules/events/spider_terror.dm +++ b/code/modules/events/spider_terror.dm @@ -56,6 +56,7 @@ var/mob/living/simple_animal/hostile/poison/terror_spider/S = new spider_type(vent.loc) var/mob/M = pick_n_take(candidates) S.key = M.key + to_chat(S, "For more information, check the wiki page: ([config.wikiurl]/index.php/Terror_Spider)") spawncount-- successSpawn = TRUE diff --git a/code/modules/examine/descriptions/weapons.dm b/code/modules/examine/descriptions/weapons.dm index 86e5f69699b..2b8c234564a 100644 --- a/code/modules/examine/descriptions/weapons.dm +++ b/code/modules/examine/descriptions/weapons.dm @@ -27,11 +27,11 @@ description_info = "This is an energy weapon. To recharge this weapon, use a weapon recharger. \ To switch between insta-stun and disabler beams, click the weapon in your hand. This weapon can only fire through glass if it is set to disabler beams." -/obj/item/gun/energy/nuclear +/obj/item/gun/energy/gun/nuclear description_info = "This is an energy weapon. Most energy weapons can fire through windows harmlessly. To switch between stun and lethal, click the weapon \ in your hand. Unlike most weapons, this weapon recharges itself." -/obj/item/gun/energy/captain +/obj/item/gun/energy/laser/captain description_info = "This is an energy weapon. Most energy weapons can fire through windows harmlessly. Unlike most weapons, this weapon recharges itself." /obj/item/gun/energy/sniperrifle diff --git a/code/modules/fish/fish_items.dm b/code/modules/fish/fish_items.dm index d1e4f8eaaba..fbea6172ac6 100644 --- a/code/modules/fish/fish_items.dm +++ b/code/modules/fish/fish_items.dm @@ -26,7 +26,7 @@ throw_range = 7 /obj/item/fish_net/suicide_act(mob/user) //"A tiny net is a death sentence: it's a net and it's tiny!" https://www.youtube.com/watch?v=FCI9Y4VGCVw - to_chat(viewers(user), "[user] places the [src.name] on top of [user.p_their()] head, [user.p_their()] fingers tangled in the netting! It looks like [user.p_theyre()] trying to commit suicide.") + visible_message("[user] places [src] on top of [user.p_their()] head, [user.p_their()] fingers tangled in the netting! It looks like [user.p_theyre()] trying to commit suicide.") return OXYLOSS /obj/item/fishfood @@ -52,7 +52,7 @@ attack_verb = list("scrubbed", "brushed", "scraped") /obj/item/tank_brush/suicide_act(mob/user) - to_chat(viewers(user), "[user] is vigorously scrubbing [user.p_them()]self raw with the [name]! It looks like [user.p_theyre()] trying to commit suicide.") + visible_message("[user] is vigorously scrubbing [user.p_them()]self raw with [src]! It looks like [user.p_theyre()] trying to commit suicide.") return BRUTELOSS|FIRELOSS /obj/item/storage/bag/fish diff --git a/code/modules/fish/fishtank.dm b/code/modules/fish/fishtank.dm index 12c5d243b52..d41b48b6561 100644 --- a/code/modules/fish/fishtank.dm +++ b/code/modules/fish/fishtank.dm @@ -570,15 +570,14 @@ if(isAI(user)) return user.changeNext_move(CLICK_CD_MELEE) + playsound(get_turf(src), 'sound/effects/glassknock.ogg', 80, TRUE) if(user.a_intent == INTENT_HARM) - playsound(get_turf(src), 'sound/effects/glassknock.ogg', 80, 1) - user.visible_message("[user.name] bangs against the [name]!", \ - "You bang against the [name]!", \ + user.visible_message("[user] bangs against [src]!", + "You bang against [src]!", "You hear a banging sound.") else - playsound(loc, 'sound/effects/glassknock.ogg', 80, 1) - user.visible_message("[user.name] taps on the [name].", \ - "You tap on the [name].", \ + user.visible_message("[user] taps on [src].", + "You tap on [src].", "You hear a knocking sound.") /obj/machinery/fishtank/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0) diff --git a/code/modules/food_and_drinks/drinks/bottler/bottler.dm b/code/modules/food_and_drinks/drinks/bottler/bottler.dm index dcdd116012d..9426a9cf21d 100644 --- a/code/modules/food_and_drinks/drinks/bottler/bottler.dm +++ b/code/modules/food_and_drinks/drinks/bottler/bottler.dm @@ -206,7 +206,7 @@ containers[con_type] = min(containers[con_type], max_define) S.use(sheets_to_use) else - visible_message("[src] rejects the [S] because it already is fully stocked with [con_type]s.") + visible_message("[src] rejects [S] because it already is fully stocked with [con_type]s.") /obj/machinery/bottler/proc/select_recipe() for(var/datum/bottler_recipe/recipe in available_recipes) diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm index 8444e101132..b3b03b5777b 100644 --- a/code/modules/food_and_drinks/drinks/drinks.dm +++ b/code/modules/food_and_drinks/drinks/drinks.dm @@ -45,12 +45,12 @@ to_chat(chugger, "You need to open [src] first!") return if(istype(chugger) && loc == chugger && src == chugger.get_active_hand() && reagents.total_volume) - chugger.visible_message("[chugger] raises the [src] to [chugger.p_their()] mouth and starts [pick("chugging","gulping")] it down like [pick("a savage","a mad beast","it's going out of style","there's no tomorrow")]!", "You start chugging [src].", "You hear what sounds like gulping.") + chugger.visible_message("[chugger] raises [src] to [chugger.p_their()] mouth and starts [pick("chugging","gulping")] it down like [pick("a savage","a mad beast","it's going out of style","there's no tomorrow")]!", "You start chugging [src].", "You hear what sounds like gulping.") while(do_mob(chugger, chugger, 40)) //Between the default time for do_mob and the time it takes for a vampire to suck blood. chugger.eat(src, chugger, 25) //Half of a glass, quarter of a bottle. if(!reagents.total_volume) //Finish in style. chugger.emote("gasp") - chugger.visible_message("[chugger] [pick("finishes","downs","polishes off","slams")] the entire [src], what a [pick("savage","monster","champ","beast")]!", "You finish off the [src]![prob(50) ? " Maybe that wasn't such a good idea..." : ""]", "You hear a gasp and a clink.") + chugger.visible_message("[chugger] [pick("finishes","downs","polishes off","slams")] the entire [src], what a [pick("savage","monster","champ","beast")]!", "You finish off [src]![prob(50) ? " Maybe that wasn't such a good idea..." : ""]", "You hear a gasp and a clink.") break /obj/item/reagent_containers/food/drinks/afterattack(obj/target, mob/user, proximity) diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm index 532e5572894..d01e314c593 100644 --- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm +++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm @@ -12,7 +12,7 @@ var/const/duration = 13 //Directly relates to the 'weaken' duration. Lowered by armor (i.e. helmets) var/isGlass = 1 //Whether the 'bottle' is made of glass or not so that milk cartons dont shatter when someone gets hit by it -/obj/item/reagent_containers/food/drinks/bottle/proc/smash(mob/living/target, mob/living/user, ranged = 0) +/obj/item/reagent_containers/food/drinks/bottle/proc/smash(mob/living/target, mob/living/user, ranged = FALSE) //Creates a shattering noise and replaces the bottle with a broken_bottle var/new_location = get_turf(loc) @@ -124,6 +124,11 @@ reagents.reaction(M, REAGENT_TOUCH) reagents.clear_reagents() +/obj/item/reagent_containers/food/drinks/bottle/throw_impact(atom/target,mob/thrower) + ..() + SplashReagents(target) + smash(target, thrower, ranged = TRUE) + /obj/item/reagent_containers/food/drinks/bottle/decompile_act(obj/item/matter_decompiler/C, mob/user) if(!reagents.total_volume) C.stored_comms["glass"] += 3 @@ -345,11 +350,10 @@ if(istype(R, A)) firestarter = 1 break - SplashReagents(target) + ..() if(firestarter && active) target.fire_act() new /obj/effect/hotspot(get_turf(target)) - ..() /obj/item/reagent_containers/food/drinks/bottle/molotov/attackby(obj/item/I, mob/user, params) if(is_hot(I) && !active) diff --git a/code/modules/food_and_drinks/drinks/drinks/cans.dm b/code/modules/food_and_drinks/drinks/drinks/cans.dm index d5508ca6919..4759f76eb2b 100644 --- a/code/modules/food_and_drinks/drinks/drinks/cans.dm +++ b/code/modules/food_and_drinks/drinks/drinks/cans.dm @@ -57,7 +57,7 @@ addtimer(CALLBACK(src, .proc/reset_shakable), 1 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE) to_chat(H, "You start shaking up [src].") if(do_after(H, 1 SECONDS, target = H)) - visible_message("[user] shakes up the [name]!") + visible_message("[user] shakes up [src]!") if(times_shaken == 0) times_shaken++ addtimer(CALLBACK(src, .proc/reset_shaken), 1 MINUTES, TIMER_UNIQUE | TIMER_OVERRIDE | TIMER_NO_HASH_WAIT) diff --git a/code/modules/food_and_drinks/food/condiment.dm b/code/modules/food_and_drinks/food/condiment.dm index 898d3f3cc71..9d9e81be9af 100644 --- a/code/modules/food_and_drinks/food/condiment.dm +++ b/code/modules/food_and_drinks/food/condiment.dm @@ -23,6 +23,7 @@ "sodiumchloride" = list("saltshakersmall", "salt shaker", "Salt. From space oceans, presumably"), "blackpepper" = list("peppermillsmall", "pepper mill", "Often used to flavor food or make people sneeze"), "cornoil" = list("oliveoil", "corn oil bottle", "A delicious oil used in cooking. Made from corn"), + "wasabi" = list("wasabitube", "wasabi bottle", "A pungent paste commonly served in tiny amounts with sushi. Spicy!"), "sugar" = list("emptycondiment", "sugar bottle", "Tasty spacey sugar!")) var/originalname = "condiment" //Can't use initial(name) for this. This stores the name set by condimasters. @@ -113,6 +114,9 @@ icon_state = "enzyme" list_reagents = list("enzyme" = 50) +/obj/item/reagent_containers/food/condiment/enzyme/cyborg_recharge(coeff, emagged) + reagents.check_and_add("enzyme", volume, 2 * coeff) // Only recharge if the current amount of enzyme is under `volume`. + /obj/item/reagent_containers/food/condiment/sugar name = "sugar bottle" desc = "Tasty spacey sugar!" diff --git a/code/modules/food_and_drinks/food/customizables.dm b/code/modules/food_and_drinks/food/customizables.dm index ef2ad5f777b..820dbbe70d0 100644 --- a/code/modules/food_and_drinks/food/customizables.dm +++ b/code/modules/food_and_drinks/food/customizables.dm @@ -1,54 +1,53 @@ +#define MAKE_CUSTOM_FOOD(snack_to_add, user, type) \ +do {\ + var/obj/item/reagent_containers/food/snacks/customizable/custom_snack = new type(get_turf(user));\ + custom_snack.add_ingredient(snack_to_add, user); \ + user.put_in_active_hand(custom_snack); \ + qdel(src);\ +} while(FALSE) + /obj/item/reagent_containers/food/snacks/breadslice/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/reagent_containers/food/snacks) && !(W.flags & NODROP)) - var/obj/item/reagent_containers/food/snacks/customizable/sandwich/S = new(get_turf(user)) - S.attackby(W,user, params) - qdel(src) + MAKE_CUSTOM_FOOD(W, user, /obj/item/reagent_containers/food/snacks/customizable/sandwich) else ..() /obj/item/reagent_containers/food/snacks/bun/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/reagent_containers/food/snacks) && !(W.flags & NODROP)) - var/obj/item/reagent_containers/food/snacks/customizable/burger/S = new(get_turf(user)) - S.attackby(W,user, params) - qdel(src) + MAKE_CUSTOM_FOOD(W, user, /obj/item/reagent_containers/food/snacks/customizable/burger) /obj/item/reagent_containers/food/snacks/sliceable/flatdough/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/reagent_containers/food/snacks) && !(W.flags & NODROP)) - var/obj/item/reagent_containers/food/snacks/customizable/pizza/S = new(get_turf(user)) - S.attackby(W,user, params) - qdel(src) + MAKE_CUSTOM_FOOD(W, user, /obj/item/reagent_containers/food/snacks/customizable/pizza) else ..() /obj/item/reagent_containers/food/snacks/boiledspaghetti/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/reagent_containers/food/snacks) && !(W.flags & NODROP)) - var/obj/item/reagent_containers/food/snacks/customizable/pasta/S = new(get_turf(user)) - S.attackby(W,user, params) - qdel(src) + MAKE_CUSTOM_FOOD(W, user, /obj/item/reagent_containers/food/snacks/customizable/pasta) else ..() /obj/item/trash/plate/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/reagent_containers/food/snacks) && !(W.flags & NODROP)) - var/obj/item/reagent_containers/food/snacks/customizable/fullycustom/S = new(get_turf(user)) - S.attackby(W,user, params) - qdel(src) + MAKE_CUSTOM_FOOD(W, user, /obj/item/reagent_containers/food/snacks/customizable/fullycustom) else ..() +#undef MAKE_CUSTOM_FOOD + /obj/item/trash/bowl name = "bowl" desc = "An empty bowl. Put some food in it to start making a soup." - icon = 'icons/obj/food/food.dmi' + icon = 'icons/obj/food/custom.dmi' icon_state = "soup" -/obj/item/trash/bowl/attackby(obj/item/W, mob/user, params) - - if(istype(W, /obj/item/reagent_containers/food/snacks) && !(W.flags & NODROP)) +/obj/item/trash/bowl/attackby(obj/item/I, mob/user, params) + if(istype(I, /obj/item/reagent_containers/food/snacks) && !(I.flags & NODROP)) var/obj/item/reagent_containers/food/snacks/customizable/soup/S = new(get_turf(user)) - S.attackby(W,user, params) + S.attackby(I, user, params) qdel(src) else ..() @@ -59,7 +58,6 @@ icon_state = "breadslice" baseicon = "sandwichcustom" basename = "sandwich" - toptype = new /obj/item/reagent_containers/food/snacks/breadslice() @@ -71,16 +69,24 @@ var/baseicon = "sandwichcustom" var/basename = "sandwichcustom" bitesize = 4 - var/top = 1 //Do we have a top? - var/obj/item/toptype + /// Do we have a top? + var/top = TRUE + /// The image of the top + var/image/top_image var/snack_overlays = 1 //Do we stack? // var/offsetstuff = 1 //Do we offset the overlays? - var/sandwich_limit = 40 + var/ingredient_limit = 40 var/fullycustom = 0 trash = /obj/item/trash/plate var/list/ingredients = list() list_reagents = list("nutriment" = 8) +/obj/item/reagent_containers/food/snacks/customizable/Initialize(mapload) + . = ..() + if(top) + top_image = new(icon, "[baseicon]_top") + add_overlay(top_image) + /obj/item/reagent_containers/food/snacks/customizable/pizza name = "personal pizza" desc = "A personalized pan pizza meant for only one person." @@ -304,7 +310,7 @@ basename = "on a plate" snack_overlays = 0 top = 0 - sandwich_limit = 20 + ingredient_limit = 20 fullycustom = 1 /obj/item/reagent_containers/food/snacks/customizable/soup @@ -313,6 +319,7 @@ icon_state = "soup" baseicon = "soup" basename = "soup" + consume_sound = 'sound/items/drink.ogg' snack_overlays = 0 trash = /obj/item/trash/bowl top = 0 @@ -321,71 +328,102 @@ /obj/item/reagent_containers/food/snacks/customizable/burger name = "burger bun" desc = "A bun for a burger. Delicious." - icon_state = "burger" + icon_state = "burgercustom" baseicon = "burgercustom" basename = "burger" - toptype = new /obj/item/reagent_containers/food/snacks/bun() tastes = list("bun" = 4) + /obj/item/reagent_containers/food/snacks/customizable/attackby(obj/item/I, mob/user, params) - if(contents.len > sandwich_limit) + if(!istype(I, /obj/item/reagent_containers/food/snacks)) + to_chat(user, "[I] isn't exactly something that you would want to eat.") + return + + add_ingredient(I, user) + +/** + * Tries to add one ingredient and it's ingredients, if any and applicable, to this snack + * + * Arguments: + * * snack - The ingredient that will be added + */ +/obj/item/reagent_containers/food/snacks/customizable/proc/add_ingredient(obj/item/reagent_containers/food/snacks/snack, mob/user) + if(length(ingredients) > ingredient_limit) to_chat(user, "If you put anything else in or on [src] it's going to make a mess.") return - if(!istype(I, /obj/item/reagent_containers/food/snacks)) - to_chat(user, "\The [I] isn't exactly something that you would want to eat.") + + // Fully custom snacks don't add the ingredients. So no need to check + if(!fullycustom && istype(snack, /obj/item/reagent_containers/food/snacks/customizable)) + var/obj/item/reagent_containers/food/snacks/customizable/origin = snack + if(length(ingredients) + length(origin.ingredients) > ingredient_limit) + to_chat(user, "Merging [snack] and [src] together is going to make a mess.") + return + + if(!user.unEquip(snack)) + to_chat(user, "[snack] is stuck to your hand!") return - to_chat(user, "You add [I] to [src].") - if(istype(I, /obj/item/reagent_containers/)) - var/obj/item/reagent_containers/F = I - F.reagents.trans_to(src, F.reagents.total_volume) - if(istype(I, /obj/item/reagent_containers/food/snacks/customizable)) - var/obj/item/reagent_containers/food/snacks/customizable/origin = I - ingredients += origin.ingredients - user.drop_item() - cooktype[basename] = 1 - I.loc = src - if(!istype(I, toptype)) - ingredients += I - updateicon() + + to_chat(user, "You add [snack] to [src].") + snack.reagents.trans_to(src, snack.reagents.total_volume) + + var/list/added_ingredients = list(snack) + + // Only merge when it is not fullycustom. Else it looks weird + if(!fullycustom && istype(snack, /obj/item/reagent_containers/food/snacks/customizable)) + var/obj/item/reagent_containers/food/snacks/customizable/origin = snack + added_ingredients += origin.ingredients + origin.ingredients.Cut() + origin.name = initial(origin.name) // Reset the name for the examine text + + cooktype[basename] = TRUE + snack.forceMove(src) + add_ingredients(added_ingredients) + name = newname() +/** + * Adds a list of ingredients to the existing snack. Updates the overlays as well + * + * Arguments: + * * new_ingredients - The new ingredients to be added + */ +/obj/item/reagent_containers/food/snacks/customizable/proc/add_ingredients(list/new_ingredients) + cut_overlay(top_image) // Remove the top image so we can change it again -/obj/item/reagent_containers/food/snacks/customizable/proc/updateicon() - overlays = 0 - var/i=0 - for(var/obj/item/O in ingredients) - i++ + var/ingredient_num = length(ingredients) + ingredients += new_ingredients + for(var/obj/item/reagent_containers/food/snacks/food as anything in new_ingredients) + ingredient_num++ + var/image/ingredient_image if(!fullycustom) - var/image/I = new(icon, "[baseicon]_filling") - if(istype(O, /obj/item/reagent_containers/food/snacks)) - var/obj/item/reagent_containers/food/snacks/food = O - if(!food.filling_color == "#FFFFFF") - I.color = food.filling_color - else - I.color = pick("#FF0000","#0000FF","#008000","#FFFF00") + ingredient_image = new(icon, "[baseicon]_filling") + if(!food.filling_color == "#FFFFFF") + ingredient_image.color = food.filling_color else - I.color = pick("#FF0000","#0000FF","#008000","#FFFF00") + ingredient_image.color = pick("#FF0000", "#0000FF", "#008000", "#FFFF00") if(snack_overlays) - I.pixel_x = pick(list(-1,0,1)) - I.pixel_y = (i*2)+1 - overlays += I + ingredient_image.pixel_x = rand(2) - 1 + ingredient_image.pixel_y = ingredient_num * 2 + 1 else - var/image/F = new(O.icon, O.icon_state) - F.pixel_x = pick(list(-1,0,1)) - F.pixel_y = pick(list(-1,0,1)) - overlays += F - overlays += O.overlays + ingredient_image = new(food.icon, food.icon_state) + ingredient_image.pixel_x = rand(2) - 1 + ingredient_image.pixel_y = rand(2) - 1 + add_overlay(food.overlays) + + add_overlay(ingredient_image) + + if(top_image) + top_image.pixel_x = rand(2) - 1 + top_image.pixel_y = ingredient_num * 2 + 1 + add_overlay(top_image) - if(top) - var/image/T = new(icon, "[baseicon]_top") - T.pixel_x = pick(list(-1,0,1)) - T.pixel_y = (ingredients.len * 2)+1 - overlays += T /obj/item/reagent_containers/food/snacks/customizable/Destroy() QDEL_LIST(ingredients) + qdel(top_image) return ..() + /obj/item/reagent_containers/food/snacks/customizable/examine(mob/user) . = ..() if(LAZYLEN(ingredients)) diff --git a/code/modules/food_and_drinks/food/foods/bread.dm b/code/modules/food_and_drinks/food/foods/bread.dm index 47c185c3ff0..63eb623b8f9 100644 --- a/code/modules/food_and_drinks/food/foods/bread.dm +++ b/code/modules/food_and_drinks/food/foods/bread.dm @@ -126,6 +126,25 @@ list_reagents = list("nutriment" = 4, "vitamin" = 1) tastes = list("bread" = 10, "cheese" = 10) +/obj/item/reagent_containers/food/snacks/sliceable/banarnarbread + name = "banarnarbread loaf" + desc = "A loaf of delicious mah'weyh pleggh at e'ntrath!" + icon_state = "banarnarbread" + slice_path = /obj/item/reagent_containers/food/snacks/banarnarbreadslice + slices_num = 5 + filling_color = "#6F0000" + list_reagents = list("nutriment" = 20, "vitamin" = 5) + tastes = list("heresy" = 10, "banana" = 10) + +/obj/item/reagent_containers/food/snacks/banarnarbreadslice + name = "banarnarbread slice" + desc = "A slice of delicious mah'weyh pleggh at e'ntrath!" + icon_state = "banarnarbreadslice" + trash = /obj/item/trash/plate + filling_color = "#6F0000" + list_reagents = list("nutriment" = 4, "vitamin" = 1) + tastes = list("heresy" = 10, "banana" = 10) + ////////////////////// // Misc // diff --git a/code/modules/food_and_drinks/food/foods/pizza.dm b/code/modules/food_and_drinks/food/foods/pizza.dm index 50b270d1bbe..66078b9b6fb 100644 --- a/code/modules/food_and_drinks/food/foods/pizza.dm +++ b/code/modules/food_and_drinks/food/foods/pizza.dm @@ -173,7 +173,7 @@ /obj/item/pizzabox/attack_hand(mob/user) if(open && pizza) user.put_in_hands(pizza) - to_chat(user, "You take the [pizza] out of the [src].") + to_chat(user, "You take [pizza] out of [src].") pizza = null update_icon() return @@ -215,11 +215,11 @@ boxes.Add(boxestoadd) box.update_icon() update_icon() - to_chat(user, "You put the [box] ontop of the [src]!") + to_chat(user, "You put [box] on top of [src]!") else to_chat(user, "The stack is too high!") else - to_chat(user, "Close the [box] first!") + to_chat(user, "Close [box] first!") return if(istype(I, /obj/item/reagent_containers/food/snacks/sliceable/pizza/)) // Long ass fucking object name @@ -230,9 +230,9 @@ update_icon() - to_chat(user, "You put the [I] in the [src]!") + to_chat(user, "You put [I] in [src]!") else - to_chat(user, "You try to push the [I] through the lid but it doesn't work!") + to_chat(user, "You try to push [I] through the lid but it doesn't work!") return if(istype(I, /obj/item/pen/)) diff --git a/code/modules/food_and_drinks/food/foods/soups.dm b/code/modules/food_and_drinks/food/foods/soups.dm index 17b70a26308..16048147fb3 100644 --- a/code/modules/food_and_drinks/food/foods/soups.dm +++ b/code/modules/food_and_drinks/food/foods/soups.dm @@ -3,143 +3,132 @@ // Soups // ////////////////////// -/obj/item/reagent_containers/food/snacks/meatballsoup +// Base object for soups, should never appear ingame. +/obj/item/reagent_containers/food/snacks/soup + name = "impossible soup" + desc = "This soup is so good, it shouldn't even exist!" + icon_state = "beans" // If you don't have a sprite, you get beans. + consume_sound = 'sound/items/drink.ogg' + trash = /obj/item/trash/snack_bowl + bitesize = 5 + +/obj/item/reagent_containers/food/snacks/soup/meatballsoup name = "meatball soup" desc = "You've got balls kid, BALLS!" icon_state = "meatballsoup" - trash = /obj/item/trash/snack_bowl filling_color = "#785210" - bitesize = 5 list_reagents = list("nutriment" = 8, "water" = 5, "vitamin" = 4) tastes = list("meatball" = 1) -/obj/item/reagent_containers/food/snacks/slimesoup +/obj/item/reagent_containers/food/snacks/soup/slimesoup name = "slime soup" desc = "If no water is available, you may substitute tears." icon_state = "slimesoup" filling_color = "#C4DBA0" - bitesize = 5 list_reagents = list("nutriment" = 5, "slimejelly" = 5, "water" = 5, "vitamin" = 4) tastes = list("slime" = 1) -/obj/item/reagent_containers/food/snacks/bloodsoup +/obj/item/reagent_containers/food/snacks/soup/bloodsoup name = "tomato soup" desc = "Smells like copper." icon_state = "tomatosoup" filling_color = "#FF0000" - bitesize = 5 list_reagents = list("nutriment" = 2, "blood" = 10, "water" = 5, "vitamin" = 4) tastes = list("iron" = 1) -/obj/item/reagent_containers/food/snacks/clownstears +/obj/item/reagent_containers/food/snacks/soup/clownstears name = "clown's tears" desc = "Not very funny." icon_state = "clownstears" filling_color = "#C4FBFF" - bitesize = 5 list_reagents = list("nutriment" = 4, "banana" = 5, "water" = 5, "vitamin" = 8) tastes = list("a bad joke" = 1) -/obj/item/reagent_containers/food/snacks/vegetablesoup +/obj/item/reagent_containers/food/snacks/soup/vegetablesoup name = "vegetable soup" desc = "A true vegan meal." //TODO icon_state = "vegetablesoup" - trash = /obj/item/trash/snack_bowl filling_color = "#AFC4B5" - bitesize = 5 list_reagents = list("nutriment" = 8, "water" = 5, "vitamin" = 4) tastes = list("vegetables" = 1) -/obj/item/reagent_containers/food/snacks/nettlesoup +/obj/item/reagent_containers/food/snacks/soup/nettlesoup name = "nettle soup" desc = "To think, the botanist would've beaten you to death with one of these." icon_state = "nettlesoup" - trash = /obj/item/trash/snack_bowl filling_color = "#AFC4B5" - bitesize = 5 list_reagents = list("nutriment" = 8, "water" = 5, "vitamin" = 4) tastes = list("nettles" = 1) -/obj/item/reagent_containers/food/snacks/mysterysoup +/obj/item/reagent_containers/food/snacks/soup/mysterysoup name = "mystery soup" desc = "The mystery is, why aren't you eating it?" icon_state = "mysterysoup" var/extra_reagent = null - bitesize = 5 list_reagents = list("nutriment" = 6) tastes = list("chaos" = 1) -/obj/item/reagent_containers/food/snacks/mysterysoup/New() +/obj/item/reagent_containers/food/snacks/soup/mysterysoup/New() ..() extra_reagent = pick("capsaicin", "frostoil", "omnizine", "banana", "blood", "slimejelly", "toxin", "banana", "carbon", "oculine") reagents.add_reagent("[extra_reagent]", 5) -/obj/item/reagent_containers/food/snacks/wishsoup +/obj/item/reagent_containers/food/snacks/soup/wishsoup name = "wish soup" desc = "I wish this was soup." icon_state = "wishsoup" - trash = /obj/item/trash/snack_bowl filling_color = "#D1F4FF" - bitesize = 5 list_reagents = list("water" = 10) tastes = list("wishes" = 1) -/obj/item/reagent_containers/food/snacks/wishsoup/New() +/obj/item/reagent_containers/food/snacks/soup/wishsoup/New() ..() if(prob(25)) desc = "A wish come true!" // hue reagents.add_reagent("nutriment", 9) reagents.add_reagent("vitamin", 1) -/obj/item/reagent_containers/food/snacks/tomatosoup +/obj/item/reagent_containers/food/snacks/soup/tomatosoup name = "tomato soup" desc = "Drinking this feels like being a vampire! A tomato vampire..." icon_state = "tomatosoup" - trash = /obj/item/trash/snack_bowl filling_color = "#D92929" - bitesize = 5 list_reagents = list("nutriment" = 5, "tomatojuice" = 10, "vitamin" = 3) tastes = list("tomato" = 1) -/obj/item/reagent_containers/food/snacks/misosoup +/obj/item/reagent_containers/food/snacks/soup/misosoup name = "miso soup" desc = "The universe's best soup! Yum!!!" icon_state = "misosoup" - trash = /obj/item/trash/snack_bowl - bitesize = 5 list_reagents = list("nutriment" = 7, "vitamin" = 2) tastes = list("miso" = 1) -/obj/item/reagent_containers/food/snacks/mushroomsoup +/obj/item/reagent_containers/food/snacks/soup/mushroomsoup name = "chantrelle soup" desc = "A delicious and hearty mushroom soup." icon_state = "mushroomsoup" - trash = /obj/item/trash/snack_bowl filling_color = "#E386BF" - bitesize = 5 list_reagents = list("nutriment" = 8, "vitamin" = 4) tastes = list("mushroom" = 1) -/obj/item/reagent_containers/food/snacks/beetsoup +/obj/item/reagent_containers/food/snacks/soup/beetsoup name = "beet soup" desc = "Wait, how do you spell it again..?" icon_state = "beetsoup" - trash = /obj/item/trash/snack_bowl - bitesize = 5 filling_color = "#FAC9FF" list_reagents = list("nutriment" = 7, "vitamin" = 2) tastes = list("beet" = 1) -/obj/item/reagent_containers/food/snacks/beetsoup/New() +/obj/item/reagent_containers/food/snacks/soup/beetsoup/New() ..() - name = pick("borsch","bortsch","borstch","borsh","borshch","borscht") + name = pick("borsch", "bortsch", "borstch", "borsh", "borshch", "borscht") ////////////////////// // Stews // ////////////////////// -/obj/item/reagent_containers/food/snacks/stew +/obj/item/reagent_containers/food/snacks/soup/stew name = "stew" desc = "A nice and warm stew. Healthy and strong." icon_state = "stew" @@ -161,22 +150,18 @@ // Chili // ////////////////////// -/obj/item/reagent_containers/food/snacks/hotchili +/obj/item/reagent_containers/food/snacks/soup/hotchili name = "hot chili" desc = "A five alarm Texan Chili!" icon_state = "hotchili" - trash = /obj/item/trash/snack_bowl filling_color = "#FF3C00" - bitesize = 5 list_reagents = list("nutriment" = 5, "capsaicin" = 1, "tomatojuice" = 2, "vitamin" = 2) tastes = list("hot peppers" = 1, "tomato" = 1) -/obj/item/reagent_containers/food/snacks/coldchili +/obj/item/reagent_containers/food/snacks/soup/coldchili name = "cold chili" desc = "This slush is barely a liquid!" icon_state = "coldchili" filling_color = "#2B00FF" - trash = /obj/item/trash/snack_bowl - bitesize = 5 list_reagents = list("nutriment" = 5, "frostoil" = 1, "tomatojuice" = 2, "vitamin" = 2) tastes = list("tomato" = 1, "mint" = 1) diff --git a/code/modules/food_and_drinks/kitchen_machinery/cooker.dm b/code/modules/food_and_drinks/kitchen_machinery/cooker.dm index c8cf2aa8eee..d950737b07d 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/cooker.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/cooker.dm @@ -67,7 +67,7 @@ /obj/machinery/cooker/proc/burn_food(mob/user, obj/item/reagent_containers/props) var/obj/item/reagent_containers/food/snacks/badrecipe/burnt = new(get_turf(src)) setRegents(props, burnt) - to_chat(user, "You smell burning coming from the [src]!") + to_chat(user, "You smell burning coming from [src]!") var/datum/effect_system/smoke_spread/bad/smoke = new // burning things makes smoke! smoke.set_up(5, 0, src) smoke.start() @@ -75,7 +75,7 @@ var/turf/location = get_turf(src) var/obj/effect/decal/cleanable/liquid_fuel/oil = new(location) oil.name = "fat" - oil.desc = "uh oh, looks like some fat from the [src]" + oil.desc = "Uh oh, looks like some fat from [src]!" oil.loc = location location.hotspot_expose(700, 50, 1) //TODO have a chance of setting the tile on fire diff --git a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm index 4336c870bf3..4ec135e9e01 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm @@ -128,25 +128,25 @@ /obj/machinery/gibber/proc/move_into_gibber(mob/user, mob/living/victim) if(occupant) - to_chat(user, "The [src] is full, empty it first!") + to_chat(user, "[src] is full, empty it first!") return if(operating) - to_chat(user, "The [src] is locked and running, wait for it to finish.") + to_chat(user, "[src] is locked and running, wait for it to finish.") return if(!ishuman(victim)) - to_chat(user, "This is not suitable for the [src]!") + to_chat(user, "This is not suitable for [src]!") return if(victim.abiotic(1)) to_chat(user, "Subject may not have abiotic items on.") return - user.visible_message("[user] starts to put [victim] into the [src]!") + user.visible_message("[user] starts to put [victim] into [src]!") add_fingerprint(user) if(do_after(user, 30, target = victim) && user.Adjacent(src) && victim.Adjacent(user) && !occupant) - user.visible_message("[user] stuffs [victim] into the [src]!") + user.visible_message("[user] stuffs [victim] into [src]!") victim.forceMove(src) occupant = victim diff --git a/code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm b/code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm index 72782f532a6..b01925e009d 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm @@ -115,7 +115,7 @@ return 1 if(istype(O,/obj/item/stack)) var/obj/item/stack/S = O - if(S.amount > 1) + if(S.get_amount() > 1) var/obj/item/stack/to_add = S.split(user, 1) to_add.forceMove(src) user.visible_message("[user] adds one of [S] to [src].", "You add one of [S] to [src].") @@ -213,7 +213,7 @@ dat += {"[display_name]: [R.volume] unit\s
      "} if(items_counts.len==0 && reagents.reagent_list.len==0) - dat = {"The [src] is empty
      "} + dat = {"[src] is empty
      "} else dat = {"Ingredients:
      [dat]"} dat += {"

      \ @@ -394,7 +394,7 @@ /obj/machinery/kitchen_machine/proc/broke() do_sparks(2, 1, src) icon_state = broken_icon // Make it look all busted up and shit - visible_message("The [src] breaks!") //Let them know they're stupid + visible_message("[src] breaks!") //Let them know they're stupid broken = 2 // Make it broken so it can't be used util fixed flags = null //So you can't add condiments operating = 0 // Turn it off again aferwards diff --git a/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm b/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm index a648d37656d..8dbd68b0b71 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm @@ -78,7 +78,7 @@ GLOBAL_LIST_EMPTY(monkey_recyclers) else var/obj/item/multitool/M = O M.buffer = src - to_chat(user, "You log [src] in the [M]'s buffer.") + to_chat(user, "You log [src] in [M]'s buffer.") return if(stat != 0) //NOPOWER etc return diff --git a/code/modules/food_and_drinks/recipes/recipes_microwave.dm b/code/modules/food_and_drinks/recipes/recipes_microwave.dm index 2214e44b772..a54ef40918a 100644 --- a/code/modules/food_and_drinks/recipes/recipes_microwave.dm +++ b/code/modules/food_and_drinks/recipes/recipes_microwave.dm @@ -227,30 +227,30 @@ /datum/recipe/microwave/meatballsoup reagents = list("water" = 10) items = list(/obj/item/reagent_containers/food/snacks/meatball, /obj/item/reagent_containers/food/snacks/grown/potato, /obj/item/reagent_containers/food/snacks/grown/carrot) - result = /obj/item/reagent_containers/food/snacks/meatballsoup + result = /obj/item/reagent_containers/food/snacks/soup/meatballsoup /datum/recipe/microwave/vegetablesoup reagents = list("water" = 10) items = list(/obj/item/reagent_containers/food/snacks/grown/potato, /obj/item/reagent_containers/food/snacks/grown/carrot, /obj/item/reagent_containers/food/snacks/grown/corn, /obj/item/reagent_containers/food/snacks/grown/eggplant) - result = /obj/item/reagent_containers/food/snacks/vegetablesoup + result = /obj/item/reagent_containers/food/snacks/soup/vegetablesoup /datum/recipe/microwave/nettlesoup reagents = list("water" = 10) items = list(/obj/item/reagent_containers/food/snacks/egg, /obj/item/grown/nettle/basic, /obj/item/reagent_containers/food/snacks/grown/potato) - result = /obj/item/reagent_containers/food/snacks/nettlesoup + result = /obj/item/reagent_containers/food/snacks/soup/nettlesoup /datum/recipe/microwave/wishsoup reagents = list("water" = 20) - result= /obj/item/reagent_containers/food/snacks/wishsoup + result = /obj/item/reagent_containers/food/snacks/soup/wishsoup /datum/recipe/microwave/hotchili items = list(/obj/item/reagent_containers/food/snacks/meat, /obj/item/reagent_containers/food/snacks/grown/chili, /obj/item/reagent_containers/food/snacks/grown/tomato) - result = /obj/item/reagent_containers/food/snacks/hotchili + result = /obj/item/reagent_containers/food/snacks/soup/hotchili /datum/recipe/microwave/coldchili items = list(/obj/item/reagent_containers/food/snacks/meat, /obj/item/reagent_containers/food/snacks/grown/icepepper, /obj/item/reagent_containers/food/snacks/grown/tomato) - result = /obj/item/reagent_containers/food/snacks/coldchili + result = /obj/item/reagent_containers/food/snacks/soup/coldchili /datum/recipe/microwave/spellburger items = list( @@ -314,14 +314,14 @@ /datum/recipe/microwave/tomatosoup reagents = list("water" = 10) items = list(/obj/item/reagent_containers/food/snacks/grown/tomato, /obj/item/reagent_containers/food/snacks/grown/tomato) - result = /obj/item/reagent_containers/food/snacks/tomatosoup + result = /obj/item/reagent_containers/food/snacks/soup/tomatosoup /datum/recipe/microwave/stew reagents = list("water" = 10) items= list(/obj/item/reagent_containers/food/snacks/grown/tomato, /obj/item/reagent_containers/food/snacks/grown/potato, /obj/item/reagent_containers/food/snacks/grown/carrot, /obj/item/reagent_containers/food/snacks/grown/eggplant, /obj/item/reagent_containers/food/snacks/grown/mushroom, /obj/item/reagent_containers/food/snacks/meat) - result = /obj/item/reagent_containers/food/snacks/stew + result = /obj/item/reagent_containers/food/snacks/soup/stew /datum/recipe/microwave/slimetoast reagents = list("slimejelly" = 5) @@ -345,7 +345,7 @@ /obj/item/reagent_containers/food/snacks/tofu, /obj/item/reagent_containers/food/snacks/tofu, ) - result = /obj/item/reagent_containers/food/snacks/misosoup + result = /obj/item/reagent_containers/food/snacks/soup/misosoup /datum/recipe/microwave/stewedsoymeat items = list(/obj/item/reagent_containers/food/snacks/soydope, /obj/item/reagent_containers/food/snacks/soydope, @@ -463,11 +463,11 @@ /datum/recipe/microwave/bloodsoup reagents = list("blood" = 10) items = list(/obj/item/reagent_containers/food/snacks/grown/tomato/blood, /obj/item/reagent_containers/food/snacks/grown/tomato/blood) - result = /obj/item/reagent_containers/food/snacks/bloodsoup + result = /obj/item/reagent_containers/food/snacks/soup/bloodsoup /datum/recipe/microwave/slimesoup reagents = list("water" = 10, "slimejelly" = 5) - result = /obj/item/reagent_containers/food/snacks/slimesoup + result = /obj/item/reagent_containers/food/snacks/soup/slimesoup /datum/recipe/microwave/clownstears reagents = list("water" = 10) @@ -475,7 +475,7 @@ /obj/item/stack/ore/bananium, /obj/item/reagent_containers/food/snacks/grown/banana ) - result = /obj/item/reagent_containers/food/snacks/clownstears + result = /obj/item/reagent_containers/food/snacks/soup/clownstears /datum/recipe/microwave/boiledslimeextract reagents = list("water" = 5) @@ -503,12 +503,12 @@ /obj/item/reagent_containers/food/snacks/egg, /obj/item/reagent_containers/food/snacks/cheesewedge, ) - result = /obj/item/reagent_containers/food/snacks/mysterysoup + result = /obj/item/reagent_containers/food/snacks/soup/mysterysoup /datum/recipe/microwave/mushroomsoup reagents = list("water" = 5, "milk" = 5) items = list(/obj/item/reagent_containers/food/snacks/grown/mushroom) - result = /obj/item/reagent_containers/food/snacks/mushroomsoup + result = /obj/item/reagent_containers/food/snacks/soup/mushroomsoup /datum/recipe/microwave/chawanmushi reagents = list("water" = 5, "soysauce" = 5) @@ -522,7 +522,7 @@ /datum/recipe/microwave/beetsoup reagents = list("water" = 10) items = list(/obj/item/reagent_containers/food/snacks/grown/whitebeet, /obj/item/reagent_containers/food/snacks/grown/cabbage) - result = /obj/item/reagent_containers/food/snacks/beetsoup + result = /obj/item/reagent_containers/food/snacks/soup/beetsoup /datum/recipe/microwave/herbsalad items = list(/obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris, /obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris, diff --git a/code/modules/food_and_drinks/recipes/recipes_oven.dm b/code/modules/food_and_drinks/recipes/recipes_oven.dm index 5fc2b6d8c25..8c9307ae014 100644 --- a/code/modules/food_and_drinks/recipes/recipes_oven.dm +++ b/code/modules/food_and_drinks/recipes/recipes_oven.dm @@ -59,6 +59,16 @@ ) result = /obj/item/reagent_containers/food/snacks/sliceable/bananabread +/datum/recipe/oven/banarnarbread + reagents = list("milk" = 5, "sugar" = 5, "blood" = 5) + items = list( + /obj/item/reagent_containers/food/snacks/dough, + /obj/item/reagent_containers/food/snacks/dough, + /obj/item/reagent_containers/food/snacks/dough, + /obj/item/reagent_containers/food/snacks/grown/banana + ) + result = /obj/item/reagent_containers/food/snacks/sliceable/banarnarbread + /datum/recipe/oven/muffin reagents = list("milk" = 5, "sugar" = 5) items = list( diff --git a/code/modules/games/cards.dm b/code/modules/games/cards.dm index 8df53817d1b..87e17efd10b 100644 --- a/code/modules/games/cards.dm +++ b/code/modules/games/cards.dm @@ -238,7 +238,7 @@ usr.visible_message("[usr] picks up the deck.") /obj/item/pack - name = "Card Pack" + name = "card pack" desc = "For those with disposable income." icon_state = "card_pack" @@ -249,7 +249,7 @@ /obj/item/pack/attack_self(mob/user as mob) - user.visible_message("[name] rips open the [src]!", "You rips open the [src]!") + user.visible_message("[name] rips open [src]!", "You rip open [src]!") var/obj/item/cardhand/H = new(get_turf(user)) H.cards += cards @@ -410,8 +410,8 @@ if(cards.len) update_icon() if(H.cards.len) - usr.visible_message("The [usr] plays the [discarding].", "You play the [discarding].") - H.loc = get_step(usr,usr.dir) + user.visible_message("[user] plays the [discarding].", "You play the [discarding].") + H.loc = get_step(user, user.dir) if(!cards.len) qdel(src) diff --git a/code/modules/games/tarot.dm b/code/modules/games/tarot.dm index bd26c34d437..d5fdac7efd6 100644 --- a/code/modules/games/tarot.dm +++ b/code/modules/games/tarot.dm @@ -28,5 +28,5 @@ cards -= P cards = newcards playsound(user, 'sound/items/cardshuffle.ogg', 50, 1) - user.visible_message("[user] shuffles [src].", "You shuffle the [src].") + user.visible_message("[user] shuffles [src].", "You shuffle [src].") cooldown = world.time diff --git a/code/modules/hydroponics/beekeeping/beebox.dm b/code/modules/hydroponics/beekeeping/beebox.dm index 5a73313601a..10bed630a13 100644 --- a/code/modules/hydroponics/beekeeping/beebox.dm +++ b/code/modules/hydroponics/beekeeping/beebox.dm @@ -174,11 +174,11 @@ queen_bee = qb.queen qb.queen = null else - visible_message("The [qb] refuses to settle down. Maybe it's something to do with its reagent?") + visible_message("[qb] refuses to settle down. Maybe it's something to do with its reagent?") return if(queen_bee) - visible_message("[user] sets [qb] down inside the apiary, making it [user.p_their()] new home.") + visible_message("[user] sets [qb] down inside the apiary, making it [qb.p_their()] new home.") var/relocated = 0 for(var/b in bees) var/mob/living/simple_animal/hostile/poison/bees/B = b diff --git a/code/modules/hydroponics/grown/banana.dm b/code/modules/hydroponics/grown/banana.dm index 0552f78ee92..d2306a4033a 100644 --- a/code/modules/hydroponics/grown/banana.dm +++ b/code/modules/hydroponics/grown/banana.dm @@ -27,7 +27,7 @@ tastes = list("banana" = 1) /obj/item/reagent_containers/food/snacks/grown/banana/suicide_act(mob/user) - user.visible_message("[user] is aiming the [name] at [user.p_them()]self! It looks like [user.p_theyre()] trying to commit suicide.") + user.visible_message("[user] is aiming [src] at [user.p_them()]self! It looks like [user.p_theyre()] trying to commit suicide.") playsound(loc, 'sound/items/bikehorn.ogg', 50, 1, -1) sleep(25) if(!user) @@ -51,7 +51,7 @@ throw_range = 7 /obj/item/grown/bananapeel/suicide_act(mob/user) - user.visible_message("[user] is deliberately slipping on the [src.name]! It looks like [user.p_theyre()] trying to commit suicide.") + user.visible_message("[user] is deliberately slipping on [src]! It looks like [user.p_theyre()] trying to commit suicide.") playsound(loc, 'sound/misc/slip.ogg', 50, 1, -1) return BRUTELOSS diff --git a/code/modules/hydroponics/grown/citrus.dm b/code/modules/hydroponics/grown/citrus.dm index 72bd5fe8bf7..12cdb4834d2 100644 --- a/code/modules/hydroponics/grown/citrus.dm +++ b/code/modules/hydroponics/grown/citrus.dm @@ -58,7 +58,7 @@ icon_state = "orange" // Sprite created by https://github.com/binarysudoku for Goonstation, They have relicensed it for our use. tastes = list("orange" = 1) filling_color = "#FFA500" - distill_reagent = "triple_sec" + distill_reagent = "tequilasunrise" // Lemon /obj/item/seeds/lemon @@ -105,7 +105,7 @@ /obj/item/reagent_containers/food/snacks/grown/firelemon seed = /obj/item/seeds/firelemon - name = "Combustible Lemon" + name = "combustible lemon" desc = "Made for burning houses down." icon_state = "firelemon" bitesize_mod = 2 @@ -115,7 +115,7 @@ /obj/item/reagent_containers/food/snacks/grown/firelemon/attack_self(mob/living/user) var/area/A = get_area(user) - user.visible_message("[user] primes the [src]!", "You prime the [src]!") + user.visible_message("[user] primes [src]!", "You prime [src]!") investigate_log("[key_name(user)] primed a combustible lemon for detonation at [A] [COORD(user)].", INVESTIGATE_BOMB) add_attack_logs(user, src, "primed a combustible lemon for detonation", ATKLOG_FEW) log_game("[key_name(user)] primed a combustible lemon for detonation at [A] [COORD(user)].") diff --git a/code/modules/hydroponics/grown/cocoa_vanilla.dm b/code/modules/hydroponics/grown/cocoa_vanilla.dm index ad80934ca18..136b4c7dbf4 100644 --- a/code/modules/hydroponics/grown/cocoa_vanilla.dm +++ b/code/modules/hydroponics/grown/cocoa_vanilla.dm @@ -26,7 +26,6 @@ filling_color = "#FFD700" bitesize_mod = 2 tastes = list("cocoa" = 1) - distill_reagent = "creme_de_cacao" // Vanilla Pod /obj/item/seeds/cocoapod/vanillapod diff --git a/code/modules/hydroponics/grown/cotton.dm b/code/modules/hydroponics/grown/cotton.dm index 3f864e45328..8c5df5d7786 100644 --- a/code/modules/hydroponics/grown/cotton.dm +++ b/code/modules/hydroponics/grown/cotton.dm @@ -32,7 +32,7 @@ var/cotton_name = "raw cotton" /obj/item/grown/cotton/attack_self(mob/user) - user.show_message("You pull some [cotton_name] out of the [name]!", 1) + user.show_message("You pull some [cotton_name] out of [src]!", 1) var/seed_modifier = 0 if(seed) seed_modifier = round(seed.potency / 25) diff --git a/code/modules/hydroponics/grown/flowers.dm b/code/modules/hydroponics/grown/flowers.dm index dea72093b15..3a312a78154 100644 --- a/code/modules/hydroponics/grown/flowers.dm +++ b/code/modules/hydroponics/grown/flowers.dm @@ -191,7 +191,7 @@ /obj/item/grown/novaflower/attack(mob/living/carbon/M, mob/user) ..() if(isliving(M)) - to_chat(M, "You are lit on fire from the intense heat of the [name]!") + to_chat(M, "You are lit on fire from the intense heat of [src]!") M.adjust_fire_stacks(seed.potency / 20) if(M.IgniteMob()) message_admins("[key_name_admin(user)] set [key_name_admin(M)] on fire") @@ -203,12 +203,12 @@ if(force > 0) force -= rand(1, (force / 3) + 1) else - to_chat(usr, "All the petals have fallen off the [name] from violent whacking!") + to_chat(usr, "All the petals have fallen off [src] from violent whacking!") usr.unEquip(src) qdel(src) /obj/item/grown/novaflower/pickup(mob/living/carbon/human/user) . = ..() if(!user.gloves) - to_chat(user, "The [name] burns your bare hand!") + to_chat(user, "[src] burns your bare hand!") user.adjustFireLoss(rand(1, 5)) diff --git a/code/modules/hydroponics/grown/nettle.dm b/code/modules/hydroponics/grown/nettle.dm index 97d35aa4eed..060de890139 100644 --- a/code/modules/hydroponics/grown/nettle.dm +++ b/code/modules/hydroponics/grown/nettle.dm @@ -11,7 +11,7 @@ growthstages = 5 genes = list(/datum/plant_gene/trait/repeated_harvest, /datum/plant_gene/trait/plant_type/weed_hardy) mutatelist = list(/obj/item/seeds/nettle/death) - reagents_add = list("sacid" = 0.5) + reagents_add = list("wasabi" = 0.15) /obj/item/seeds/nettle/death name = "pack of death-nettle seeds" @@ -44,7 +44,7 @@ attack_verb = list("stung") /obj/item/grown/nettle/suicide_act(mob/user) - user.visible_message("[user] is eating some of the [src.name]! It looks like [user.p_theyre()] trying to commit suicide.") + user.visible_message("[user] is eating some of [src]! It looks like [user.p_theyre()] trying to commit suicide.") return BRUTELOSS|TOXLOSS /obj/item/grown/nettle/pickup(mob/living/user) diff --git a/code/modules/hydroponics/grown/tobacco.dm b/code/modules/hydroponics/grown/tobacco.dm index 3087fa1dddb..36be1599728 100644 --- a/code/modules/hydroponics/grown/tobacco.dm +++ b/code/modules/hydroponics/grown/tobacco.dm @@ -22,7 +22,7 @@ icon_state = "tobacco_leaves" tastes = list("tobacco" = 1) filling_color = "#008000" - distill_reagent = "creme_de_menthe" //Menthol, I guess. + distill_reagent = "menthol" // Space Tobacco /obj/item/seeds/tobacco/space diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm index e9d57b0dbad..ecddd999ea0 100644 --- a/code/modules/hydroponics/hydroitemdefines.dm +++ b/code/modules/hydroponics/hydroitemdefines.dm @@ -15,9 +15,9 @@ // ************************************* /obj/item/reagent_containers/spray/weedspray // -- Skie + name = "weed spray" desc = "It's a toxic mixture, in spray form, to kill small weeds." icon = 'icons/obj/hydroponics/equipment.dmi' - name = "weed spray" icon_state = "weedspray" item_state = "plantbgone" volume = 100 @@ -30,13 +30,13 @@ list_reagents = list("atrazine" = 100) /obj/item/reagent_containers/spray/weedspray/suicide_act(mob/user) - user.visible_message("[user] is huffing the [src.name]! It looks like [user.p_theyre()] trying to commit suicide.") + user.visible_message("[user] is huffing [src]! It looks like [user.p_theyre()] trying to commit suicide.") return TOXLOSS /obj/item/reagent_containers/spray/pestspray // -- Skie + name = "pest spray" desc = "It's some pest eliminator spray! Do not inhale!" icon = 'icons/obj/hydroponics/equipment.dmi' - name = "pest spray" icon_state = "pestspray" item_state = "plantbgone" volume = 100 @@ -49,7 +49,7 @@ list_reagents = list("pestkiller" = 100) /obj/item/reagent_containers/spray/pestspray/suicide_act(mob/user) - user.visible_message("[user] is huffing the [src.name]! It looks like [user.p_theyre()] trying to commit suicide.") + user.visible_message("[user] is huffing [src]! It looks like [user.p_theyre()] trying to commit suicide.") return TOXLOSS /obj/item/cultivator @@ -94,7 +94,7 @@ sharp = 1 /obj/item/hatchet/suicide_act(mob/user) - user.visible_message("[user] is chopping at [user.p_them()]self with the [name]! It looks like [user.p_theyre()] trying to commit suicide.") + user.visible_message("[user] is chopping at [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide.") playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1) return BRUTELOSS @@ -130,7 +130,7 @@ var/swiping = FALSE /obj/item/scythe/suicide_act(mob/user) - user.visible_message("[user] is beheading [user.p_them()]self with the [name]! It looks like [user.p_theyre()] trying to commit suicide.") + user.visible_message("[user] is beheading [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide.") if(ishuman(user)) var/mob/living/carbon/human/H = user var/obj/item/organ/external/affecting = H.get_organ("head") diff --git a/code/modules/karma/karma.dm b/code/modules/karma/karma.dm index de8b42f04ae..7c80166c46f 100644 --- a/code/modules/karma/karma.dm +++ b/code/modules/karma/karma.dm @@ -127,11 +127,13 @@ GLOBAL_LIST_EMPTY(karma_spenders) continue if(M == src) continue + if(M.get_preference(PREFTOGGLE_DISABLE_KARMA)) + continue if(!isobserver(src) && isNonCrewAntag(M)) continue // Don't include special roles for non-observers, because players use it to meta karma_list += M - if(!karma_list.len) + if(!length(karma_list)) to_chat(usr, "There's no-one to spend your karma on.") return diff --git a/code/modules/map_fluff/cyberiad.dm b/code/modules/map_fluff/cyberiad.dm deleted file mode 100644 index e0865f6fb1d..00000000000 --- a/code/modules/map_fluff/cyberiad.dm +++ /dev/null @@ -1,10 +0,0 @@ -/datum/map/cyberiad - name = "Cyberiad" - full_name = "NSS Cyberiad" - - station_name = "NSS Cyberiad" - station_short = "Cyberiad" - dock_name = "NAS Trurl" - company_name = "Nanotrasen" - company_short = "NT" - starsys_name = "Epsilon Eridani " diff --git a/code/modules/map_fluff/delta.dm b/code/modules/map_fluff/delta.dm deleted file mode 100644 index d68266e3146..00000000000 --- a/code/modules/map_fluff/delta.dm +++ /dev/null @@ -1,10 +0,0 @@ -/datum/map/delta - name = "Delta" - full_name = "NSS Kerberos" - - station_name = "NSS Kerberos" - station_short = "Kerberos" - dock_name = "NAS Trurl" - company_name = "Nanotrasen" - company_short = "NT" - starsys_name = "Epsilon Eridani " diff --git a/code/modules/map_fluff/maps.dm b/code/modules/map_fluff/maps.dm deleted file mode 100644 index e2684d5c735..00000000000 --- a/code/modules/map_fluff/maps.dm +++ /dev/null @@ -1,10 +0,0 @@ -/datum/map - var/name = "Unnamed Map" - var/full_name = "Unnamed Map" - - var/station_name = "BAD Station" - var/station_short = "Baddy" - var/dock_name = "THE PirateBay" - var/company_name = "BadMan" - var/company_short = "BM" - var/starsys_name = "Dull Star" diff --git a/code/modules/map_fluff/metastation.dm b/code/modules/map_fluff/metastation.dm deleted file mode 100644 index a8714b5cb19..00000000000 --- a/code/modules/map_fluff/metastation.dm +++ /dev/null @@ -1,10 +0,0 @@ -/datum/map/metastation - name = "MetaStation" - full_name = "NSS Cerebron" - - station_name = "NSS Cerebron" - station_short = "Cerebron" - dock_name = "NAS Trurl" - company_name = "Nanotrasen" - company_short = "NT" - starsys_name = "Epsilon Eridani " diff --git a/code/modules/mapping/base_map_datum.dm b/code/modules/mapping/base_map_datum.dm new file mode 100644 index 00000000000..6a5c7260f3a --- /dev/null +++ b/code/modules/mapping/base_map_datum.dm @@ -0,0 +1,14 @@ +/** + * Map Datum + * + * Datum which holds all of the information for maps ingame + * This is used for showing map information, as well as map loading + * + **/ +/datum/map + /// Name of the map to be shown in the statpanel + var/fluff_name + /// Name to be used when using the map from a technical standpoint. Used in TGUI Nanomaps among other things. + var/technical_name + /// Path to the map file + var/map_path diff --git a/code/modules/mapping/cyberiad.dm b/code/modules/mapping/cyberiad.dm new file mode 100644 index 00000000000..29c27d59c73 --- /dev/null +++ b/code/modules/mapping/cyberiad.dm @@ -0,0 +1,4 @@ +/datum/map/cyberiad + fluff_name = "NSS Cyberiad" + technical_name = "Cyberiad" + map_path = "_maps/map_files/cyberiad/cyberiad.dmm" diff --git a/code/modules/mapping/delta.dm b/code/modules/mapping/delta.dm new file mode 100644 index 00000000000..6b8bbce94cd --- /dev/null +++ b/code/modules/mapping/delta.dm @@ -0,0 +1,4 @@ +/datum/map/delta + fluff_name = "NSS Kerberos" + technical_name = "Delta" + map_path = "_maps/map_files/Delta/delta.dmm" diff --git a/code/modules/mapping/metastation.dm b/code/modules/mapping/metastation.dm new file mode 100644 index 00000000000..654aad46ac8 --- /dev/null +++ b/code/modules/mapping/metastation.dm @@ -0,0 +1,4 @@ +/datum/map/metastation + fluff_name = "NSS Cerebron" + technical_name = "MetaStation" + map_path = "_maps/map_files/MetaStation/MetaStation.dmm" diff --git a/code/modules/mining/equipment/regenerative_core.dm b/code/modules/mining/equipment/regenerative_core.dm index 20cd27d14e4..4731d8134e9 100644 --- a/code/modules/mining/equipment/regenerative_core.dm +++ b/code/modules/mining/equipment/regenerative_core.dm @@ -15,7 +15,7 @@ return ..() C.preserved() - to_chat(user, "You inject the [M] with the stabilizer. It will no longer go inert.") + to_chat(user, "You inject [M] with the stabilizer. It will no longer go inert.") qdel(src) /************************Hivelord core*******************/ diff --git a/code/modules/mining/equipment/wormhole_jaunter.dm b/code/modules/mining/equipment/wormhole_jaunter.dm index 1d43df490fd..dc2d9273a95 100644 --- a/code/modules/mining/equipment/wormhole_jaunter.dm +++ b/code/modules/mining/equipment/wormhole_jaunter.dm @@ -39,7 +39,7 @@ var/list/L = get_destinations(user) if(!L.len) - to_chat(user, "The [name] found no beacons in the world to anchor a wormhole to.") + to_chat(user, "[src] found no beacons in the world to anchor a wormhole to.") return var/chosen_beacon = pick(L) var/obj/effect/portal/jaunt_tunnel/J = new(get_turf(src), get_turf(chosen_beacon), src, 100) @@ -89,3 +89,87 @@ if(ishuman(L)) shake_camera(L, 20, 1) addtimer(CALLBACK(L, /mob/living/carbon.proc/vomit), 20) + +/obj/item/wormhole_jaunter/contractor + name = "emergency extraction flare" + icon = 'icons/obj/lighting.dmi' + desc = "A single-use extraction flare that will let you create a portal to any beacon on the station. You must choose the destination beforehand, else it will target a random beacon. The portal is generated 5 seconds after activation, and has 1 use." + icon_state = "flare-contractor" + item_state = "flare" + var/destination + +/obj/item/wormhole_jaunter/contractor/verb/set_destination() + set category = "Object" + set name = "Change Portal Destination" + set src in usr + + var/list/L = list() + var/list/areaindex = list() + + for(var/obj/item/radio/beacon/R in GLOB.beacons) + var/turf/T = get_turf(R) + if(!T) + continue + if(!is_teleport_allowed(T.z)) + continue + var/tmpname = T.loc.name + if(areaindex[tmpname]) + tmpname = "[tmpname] ([++areaindex[tmpname]])" + else + areaindex[tmpname] = 1 + L[tmpname] = R + + var/desc = input("Please select a location to target.", "Flare Target Interface") in L + destination = L[desc] + return + +/obj/item/wormhole_jaunter/contractor/attack_self(mob/user) // message is later down + activate(user, TRUE) + +/obj/item/wormhole_jaunter/contractor/activate(mob/user) + if(!turf_check(user)) + return + if(!destination) + var/list/L = get_destinations(user) + if(!length(L)) + to_chat(user, "[src] found no beacons in the sector to target.") + return + destination = pick(L) + var/obj/effect/temp_visual/getaway_flare/F = new(get_turf(src)) + user.visible_message("[user] pulls out a black and gold flare and lights it.",\ + "You light an emergency extraction flare, initiating the extraction process.") + user.drop_item() + forceMove(F) + addtimer(CALLBACK(src, .proc/create_portal, destination), 5 SECONDS) + +/obj/item/wormhole_jaunter/contractor/proc/create_portal(turf/destination) + new /obj/effect/decal/cleanable/ash(get_turf(src)) + new /obj/effect/portal/redspace/getaway(get_turf(src), get_turf(destination), src, 100) + qdel(src) + +/obj/item/wormhole_jaunter/contractor/emag_act(mob/user) + to_chat(user, "Emagging [src] has no effect.") + +/obj/item/wormhole_jaunter/contractor/chasm_react(mob/user) + return //This is not an instant getaway portal like the jaunter + +/obj/item/storage/box/syndie_kit/escape_flare + name = "emergency extraction kit" + +/obj/item/storage/box/syndie_kit/escape_flare/populate_contents() + new /obj/item/wormhole_jaunter/contractor(src) + new /obj/item/radio/beacon/emagged(src) + +/obj/effect/portal/redspace/getaway + one_use = TRUE + +/obj/effect/temp_visual/getaway_flare // Because the original contractor flare is not a temp visual, for some reason. + name = "contractor extraction flare" + icon = 'icons/obj/lighting.dmi' + icon_state = "flare-contractor-on" + duration = 5.1 SECONDS // Needs to be slightly longer then the callback to make the portal + +/obj/effect/temp_visual/getaway_flare/Initialize() + . = ..() + playsound(loc, 'sound/goonstation/misc/matchstick_light.ogg', 50, TRUE) + set_light(8, l_color = "#FFD165") diff --git a/code/modules/mining/lavaland/loot/colossus_loot.dm b/code/modules/mining/lavaland/loot/colossus_loot.dm index 0c58119a6c9..0bf1d67bf71 100644 --- a/code/modules/mining/lavaland/loot/colossus_loot.dm +++ b/code/modules/mining/lavaland/loot/colossus_loot.dm @@ -156,7 +156,7 @@ var/atom/Picked = pick(NewFlora) new Picked(O) continue - if(iswallturf(T) && NewTerrainWalls) + if(iswallturf(T) && NewTerrainWalls && !istype(T, /turf/simulated/wall/indestructible)) T.ChangeTurf(NewTerrainWalls) continue if(istype(Stuff, /obj/structure/chair) && NewTerrainChairs) @@ -232,9 +232,21 @@ /obj/machinery/anomalous_crystal/helpers/attack_ghost(mob/dead/observer/user) ..() if(ready_to_deploy) + if(!istype(user)) // No revs allowed + return + if(cannotPossess(user)) + to_chat(user, "Upon using the antagHUD you forfeited the ability to join the round.") + return + if(!user.can_reenter_corpse) + to_chat(user, "You have forfeited the right to respawn.") + return var/be_helper = alert("Become a Lightgeist? (Warning, You can no longer be cloned!)",,"Yes","No") if(be_helper == "No") return + if(!loc || QDELETED(src) || QDELETED(user)) + if(user) + to_chat(user, "[src] is no longer usable!") + return var/mob/living/simple_animal/hostile/lightgeist/W = new /mob/living/simple_animal/hostile/lightgeist(get_turf(loc)) W.key = user.key diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index 0fb1c77b27d..ec7da3c75bc 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -48,7 +48,7 @@ if(14) new /obj/item/nullrod/scythe/talking(src) if(15) - new /obj/item/nullrod/armblade(src) + new /obj/item/nullrod/armblade/mining(src) if(16) new /obj/item/guardiancreator(src) if(17) diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 47edad1c4fa..82df0409d2e 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -387,6 +387,30 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp to_chat(usr, "AntagHud Toggled OFF") M.antagHUD = FALSE +/mob/dead/observer/verb/set_dnr() + set name = "Set DNR" + set category = "Ghost" + set desc = "Prevent your character from being revived." + + if(!isobserver(src)) // Somehow + return + if(!can_reenter_corpse) + to_chat(src, "You are already set to DNR!") + return + if(!mind || QDELETED(mind.current)) + to_chat(src, "You have no body.") + return + if(mind.current.stat != DEAD) + to_chat(src, "Your body is still alive!") + return + + var/choice = alert(src, "If you enable this, your body will be unrevivable for the remainder of the round.", "Are you sure?", "Yes", "No") + if(choice == "Yes") + to_chat(src, "Do Not Revive state enabled.") + can_reenter_corpse = FALSE + if(!QDELETED(mind.current)) // Could change while they're choosing + mind.current.med_hud_set_status() + /mob/dead/observer/proc/dead_tele() set category = "Ghost" set name = "Teleport" @@ -578,12 +602,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp /mob/dead/observer/verb/view_manifest() set name = "View Crew Manifest" set category = "Ghost" - - var/dat - dat += "

      Crew Manifest

      " - dat += GLOB.data_core.get_manifest(OOC = TRUE) - - src << browse(dat, "window=manifest;size=370x420;can_close=1") + GLOB.generic_crew_manifest.ui_interact(usr, state = GLOB.observer_state) //this is called when a ghost is drag clicked to something. /mob/dead/observer/MouseDrop(atom/over) diff --git a/code/modules/mob/dead/observer/orbit.dm b/code/modules/mob/dead/observer/orbit.dm index 977c39bb923..d5410015f5e 100644 --- a/code/modules/mob/dead/observer/orbit.dm +++ b/code/modules/mob/dead/observer/orbit.dm @@ -66,7 +66,7 @@ if(istype(M)) if(isnewplayer(M)) // People in the lobby screen; only have their ckey as a name. continue - if(isobserver(M)) + if(isobserver(M) && M.client) ghosts += list(serialized) else if(M.mind == null) npcs += list(serialized) @@ -114,6 +114,12 @@ antag_serialized["antag"] = antag_name antagonists += list(antag_serialized) + // Player terror spiders have their own category to help see how much there are. + // Not in the above block because terrors can be known whether AHUD is on or not. + if(isterrorspider(M)) + var/list/antag_serialized = serialized.Copy() + antag_serialized["antag"] = "Terror Spider" + antagonists += list(antag_serialized) else misc += list(serialized) diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm index 6d706c94ede..b14f82758b9 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm @@ -77,15 +77,15 @@ user.set_machine(src) var/dat = {" - - + + "} - dat += "" + dat += "" dat += "" - dat += "" + dat += "" dat += "
      Left Hand:[(l_hand && !(l_hand.flags&ABSTRACT)) ? l_hand : "Empty"]
      Right Hand:[(r_hand && !(r_hand.flags&ABSTRACT)) ? r_hand : "Empty"]
      Left Hand:[(l_hand && !(l_hand.flags&ABSTRACT)) ? html_encode(l_hand) : "Empty"]
      Right Hand:[(r_hand && !(r_hand.flags&ABSTRACT)) ? html_encode(r_hand) : "Empty"]
       
      Head:[(head && !(head.flags&ABSTRACT)) ? head : "Empty"]
      Head:[(head && !(head.flags&ABSTRACT)) ? html_encode(head) : "Empty"]
       
      Exosuit:[(wear_suit && !(wear_suit.flags&ABSTRACT)) ? wear_suit : "Empty"]
      Exosuit:[(wear_suit && !(wear_suit.flags&ABSTRACT)) ? html_encode(wear_suit) : "Empty"]
      Pouches:[((l_store && !(l_store.flags&ABSTRACT)) || (r_store && !(r_store.flags&ABSTRACT))) ? "Full" : "Empty"]" dat += {"
      diff --git a/code/modules/mob/living/carbon/alien/larva/emote.dm b/code/modules/mob/living/carbon/alien/larva/emote.dm index 2a910428d31..9871c735725 100644 --- a/code/modules/mob/living/carbon/alien/larva/emote.dm +++ b/code/modules/mob/living/carbon/alien/larva/emote.dm @@ -37,73 +37,73 @@ m_type = 2 if("scratch") if(!src.restrained()) - message = "The [src.name] scratches." + message = "[src] scratches." m_type = 1 if("whimper") if(!muzzled) - message = "The [src.name] whimpers." + message = "[src] whimpers." m_type = 2 // if("roar") // if(!muzzled) -// message = "The [src.name] roars." Commenting out since larva shouldn't roar /N +// message = "[src] roars." Commenting out since larva shouldn't roar /N // m_type = 2 if("tail") - message = "The [src.name] waves its tail." + message = "[src] waves its tail." m_type = 1 if("gasp") - message = "The [src.name] gasps." + message = "[src] gasps." m_type = 2 if("shiver") - message = "The [src.name] shivers." + message = "[src] shivers." m_type = 2 if("drool") - message = "The [src.name] drools." + message = "[src] drools." m_type = 1 if("scretch") if(!muzzled) - message = "The [src.name] scretches." + message = "[src] scretches." m_type = 2 if("choke") - message = "The [src.name] chokes." + message = "[src] chokes." m_type = 2 if("moan") - message = "The [src.name] moans!" + message = "[src] moans!" m_type = 2 if("nod") - message = "The [src.name] nods its head." + message = "[src] nods its head." m_type = 1 // if("sit") -// message = "The [src.name] sits down." //Larvan can't sit down, /N +// message = "[src] sits down." //Larvan can't sit down, /N // m_type = 1 if("sway") - message = "The [src.name] sways around dizzily." + message = "[src] sways around dizzily." m_type = 1 if("sulk") - message = "The [src.name] sulks down sadly." + message = "[src] sulks down sadly." m_type = 1 if("twitch") - message = "The [src.name] twitches violently." + message = "[src] twitches violently." m_type = 1 if("dance") if(!src.restrained()) - message = "The [src.name] dances around happily." + message = "[src] dances around happily." m_type = 1 if("roll") if(!src.restrained()) - message = "The [src.name] rolls." + message = "[src] rolls." m_type = 1 if("shake") - message = "The [src.name] shakes its head." + message = "[src] shakes its head." m_type = 1 if("gnarl") if(!muzzled) - message = "The [src.name] gnarls and shows its teeth.." + message = "[src] gnarls and shows its teeth.." m_type = 2 if("jump") - message = "The [src.name] jumps!" + message = "[src] jumps!" m_type = 1 if("hiss_") - message = "The [src.name] hisses softly." + message = "[src] hisses softly." m_type = 1 if("collapse") Paralyse(2) diff --git a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm index d0a9b79aa01..d26f87d76c3 100644 --- a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm +++ b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm @@ -99,6 +99,7 @@ new_xeno.mind.assigned_role = SPECIAL_ROLE_XENOMORPH new_xeno.mind.special_role = SPECIAL_ROLE_XENOMORPH new_xeno << sound('sound/voice/hiss5.ogg',0,0,0,100)//To get the player's attention + to_chat(new_xeno, "For more information, check the wiki page: ([config.wikiurl]/index.php/Xenomorph)") if(gib_on_success) owner.gib() diff --git a/code/modules/mob/living/carbon/brain/MMI.dm b/code/modules/mob/living/carbon/brain/MMI.dm index 008ecbd2ef7..07282106a21 100644 --- a/code/modules/mob/living/carbon/brain/MMI.dm +++ b/code/modules/mob/living/carbon/brain/MMI.dm @@ -28,7 +28,7 @@ /obj/item/mmi/attackby(obj/item/O as obj, mob/user as mob, params) if(istype(O, /obj/item/organ/internal/brain/crystal)) - to_chat(user, " This brain is too malformed to be able to use with the [src].") + to_chat(user, " This brain is too malformed to be able to use with [src].") return if(istype(O, /obj/item/organ/internal/brain/golem)) to_chat(user, "You can't find a way to plug [O] into [src].") @@ -79,8 +79,8 @@ if(radio) to_chat(user, "[src] already has a radio installed.") else - user.visible_message("[user] begins to install the [O] into [src]...", \ - "You start to install the [O] into [src]...") + user.visible_message("[user] begins to install [O] into [src]...", \ + "You start to install [O] into [src]...") if(do_after(user, 20, target=src)) if(user.drop_item()) user.visible_message("[user] installs [O] in [src].", \ @@ -284,3 +284,7 @@ if((src_object in view(src)) && get_dist(src_object, src) <= user.client.view) return STATUS_INTERACTIVE // interactive (green visibility) return user.shared_living_ui_distance() + +/obj/item/mmi/forceMove(atom/destination) + . = ..() + brainmob?.update_runechat_msg_location() diff --git a/code/modules/mob/living/carbon/brain/robotic_brain.dm b/code/modules/mob/living/carbon/brain/robotic_brain.dm index 841b0187d92..e7c3528ae27 100644 --- a/code/modules/mob/living/carbon/brain/robotic_brain.dm +++ b/code/modules/mob/living/carbon/brain/robotic_brain.dm @@ -204,8 +204,8 @@ brainmob = new(src) brainmob.name = "[pick(list("PBU", "HIU", "SINA", "ARMA", "OSI"))]-[rand(100, 999)]" brainmob.real_name = brainmob.name - brainmob.forceMove(src) brainmob.container = src + brainmob.forceMove(src) brainmob.stat = CONSCIOUS brainmob.SetSilence(0) brainmob.dna = new(brainmob) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 8b0f8961e53..b0b2769032e 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -79,7 +79,7 @@ for(var/mob/M in viewers(user, null)) if(M.client) - M.show_message(text("[user] attacks [src]'s stomach wall with the [I.name]!"), 2) + M.show_message(text("[user] attacks [src]'s stomach wall with [I]!"), 2) playsound(user.loc, 'sound/effects/attackblob.ogg', 50, 1) if(prob(getBruteLoss() - 50)) @@ -215,7 +215,7 @@ if(stat == DEAD) if(M != src) M.visible_message("[M] desperately shakes [src] trying to wake [p_them()] up, but sadly there is no reaction!", \ - "You shake [src] trying to wake [p_them()] sadly they appear to be too far gone!") + "You shake [src] trying to wake [p_them()], sadly they appear to be too far gone!") return if(health >= HEALTH_THRESHOLD_CRIT) if(src == M && ishuman(src)) @@ -667,19 +667,19 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven user.set_machine(src) var/dat = {" - - + + "} - dat += "" - dat += "" + dat += "" - dat += "" + dat += "" if(istype(wear_mask, /obj/item/clothing/mask/muzzle)) var/obj/item/clothing/mask/muzzle/M = wear_mask diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm index 4bec68bc56f..5c4844d5933 100644 --- a/code/modules/mob/living/carbon/carbon_defense.dm +++ b/code/modules/mob/living/carbon/carbon_defense.dm @@ -57,7 +57,7 @@ if(M.powerlevel < 0) M.powerlevel = 0 - visible_message("The [M.name] has shocked [src]!", "The [M.name] has shocked you!") + visible_message("[M] has shocked [src]!", "[M] has shocked you!") do_sparks(5, TRUE, src) var/power = M.powerlevel + rand(0,3) diff --git a/code/modules/mob/living/carbon/human/appearance.dm b/code/modules/mob/living/carbon/human/appearance.dm index 00d0f8be2a8..c6d224975e8 100644 --- a/code/modules/mob/living/carbon/human/appearance.dm +++ b/code/modules/mob/living/carbon/human/appearance.dm @@ -202,7 +202,7 @@ H.ha_style = "None" update_head_accessory() -/mob/living/carbon/human/proc/change_eye_color(colour = "#000000", update_dna = 1) +/mob/living/carbon/human/proc/change_eye_color(colour = "#000000", update_dna = TRUE) // Update the main DNA datum, then sync the change across the organs var/obj/item/organ/internal/eyes/eyes_organ = get_int_organ(/obj/item/organ/internal/eyes) if(eyes_organ) @@ -215,10 +215,16 @@ if(update_dna) update_dna() - sync_organ_dna(assimilate=0) + sync_organ_dna(assimilate = FALSE) update_eyes() update_body() - return 1 + return TRUE + +/mob/living/carbon/human/proc/get_eye_color() + var/obj/item/organ/internal/eyes/E = get_int_organ(/obj/item/organ/internal/eyes) + if(E) + return E.eye_color + return FALSE /mob/living/carbon/human/proc/change_hair_color(colour = "#000000", secondary) var/obj/item/organ/external/head/H = get_organ("head") diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index d80ab50e0b0..1e82747b986 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -138,7 +138,7 @@ on_CD = handle_emote_CD() if("clap", "claps") on_CD = handle_emote_CD() - if("kiss", "kisses", "slap", "slaps") + if("slap", "slaps") on_CD = handle_emote_CD(3 SECONDS) //Everything else, including typos of the above emotes else @@ -516,17 +516,10 @@ m_type = 1 if("kiss", "kisses") - var/kiss_type = /obj/item/kisser + var/M = handle_emote_param(param) - if(HAS_TRAIT(src, TRAIT_KISS_OF_DEATH)) - kiss_type = /obj/item/kisser/death - - var/obj/item/kiss_blower = new kiss_type(src) - if(put_in_hands(kiss_blower)) - to_chat(src, "You ready your kiss-blowing hand.") - else - qdel(kiss_blower) - to_chat(src, "You're incapable of blowing a kiss in your current state.") + message = "[src] blows a kiss[M ? " at [M]" : ""]." + m_type = 1 if("blush", "blushes") message = "[src] blushes." diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 059fd4a4c2a..92ee3c2195d 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -332,9 +332,6 @@ else if(!client) msg += "[p_they(TRUE)] [p_have()] suddenly fallen asleep, suffering from Space Sleep Disorder. [p_they(TRUE)] may wake up soon.\n" - if(digitalcamo) - msg += "[p_they(TRUE)] [p_are()] moving [p_their()] body in an unnatural and blatantly inhuman manner.\n" - if(!(skipface || ( wear_mask && ( wear_mask.flags_inv & HIDEFACE || wear_mask.flags_cover & MASKCOVERSMOUTH) ) ) && is_thrall(src) && in_range(user,src)) msg += "Their features seem unnaturally tight and drawn.\n" diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index cd36a902c33..ee5b3b561fd 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -177,9 +177,12 @@ stat(null, "GPS: [COORD(T)]") if(locate(/obj/item/assembly/health) in total_user_contents) stat(null, "Health: [health]") + if(internal) if(!internal.air_contents) qdel(internal) + else if(client?.prefs.toggles2 & PREFTOGGLE_2_SIMPLE_STAT_PANEL) + stat(null, "Internals Tank Connected") else stat("Internal Atmosphere Info", internal.name) stat("Tank Pressure", internal.air_contents.return_pressure()) @@ -284,17 +287,17 @@ var/list/obscured = check_obscured_slots() var/dat = {"
      Left Hand:[(l_hand && !(l_hand.flags&ABSTRACT)) ? l_hand : "Empty"]
      Right Hand:[(r_hand && !(r_hand.flags&ABSTRACT)) ? r_hand : "Empty"]
      Left Hand:[(l_hand && !(l_hand.flags&ABSTRACT)) ? html_encode(l_hand) : "Empty"]
      Right Hand:[(r_hand && !(r_hand.flags&ABSTRACT)) ? html_encode(r_hand) : "Empty"]
       
      Back:[(back && !(back.flags&ABSTRACT)) ? back : "Empty"]" + dat += "
      Back:[(back && !(back.flags&ABSTRACT)) ? html_encode(back) : "Empty"]" if(istype(wear_mask, /obj/item/clothing/mask) && istype(back, /obj/item/tank)) dat += " [internal ? "Disable Internals" : "Set Internals"]" dat += "
       
      Head:[(head && !(head.flags&ABSTRACT)) ? head : "Empty"]
      Head:[(head && !(head.flags&ABSTRACT)) ? html_encode(head) : "Empty"]
      Mask:[(wear_mask && !(wear_mask.flags&ABSTRACT)) ? wear_mask : "Empty"]
      Mask:[(wear_mask && !(wear_mask.flags&ABSTRACT)) ? html_encode(wear_mask) : "Empty"]
      - - + + "} - dat += "" - dat += "" + dat += "" var/obj/item/organ/internal/headpocket/C = get_int_organ(/obj/item/organ/internal/headpocket) if(C) @@ -309,7 +312,7 @@ if(slot_wear_mask in obscured) dat += "" else - dat += "" else - dat += "" + dat += "" if(slot_l_ear in obscured) dat += "" else - dat += "" + dat += "" if(slot_r_ear in obscured) dat += "" else - dat += "" + dat += "" dat += "" - dat += "" + dat += "" if(wear_suit) - dat += "" @@ -348,17 +351,17 @@ if(slot_shoes in obscured) dat += "" else - dat += "" + dat += "" if(slot_gloves in obscured) dat += "" else - dat += "" + dat += "" if(slot_w_uniform in obscured) dat += "" else - dat += "" + dat += "" if((w_uniform == null && !(dna && dna.species.nojumpsuit)) || (slot_w_uniform in obscured)) dat += "" @@ -367,7 +370,7 @@ dat += "" dat += "" else - dat += "" @@ -387,8 +390,8 @@ else dat += "Right (Empty)" dat += "" - dat += "" - dat += "" + dat += "" + dat += "" if(istype(w_uniform, /obj/item/clothing/under)) var/obj/item/clothing/under/U = w_uniform @@ -1160,6 +1163,10 @@ set src in view(1) var/self = 0 + if (!ishuman(src)) + to_chat(usr, "You do not know how to check someone's pulse!") + return + if(usr.stat == 1 || usr.restrained() || !isliving(usr) || usr.is_dead()) return if(usr == src) @@ -1189,8 +1196,10 @@ /mob/living/carbon/human/proc/change_dna(datum/dna/new_dna, include_species_change = FALSE, keep_flavor_text = FALSE) if(include_species_change) - set_species(new_dna.species.type, retain_damage = TRUE) + set_species(new_dna.species.type, retain_damage = TRUE, transformation = TRUE) dna = new_dna.Clone() + if (include_species_change) //We have to call this after new_dna.Clone() so that species actions don't get overwritten + dna.species.on_species_gain(src) real_name = new_dna.real_name domutcheck(src, MUTCHK_FORCED) //Ensures species that get powers by the species proc handle_dna keep them if(!keep_flavor_text) @@ -1202,7 +1211,7 @@ sec_hud_set_ID() -/mob/living/carbon/human/proc/set_species(datum/species/new_species, default_colour, delay_icon_update = FALSE, skip_same_check = FALSE, retain_damage = FALSE) +/mob/living/carbon/human/proc/set_species(datum/species/new_species, default_colour, delay_icon_update = FALSE, skip_same_check = FALSE, retain_damage = FALSE, transformation = FALSE) if(!skip_same_check) if(dna.species.name == initial(new_species.name)) return @@ -1359,7 +1368,8 @@ dna.real_name = real_name - dna.species.on_species_gain(src) + if (!transformation) //Distinguish between creating a mob and switching species + dna.species.on_species_gain(src) update_sight() @@ -1734,7 +1744,7 @@ Eyes need to have significantly high darksight to shine unless the mob has the X if(G.trigger_guard == TRIGGER_GUARD_NORMAL) if(HAS_TRAIT(src, TRAIT_CHUNKYFINGERS)) - to_chat(src, "Your meaty finger is much too large for the trigger guard!") + to_chat(src, "Your meaty finger is far too large for the trigger guard!") return FALSE if(mind && mind.martial_art && mind.martial_art.no_guns) //great dishonor to famiry diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 4e3727aaf25..48cc3754905 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -25,8 +25,8 @@ emp_act reflected = is_type_in_list(P, safe_list) //And it's safe if(reflected) - visible_message("The [P.name] gets reflected by [src]!", \ - "The [P.name] gets reflected by [src]!") + visible_message("[P] gets reflected by [src]!", \ + "[P] gets reflected by [src]!") add_attack_logs(P.firer, src, "hit by [P.type] but got reflected") P.reflect_back(src) return -1 diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index fe05b61d867..8a98f7e30d2 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -307,7 +307,7 @@ return FALSE if(istype(I, /obj/item/stack)) var/obj/item/stack/S = I - if(S.amount == 0) + if(!S.get_amount()) qdel(I) return FALSE if(put_in_active_hand(I)) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 2fff14882ad..05fc209739e 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -170,11 +170,10 @@ emote("drool") /mob/living/carbon/human/handle_mutations_and_radiation() - for(var/datum/mutation/mutation in GLOB.dna_mutations) - if(!mutation.block) - continue - if(mutation.is_active(src)) - mutation.on_life(src) + for(var/mutation_type in active_mutations) + var/datum/mutation/mutation = GLOB.dna_mutations[mutation_type] + mutation.on_life(src) + if(!ignore_gene_stability && gene_stability < GENETIC_DAMAGE_STAGE_1) var/instability = DEFAULT_GENE_STABILITY - gene_stability if(prob(instability * 0.1)) @@ -301,11 +300,11 @@ else if(bodytemperature < dna.species.cold_level_1) if(status_flags & GODMODE) - return 1 + return TRUE if(stat == DEAD) - return 1 + return TRUE - if(!istype(loc, /obj/machinery/atmospherics/unary/cryo_cell)) + if(!istype(loc, /obj/machinery/atmospherics/unary/cryo_cell) && !(HAS_TRAIT(src, TRAIT_RESISTCOLD))) var/mult = dna.species.coldmod * physiology.cold_mod if(bodytemperature >= dna.species.cold_level_2 && bodytemperature <= dna.species.cold_level_1) throw_alert("temp", /obj/screen/alert/cold, 1) @@ -366,6 +365,9 @@ bodytemperature += (BODYTEMP_HEATING_MAX + (fire_stacks * 12)) /mob/living/carbon/human/proc/get_thermal_protection() + if(HAS_TRAIT(src, TRAIT_RESISTHEAT)) + return FIRE_IMMUNITY_MAX_TEMP_PROTECT + var/thermal_protection = 0 //Simple check to estimate how protected we are against multiple temperatures if(wear_suit) if(wear_suit.max_heat_protection_temperature >= FIRE_SUIT_MAX_TEMP_PROTECT) @@ -590,26 +592,7 @@ to_chat(src, "You no longer feel vigorous.") metabolism_efficiency = 1 - if(drowsyness) - AdjustDrowsy(-1) - EyeBlurry(2) - if(prob(5)) - AdjustSleeping(1) - Paralyse(5) - if(confused) - AdjustConfused(-1) - // decrement dizziness counter, clamped to 0 - if(resting) - if(dizziness) - AdjustDizzy(-15) - if(jitteriness) - AdjustJitter(-15) - else - if(dizziness) - AdjustDizzy(-3) - if(jitteriness) - AdjustJitter(-3) if(NO_INTORGANS in dna.species.species_traits) return diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm index e1b72a5b7fa..4f857163500 100644 --- a/code/modules/mob/living/carbon/human/say.dm +++ b/code/modules/mob/living/carbon/human/say.dm @@ -152,11 +152,9 @@ verb = pick("whinnies", "neighs", "says") if(dna) - for(var/datum/mutation/mutation in GLOB.dna_mutations) - if(!mutation.block) - continue - if(mutation.is_active(src)) - S.message = mutation.on_say(src, S.message) + for(var/mutation_type in active_mutations) + var/datum/mutation/mutation = GLOB.dna_mutations[mutation_type] + S.message = mutation.on_say(src, S.message) var/braindam = getBrainLoss() if(braindam >= 60) diff --git a/code/modules/mob/living/carbon/human/species/_species.dm b/code/modules/mob/living/carbon/human/species/_species.dm index 215f43b2491..7d1ae80a955 100644 --- a/code/modules/mob/living/carbon/human/species/_species.dm +++ b/code/modules/mob/living/carbon/human/species/_species.dm @@ -271,7 +271,7 @@ . += hungry/50 if(HAS_TRAIT(H, TRAIT_FAT)) . += (1.5 - flight) - if(H.bodytemperature < BODYTEMP_COLD_DAMAGE_LIMIT) + if(H.bodytemperature < BODYTEMP_COLD_DAMAGE_LIMIT && !(HAS_TRAIT(H, TRAIT_RESISTCOLD))) . += (BODYTEMP_COLD_DAMAGE_LIMIT - H.bodytemperature) / COLD_SLOWDOWN_FACTOR return . diff --git a/code/modules/mob/living/carbon/human/species/golem.dm b/code/modules/mob/living/carbon/human/species/golem.dm index 3880d578b58..a6e3bf4ef18 100644 --- a/code/modules/mob/living/carbon/human/species/golem.dm +++ b/code/modules/mob/living/carbon/human/species/golem.dm @@ -392,8 +392,8 @@ if(!(P.original == H && P.firer == H)) if(P.flag == "bullet" || P.flag == "bomb") playsound(H, 'sound/effects/shovel_dig.ogg', 70, 1) - H.visible_message("The [P.name] sinks harmlessly in [H]'s sandy body!", \ - "The [P.name] sinks harmlessly in [H]'s sandy body!") + H.visible_message("[P] sinks harmlessly in [H]'s sandy body!", \ + "[P] sinks harmlessly in [H]'s sandy body!") return FALSE return TRUE @@ -425,8 +425,8 @@ /datum/species/golem/glass/bullet_act(obj/item/projectile/P, mob/living/carbon/human/H) if(!(P.original == H && P.firer == H)) //self-shots don't reflect if(P.is_reflectable) - H.visible_message("The [P.name] gets reflected by [H]'s glass skin!", \ - "The [P.name] gets reflected by [H]'s glass skin!") + H.visible_message("[P] gets reflected by [H]'s glass skin!", \ + "[P] gets reflected by [H]'s glass skin!") P.reflect_back(H) diff --git a/code/modules/mob/living/carbon/human/species/grey.dm b/code/modules/mob/living/carbon/human/species/grey.dm index 26b56be2315..915d0072434 100644 --- a/code/modules/mob/living/carbon/human/species/grey.dm +++ b/code/modules/mob/living/carbon/human/species/grey.dm @@ -81,7 +81,7 @@ to_chat(H, "A speech translator implant has been installed due to your role on the station.") /datum/species/grey/handle_reagents(mob/living/carbon/human/H, datum/reagent/R) - if(R.id == "sacid") + if(R.id == "sacid" || R.id == "facid") H.reagents.remove_reagent(R.id, REAGENTS_METABOLISM) return FALSE if(R.id == "water") diff --git a/code/modules/mob/living/carbon/human/species/vox.dm b/code/modules/mob/living/carbon/human/species/vox.dm index 1d646237c19..f4ccced8fd8 100644 --- a/code/modules/mob/living/carbon/human/species/vox.dm +++ b/code/modules/mob/living/carbon/human/species/vox.dm @@ -93,7 +93,7 @@ H.equip_or_collect(internal_tank, slot_l_hand) to_chat(H, "Could not find an empty slot for internals! Please report this as a bug") H.internal = internal_tank - to_chat(H, "You are now running on nitrogen internals from the [internal_tank]. Your species finds oxygen toxic, so you must breathe nitrogen only.") + to_chat(H, "You are now running on nitrogen internals from [internal_tank]. Your species finds oxygen toxic, so you must breathe nitrogen only.") H.update_action_buttons_icon() /datum/species/vox/on_species_gain(mob/living/carbon/human/H) diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 9919778562f..e3ef4648fa4 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -450,14 +450,13 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) if(gender == FEMALE) g = "f" // DNA2 - Drawing underlays. - for(var/datum/mutation/mutation in GLOB.dna_mutations) - if(!mutation.block) - continue - if(mutation.is_active(src)) - var/underlay = mutation.on_draw_underlays(src, g) - if(underlay) - standing.underlays += underlay - add_image = 1 + for(var/mutation_type in active_mutations) + var/datum/mutation/mutation = GLOB.dna_mutations[mutation_type] + var/underlay = mutation.on_draw_underlays(src, g) + if(underlay) + standing.underlays += underlay + add_image = TRUE + if(HAS_TRAIT(src, TRAIT_LASEREYES)) standing.overlays += "lasereyes_s" add_image = 1 diff --git a/code/modules/mob/living/death.dm b/code/modules/mob/living/death.dm index c4e246f9d3f..65589260d66 100644 --- a/code/modules/mob/living/death.dm +++ b/code/modules/mob/living/death.dm @@ -93,7 +93,7 @@ for(var/P in GLOB.dead_mob_list) var/mob/M = P if((M.client?.prefs.toggles2 & PREFTOGGLE_2_DEATHMESSAGE) && (isobserver(M) || M.stat == DEAD)) - to_chat(M, "[mind.name] has died at [area_name]. (JMP)") + to_chat(M, "[mind.name] has died at [area_name]. (JMP)") if(SSticker && SSticker.mode) SSticker.mode.check_win() diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index ec931e5af9a..23f4d829d43 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -973,7 +973,7 @@ M.LAssailant = usr /mob/living/proc/check_pull() - if(pulling && !(pulling in orange(1))) + if(pulling && !pulling.Adjacent(src)) stop_pulling() /mob/living/proc/update_z(new_z) // 1+ to register, null to unregister diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index eb0c356863b..26b940308ea 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -71,8 +71,8 @@ take_overall_damage(0, shock_damage, TRUE, used_weapon = "Electrocution") if(shock_damage > 200) visible_message( - "[src] was arc flashed by the [source]!", - "The [source] arc flashes and electrocutes you!", + "[src] was arc flashed by \the [source]!", + "\The [source] arc flashes and electrocutes you!", "You hear a lightning-like crack!") playsound(loc, 'sound/effects/eleczap.ogg', 50, 1, -1) explosion(loc, -1, 0, 2, 2) diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index eaf7261a7b0..d0407aa271e 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -539,7 +539,7 @@ GLOBAL_LIST_INIT(ai_verbs_default, list( if(check_unable(AI_CHECK_WIRELESS)) return - var/input = clean_input("Please enter the reason for calling the shuttle.", "Shuttle Call Reason.","") + var/input = input("Please enter the reason for calling the shuttle.", "Shuttle Call Reason.") as null|message if(!input || stat) return diff --git a/code/modules/mob/living/silicon/ai/latejoin.dm b/code/modules/mob/living/silicon/ai/latejoin.dm index e1be5450811..449df48288a 100644 --- a/code/modules/mob/living/silicon/ai/latejoin.dm +++ b/code/modules/mob/living/silicon/ai/latejoin.dm @@ -28,7 +28,7 @@ GLOBAL_LIST_EMPTY(empty_playable_ai_cores) current_mode.possible_traitors.Remove(src) // Ghost the current player and disallow them to return to the body - ghostize(FALSE) + ghostize() // Delete the old AI shell qdel(src) diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm index 0a4bbfa6ec1..e1e1563459c 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone.dm @@ -8,6 +8,7 @@ health = 35 bubble_icon = "machine" pass_flags = PASSTABLE + flags_2 = RAD_PROTECT_CONTENTS_2 | RAD_NO_CONTAMINATE_2 braintype = "Robot" lawupdate = FALSE density = FALSE @@ -238,7 +239,7 @@ health = 35 stat = CONSCIOUS return - health = 35 - (getBruteLoss() + getFireLoss()) + health = 35 - (getBruteLoss() + getFireLoss() + getOxyLoss()) update_stat("updatehealth([reason])") /mob/living/silicon/robot/drone/death(gibbed) @@ -299,11 +300,7 @@ if(!player) return - if(player.mob?.mind) - player.mob.mind.transfer_to(src) - player.mob.mind.assigned_role = "Drone" - else - ckey = player.ckey + ckey = player.ckey to_chat(src, "Systems rebooted. Loading base pattern maintenance protocol... loaded.") full_law_reset() @@ -361,6 +358,10 @@ . = ..() density = emagged //this is reset every canmove update otherwise +/mob/living/silicon/robot/drone/add_ventcrawl(obj/machinery/atmospherics/starting_machine) + ..() + update_headlamp(TRUE, 0, FALSE) + /mob/living/silicon/robot/drone/flash_eyes(intensity = 1, override_blindness_check = FALSE, affect_silicon = FALSE, visual = FALSE) if(affect_silicon) return ..() diff --git a/code/modules/mob/living/silicon/robot/drone/drone_console.dm b/code/modules/mob/living/silicon/robot/drone/drone_console.dm index 02924fbbbda..2c09800c1d6 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_console.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_console.dm @@ -114,7 +114,8 @@ var/mob/living/silicon/robot/drone/D = locateUID(params["uid"]) if(D) to_chat(usr, "You issue a kill command for the unfortunate drone.") - message_admins("[key_name_admin(usr)] issued kill order for drone [key_name_admin(D)] from control console.") + if(D != usr) // Don't need to bug admins about a suicide + message_admins("[key_name_admin(usr)] issued kill order for drone [key_name_admin(D)] from control console.") log_game("[key_name(usr)] issued kill order for [key_name(D)] from control console.") D.shut_down() diff --git a/code/modules/mob/living/silicon/robot/drone/drone_items.dm b/code/modules/mob/living/silicon/robot/drone/drone_items.dm index 16e81f53276..d1156b5c81d 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_items.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_items.dm @@ -179,62 +179,6 @@ to_chat(user, "Nothing on \the [T] is useful to you.") return -//PRETTIER TOOL LIST. -/mob/living/silicon/robot/drone/installed_modules() - - if(weapon_lock) - to_chat(src, "Weapon lock active, unable to use modules! Count:[weaponlock_time]") - return - - if(!module) - module = new /obj/item/robot_module/drone(src) - - var/dat = "Drone modules\n" - dat += {"Close -
      -
      - Activated Modules -
      - Module 1: [module_state_1 ? "[module_state_1]" : "No Module"]
      - Module 2: [module_state_2 ? "
      [module_state_2]" : "No Module"]
      - Module 3: [module_state_3 ? "
      [module_state_3]" : "No Module"]
      -
      - Installed Modules

      "} - - - var/tools = "Tools and devices
      " - var/resources = "
      Resources
      " - - for(var/O in module.modules) - - var/module_string = "" - - if(!O) - module_string += text("Resource depleted
      ") - else if(activated(O)) - module_string += text("[O]: Activated
      ") - else - module_string += text("[O]:
      Activate
      ") - - if((istype(O,/obj/item) || istype(O,/obj/item)) && !(istype(O,/obj/item/stack/cable_coil))) - tools += module_string - else - resources += module_string - - dat += tools - - if(emagged) - if(!module.emag) - dat += text("Resource depleted
      ") - else if(activated(module.emag)) - dat += text("[module.emag]: Activated
      ") - else - dat += text("[module.emag]: Activate
      ") - - dat += resources - - src << browse(dat, "window=robotmod&can_close=0") - //Putting the decompiler here to avoid doing list checks every tick. /mob/living/silicon/robot/drone/use_power() diff --git a/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm b/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm index 73c78ff3bec..6baf208a377 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm @@ -37,7 +37,7 @@ icon_state = "drone_fab_active" var/elapsed = world.time - time_last_drone - drone_progress = round((elapsed / config.drone_build_time) * 100) + drone_progress = clamp(round((elapsed / config.drone_build_time) * 100), 0, 100) if(drone_progress >= 100) visible_message("[src] voices a strident beep, indicating a drone chassis is prepared.") diff --git a/code/modules/mob/living/silicon/robot/inventory.dm b/code/modules/mob/living/silicon/robot/inventory.dm index 32ce86e582f..3357bddc925 100644 --- a/code/modules/mob/living/silicon/robot/inventory.dm +++ b/code/modules/mob/living/silicon/robot/inventory.dm @@ -40,7 +40,7 @@ return 1 /mob/living/silicon/robot/proc/activate_module(obj/item/O) - if(!(locate(O) in src.module.modules) && O != src.module.emag) + if(!(locate(O) in module.modules) && !(O in module.emag_modules)) return if(activated(O)) to_chat(src, "Already activated") diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index caacfc0e34b..8bcd14a8d9e 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -482,6 +482,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( speed = 0 // Remove upgrades. ionpulse = FALSE magpulse = FALSE + weapons_unlock = FALSE add_language("Robot Talk", TRUE) if("lava" in weather_immunities) // Remove the lava-immunity effect given by a printable upgrade weather_immunities -= "lava" @@ -635,17 +636,27 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( else stat(null, text("No Cell Inserted!")) +/mob/living/silicon/robot/proc/show_gps_coords() + if(locate(/obj/item/gps/cyborg) in module.modules) + var/turf/T = get_turf(src) + stat(null, "GPS: [COORD(T)]") + +/mob/living/silicon/robot/proc/show_stack_energy() + for(var/storage in module.storages) // Storages should only contain `/datum/robot_energy_storage` + var/datum/robot_energy_storage/R = storage + stat(null, "[R.statpanel_name]: [R.energy] / [R.max_energy]") // update the status screen display /mob/living/silicon/robot/Stat() ..() - statpanel("Status") - if(client.statpanel == "Status") - show_cell_power() - var/total_user_contents = GetAllContents() - if(locate(/obj/item/gps/cyborg) in total_user_contents) - var/turf/T = get_turf(src) - stat(null, "GPS: [COORD(T)]") + if(!statpanel("Status")) + return // They aren't looking at the status panel. + + show_cell_power() + + if(module) + show_gps_coords() + show_stack_energy() /mob/living/silicon/robot/restrained() return 0 @@ -708,7 +719,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( C.brute_damage = WC.brute C.electronics_damage = WC.burn - to_chat(usr, "You install the [W.name].") + to_chat(usr, "You install [W].") return @@ -746,6 +757,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( //This will mean that removing and replacing a power cell will repair the mount, but I don't care at this point. ~Z C.brute_damage = 0 C.electronics_damage = 0 + module?.update_cells() diag_hud_set_borgcell() else if(istype(W, /obj/item/encryptionkey/) && opened) @@ -774,16 +786,12 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( to_chat(user, "You must access the borg's internals!") else if(!src.module && U.require_module) to_chat(user, "The borg must choose a module before it can be upgraded!") - else if(U.locked) - to_chat(user, "The upgrade is locked and cannot be used yet!") else if(!user.drop_item()) return if(U.action(src)) - user.visible_message("[user] applied [U] to [src].", "You apply [U] to [src].") + user.visible_message("[user] applied [U] to [src].", "You apply [U] to [src].") U.forceMove(src) - else - to_chat(user, "Upgrade error.") else if(istype(W, /obj/item/mmi_radio_upgrade)) if(!opened) @@ -910,7 +918,19 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( spark_system.start() ..() -/mob/living/silicon/robot/emag_act(user as mob) +// Here so admins can unemag borgs. +/mob/living/silicon/robot/unemag() + SetEmagged(FALSE) + if(!module) + return + uneq_all() + module.module_type = initial(module.module_type) + update_module_icon() + module.unemag() + clear_supplied_laws() + laws = new /datum/ai_laws/crewsimov + +/mob/living/silicon/robot/emag_act(mob/user) if(!ishuman(user) && !issilicon(user)) return var/mob/living/M = user @@ -925,7 +945,8 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( return if(opened)//Cover is open - if(emagged) return//Prevents the X has hit Y with Z message also you cant emag them twice + if(emagged) + return //Prevents the X has hit Y with Z message also you cant emag them twice if(wiresexposed) to_chat(user, "You must close the panel first") return @@ -933,11 +954,10 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( sleep(6) SetEmagged(TRUE) SetLockdown(1) //Borgs were getting into trouble because they would attack the emagger before the new laws were shown - if(src.hud_used) - src.hud_used.update_robot_modules_display() //Shows/hides the emag item if the inventory screen is already open. + if(hud_used) + hud_used.update_robot_modules_display() //Shows/hides the emag item if the inventory screen is already open. disconnect_from_ai() to_chat(user, "You emag [src]'s interface.") -// message_admins("[key_name_admin(user)] emagged cyborg [key_name_admin(src)]. Laws overridden.") log_game("[key_name(user)] emagged cyborg [key_name(src)]. Laws overridden.") clear_supplied_laws() clear_inherent_laws() @@ -963,17 +983,11 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( laws.show_laws(src) to_chat(src, "ALERT: [M.real_name] is your new master. Obey your new laws and [M.p_their()] commands.") SetLockdown(0) - if(src.module && istype(src.module, /obj/item/robot_module/miner)) - for(var/obj/item/pickaxe/drill/cyborg/D in src.module.modules) - qdel(D) - src.module.modules += new /obj/item/pickaxe/drill/cyborg/diamond(src.module) - src.module.rebuild() - if(src.module && istype(src.module, /obj/item/robot_module/medical)) - for(var/obj/item/borg_defib/F in src.module.modules) - F.safety = 0 if(module) + module.emag_act() module.module_type = "Malf" // For the cool factor update_module_icon() + module.rebuild_modules() // This will add the emagged items to the borgs inventory. update_icons() return @@ -1041,51 +1055,6 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( /mob/living/silicon/robot/proc/borg_icons() // Exists so that robot/destroyer can override it return -/mob/living/silicon/robot/proc/installed_modules() - if(weapon_lock) - to_chat(src, "Weapon lock active, unable to use modules! Count:[weaponlock_time]") - return - - if(!module) - pick_module() - return - var/dat = {"Close -
      -
      - Activated Modules -
      -
      Left Hand:[(l_hand && !(l_hand.flags&ABSTRACT)) ? l_hand : "Empty"]
      Right Hand:[(r_hand && !(r_hand.flags&ABSTRACT)) ? r_hand : "Empty"]
      Left Hand:[(l_hand && !(l_hand.flags&ABSTRACT)) ? html_encode(l_hand) : "Empty"]
      Right Hand:[(r_hand && !(r_hand.flags&ABSTRACT)) ? html_encode(r_hand) : "Empty"]
       
      Back:[(back && !(back.flags&ABSTRACT)) ? back : "Empty"]" + dat += "
      Back:[(back && !(back.flags&ABSTRACT)) ? html_encode(back) : "Empty"]" if(has_breathable_mask && istype(back, /obj/item/tank)) dat += " [internal ? "Disable Internals" : "Set Internals"]" dat += "
       
      Head:[(head && !(head.flags&ABSTRACT)) ? head : "Empty"]
      Head:[(head && !(head.flags&ABSTRACT)) ? html_encode(head) : "Empty"]
      Mask:Obscured
      Mask:[(wear_mask && !(wear_mask.flags&ABSTRACT)) ? wear_mask : "Empty"]" + dat += "
      Mask:[(wear_mask && !(wear_mask.flags&ABSTRACT)) ? html_encode(wear_mask) : "Empty"]" if(istype(wear_mask, /obj/item/clothing/mask/muzzle)) var/obj/item/clothing/mask/muzzle/M = wear_mask @@ -322,23 +325,23 @@ if(slot_glasses in obscured) dat += "
      Eyes:Obscured
      Eyes:[(glasses && !(glasses.flags&ABSTRACT)) ? glasses : "Empty"]
      Eyes:[(glasses && !(glasses.flags&ABSTRACT)) ? html_encode(glasses) : "Empty"]
      Left Ear:Obscured
      Left Ear:[(l_ear && !(l_ear.flags&ABSTRACT)) ? l_ear : "Empty"]
      Left Ear:[(l_ear && !(l_ear.flags&ABSTRACT)) ? html_encode(l_ear) : "Empty"]
      Right Ear:Obscured
      Right Ear:[(r_ear && !(r_ear.flags&ABSTRACT)) ? r_ear : "Empty"]
      Right Ear:[(r_ear && !(r_ear.flags&ABSTRACT)) ? html_encode(r_ear) : "Empty"]
       
      Exosuit:[(wear_suit && !(wear_suit.flags&ABSTRACT)) ? wear_suit : "Empty"]
      Exosuit:[(wear_suit && !(wear_suit.flags&ABSTRACT)) ? html_encode(wear_suit) : "Empty"]
       ↳Suit Storage:[(s_store && !(s_store.flags&ABSTRACT)) ? s_store : "Empty"]" + dat += "
       ↳Suit Storage:[(s_store && !(s_store.flags&ABSTRACT)) ? html_encode(s_store) : "Empty"]" if(has_breathable_mask && istype(s_store, /obj/item/tank)) dat += " [internal ? "Disable Internals" : "Set Internals"]" dat += "
      Shoes:Obscured
      Shoes:[(shoes && !(shoes.flags&ABSTRACT)) ? shoes : "Empty"]
      Shoes:[(shoes && !(shoes.flags&ABSTRACT)) ? html_encode(shoes) : "Empty"]
      Gloves:Obscured
      Gloves:[(gloves && !(gloves.flags&ABSTRACT)) ? gloves : "Empty"]
      Gloves:[(gloves && !(gloves.flags&ABSTRACT)) ? html_encode(gloves) : "Empty"]
      Uniform:Obscured
      Uniform:[(w_uniform && !(w_uniform.flags&ABSTRACT)) ? w_uniform : "Empty"]
      Uniform:[(w_uniform && !(w_uniform.flags&ABSTRACT)) ? html_encode(w_uniform) : "Empty"]
       ↳Pockets:
       ↳Suit Sensors:
       ↳PDA:
       ↳Belt:[(belt && !(belt.flags&ABSTRACT)) ? belt : "Empty"]" + dat += "
       ↳Belt:[(belt && !(belt.flags&ABSTRACT)) ? html_encode(belt) : "Empty"]" if(has_breathable_mask && istype(belt, /obj/item/tank)) dat += " [internal ? "Disable Internals" : "Set Internals"]" dat += "
       ↳ID:[(wear_id && !(wear_id.flags&ABSTRACT)) ? wear_id : "Empty"]
       ↳PDA:[(wear_pda && !(wear_pda.flags&ABSTRACT)) ? wear_pda : "Empty"]
       ↳ID:[(wear_id && !(wear_id.flags&ABSTRACT)) ? html_encode(wear_id) : "Empty"]
       ↳PDA:[(wear_pda && !(wear_pda.flags&ABSTRACT)) ? html_encode(wear_pda) : "Empty"]
      - - - -
      Module 1:[module_state_1 ? "[module_state_1]" : "No Module"]
      Module 2:[module_state_2 ? "[module_state_2]" : "No Module"]
      Module 3:[module_state_3 ? "[module_state_3]" : "No Module"]

      - Installed Modules

      - - "} - for(var/obj in module.modules) - if(!obj) - dat += text("") - else if(activated(obj)) - dat += text("") - else - dat += text("") - if(emagged || weapons_unlock) - if(activated(module.emag)) - dat += text("") - else - dat += text("") - dat += "
      Resource depleted
      [obj]Activated
      [obj]Activate
      [module.emag]Activated
      [module.emag]Activate
      " -/* - if(activated(obj)) - dat += text("[obj]: \[Activated | Deactivate\]
      ") - else - dat += text("[obj]: \[Activate | Deactivated\]
      ") -*/ - var/datum/browser/popup = new(src, "robotmod", "Modules") - popup.set_content(dat) - popup.open() - - /mob/living/silicon/robot/Topic(href, href_list) if(..()) return 1 @@ -1111,7 +1080,6 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( return 1 activate_module(O) - installed_modules() //Show alerts window if user clicked on "Show alerts" in chat if(href_list["showalerts"]) @@ -1134,7 +1102,6 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( to_chat(src, "Module isn't activated.") else to_chat(src, "Module isn't activated") - installed_modules() return 1 return 1 @@ -1146,17 +1113,20 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( if(stat || lamp_recharging || low_power_mode) to_chat(src, "This function is currently offline.") return + if(is_ventcrawling(src)) + return //Some sort of magical "modulo" thing which somehow increments lamp power by 2, until it hits the max and resets to 0. lamp_intensity = (lamp_intensity+2) % (lamp_max+2) to_chat(src, "[lamp_intensity ? "Headlamp power set to Level [lamp_intensity/2]" : "Headlamp disabled."]") update_headlamp() -/mob/living/silicon/robot/proc/update_headlamp(turn_off = 0, cooldown = 100) +/mob/living/silicon/robot/proc/update_headlamp(turn_off = 0, cooldown = 100, show_warning = TRUE) set_light(0) if(lamp_intensity && (turn_off || stat || low_power_mode)) - to_chat(src, "Your headlamp has been deactivated.") + if(show_warning) + to_chat(src, "Your headlamp has been deactivated.") lamp_intensity = 0 lamp_recharging = 1 spawn(cooldown) //10 seconds by default, if the source of the deactivation does not keep stat that long. @@ -1231,12 +1201,13 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( var/floor_only = TRUE for(var/A in tile) if(istype(A, /obj/effect)) - if(is_cleanable(A)) - var/obj/effect/decal/cleanable/blood/B = A + var/obj/effect/E = A + if(E.is_cleanable()) + var/obj/effect/decal/cleanable/blood/B = E if(istype(B) && B.off_floor) floor_only = FALSE else - qdel(A) + qdel(E) else if(istype(A, /obj/item)) var/obj/item/cleaned_item = A cleaned_item.clean_blood() @@ -1438,7 +1409,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( /mob/living/silicon/robot/deathsquad/bullet_act(obj/item/projectile/P) if(istype(P) && P.is_reflectable && P.starting) - visible_message("The [P.name] gets reflected by [src]!", "The [P.name] gets reflected by [src]!") + visible_message("[P] gets reflected by [src]!", "[P] gets reflected by [src]!") P.reflect_back(src) return -1 return ..(P) diff --git a/code/modules/mob/living/silicon/robot/robot_defense.dm b/code/modules/mob/living/silicon/robot/robot_defense.dm index 84eb782833b..6469bfbf6a6 100644 --- a/code/modules/mob/living/silicon/robot/robot_defense.dm +++ b/code/modules/mob/living/silicon/robot/robot_defense.dm @@ -47,6 +47,7 @@ var/datum/robot_component/C = components["power cell"] C.installed = 0 C.uninstall() + module?.update_cells(TRUE) diag_hud_set_borgcell() if(!opened) diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 29fd2a0235c..4cda181ee4f 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -6,77 +6,223 @@ item_state = "electronic" flags = CONDUCT + /// A list of all currently usable and created modules the robot currently has access too. var/list/modules = list() - var/obj/item/emag = null - var/list/subsystems = list() + /// A list of module-specific, non-emag modules the borg will gain when this module is chosen. + var/list/basic_modules = list() + /// A list of modules the robot gets when emagged. + var/list/emag_modules = list() + /// A list of modules that require special recharge handling. Examples include things like flashes, sprays and welding tools. + var/list/special_rechargables = list() + /// A list of all "energy stacks", i.e metal, glass, brute kits, splints, etc. + var/list/storages = list() + /// Special actions this module will gain when chosen such as meson vision, or thermal vision. var/list/module_actions = list() - - var/module_type = "NoMod" // For icon usage - - var/list/stacktypes - var/channels = list() + /// Available tools given in the verb tab such as a crew monitor, or power monitor. + var/list/subsystems = list() + /// Radio channels the module owner has access to. + var/list/channels = list() + /// Special items that are able to be removed from the robot owner via crowbar. var/list/custom_removals = list() - - -/obj/item/robot_module/emp_act(severity) - if(modules) - for(var/obj/O in modules) - O.emp_act(severity) - if(emag) - emag.emp_act(severity) - ..() + /// For icon usage. + var/module_type = "NoMod" /obj/item/robot_module/New() ..() - add_default_robot_items() - emag = new /obj/item/toy/sword(src) - emag.name = "Placeholder Emag Item" + + // Creates new objects from the type lists. + for(var/i in basic_modules) + var/obj/item/I = new i(src) + basic_modules += I + basic_modules -= i + + // Even though these are created here the robot won't be able to see and equip them until they actually get emagged/hacked. + for(var/i in emag_modules) + var/obj/item/I = new i(src) + emag_modules += I + emag_modules -= i + + // Flashes need a special recharge, and since basically every module uses it, add it here. + // Even if the module doesn't use a flash, it wont cause any issues to have it in this list. + special_rechargables += /obj/item/flash/cyborg + + // This is done so we can loop through this list later and call cyborg_recharge() on the items while the borg is recharging. + var/all_modules = basic_modules | emag_modules + for(var/path in special_rechargables) + var/obj/item/I = locate(path) in all_modules + if(I) // If it exists, add the object reference. + special_rechargables += I + special_rechargables -= path // No matter what, remove the path from the list. + + // Add all the modules into the robot's inventory. Without this, their inventory will be blank. + rebuild_modules() + + +/obj/item/robot_module/emp_act(severity) + . = ..() + for(var/object in modules) + var/obj/O = object + O.emp_act(severity) /obj/item/robot_module/Destroy() + // These can all contain actual objects, so we need to null them out. QDEL_LIST(modules) - QDEL_NULL(emag) + QDEL_LIST(basic_modules) + QDEL_LIST(emag_modules) + QDEL_LIST(storages) + QDEL_LIST(special_rechargables) return ..() -// By default, all robots will get the items in this proc, unless you override it for your specific module. See: ../robot_module/drone -/obj/item/robot_module/proc/add_default_robot_items() - modules += new /obj/item/flash/cyborg(src) +/** + * Searches through the various module lists for the given `item_type`, deletes and removes the item from all supplied lists, if the item is found. + * + * NOTE: be careful with using this proc, as it irreversibly removes entries from a borg's module list. + * This is safe to do with upgrades because the only way to revert upgrades currently is either to rebuild the borg or use a reset module, which allows the lists to regenerate. + * + * Arugments: + * * item_type - the type of item to search for. Also accepts objects themselves. + */ +/obj/item/robot_module/proc/remove_item_from_lists(item_or_item_type) + var/list/lists = list( + basic_modules, + emag_modules, + storages, + special_rechargables + ) + for(var/_list in lists) + for(var/item in _list) + var/obj/item/I = item + if(!istype(I, item_or_item_type)) + continue + if(!QDELETED(I)) + qdel(I) + _list -= I + +// Here for admin debugging purposes only. /obj/item/robot_module/proc/fix_modules() - for(var/obj/item/I in modules) + for(var/item in modules) + var/obj/item/I = item I.flags |= NODROP I.mouse_opacity = MOUSE_OPACITY_OPAQUE - if(emag) - emag.flags |= NODROP - emag.mouse_opacity = MOUSE_OPACITY_OPAQUE -/obj/item/robot_module/proc/respawn_consumable(mob/living/silicon/robot/R) - if(!stacktypes || !stacktypes.len) +/** + * Returns a `robot_energy_strage` datum of type `storage_type`. If one already exists, it returns that one, otherwise it create a new one. + * + * Arguments: + * * storage_type - the subtype of `datum/robot_energy_storage` to fetch or create. + */ +/obj/item/robot_module/proc/get_or_create_estorage(storage_type) + for(var/e_storage in storages) + var/datum/robot_energy_storage/S = e_storage + if(istype(S, storage_type)) + return S + return new storage_type(src) + +/** + * Adds the item `I` to our `modules` list, and sets up an `/datum/robot_energy_storage` if its a stack. + * + * Arugments: + * * I - the item to add to our modules. + * * requires_rebuild - if adding this item requires `rebuild_modules()` to be called. + */ +/obj/item/robot_module/proc/add_module(obj/item/I, requires_rebuild) + if(I in modules) // No duplicate items. return - var/stack_respawned = 0 - for(var/T in stacktypes) - var/O = locate(T) in modules - var/obj/item/stack/S = O + if(istype(I, /obj/item/stack)) + var/obj/item/stack/S = I - if(!S) - S = new T(src) - modules += S - S.amount = 1 - stack_respawned = 1 + if(S.energy_type) + S.source = get_or_create_estorage(S.energy_type) + S.is_cyborg = TRUE - if(S && S.amount < stacktypes[T]) - S.amount++ - if(stack_respawned && istype(R) && R.hud_used) + // Here for safety. Using a cyborg stack without a `source` will create hundreds of runtimes. + if(!S.source) + qdel(S) + return + + if(I.loc != src) + I.forceMove(src) + + modules += I + I.flags |= NODROP + I.mouse_opacity = MOUSE_OPACITY_OPAQUE + + if(requires_rebuild) + rebuild_modules() + return I + +/** + * Builds the usable module list from the modules we have in `basic_modules` and `emag_modules` + */ +/obj/item/robot_module/proc/rebuild_modules() + var/mob/living/silicon/robot/R = loc + R.uneq_all() + modules = list() + + // By this point these lists should only contain items. It's safe to use typeless loops here. + for(var/item in basic_modules) + add_module(item, FALSE) + + if(R.emagged || R.weapons_unlock) + for(var/item in emag_modules) + add_module(item, FALSE) + + if(R.hud_used) R.hud_used.update_robot_modules_display() -/obj/item/robot_module/proc/rebuild()//Rebuilds the list so it's possible to add/remove items from the module - var/list/temp_list = modules - modules = list() - for(var/obj/O in temp_list) - if(!QDELETED(O)) //so items getting deleted don't stay in module list and haunt you - modules += O +/** + * Handles the recharging of all borg stack items and any items which are in the `special_rechargables` list. + * + * Arguments: + * * R - the owner of this module. + * * coeff - a coefficient which can be used to modify the recharge rate of consumables. + */ +/obj/item/robot_module/proc/recharge_consumables(mob/living/silicon/robot/R, coeff = 1) + for(var/e_storage in storages) + var/datum/robot_energy_storage/E = e_storage + E.add_charge(max(1, coeff * E.recharge_rate)) + for(var/item in special_rechargables) + var/obj/item/I = item + I.cyborg_recharge(coeff, R.emagged) +/** + * Called when the robot owner of this module has their power cell replaced. + * + * Changes the linked power cell for module items to the newly inserted cell, or to `null`. + * Arguments: + * * unlink_cell - If TRUE, set the item's power cell variable to `null` rather than linking it to a new one. + */ +/obj/item/robot_module/proc/update_cells(unlink_cell = FALSE) + return + +/** + * Called when the robot owner of this module has the `unemag()` proc called on them, which is only via admin means. + * + * Deletes this module's emag items, and recreates them. + */ +/obj/item/robot_module/unemag() + . = ..() + for(var/item in emag_modules) + var/obj/item/old_item = item + var/obj/item/new_item = new old_item.type(src) + emag_modules += new_item + if(old_item in special_rechargables) // If the old item was in this list, make sure the new one goes into it as well. + special_rechargables += new_item + special_rechargables -= old_item + modules -= old_item + emag_modules -= old_item + qdel(old_item) + rebuild_modules() + +/** + * Adds all of the languages this module is suppose to know and/or speak. + * + * Arugments: + * * R - the owner of this module. + */ /obj/item/robot_module/proc/add_languages(mob/living/silicon/robot/R) //full set of languages R.add_language("Galactic Common", 1) @@ -94,8 +240,9 @@ R.add_language("Chittin", 0) R.add_language("Bubblish", 0) R.add_language("Orluum", 0) - R.add_language("Clownish",0) + R.add_language("Clownish", 0) +/// Adds anything in `subsystems` to the robot's verbs, and grants any actions that are in `module_actions`. /obj/item/robot_module/proc/add_subsystems_and_actions(mob/living/silicon/robot/R) R.verbs |= subsystems for(var/A in module_actions) @@ -103,6 +250,7 @@ act.Grant(R) R.module_actions += act +/// Removes any verbs from the robot that are in `subsystems`, and removes any actions that are in `module_actions`. /obj/item/robot_module/proc/remove_subsystems_and_actions(mob/living/silicon/robot/R) R.verbs -= subsystems for(var/datum/action/A in R.module_actions) @@ -117,6 +265,7 @@ /obj/item/robot_module/proc/handle_death(mob/living/silicon/robot/R, gibbed) return +// Standard cyborg module. /obj/item/robot_module/standard // if station is fine, assist with constructing station goal room, cleaning, and repairing cables chewed by rats // if medical crisis, assist by providing basic healthcare, retrieving corpses, and monitoring crew lifesigns @@ -125,221 +274,219 @@ name = "generalist robot module" module_type = "Standard" subsystems = list(/mob/living/silicon/proc/subsystem_power_monitor, /mob/living/silicon/proc/subsystem_crew_monitor) - stacktypes = list( - /obj/item/stack/sheet/metal/cyborg = 50, - /obj/item/stack/cable_coil/cyborg = 50, - /obj/item/stack/rods/cyborg = 60, - /obj/item/stack/tile/plasteel = 20 - ) - -/obj/item/robot_module/standard/New() - ..() - // sec - modules += new /obj/item/restraints/handcuffs/cable/zipties/cyborg(src) - // janitorial - modules += new /obj/item/soap/nanotrasen(src) - modules += new /obj/item/lightreplacer/cyborg(src) - // eng - modules += new /obj/item/crowbar/cyborg(src) - modules += new /obj/item/wrench/cyborg(src) - modules += new /obj/item/extinguisher(src) // for firefighting, and propulsion in space - modules += new /obj/item/weldingtool/largetank/cyborg(src) - // mining - modules += new /obj/item/pickaxe(src) - modules += new /obj/item/t_scanner/adv_mining_scanner(src) - modules += new /obj/item/storage/bag/ore/cyborg(src) - // med - modules += new /obj/item/healthanalyzer(src) - modules += new /obj/item/reagent_containers/borghypo/basic(src) - modules += new /obj/item/roller_holder(src) // for taking the injured to medbay without worsening their injuries or leaving a blood trail the whole way - emag = new /obj/item/melee/energy/sword/cyborg(src) - for(var/G in stacktypes) - var/obj/item/stack/sheet/M = new G(src) - M.amount = stacktypes[G] - modules += M - fix_modules() - + basic_modules = list( + // sec + /obj/item/flash/cyborg, + /obj/item/restraints/handcuffs/cable/zipties/cyborg, + // janitorial + /obj/item/soap/nanotrasen, + /obj/item/lightreplacer/cyborg, + // eng + /obj/item/crowbar/cyborg, + /obj/item/wrench/cyborg, + /obj/item/extinguisher, // for firefighting, and propulsion in space + /obj/item/weldingtool/largetank/cyborg, + // mining + /obj/item/pickaxe, + /obj/item/t_scanner/adv_mining_scanner, + /obj/item/storage/bag/ore/cyborg, + // med + /obj/item/healthanalyzer, + /obj/item/reagent_containers/borghypo/basic, + /obj/item/roller_holder, // for taking the injured to medbay without worsening their injuries or leaving a blood trail the whole way + /obj/item/stack/sheet/metal/cyborg, + /obj/item/stack/cable_coil/cyborg, + /obj/item/stack/rods/cyborg, + /obj/item/stack/tile/plasteel/cyborg + ) + emag_modules = list(/obj/item/melee/energy/sword/cyborg) + special_rechargables = list( + /obj/item/extinguisher, + /obj/item/weldingtool/largetank/cyborg, + /obj/item/lightreplacer/cyborg + ) +// Medical cyborg module. /obj/item/robot_module/medical name = "medical robot module" module_type = "Medical" subsystems = list(/mob/living/silicon/proc/subsystem_crew_monitor) - stacktypes = list( - /obj/item/stack/medical/bruise_pack/advanced = 6, - /obj/item/stack/medical/ointment/advanced = 6, - /obj/item/stack/medical/splint = 6, - /obj/item/stack/nanopaste = 6 - ) + basic_modules = list( + /obj/item/flash/cyborg, + /obj/item/healthanalyzer/advanced, + /obj/item/robotanalyzer, + /obj/item/reagent_scanner/adv, + /obj/item/borg_defib, + /obj/item/handheld_defibrillator, + /obj/item/roller_holder, + /obj/item/reagent_containers/borghypo, + /obj/item/scalpel/laser/laser1, + /obj/item/hemostat, + /obj/item/retractor, + /obj/item/circular_saw, + /obj/item/surgicaldrill, + /obj/item/bonesetter, + /obj/item/bonegel, + /obj/item/FixOVein, + /obj/item/extinguisher/mini, + /obj/item/reagent_containers/glass/beaker/large, + /obj/item/reagent_containers/dropper, + /obj/item/reagent_containers/syringe, + /obj/item/stack/medical/bruise_pack/advanced/cyborg, + /obj/item/stack/medical/ointment/advanced/cyborg, + /obj/item/stack/medical/splint/cyborg, + /obj/item/stack/nanopaste/cyborg, + /obj/item/gripper/medical + ) + emag_modules = list(/obj/item/reagent_containers/spray/cyborg_facid) + special_rechargables = list(/obj/item/reagent_containers/spray/cyborg_facid, /obj/item/extinguisher/mini) -/obj/item/robot_module/medical/New() - ..() - modules += new /obj/item/healthanalyzer/advanced(src) - modules += new /obj/item/robotanalyzer(src) - modules += new /obj/item/reagent_scanner/adv(src) - modules += new /obj/item/borg_defib(src) - modules += new /obj/item/handheld_defibrillator(src) - modules += new /obj/item/roller_holder(src) - modules += new /obj/item/reagent_containers/borghypo(src) - modules += new /obj/item/reagent_containers/glass/beaker/large(src) - modules += new /obj/item/reagent_containers/dropper(src) - modules += new /obj/item/reagent_containers/syringe(src) - modules += new /obj/item/extinguisher/mini(src) - modules += new /obj/item/stack/medical/bruise_pack/advanced(src) - modules += new /obj/item/stack/medical/ointment/advanced(src) - modules += new /obj/item/stack/medical/splint(src) - modules += new /obj/item/stack/nanopaste(src) - modules += new /obj/item/scalpel/laser/laser1(src) - modules += new /obj/item/hemostat(src) - modules += new /obj/item/retractor(src) - modules += new /obj/item/bonegel(src) - modules += new /obj/item/FixOVein(src) - modules += new /obj/item/bonesetter(src) - modules += new /obj/item/circular_saw(src) - modules += new /obj/item/surgicaldrill(src) - modules += new /obj/item/gripper/medical(src) +// Disable safeties on the borg's defib. +/obj/item/robot_module/medical/emag_act() + . = ..() + for(var/obj/item/borg_defib/F in modules) + F.safety = FALSE - emag = new /obj/item/reagent_containers/spray(src) +// Enable safeties on the borg's defib. +/obj/item/robot_module/medical/unemag() + for(var/obj/item/borg_defib/F in modules) + F.safety = TRUE + return ..() - emag.reagents.add_reagent("facid", 250) - emag.name = "Polyacid spray" +// Fluorosulphuric acid spray bottle. +/obj/item/reagent_containers/spray/cyborg_facid + name = "Polyacid spray" + list_reagents = list("facid" = 250) - fix_modules() - -/obj/item/robot_module/medical/respawn_consumable(mob/living/silicon/robot/R) - if(emag) - var/obj/item/reagent_containers/spray/PS = emag - PS.reagents.add_reagent("facid", 2) - ..() +/obj/item/reagent_containers/spray/cyborg_facid/cyborg_recharge(coeff, emagged) + if(emagged) + reagents.check_and_add("facid", volume, 2 * coeff) +// Engineering cyborg module. /obj/item/robot_module/engineering name = "engineering robot module" module_type = "Engineer" subsystems = list(/mob/living/silicon/proc/subsystem_power_monitor) - module_actions = list( - /datum/action/innate/robot_sight/meson, + module_actions = list(/datum/action/innate/robot_sight/meson) + basic_modules = list( + /obj/item/flash/cyborg, + /obj/item/rcd/borg, + /obj/item/rpd, + /obj/item/extinguisher, + /obj/item/weldingtool/largetank/cyborg, + /obj/item/screwdriver/cyborg, + /obj/item/wrench/cyborg, + /obj/item/crowbar/cyborg, + /obj/item/wirecutters/cyborg, + /obj/item/multitool/cyborg, + /obj/item/t_scanner, + /obj/item/analyzer, + /obj/item/geiger_counter/cyborg, + /obj/item/holosign_creator/engineering, + /obj/item/gripper, + /obj/item/matter_decompiler, + /obj/item/floor_painter, + /obj/item/areaeditor/blueprints/cyborg, + /obj/item/stack/sheet/metal/cyborg, + /obj/item/stack/rods/cyborg, + /obj/item/stack/tile/plasteel/cyborg, + /obj/item/stack/cable_coil/cyborg, + /obj/item/stack/sheet/glass/cyborg, + /obj/item/stack/sheet/rglass/cyborg ) - - stacktypes = list( - /obj/item/stack/sheet/metal/cyborg = 50, - /obj/item/stack/sheet/glass/cyborg = 50, - /obj/item/stack/sheet/rglass/cyborg = 50, - /obj/item/stack/cable_coil/cyborg = 50, - /obj/item/stack/rods/cyborg = 60, - /obj/item/stack/tile/plasteel = 20 - ) - -/obj/item/robot_module/engineering/New() - ..() - modules += new /obj/item/rcd/borg(src) - modules += new /obj/item/rpd(src) - modules += new /obj/item/extinguisher(src) - modules += new /obj/item/weldingtool/largetank/cyborg(src) - modules += new /obj/item/screwdriver/cyborg(src) - modules += new /obj/item/wrench/cyborg(src) - modules += new /obj/item/crowbar/cyborg(src) - modules += new /obj/item/wirecutters/cyborg(src) - modules += new /obj/item/multitool/cyborg(src) - modules += new /obj/item/t_scanner(src) - modules += new /obj/item/analyzer(src) - modules += new /obj/item/geiger_counter/cyborg(src) - modules += new /obj/item/holosign_creator/engineering(src) - modules += new /obj/item/gripper(src) - modules += new /obj/item/matter_decompiler(src) - modules += new /obj/item/floor_painter(src) - modules += new /obj/item/areaeditor/blueprints/cyborg(src) - emag = new /obj/item/borg/stun(src) - - for(var/G in stacktypes) //Attempt to unify Engi-Borg material stacks into fewer lines. See Line 492 for example. Variables changed out of paranoia. - var/obj/item/stack/sheet/M = new G(src) - M.amount = stacktypes[G] - modules += M - - fix_modules() + emag_modules = list(/obj/item/borg/stun) + special_rechargables = list(/obj/item/extinguisher, /obj/item/weldingtool/largetank/cyborg) /obj/item/robot_module/engineering/handle_death(mob/living/silicon/robot/R, gibbed) var/obj/item/gripper/G = locate(/obj/item/gripper) in modules if(G) G.drop_gripped_item(silent = TRUE) +// Security cyborg module. /obj/item/robot_module/security name = "security robot module" module_type = "Security" subsystems = list(/mob/living/silicon/proc/subsystem_crew_monitor) + basic_modules = list( + /obj/item/flash/cyborg, + /obj/item/restraints/handcuffs/cable/zipties/cyborg, + /obj/item/melee/baton/loaded, + /obj/item/gun/energy/disabler/cyborg, + /obj/item/holosign_creator/security, + /obj/item/clothing/mask/gas/sechailer/cyborg + ) + emag_modules = list(/obj/item/gun/energy/laser/cyborg) + special_rechargables = list(/obj/item/melee/baton/loaded, /obj/item/gun/energy/disabler/cyborg) -/obj/item/robot_module/security/New() - ..() - modules += new /obj/item/restraints/handcuffs/cable/zipties/cyborg(src) - modules += new /obj/item/melee/baton/loaded(src) - modules += new /obj/item/gun/energy/disabler/cyborg(src) - modules += new /obj/item/holosign_creator/security(src) - modules += new /obj/item/clothing/mask/gas/sechailer/cyborg(src) - emag = new /obj/item/gun/energy/laser/cyborg(src) - - fix_modules() +/obj/item/robot_module/security/update_cells(unlink_cell = FALSE) + var/obj/item/melee/baton/B = locate(/obj/item/melee/baton/loaded) in modules + if(B) + B.link_new_cell(unlink_cell) +// Janitor cyborg module. /obj/item/robot_module/janitor name = "janitorial robot module" module_type = "Janitor" + basic_modules = list( + /obj/item/flash/cyborg, + /obj/item/soap/nanotrasen, + /obj/item/storage/bag/trash/cyborg, + /obj/item/mop/advanced/cyborg, + /obj/item/lightreplacer/cyborg, + /obj/item/holosign_creator, + /obj/item/extinguisher/mini + ) + emag_modules = list(/obj/item/reagent_containers/spray/cyborg_lube) + special_rechargables = list( + /obj/item/lightreplacer, + /obj/item/reagent_containers/spray/cyborg_lube, + /obj/item/extinguisher/mini + ) -/obj/item/robot_module/janitor/New() - ..() - modules += new /obj/item/soap/nanotrasen(src) - modules += new /obj/item/storage/bag/trash/cyborg(src) - modules += new /obj/item/mop/advanced/cyborg(src) - modules += new /obj/item/lightreplacer/cyborg(src) - modules += new /obj/item/holosign_creator(src) - modules += new /obj/item/extinguisher/mini(src) - emag = new /obj/item/reagent_containers/spray(src) +/obj/item/reagent_containers/spray/cyborg_lube + name = "Lube spray" + list_reagents = list("lube" = 250) - emag.reagents.add_reagent("lube", 250) - emag.name = "Lube spray" - - fix_modules() - -/obj/item/robot_module/janitor/respawn_consumable(mob/living/silicon/robot/R) - if(emag) - var/obj/item/reagent_containers/spray/S = emag - S.reagents.add_reagent("lube", 5) - ..() +/obj/item/reagent_containers/spray/cyborg_lube/cyborg_recharge(coeff, emagged) + if(emagged) + reagents.check_and_add("lube", volume, 2 * coeff) +// Service cyborg module. /obj/item/robot_module/butler name = "service robot module" module_type = "Service" + basic_modules = list( + /obj/item/flash/cyborg, + /obj/item/handheld_chem_dispenser/booze, + /obj/item/handheld_chem_dispenser/soda, + /obj/item/pen, + /obj/item/razor, + /obj/item/instrument/piano_synth, + /obj/item/healthanalyzer/advanced, + /obj/item/reagent_scanner/adv, + /obj/item/rsf/cyborg, + /obj/item/reagent_containers/dropper/cyborg, + /obj/item/lighter/zippo, + /obj/item/storage/bag/tray/cyborg, + /obj/item/reagent_containers/food/drinks/shaker + ) + emag_modules = list(/obj/item/reagent_containers/food/drinks/cans/beer/sleepy_beer) + special_rechargables = list( + /obj/item/reagent_containers/food/condiment/enzyme, + /obj/item/reagent_containers/food/drinks/cans/beer/sleepy_beer + ) -/obj/item/robot_module/butler/New() - ..() - modules += new /obj/item/handheld_chem_dispenser/booze(src) - modules += new /obj/item/handheld_chem_dispenser/soda(src) +/obj/item/rsf/cyborg + matter = 30 - modules += new /obj/item/pen(src) - modules += new /obj/item/razor(src) - modules += new /obj/item/instrument/piano_synth(src) - modules += new /obj/item/healthanalyzer/advanced(src) - modules += new /obj/item/reagent_scanner/adv(src) +// This is a special type of beer given when emagged, one sip and the target falls asleep. +/obj/item/reagent_containers/food/drinks/cans/beer/sleepy_beer + name = "Mickey Finn's Special Brew" + list_reagents = list("beer2" = 50) - var/obj/item/rsf/M = new /obj/item/rsf(src) - M.matter = 30 - modules += M - - modules += new /obj/item/reagent_containers/dropper/cyborg(src) - modules += new /obj/item/lighter/zippo(src) - modules += new /obj/item/storage/bag/tray/cyborg(src) - modules += new /obj/item/reagent_containers/food/drinks/shaker(src) - emag = new /obj/item/reagent_containers/food/drinks/cans/beer(src) - - var/datum/reagents/R = new/datum/reagents(50) - emag.reagents = R - R.my_atom = emag - R.add_reagent("beer2", 50) - emag.name = "Mickey Finn's Special Brew" - - fix_modules() - -/obj/item/robot_module/butler/respawn_consumable(mob/living/silicon/robot/R) - if(emag) - var/obj/item/reagent_containers/food/drinks/cans/beer/B = emag - B.reagents.add_reagent("beer2", 5) - ..() +/obj/item/reagent_containers/food/drinks/cans/beer/sleepy_beer/cyborg_recharge(coeff, emagged) + if(emagged) + reagents.check_and_add("beer2", volume, 5) /obj/item/robot_module/butler/add_languages(mob/living/silicon/robot/R) //full set of languages @@ -368,267 +515,352 @@ /obj/item/robot_module/miner name = "miner robot module" module_type = "Miner" - module_actions = list( - /datum/action/innate/robot_sight/meson, - ) + module_actions = list(/datum/action/innate/robot_sight/meson) custom_removals = list("KA modkits") + basic_modules = list( + /obj/item/flash/cyborg, + /obj/item/storage/bag/ore/cyborg, + /obj/item/pickaxe/drill/cyborg, + /obj/item/shovel, + /obj/item/weldingtool/mini, + /obj/item/extinguisher/mini, + /obj/item/storage/bag/sheetsnatcher/borg, + /obj/item/t_scanner/adv_mining_scanner/cyborg, + /obj/item/gun/energy/kinetic_accelerator/cyborg, + /obj/item/gps/cyborg + ) + emag_modules = list(/obj/item/borg/stun, /obj/item/pickaxe/drill/cyborg/diamond) + special_rechargables = list(/obj/item/extinguisher/mini, /obj/item/weldingtool/mini) -/obj/item/robot_module/miner/New() - ..() - modules += new /obj/item/storage/bag/ore/cyborg(src) - modules += new /obj/item/pickaxe/drill/cyborg(src) - modules += new /obj/item/shovel(src) - modules += new /obj/item/weldingtool/mini(src) - modules += new /obj/item/extinguisher/mini(src) - modules += new /obj/item/storage/bag/sheetsnatcher/borg(src) - modules += new /obj/item/t_scanner/adv_mining_scanner/cyborg(src) - modules += new /obj/item/gun/energy/kinetic_accelerator/cyborg(src) - modules += new /obj/item/gps/cyborg(src) - emag = new /obj/item/borg/stun(src) +// Replace their normal drill with a diamond drill. +/obj/item/robot_module/miner/emag_act() + . = ..() + for(var/obj/item/pickaxe/drill/cyborg/D in modules) + // Make sure we don't remove the diamond drill If they already have a diamond drill from the borg upgrade. + if(!istype(D, /obj/item/pickaxe/drill/cyborg/diamond)) + qdel(D) + basic_modules -= D // Remove it from this list so it doesn't get added in the rebuild. - fix_modules() +// Readd the normal drill +/obj/item/robot_module/miner/unemag() + var/obj/item/pickaxe/drill/cyborg/C = new(src) + basic_modules += C + return ..() +// This makes it so others can crowbar out KA upgrades from the miner borg. /obj/item/robot_module/miner/handle_custom_removal(component_id, mob/living/user, obj/item/W) - if(component_id == "KA modkits") - for(var/obj/item/gun/energy/kinetic_accelerator/cyborg/D in src) - D.attackby(W, user) - return TRUE - return ..() + if(component_id == "KA modkits") + for(var/obj/item/gun/energy/kinetic_accelerator/cyborg/D in src) + D.crowbar_act(user, W) + return TRUE + return ..() +// Deathsquad cyborg module. /obj/item/robot_module/deathsquad name = "NT advanced combat module" module_type = "Malf" - module_actions = list( - /datum/action/innate/robot_sight/thermal, + module_actions = list(/datum/action/innate/robot_sight/thermal) + basic_modules = list( + /obj/item/flash/cyborg, + /obj/item/melee/energy/sword/cyborg, + /obj/item/gun/energy/pulse/cyborg, + /obj/item/crowbar/cyborg ) -/obj/item/robot_module/deathsquad/New() - ..() - modules += new /obj/item/melee/energy/sword/cyborg(src) - modules += new /obj/item/gun/energy/pulse/cyborg(src) - modules += new /obj/item/crowbar(src) - emag = null - - fix_modules() - +// Sydicate assault cyborg module. /obj/item/robot_module/syndicate name = "syndicate assault robot module" module_type = "Malf" // cuz it looks cool + basic_modules = list( + /obj/item/flash/cyborg, + /obj/item/melee/energy/sword/cyborg, + /obj/item/gun/energy/printer, + /obj/item/gun/projectile/revolver/grenadelauncher/multi/cyborg, + /obj/item/card/emag, + /obj/item/crowbar/cyborg, + /obj/item/pinpointer/operative + ) -/obj/item/robot_module/syndicate/New() - ..() - modules += new /obj/item/melee/energy/sword/cyborg(src) - modules += new /obj/item/gun/energy/printer(src) - modules += new /obj/item/gun/projectile/revolver/grenadelauncher/multi/cyborg(src) - modules += new /obj/item/card/emag(src) - modules += new /obj/item/crowbar/cyborg(src) - modules += new /obj/item/pinpointer/operative(src) - emag = null - - fix_modules() - +// Sydicate medical cyborg module. /obj/item/robot_module/syndicate_medical name = "syndicate medical robot module" module_type = "Malf" - stacktypes = list( - /obj/item/stack/medical/bruise_pack/advanced = 25, - /obj/item/stack/medical/ointment/advanced = 25, - /obj/item/stack/medical/splint = 25, - /obj/item/stack/nanopaste = 25 + basic_modules = list( + /obj/item/flash/cyborg, + /obj/item/healthanalyzer/advanced, + /obj/item/reagent_scanner/adv, + /obj/item/bodyanalyzer/borg/syndicate, + /obj/item/borg_defib, + /obj/item/handheld_defibrillator, + /obj/item/roller_holder, + /obj/item/reagent_containers/borghypo/syndicate, + /obj/item/scalpel/laser/laser1, + /obj/item/hemostat, + /obj/item/retractor, + /obj/item/melee/energy/sword/cyborg/saw, //Energy saw -- primary weapon + /obj/item/surgicaldrill, + /obj/item/bonesetter, + /obj/item/bonegel, + /obj/item/FixOVein, + /obj/item/card/emag, + /obj/item/crowbar/cyborg, + /obj/item/pinpointer/operative, + /obj/item/stack/medical/bruise_pack/advanced/cyborg/syndicate, + /obj/item/stack/medical/ointment/advanced/cyborg/syndicate, + /obj/item/stack/medical/splint/cyborg/syndicate, + /obj/item/stack/nanopaste/cyborg/syndicate, + /obj/item/gun/medbeam, + /obj/item/extinguisher/mini, + /obj/item/gripper/medical ) + special_rechargables = list(/obj/item/extinguisher/mini) -/obj/item/robot_module/syndicate_medical/New() - ..() - modules += new /obj/item/healthanalyzer/advanced(src) - modules += new /obj/item/reagent_scanner/adv(src) - modules += new /obj/item/bodyanalyzer/borg/syndicate(src) - modules += new /obj/item/borg_defib(src) - modules += new /obj/item/handheld_defibrillator(src) - modules += new /obj/item/roller_holder(src) - modules += new /obj/item/reagent_containers/borghypo/syndicate(src) - modules += new /obj/item/extinguisher/mini(src) - modules += new /obj/item/stack/medical/bruise_pack/advanced(src) - modules += new /obj/item/stack/medical/ointment/advanced(src) - modules += new /obj/item/stack/medical/splint(src) - modules += new /obj/item/stack/nanopaste(src) - modules += new /obj/item/scalpel/laser/laser1(src) - modules += new /obj/item/hemostat(src) - modules += new /obj/item/retractor(src) - modules += new /obj/item/bonegel(src) - modules += new /obj/item/FixOVein(src) - modules += new /obj/item/bonesetter(src) - modules += new /obj/item/surgicaldrill(src) - modules += new /obj/item/gripper/medical(src) - modules += new /obj/item/gun/medbeam(src) - modules += new /obj/item/melee/energy/sword/cyborg/saw(src) //Energy saw -- primary weapon - modules += new /obj/item/card/emag(src) - modules += new /obj/item/crowbar/cyborg(src) - modules += new /obj/item/pinpointer/operative(src) - emag = null - - fix_modules() - +// Sydicate engineer/sabotuer cyborg module. /obj/item/robot_module/syndicate_saboteur name = "engineering robot module" //to disguise in examine module_type = "Malf" - - stacktypes = list( - /obj/item/stack/sheet/metal/cyborg = 50, - /obj/item/stack/sheet/glass/cyborg = 50, - /obj/item/stack/sheet/rglass/cyborg = 50, - /obj/item/stack/cable_coil/cyborg = 50, - /obj/item/stack/rods/cyborg = 60, - /obj/item/stack/tile/plasteel = 20 - ) - -/obj/item/robot_module/syndicate_saboteur/New() - ..() - modules += new /obj/item/rcd/borg/syndicate(src) - modules += new /obj/item/rpd(src) - modules += new /obj/item/extinguisher(src) - modules += new /obj/item/weldingtool/largetank/cyborg(src) - modules += new /obj/item/screwdriver/cyborg(src) - modules += new /obj/item/wrench/cyborg(src) - modules += new /obj/item/crowbar/cyborg(src) - modules += new /obj/item/wirecutters/cyborg(src) - modules += new /obj/item/multitool/cyborg(src) - modules += new /obj/item/t_scanner(src) - modules += new /obj/item/analyzer(src) - modules += new /obj/item/gripper(src) - modules += new /obj/item/melee/energy/sword/cyborg(src) - modules += new /obj/item/card/emag(src) - modules += new /obj/item/borg_chameleon(src) - modules += new /obj/item/pinpointer/operative(src) - emag = null - - for(var/T in stacktypes) - var/obj/item/stack/sheet/W = new T(src) - W.amount = stacktypes[T] - modules += W - - fix_modules() + basic_modules = list( + /obj/item/flash/cyborg, + /obj/item/rcd/borg/syndicate, + /obj/item/rpd, + /obj/item/extinguisher, + /obj/item/weldingtool/largetank/cyborg, + /obj/item/screwdriver/cyborg, + /obj/item/wrench/cyborg, + /obj/item/crowbar/cyborg, + /obj/item/wirecutters/cyborg, + /obj/item/multitool/cyborg, + /obj/item/t_scanner, + /obj/item/analyzer, + /obj/item/gripper, + /obj/item/melee/energy/sword/cyborg, + /obj/item/card/emag, + /obj/item/borg_chameleon, + /obj/item/pinpointer/operative, + /obj/item/stack/sheet/metal/cyborg, + /obj/item/stack/rods/cyborg, + /obj/item/stack/tile/plasteel/cyborg, + /obj/item/stack/cable_coil/cyborg, + /obj/item/stack/sheet/glass/cyborg, + /obj/item/stack/sheet/rglass/cyborg + ) + special_rechargables = list(/obj/item/extinguisher, /obj/item/weldingtool/largetank/cyborg) /obj/item/robot_module/destroyer name = "destroyer robot module" module_type = "Malf" - module_actions = list( - /datum/action/innate/robot_sight/thermal, + module_actions = list(/datum/action/innate/robot_sight/thermal) + basic_modules = list( + /obj/item/flash/cyborg, + /obj/item/gun/energy/immolator/multi/cyborg, // See comments on /robot_module/combat below + /obj/item/melee/baton/loaded, // secondary weapon, for things immune to burn, immune to ranged weapons, or for arresting low-grade threats + /obj/item/restraints/handcuffs/cable/zipties/cyborg, + /obj/item/pickaxe/drill/jackhammer, // for breaking walls to execute flanking moves + /obj/item/borg/destroyer/mobility ) - -/obj/item/robot_module/destroyer/New() - ..() - - modules += new /obj/item/gun/energy/immolator/multi/cyborg(src) // See comments on /robot_module/combat below - modules += new /obj/item/melee/baton/loaded(src) // secondary weapon, for things immune to burn, immune to ranged weapons, or for arresting low-grade threats - modules += new /obj/item/restraints/handcuffs/cable/zipties/cyborg(src) - modules += new /obj/item/pickaxe/drill/jackhammer(src) // for breaking walls to execute flanking moves - modules += new /obj/item/borg/destroyer/mobility(src) - emag = null - fix_modules() - + special_rechargables = list(/obj/item/melee/baton/loaded) /obj/item/robot_module/combat name = "combat robot module" module_type = "Malf" - module_actions = list() - -/obj/item/robot_module/combat/New() - ..() - modules += new /obj/item/gun/energy/immolator/multi/cyborg(src) // primary weapon, strong at close range (ie: against blob/terror/xeno), but consumes a lot of energy per shot. - // Borg gets 40 shots of this weapon. Gamma Sec ERT gets 10. - // So, borg has way more burst damage, but also takes way longer to recharge / get back in the fight once depleted. Has to find a borg recharger and sit in it for ages. - // Organic gamma sec ERT carries alternate weapons, including a box of flashbangs, and can load up on a huge number of guns from science. Borg cannot do either. - // Overall, gamma borg has higher skill floor but lower skill ceiling. - modules += new /obj/item/melee/baton/loaded(src) // secondary weapon, for things immune to burn, immune to ranged weapons, or for arresting low-grade threats - modules += new /obj/item/restraints/handcuffs/cable/zipties/cyborg(src) - modules += new /obj/item/pickaxe/drill/jackhammer(src) // for breaking walls to execute flanking moves - emag = null - fix_modules() - + basic_modules = list( + /obj/item/flash/cyborg, + /obj/item/gun/energy/immolator/multi/cyborg, // primary weapon, strong at close range (ie: against blob/terror/xeno), but consumes a lot of energy per shot. + // Borg gets 40 shots of this weapon. Gamma Sec ERT gets 10. + // So, borg has way more burst damage, but also takes way longer to recharge / get back in the fight once depleted. Has to find a borg recharger and sit in it for ages. + // Organic gamma sec ERT carries alternate weapons, including a box of flashbangs, and can load up on a huge number of guns from science. Borg cannot do either. + // Overall, gamma borg has higher skill floor but lower skill ceiling. + /obj/item/melee/baton/loaded, // secondary weapon, for things immune to burn, immune to ranged weapons, or for arresting low-grade threats + /obj/item/restraints/handcuffs/cable/zipties/cyborg, + /obj/item/pickaxe/drill/jackhammer // for breaking walls to execute flanking moves + ) + special_rechargables = list(/obj/item/melee/baton/loaded) +// Xenomorph cyborg module. /obj/item/robot_module/alien/hunter name = "alien hunter module" module_type = "Standard" - module_actions = list( - /datum/action/innate/robot_sight/thermal/alien, + module_actions = list(/datum/action/innate/robot_sight/thermal/alien) + basic_modules = list( + /obj/item/melee/energy/alien/claws, + /obj/item/flash/cyborg/alien, + /obj/item/reagent_containers/spray/alien/stun, + /obj/item/reagent_containers/spray/alien/smoke, + ) + emag_modules = list(/obj/item/reagent_containers/spray/alien/acid) + special_rechargables = list( + /obj/item/reagent_containers/spray/alien/acid, + /obj/item/reagent_containers/spray/alien/stun, + /obj/item/reagent_containers/spray/alien/smoke ) -/obj/item/robot_module/alien/hunter/New() - ..() - modules += new /obj/item/melee/energy/alien/claws(src) - modules += new /obj/item/flash/cyborg/alien(src) - var/obj/item/reagent_containers/spray/alien/stun/S = new /obj/item/reagent_containers/spray/alien/stun(src) - S.reagents.add_reagent("ether",250) //nerfed to sleeptoxin to make it less instant drop. - modules += S - var/obj/item/reagent_containers/spray/alien/smoke/A = new /obj/item/reagent_containers/spray/alien/smoke(src) - S.reagents.add_reagent("water",50) //Water is used as a dummy reagent for the smoke bombs. More of an ammo counter. - modules += A - emag = new /obj/item/reagent_containers/spray/alien/acid(src) - emag.reagents.add_reagent("facid", 125) - emag.reagents.add_reagent("sacid", 125) - - fix_modules() - /obj/item/robot_module/alien/hunter/add_languages(mob/living/silicon/robot/R) - ..() + . = ..() R.add_language("xenocommon", 1) +// Maintenance drone module. /obj/item/robot_module/drone name = "drone module" module_type = "Engineer" - stacktypes = list( - /obj/item/stack/sheet/wood = 10, - /obj/item/stack/sheet/rglass/cyborg = 50, - /obj/item/stack/tile/wood = 20, - /obj/item/stack/rods/cyborg = 60, - /obj/item/stack/tile/plasteel = 20, - /obj/item/stack/sheet/metal/cyborg = 50, - /obj/item/stack/sheet/glass/cyborg = 50, - /obj/item/stack/cable_coil/cyborg = 30 - ) - -/obj/item/robot_module/drone/New() - ..() - modules += new /obj/item/weldingtool/largetank/cyborg(src) - modules += new /obj/item/screwdriver/cyborg(src) - modules += new /obj/item/wrench/cyborg(src) - modules += new /obj/item/crowbar/cyborg(src) - modules += new /obj/item/wirecutters/cyborg(src) - modules += new /obj/item/multitool/cyborg(src) - modules += new /obj/item/lightreplacer/cyborg(src) - modules += new /obj/item/gripper(src) - modules += new /obj/item/matter_decompiler(src) - modules += new /obj/item/reagent_containers/spray/cleaner/drone(src) - modules += new /obj/item/soap(src) - modules += new /obj/item/t_scanner(src) - modules += new /obj/item/rpd(src) - - for(var/T in stacktypes) - var/obj/item/stack/sheet/W = new T(src) - W.amount = stacktypes[T] - modules += W - - fix_modules() - -/obj/item/robot_module/drone/add_default_robot_items() - return - -/obj/item/robot_module/drone/respawn_consumable(mob/living/silicon/robot/R) - var/obj/item/reagent_containers/spray/cleaner/C = locate() in modules - C.reagents.add_reagent("cleaner", 3) - ..() - + basic_modules = list( + /obj/item/weldingtool/largetank/cyborg, + /obj/item/screwdriver/cyborg, + /obj/item/wrench/cyborg, + /obj/item/crowbar/cyborg, + /obj/item/wirecutters/cyborg/drone, + /obj/item/multitool/cyborg/drone, + /obj/item/lightreplacer/cyborg, + /obj/item/gripper, + /obj/item/matter_decompiler, + /obj/item/reagent_containers/spray/cleaner/drone, + /obj/item/soap, + /obj/item/t_scanner, + /obj/item/rpd, + /obj/item/stack/sheet/metal/cyborg, + /obj/item/stack/rods/cyborg, + /obj/item/stack/tile/plasteel/cyborg, + /obj/item/stack/cable_coil/cyborg, + /obj/item/stack/sheet/glass/cyborg, + /obj/item/stack/sheet/rglass/cyborg, + /obj/item/stack/sheet/wood/cyborg, + /obj/item/stack/tile/wood/cyborg + ) + special_rechargables = list( + /obj/item/reagent_containers/spray/cleaner/drone, + /obj/item/weldingtool/largetank/cyborg, + /obj/item/lightreplacer/cyborg + ) /obj/item/robot_module/drone/handle_death(mob/living/silicon/robot/R, gibbed) var/obj/item/gripper/G = locate(/obj/item/gripper) in modules if(G) G.drop_gripped_item(silent = TRUE) -//checks whether this item is a module of the robot it is located in. +/// Checks whether this item is a module of the robot it is located in. /obj/item/proc/is_robot_module() if(!istype(loc, /mob/living/silicon/robot)) - return 0 + return FALSE var/mob/living/silicon/robot/R = loc return (src in R.module.modules) + +/** + * # The robot_energy_storage datum + * + * Used to handle robot stack items, such as metal, wood, nanopaste, etc. + * + * To make things simple, the default `cost` of using 1 item from a borg stack, is 1. + * So then for example, when we have a `max_energy` of 50, the borg can use 50 of that item before it runs out. + * + * The `recharge_rate` will be affected by the charge rate of a borg recharger, depending on the level of parts. By default it is 1. + * This amount will be given every 2 seconds. So at round start, rechargers will give 1 energy back every 2 seconds, to each stack the borg has. + */ +/datum/robot_energy_storage + /// The name of the energy storage. + var/name = "Generic energy storage" + /// The name that will be displayed in the status panel. + var/statpanel_name = "Statpanel name" + /// The max amount of energy the stack can hold at once. + var/max_energy = 50 + /// The amount of energy the stack will regain while charging. + var/recharge_rate = 1 + /// Current amount of energy. + var/energy + +/datum/robot_energy_storage/New(obj/item/robot_module/R = null) + if(!energy) + energy = max_energy + if(R) + R.storages += src + +/** + * Called whenever the cyborg uses one of its stacks. Subtract the amount used from this datum's `energy` variable. + * + * Arguments: + * * amount - the number to subtract from the `energy` var. + */ +/datum/robot_energy_storage/proc/use_charge(amount) + if(energy < amount) + return FALSE // If we have more energy that we're about to drain, return + + energy -= amount + return TRUE + +/** + * Called whenever the cyborg is recharging and gains charge on its stack, or when clicking on other same-type stacks in the world. + * + * Arguments: + * * amount - the number to add to the `energy` var. + */ +/datum/robot_energy_storage/proc/add_charge(amount) + energy = min(energy + amount, max_energy) + +/datum/robot_energy_storage/metal + name = "Metal Synthesizer" + statpanel_name = "Metal" + +/datum/robot_energy_storage/metal_tile + name = "Floor tile Synthesizer" + statpanel_name = "Floor tiles" + max_energy = 60 + +/datum/robot_energy_storage/rods + name = "Rod Synthesizer" + statpanel_name = "Rods" + +/datum/robot_energy_storage/glass + name = "Glass Synthesizer" + statpanel_name = "Glass" + +/datum/robot_energy_storage/rglass + name = "Reinforced glass Synthesizer" + statpanel_name = "Reinforced glass" + +/datum/robot_energy_storage/wood + name = "Wood Synthesizer" + statpanel_name = "Wood" + +/datum/robot_energy_storage/wood_tile + name = "Wooden tile Synthesizer" + statpanel_name = "Wooden tiles" + max_energy = 60 + +/datum/robot_energy_storage/cable + name = "Cable Synthesizer" + statpanel_name = "Cable" + +// For the medical stacks, even though the recharge rate is 0, it will be set to 1 by default because of a `max()` proc. +// It will always take ~12 seconds to fully recharge these stacks beacuse of this. This time does not apply to the syndicate storages. +/datum/robot_energy_storage/medical + name = "Medical Synthesizer" + max_energy = 6 + recharge_rate = 0 + +/datum/robot_energy_storage/medical/splint + name = "Splint Synthesizer" + statpanel_name = "Splints" + +/datum/robot_energy_storage/medical/splint/syndicate + max_energy = 25 + +/datum/robot_energy_storage/medical/adv_burn_kit + name = "Burn kit Synthesizer" + statpanel_name = "Burn kits" + +/datum/robot_energy_storage/medical/adv_burn_kit/syndicate + max_energy = 25 + +/datum/robot_energy_storage/medical/adv_brute_kit + name = "Trauma kit Synthesizer" + statpanel_name = "Brute kits" + +/datum/robot_energy_storage/medical/adv_brute_kit/syndicate + max_energy = 25 + +/datum/robot_energy_storage/medical/nanopaste + name = "Nanopaste Synthesizer" + statpanel_name = "Nanopaste" + +/datum/robot_energy_storage/medical/nanopaste/syndicate + max_energy = 25 diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index 47bf097d39a..a54cb95956c 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -288,13 +288,7 @@ // this function displays the stations manifest in a separate window /mob/living/silicon/proc/show_station_manifest() - var/dat - dat += "

      Crew Manifest

      " - if(GLOB.data_core) - dat += GLOB.data_core.get_manifest(1) // make it monochrome - dat += "
      " - src << browse(dat, "window=airoster") - onclose(src, "airoster") + GLOB.generic_crew_manifest.ui_interact(usr, state = GLOB.not_incapacitated_state) /mob/living/silicon/assess_threat() //Secbots won't hunt silicon units return -10 @@ -373,4 +367,3 @@ /////////////////////////////////// EAR DAMAGE //////////////////////////////////// /mob/living/silicon/can_hear() . = TRUE - diff --git a/code/modules/mob/living/simple_animal/bot/mulebot.dm b/code/modules/mob/living/simple_animal/bot/mulebot.dm index e8d3ffeb54e..c17b911b0f2 100644 --- a/code/modules/mob/living/simple_animal/bot/mulebot.dm +++ b/code/modules/mob/living/simple_animal/bot/mulebot.dm @@ -135,7 +135,7 @@ emagged = 1 if(!open) locked = !locked - to_chat(user, "You [locked ? "lock" : "unlock"] the [src]'s controls!") + to_chat(user, "You [locked ? "lock" : "unlock"] [src]'s controls!") flick("mulebot-emagged", src) playsound(loc, 'sound/effects/sparks1.ogg', 100, 0) diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm index e45f8e311fd..2e0f90ec24e 100644 --- a/code/modules/mob/living/simple_animal/constructs.dm +++ b/code/modules/mob/living/simple_animal/constructs.dm @@ -4,9 +4,10 @@ mob_biotypes = NONE speak_emote = list("hisses") emote_hear = list("wails","screeches") - response_help = "thinks better of touching" + response_help = "thinks better of touching" response_disarm = "flails at" - response_harm = "punches" + response_harm = "punches" + icon = 'icons/mob/cult.dmi' icon_dead = "shade_dead" speed = 0 a_intent = INTENT_HARM @@ -26,6 +27,9 @@ deathmessage = "collapses in a shattered heap." var/construct_type = "shade" var/list/construct_spells = list() + /// Is this a holy/purified construct? + var/holy = FALSE + /// Message to send to the construct when they are created, containing information about their role. var/playstyle_string = "You are a generic construct! Your job is to not exist, and you should probably adminhelp this." /mob/living/simple_animal/hostile/construct/New() @@ -98,7 +102,6 @@ name = "Juggernaut" real_name = "Juggernaut" desc = "A possessed suit of armour driven by the will of the restless dead" - icon = 'icons/mob/mob.dmi' icon_state = "behemoth" icon_living = "behemoth" maxHealth = 250 @@ -130,8 +133,8 @@ if(prob(reflectchance)) if((P.damage_type == BRUTE || P.damage_type == BURN)) adjustBruteLoss(P.damage * 0.5) - visible_message("The [P.name] gets reflected by [src]'s shell!", \ - "The [P.name] gets reflected by [src]'s shell!") + visible_message("[P] gets reflected by [src]'s shell!", \ + "[P] gets reflected by [src]'s shell!") P.reflect_back(src, list(0, 0, -1, 1, -2, 2, -2, 2, -2, 2, -3, 3, -3, 3)) @@ -149,7 +152,6 @@ name = "Wraith" real_name = "Wraith" desc = "A wicked bladed shell contraption piloted by a bound spirit" - icon = 'icons/mob/mob.dmi' icon_state = "floating" icon_living = "floating" maxHealth = 75 @@ -174,7 +176,6 @@ name = "Artificer" real_name = "Artificer" desc = "A bulbous construct dedicated to building and maintaining Cult armies." - icon = 'icons/mob/mob.dmi' icon_state = "artificer" icon_living = "artificer" maxHealth = 50 @@ -254,7 +255,6 @@ name = "Behemoth" real_name = "Behemoth" desc = "The pinnacle of occult technology, Behemoths are the ultimate weapon in the Cult's arsenal." - icon = 'icons/mob/mob.dmi' icon_state = "behemoth" icon_living = "behemoth" maxHealth = 750 @@ -288,7 +288,6 @@ name = "Harvester" real_name = "Harvester" desc = "A harbinger of enlightenment. It'll be all over soon." - icon = 'icons/mob/mob.dmi' icon_state = "harvester" icon_living = "harvester" maxHealth = 60 @@ -316,6 +315,17 @@ AIStatus = AI_ON environment_smash = 1 //only token destruction, don't smash the cult wall NO STOP + +/mob/living/simple_animal/hostile/construct/proc/make_holy() + if(holy) // Already holy-fied + return + holy = TRUE + set_light(3, 5, LIGHT_COLOR_DARK_BLUE) + name = "Holy [name]" + real_name = "Holy [real_name]" + faction.Remove("cult") + + ///ui stuff /mob/living/simple_animal/hostile/construct/armoured/update_health_hud() diff --git a/code/modules/mob/living/simple_animal/friendly/dog.dm b/code/modules/mob/living/simple_animal/friendly/dog.dm index 415d012b402..666942b8042 100644 --- a/code/modules/mob/living/simple_animal/friendly/dog.dm +++ b/code/modules/mob/living/simple_animal/friendly/dog.dm @@ -140,8 +140,8 @@ var/dat = "
      Inventory of [name]

      " - dat += "
      Head: [inventory_head]" : "add_inv=head'>Nothing"]" - dat += "
      Back: [inventory_back]" : "add_inv=back'>Nothing"]" + dat += "
      Head: [html_encode(inventory_head)]" : "add_inv=head'>Nothing"]" + dat += "
      Back: [html_encode(inventory_back)]" : "add_inv=back'>Nothing"]" dat += "
      Collar: [pcollar]" : "add_inv=collar'>Nothing"]" var/datum/browser/popup = new(user, "mob[UID()]", "[src]", 440, 250) @@ -322,7 +322,7 @@ if(valid) if(health <= 0) - to_chat(user, "There is merely a dull, lifeless look in [real_name]'s eyes as you put the [item_to_add] on [p_them()].") + to_chat(user, "There is merely a dull, lifeless look in [real_name]'s eyes as you put [item_to_add] on [p_them()].") // :'( else if(user) user.visible_message("[user] puts [item_to_add] on [real_name]'s head. [src] looks at [user] and barks once.", "You put [item_to_add] on [real_name]'s head. [src] gives you a peculiar look, then wags [p_their()] tail once and barks.", @@ -503,53 +503,58 @@ /mob/living/simple_animal/pet/dog/corgi/Ian/handle_automated_movement() . = ..() //Feeding, chasing food, FOOOOODDDD - if(!resting && !buckled) - turns_since_scan++ - if(turns_since_scan > 5) - turns_since_scan = 0 - if((movement_target) && !(isturf(movement_target.loc) || ishuman(movement_target.loc) )) - movement_target = null - stop_automated_movement = 0 - if( !movement_target || !(movement_target.loc in oview(src, 3)) ) - movement_target = null - stop_automated_movement = 0 - for(var/obj/item/reagent_containers/food/snacks/S in oview(src,3)) - if(isturf(S.loc) || ishuman(S.loc)) - movement_target = S + if(resting || buckled) + return + + if(++turns_since_scan > 5) + turns_since_scan = 0 + + // Has a target, but it's not where it was before, and it wasn't picked up by someone. + if(movement_target && !(isturf(movement_target.loc) || ishuman(movement_target.loc))) + movement_target = null + stop_automated_movement = FALSE + + // No current target, or current target is out of range. + var/list/snack_range = oview(src, 3) + if(!movement_target || !(movement_target.loc in snack_range)) + movement_target = null + stop_automated_movement = FALSE + var/obj/item/possible_target = null + for(var/I in snack_range) + if(istype(I, /obj/item/reagent_containers/food/snacks)) // Noms + possible_target = I + break + else if(istype(I, /obj/item/paper)) // Important noms + if(prob(10)) + possible_target = I break - if(movement_target) - spawn(0) - stop_automated_movement = 1 - step_to(src,movement_target,1) - sleep(3) - step_to(src,movement_target,1) - sleep(3) - step_to(src,movement_target,1) + if(possible_target && (isturf(possible_target.loc) || ishuman(possible_target.loc))) // On the ground or in someone's hand. + movement_target = possible_target + if(movement_target) + INVOKE_ASYNC(src, .proc/move_to_target) - if(movement_target) //Not redundant due to sleeps, Item can be gone in 6 decisecomds - if(movement_target.loc.x < src.x) - dir = WEST - else if(movement_target.loc.x > src.x) - dir = EAST - else if(movement_target.loc.y < src.y) - dir = SOUTH - else if(movement_target.loc.y > src.y) - dir = NORTH - else - dir = SOUTH + if(prob(1)) + chasetail() - if(!Adjacent(movement_target)) //can't reach food through windows. - return +/mob/living/simple_animal/pet/dog/corgi/Ian/proc/move_to_target() + stop_automated_movement = TRUE + step_to(src, movement_target, 1) + sleep(3) + step_to(src, movement_target, 1) + sleep(3) + step_to(src, movement_target, 1) - if(isturf(movement_target.loc) ) - movement_target.attack_animal(src) - else if(ishuman(movement_target.loc) ) - if(prob(20)) - custom_emote(1, "stares at [movement_target.loc]'s [movement_target] with a sad puppy-face") + if(movement_target) // Not redundant due to sleeps, Item can be gone in 6 deciseconds + // Face towards the thing + dir = get_dir(src, movement_target) - if(prob(1)) - custom_emote(1, pick("dances around.","chases its tail!")) - spin(20, 1) + if(!Adjacent(movement_target)) //can't reach food through windows. + return + + if(isturf(movement_target.loc)) + movement_target.attack_animal(src) // Eat the thing + else if(prob(30) && ishuman(movement_target.loc)) // mean hooman has stolen it + custom_emote(EMOTE_VISUAL, "stares at [movement_target.loc]'s [movement_target] with a sad puppy-face.") /obj/item/reagent_containers/food/snacks/meat/corgi name = "Corgi meat" diff --git a/code/modules/mob/living/simple_animal/hostile/bees.dm b/code/modules/mob/living/simple_animal/hostile/bees.dm index ac245258c7b..0370a84baba 100644 --- a/code/modules/mob/living/simple_animal/hostile/bees.dm +++ b/code/modules/mob/living/simple_animal/hostile/bees.dm @@ -265,6 +265,7 @@ icon_state = "queen_item" item_state = "" icon = 'icons/mob/bees.dmi' + gender = FEMALE var/mob/living/simple_animal/hostile/poison/bees/queen/queen diff --git a/code/modules/mob/living/simple_animal/hostile/hivebot.dm b/code/modules/mob/living/simple_animal/hostile/hivebot.dm index 7359d11384f..6402526be42 100644 --- a/code/modules/mob/living/simple_animal/hostile/hivebot.dm +++ b/code/modules/mob/living/simple_animal/hostile/hivebot.dm @@ -79,12 +79,12 @@ var/datum/effect_system/smoke_spread/smoke = new smoke.set_up(5, 0, src.loc) smoke.start() - visible_message("The [src] warps in!") + visible_message("[src] warps in!") playsound(src.loc, 'sound/effects/empulse.ogg', 25, 1) /mob/living/simple_animal/hostile/hivebot/tele/proc/warpbots() icon_state = "def_radar" - visible_message("The [src] turns on!") + visible_message("[src] turns on!") while(bot_amt > 0) bot_amt-- switch(bot_type) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm index dd0316f4177..6324e8bb7a6 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm @@ -189,7 +189,7 @@ Difficulty: Very Hard var/turf/target_turf = get_turf(target) playsound(src, 'sound/magic/clockwork/invoke_general.ogg', 200, TRUE, 2) newtonian_move(get_dir(target_turf, src)) - var/angle_to_target = Get_Angle(src, target_turf) + var/angle_to_target = get_angle(src, target_turf) if(isnum(set_angle)) angle_to_target = set_angle var/static/list/colossus_shotgun_shot_angles = list(12.5, 7.5, 2.5, -2.5, -7.5, -12.5) diff --git a/code/modules/mob/living/simple_animal/hostile/mining/goldgrub.dm b/code/modules/mob/living/simple_animal/hostile/mining/goldgrub.dm index b1b3c7066b8..6f2239d334d 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining/goldgrub.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining/goldgrub.dm @@ -43,10 +43,10 @@ target = new_target if(target != null) if(istype(target, /obj/item/stack/ore) && loot.len < 10) - visible_message("The [name] looks at [target.name] with hungry eyes.") + visible_message("[src] looks at [target.name] with hungry eyes.") else if(isliving(target)) Aggro() - visible_message("The [name] tries to flee from [target.name]!") + visible_message("[src] tries to flee from [target.name]!") retreat_distance = 10 minimum_distance = 10 if(will_burrow) @@ -69,7 +69,7 @@ /mob/living/simple_animal/hostile/asteroid/goldgrub/proc/Burrow()//Begin the chase to kill the goldgrub in time if(!stat) - visible_message("The [name] buries into the ground, vanishing from sight!") + visible_message("[src] buries into the ground, vanishing from sight!") qdel(src) /mob/living/simple_animal/hostile/asteroid/goldgrub/bullet_act(obj/item/projectile/P) diff --git a/code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm index a2972b7d14f..819612d0f34 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm @@ -419,11 +419,13 @@ back = /obj/item/tank/internals/oxygen mask = /obj/item/clothing/mask/breath if("Cultist") - uniform = /obj/item/clothing/under/roman - suit = /obj/item/clothing/suit/hooded/cultrobes - suit_store = /obj/item/tome - r_pocket = /obj/item/restraints/legcuffs/bola/cult + uniform = /obj/item/clothing/under/color/black + back = /obj/item/storage/backpack/cultpack + suit = /obj/item/clothing/suit/hooded/cultrobes/alt + if(prob(40)) + suit_store = /obj/item/melee/cultblade l_pocket = /obj/item/melee/cultblade/dagger - glasses = /obj/item/clothing/glasses/hud/health/night - backpack_contents = list(/obj/item/reagent_containers/food/drinks/bottle/unholywater = 1, /obj/item/cult_shift = 1, /obj/item/flashlight/flare = 1, /obj/item/stack/sheet/runed_metal = 15) + if(prob(60)) + r_pocket = /obj/item/reagent_containers/food/drinks/bottle/unholywater + backpack_contents = list(/obj/item/tome = 1, /obj/item/restraints/legcuffs/bola/cult = 1, /obj/item/stack/sheet/runed_metal = 15) . = ..() diff --git a/code/modules/mob/living/simple_animal/hostile/mining/mining.dm b/code/modules/mob/living/simple_animal/hostile/mining/mining.dm index a888fa7ee9a..d5f60384e1f 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining/mining.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining/mining.dm @@ -48,7 +48,7 @@ if(!stat) Aggro() if(T.throwforce <= 20) - visible_message("The [T.name] [throw_message] [src.name]!") + visible_message("[T] [throw_message] [src.name]!") return ..() diff --git a/code/modules/mob/living/simple_animal/hostile/mushroom.dm b/code/modules/mob/living/simple_animal/hostile/mushroom.dm index 6728330e492..ed22692ffac 100644 --- a/code/modules/mob/living/simple_animal/hostile/mushroom.dm +++ b/code/modules/mob/living/simple_animal/hostile/mushroom.dm @@ -148,7 +148,7 @@ /mob/living/simple_animal/hostile/mushroom/proc/Bruise() if(!bruised && !stat) - src.visible_message("The [src.name] was bruised!") + src.visible_message("[src] was bruised!") bruised = 1 /mob/living/simple_animal/hostile/mushroom/attackby(obj/item/I as obj, mob/user as mob, params) diff --git a/code/modules/mob/living/simple_animal/hostile/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/syndicate.dm index 83485dcee3a..b69836d1f26 100644 --- a/code/modules/mob/living/simple_animal/hostile/syndicate.dm +++ b/code/modules/mob/living/simple_animal/hostile/syndicate.dm @@ -50,7 +50,7 @@ user.do_attack_animation(src) if(O.force) if(prob(melee_block_chance)) - visible_message("[src] blocks the [O] with its shield! ") + visible_message("[src] blocks [O] with its shield! ") else var/damage = O.force if(O.damtype == STAMINA) @@ -59,11 +59,11 @@ visible_message("[src] is unharmed by [O]!") return adjustHealth(damage) - visible_message("[src] has been attacked with the [O] by [user]. ") + visible_message("[src] has been attacked with [O] by [user]. ") playsound(loc, O.hitsound, 25, 1, -1) else to_chat(usr, "This weapon is ineffective, it does no damage.") - visible_message("[user] gently taps [src] with the [O]. ") + visible_message("[user] gently taps [src] with [O]. ") /mob/living/simple_animal/hostile/syndicate/melee/bullet_act(obj/item/projectile/Proj) diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/ghost.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/ghost.dm index daed363b8d9..685b508c291 100644 --- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/ghost.dm +++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/ghost.dm @@ -42,5 +42,6 @@ to_chat(user, "Someone else already took this spider.") return key = user.key + to_chat(src, "For more information, check the wiki page: ([config.wikiurl]/index.php/Terror_Spider)") for(var/mob/dead/observer/G in GLOB.player_list) G.show_message("A ghost has taken control of [src]. ([ghost_follow_link(src, ghost=G)]).") diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_spiders.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_spiders.dm index 303bf8151ef..9f93bcab1ef 100644 --- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_spiders.dm +++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_spiders.dm @@ -319,7 +319,7 @@ GLOBAL_LIST_EMPTY(ts_spiderling_list) if(stat == DEAD) // Can't use if(.) for this due to the fact it can sometimes return FALSE even when mob is alive. if(prob(2)) // 2% chance every cycle to decompose - visible_message("\The dead body of the [src] decomposes!") + visible_message("The dead body of [src] decomposes!") gib() else if(degenerate) diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm index 18c7e17e655..4a649dfe7e0 100644 --- a/code/modules/mob/living/simple_animal/parrot.dm +++ b/code/modules/mob/living/simple_animal/parrot.dm @@ -137,10 +137,10 @@ var/dat = {""} - dat += "" + dat += "" if(can_collar) dat += "" - dat += "" + dat += "" dat += {"
      Headset:[(ears && !(ears.flags&ABSTRACT)) ? ears : "Empty"]
      Headset:[(ears && !(ears.flags&ABSTRACT)) ? html_encode(ears) : "Empty"]
       
      Collar:[(pcollar && !(pcollar.flags&ABSTRACT)) ? pcollar : "Empty"]
      Collar:[(pcollar && !(pcollar.flags&ABSTRACT)) ? html_encode(pcollar) : "Empty"]
      Close @@ -562,7 +562,9 @@ if(held_item) to_chat(src, "You are already holding [held_item]") return 1 - + if(istype(loc, /obj/machinery/disposal) || istype(loc, /obj/structure/disposalholder)) + to_chat(src, "You are inside a disposal chute!") + return 1 for(var/obj/item/I in view(1, src)) //Make sure we're not already holding it and it's small enough if(I.loc != src && I.w_class <= WEIGHT_CLASS_SMALL) diff --git a/code/modules/mob/living/simple_animal/shade.dm b/code/modules/mob/living/simple_animal/shade.dm index eaf5c6e0625..3e4686e146d 100644 --- a/code/modules/mob/living/simple_animal/shade.dm +++ b/code/modules/mob/living/simple_animal/shade.dm @@ -2,7 +2,7 @@ name = "Shade" real_name = "Shade" desc = "A bound spirit" - icon = 'icons/mob/mob.dmi' + icon = 'icons/mob/cult.dmi' icon_state = "shade" icon_living = "shade" icon_dead = "shade_dead" @@ -34,6 +34,10 @@ deathmessage = "lets out a contented sigh as their form unwinds." var/holy = FALSE +/mob/living/simple_animal/shade/cult/Initialize(mapload) + . = ..() + icon_state = SSticker.cultdat?.shade_icon_state + /mob/living/simple_animal/shade/death(gibbed) . = ..() SSticker.mode.remove_cultist(mind, FALSE) @@ -48,11 +52,6 @@ /mob/living/simple_animal/shade/Process_Spacemove() return TRUE - -/mob/living/simple_animal/shade/cult/Initialize(mapload) - . = ..() - icon_state = SSticker.cultdat?.shade_icon_state - /mob/living/simple_animal/shade/holy holy = TRUE icon_state = "shade_angelic" diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index f117d03ccdb..7a34f746728 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -474,7 +474,7 @@ return user.set_machine(src) - var/dat = "
      Collar:[(pcollar && !(pcollar.flags & ABSTRACT)) ? pcollar : "Empty"]
      " + var/dat = "
      Collar:[(pcollar && !(pcollar.flags & ABSTRACT)) ? html_encode(pcollar) : "Empty"]
      " dat += "Close" var/datum/browser/popup = new(user, "mob\ref[src]", "[src]", 440, 250) @@ -645,4 +645,3 @@ /mob/living/simple_animal/Login() ..() walk(src, 0) // if mob is moving under ai control, then stop AI movement - diff --git a/code/modules/mob/living/simple_animal/slime/emote.dm b/code/modules/mob/living/simple_animal/slime/emote.dm index 94806ede9d1..0eceec7a124 100644 --- a/code/modules/mob/living/simple_animal/slime/emote.dm +++ b/code/modules/mob/living/simple_animal/slime/emote.dm @@ -30,38 +30,38 @@ return return custom_emote(m_type, message) if("bounce") - message = "The [src.name] bounces in place." + message = "[src] bounces in place." m_type = 1 if("custom") return custom_emote(m_type, message) if("jiggle") - message = "The [src.name] jiggles!" + message = "[src] jiggles!" m_type = 1 if("light") - message = "The [src.name] lights up for a bit, then stops." + message = "[src] lights up for a bit, then stops." m_type = 1 if("moan") - message = "The [src.name] moans." + message = "[src] moans." m_type = 2 if("shiver") - message = "The [src.name] shivers." + message = "[src] shivers." m_type = 2 if("sway") - message = "The [src.name] sways around dizzily." + message = "[src] sways around dizzily." m_type = 1 if("twitch") - message = "The [src.name] twitches." + message = "[src] twitches." m_type = 1 if("vibrate") - message = "The [src.name] vibrates!" + message = "[src] vibrates!" m_type = 1 if("noface") //mfw I have no face diff --git a/code/modules/mob/living/update_status.dm b/code/modules/mob/living/update_status.dm index 2c25e4d7613..b942b0cabe7 100644 --- a/code/modules/mob/living/update_status.dm +++ b/code/modules/mob/living/update_status.dm @@ -86,7 +86,7 @@ /mob/living/update_canmove(delay_action_updates = 0) var/fall_over = !can_stand() var/buckle_lying = !(buckled && !buckled.buckle_lying) - if(fall_over || resting || stunned) + if(fall_over || resting || stunned || (buckled && buckle_lying != 0)) drop_r_hand() drop_l_hand() else diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 95538b18995..e0a778a1737 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -560,8 +560,8 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \ /mob/proc/show_inv(mob/user) user.set_machine(src) var/dat = {" - - + + "} dat += {"
      Left Hand:[(l_hand && !(l_hand.flags&ABSTRACT)) ? l_hand : "Empty"]
      Right Hand:[(r_hand && !(r_hand.flags&ABSTRACT)) ? r_hand : "Empty"]
      Left Hand:[(l_hand && !(l_hand.flags&ABSTRACT)) ? html_encode(l_hand) : "Empty"]
      Right Hand:[(r_hand && !(r_hand.flags&ABSTRACT)) ? html_encode(r_hand) : "Empty"]
       
      Close @@ -963,6 +963,9 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \ statpanel("Status") // We only want alt-clicked turfs to come before Status stat(null, "Round ID: [GLOB.round_id ? GLOB.round_id : "NULL"]") + stat(null, "Map: [SSmapping.map_datum.fluff_name]") + if(SSmapping.next_map) + stat(null, "Next Map: [SSmapping.next_map.fluff_name]") if(mob_spell_list && mob_spell_list.len) for(var/obj/effect/proc_holder/spell/S in mob_spell_list) diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index ff48fe1256b..cb39d6cc9c0 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -174,6 +174,7 @@ var/stance_damage = 0 //Whether this mob's ability to stand has been affected + /// List of the active mutation types var/list/active_mutations = list() var/last_movement = -100 // Last world.time the mob actually moved of its own accord. diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm index 14901a8384d..61118a32cdb 100644 --- a/code/modules/mob/mob_grab.dm +++ b/code/modules/mob/mob_grab.dm @@ -193,6 +193,8 @@ /obj/item/grab/proc/adjust_position() if(affecting.buckled) return + if(!assailant.Adjacent(affecting)) // To prevent teleportation via grab + return if(affecting.lying && state != GRAB_KILL) animate(affecting, pixel_x = 0, pixel_y = 0, 5, 1, LINEAR_EASING) return //KJK diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 24b87e836fa..e10a405a749 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -478,9 +478,9 @@ GLOBAL_LIST_INIT(intents, list(INTENT_HELP,INTENT_DISARM,INTENT_GRAB,INTENT_HARM lname = "[lname] " to_chat(M, "[lname][follow][message]") -/proc/notify_ghosts(message, ghost_sound = null, enter_link = null, title = null, atom/source = null, image/alert_overlay = null, flashwindow = TRUE, action = NOTIFY_JUMP) //Easy notification of ghosts. +/proc/notify_ghosts(message, ghost_sound = null, enter_link = null, title = null, atom/source = null, image/alert_overlay = null, flashwindow = TRUE, action = NOTIFY_JUMP, role = null) //Easy notification of ghosts. for(var/mob/dead/observer/O in GLOB.player_list) - if(O.client) + if(O.client && (!role || (role in O.client.prefs.be_special))) to_chat(O, "[message][(enter_link) ? " [enter_link]" : ""]") if(ghost_sound) O << sound(ghost_sound) @@ -509,6 +509,17 @@ GLOBAL_LIST_INIT(intents, list(INTENT_HELP,INTENT_DISARM,INTENT_GRAB,INTENT_HARM alert_overlay.plane = FLOAT_PLANE A.overlays += alert_overlay +/** + * Checks if a mob's ghost can reenter their body or not. Used to check for DNR or AntagHUD. + * + * Returns FALSE if there is a ghost, and it can't reenter the body. Returns TRUE otherwise. + */ +/mob/proc/ghost_can_reenter() + var/mob/dead/observer/ghost = get_ghost(TRUE) + if(ghost && !ghost.can_reenter_corpse) + return FALSE + return TRUE + /mob/proc/switch_to_camera(obj/machinery/camera/C) if(!C.can_use() || incapacitated() || (get_dist(C, src) > 1 || machine != src || !has_vision())) return FALSE @@ -670,4 +681,3 @@ GLOBAL_LIST_INIT(intents, list(INTENT_HELP,INTENT_DISARM,INTENT_GRAB,INTENT_HARM message_admins("[src.ckey] just got booted back to lobby with no jobs enabled, but antag rolling enabled. Likely antag rolling abuse.") return FALSE //This is the only case someone should actually be completely blocked from antag rolling as well return TRUE - diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index e694f3531ed..003a3b819ca 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -198,7 +198,8 @@ QDEL_NULL(mind) GLOB.respawnable_list += observer qdel(src) - return 1 + return TRUE + return FALSE if(href_list["tos"]) privacy_consent() return FALSE @@ -448,6 +449,7 @@ var/dat = "

      " dat += "Round Duration: [round(hours)]h [round(mins)]m
      " + dat += "The station alert level is: [get_security_level_colors()]
      " if(SSshuttle.emergency.mode >= SHUTTLE_ESCAPE) dat += "The station has been evacuated.
      " @@ -584,11 +586,7 @@ client.prefs.language = "None" /mob/new_player/proc/ViewManifest() - var/dat = "" - dat += "

      Crew Manifest

      " - dat += GLOB.data_core.get_manifest(OOC = 1) - - src << browse(dat, "window=manifest;size=370x420;can_close=1") + GLOB.generic_crew_manifest.ui_interact(usr, state = GLOB.always_state) /mob/new_player/Move() return 0 diff --git a/code/modules/mob/new_player/sprite_accessories/ipc/ipc_face.dm b/code/modules/mob/new_player/sprite_accessories/ipc/ipc_face.dm index 6868521f9c2..316f50b96fa 100644 --- a/code/modules/mob/new_player/sprite_accessories/ipc/ipc_face.dm +++ b/code/modules/mob/new_player/sprite_accessories/ipc/ipc_face.dm @@ -88,6 +88,14 @@ name = "Glider IPC Screen" icon_state = "gol_glider" +/datum/sprite_accessory/hair/ipc/ipc_screen_smoking + name = "Smoking IPC Screen" + icon_state = "smoking" + +/datum/sprite_accessory/hair/ipc/ipc_screen_test + name = "Test IPC Screen" + icon_state = "test" + /datum/sprite_accessory/hair/ipc/hesphiastos_alt_off name = "Dark Hesphiastos Screen" icon_state = "off" diff --git a/code/modules/newscaster/obj/newspaper.dm b/code/modules/newscaster/obj/newspaper.dm index 025b404064f..b9d8e1dd857 100644 --- a/code/modules/newscaster/obj/newspaper.dm +++ b/code/modules/newscaster/obj/newspaper.dm @@ -114,7 +114,8 @@ dat += "
      There is a small scribble near the end of this page... It reads: \"[scribble]\"" dat+= "
      " else - dat += "i'm sorry to break your immersion. This shit's bugged. Report this bug to Agouri, polyxenitopalidou@gmail.com" + // No trailing punctuation so that it's easy to copy and paste the address + dat += "We're sorry to break your immersion, but there has been an error with the newscaster. Please report this error, along with any more information you have, to [config.githuburl]/issues/new?template=bug_report.md" dat += "

      [curr_page+1]
      " human_user << browse(dat, "window=newspaper_main;size=300x400") diff --git a/code/modules/ninja/martial_art.dm b/code/modules/ninja/martial_art.dm index 0f4fbfba51e..6e1a1f2fdb9 100644 --- a/code/modules/ninja/martial_art.dm +++ b/code/modules/ninja/martial_art.dm @@ -19,9 +19,9 @@ /obj/item/creeping_widow_injector/attack_self(mob/living/carbon/human/user as mob) if(!used) - user.visible_message("You stick the [src]'s needle into your arm and press the button.", \ - "[user] sticks the [src]'s needle [user.p_their()] arm and presses the button.") - to_chat(user, "The nanomachines in the [src] flow through your bloodstream.") + user.visible_message("You stick [src]'s needle into your arm and press the button.", \ + "[user] sticks [src]'s needle [user.p_their()] arm and presses the button.") + to_chat(user, "The nanomachines in [src] flow through your bloodstream.") var/datum/martial_art/ninja_martial_art/N = new/datum/martial_art/ninja_martial_art(null) N.teach(user) @@ -31,7 +31,7 @@ desc = "A strange autoinjector made of a black metal.
      It appears to be used up and empty." return 0 else - to_chat(user, "The [src] has been used already!") + to_chat(user, "[src] has been used already!") return 1 // Ninja martial art datum diff --git a/code/modules/paperwork/folders.dm b/code/modules/paperwork/folders.dm index 47ddcda3036..24f3026a7d0 100644 --- a/code/modules/paperwork/folders.dm +++ b/code/modules/paperwork/folders.dm @@ -39,7 +39,7 @@ if(istype(W, /obj/item/paper) || istype(W, /obj/item/photo) || istype(W, /obj/item/paper_bundle) || istype(W, /obj/item/documents)) user.drop_item() W.loc = src - to_chat(user, "You put the [W] into \the [src].") + to_chat(user, "You put [W] into [src].") update_icon() else if(istype(W, /obj/item/pen)) rename_interactive(user, W) diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index c8b24eea2c5..226869e69f7 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -163,6 +163,51 @@ else return ..() +/obj/item/paper/attack_animal(mob/living/simple_animal/M) + if(!isdog(M)) // Only dogs can eat homework. + return + var/mob/living/simple_animal/pet/dog/D = M + D.changeNext_move(CLICK_CD_MELEE) + if(world.time < D.last_eaten + 30 SECONDS) + to_chat(D, "You are too full to try eating [src] now.") + return + + D.visible_message("[D] starts chewing the corner of [src]!", + "You start chewing the corner of [src].", + "You hear a quiet gnawing, and the sound of paper rustling.") + playsound(src, 'sound/effects/pageturn2.ogg', 100, TRUE) + if(!do_after(D, 10 SECONDS, FALSE, src)) + return + + if(world.time < D.last_eaten + 30 SECONDS) // Check again to prevent eating multiple papers at once. + to_chat(D, "You are too full to try eating [src] now.") + return + D.last_eaten = world.time + + // 90% chance of a crumpled paper with illegible text. + if(prob(90)) + var/message_ending = "." + var/obj/item/paper/crumpled/P = new(loc) + P.name = name + if(info) // Something written on the paper. + /*var/new_text = strip_html_properly(info, MAX_PAPER_MESSAGE_LEN, TRUE) // Don't want HTML stuff getting gibberished. + P.info = Gibberish(new_text, 100)*/ + P.info = "Whatever was once written here has been made completely illegible by a combination of chew marks and saliva." + message_ending = ", the drool making it an unreadable mess!" + P.update_icon() + qdel(src) + + D.visible_message("[D] finishes eating [src][message_ending]", + "You finish eating [src][message_ending]") + D.emote("bark") + + // 10% chance of the paper just being eaten entirely. + else + D.visible_message("[D] swallows [src] whole!", "You swallow [src] whole. Tasty!") + playsound(D, 'sound/items/eatfood.ogg', 50, TRUE) + qdel(src) + + /obj/item/paper/proc/addtofield(id, text, links = 0) if(id > MAX_PAPER_FIELDS) return @@ -360,7 +405,7 @@ src.loc = get_turf(h_user) if(h_user.client) h_user.client.screen -= src h_user.put_in_hands(B) - to_chat(user, "You clip the [P.name] to [(src.name == "paper") ? "the paper" : src.name].") + to_chat(user, "You clip [P] to [(src.name == "paper") ? "the paper" : src.name].") src.loc = B P.loc = B B.amount++ @@ -487,7 +532,8 @@ icon_state = "scrap" /obj/item/paper/crumpled/update_icon() - return + if(info) + icon_state = "scrap_words" /obj/item/paper/crumpled/bloody icon_state = "scrap_bloodied" @@ -591,10 +637,6 @@ name = "paper- 'Note'" info = "The call has gone out! Our ancestral home has been rediscovered! Not a small patch of land, but a true clown nation, a true Clown Planet! We're on our way home at last!" -/obj/item/paper/crumpled - name = "paper scrap" - icon_state = "scrap" - /obj/item/paper/syndicate name = "paper" header = "


      " @@ -611,13 +653,6 @@ info = "" footer = "

      Failure to adhere appropriately to orders that may be contained herein is in violation of Space Law, and punishments may be administered appropriately upon return to Central Command.
      The recipient(s) of this memorandum acknowledge by reading it that they are liable for any and all damages to crew or station that may arise from ignoring suggestions or advice given herein.

      " - -/obj/item/paper/crumpled/update_icon() - return - -/obj/item/paper/crumpled/bloody - icon_state = "scrap_bloodied" - /obj/item/paper/evilfax name = "Centcomm Reply" info = "" diff --git a/code/modules/paperwork/paper_bundle.dm b/code/modules/paperwork/paper_bundle.dm index 8dc2cd85e8f..e4ef4d28719 100644 --- a/code/modules/paperwork/paper_bundle.dm +++ b/code/modules/paperwork/paper_bundle.dm @@ -168,7 +168,7 @@ if(href_list["remove"]) var/obj/item/W = src[page] usr.put_in_hands(W) - to_chat(usr, "You remove the [W.name] from the bundle.") + to_chat(usr, "You remove [W] from the bundle.") if(amount == 1) var/obj/item/paper/P = src[1] usr.unEquip(src) diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm index a3ca2c5d410..203eacc5001 100644 --- a/code/modules/paperwork/paperbin.dm +++ b/code/modules/paperwork/paperbin.dm @@ -85,7 +85,7 @@ P.loc = user.loc user.put_in_hands(P) P.add_fingerprint(user) - to_chat(user, "You take [P] out of the [src].") + to_chat(user, "You take [P] out of [src].") else to_chat(user, "[src] is empty!") @@ -138,7 +138,7 @@ P = new /obj/item/paper/carbon P.loc = user.loc user.put_in_hands(P) - to_chat(user, "You take [P] out of the [src].") + to_chat(user, "You take [P] out of [src].") else to_chat(user, "[src] is empty!") diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index 09cfcd2a82f..25c83556882 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -25,7 +25,7 @@ pressure_resistance = 2 /obj/item/pen/suicide_act(mob/user) - to_chat(viewers(user), "[user] starts scribbling numbers over [user.p_them()]self with the [name]! It looks like [user.p_theyre()] trying to commit sudoku.") + to_chat(viewers(user), "[user] starts scribbling numbers over [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit sudoku.") return BRUTELOSS /obj/item/pen/blue @@ -137,7 +137,6 @@ */ /obj/item/pen/edagger origin_tech = "combat=3;syndicate=1" - attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") //these wont show up if the pen is off var/on = 0 var/brightness_on = 2 light_color = LIGHT_COLOR_RED @@ -149,6 +148,7 @@ sharp = 0 w_class = initial(w_class) name = initial(name) + attack_verb = list() hitsound = initial(hitsound) embed_chance = initial(embed_chance) throwforce = initial(throwforce) @@ -161,6 +161,7 @@ sharp = 1 w_class = WEIGHT_CLASS_NORMAL name = "energy dagger" + attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") hitsound = 'sound/weapons/blade1.ogg' embed_chance = 100 //rule of cool throwforce = 35 diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index ecca752ec9b..e3355adfe76 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -113,6 +113,7 @@ updateUsrDialog() else if(check_ass()) to_chat(ass, "You feel a slight pressure on your ass.") + atom_say("Attention: Unable to remove large object!") updateUsrDialog() else if(href_list["min"]) if(copies > 1) @@ -240,6 +241,7 @@ var/icon/temp_img if(!check_ass()) //You have to be sitting on the copier and either be a xeno or a human without clothes on. return + atom_say("Attention: Posterior Placed on Printing Plaque!") if(emagged) if(ishuman(ass)) var/mob/living/carbon/human/H = ass @@ -314,7 +316,6 @@ toner = 0 /obj/machinery/photocopier/MouseDrop_T(mob/target, mob/user) - check_ass() //Just to make sure that you can re-drag somebody onto it after they moved off. if(!istype(target) || target.buckled || get_dist(user, src) > 1 || get_dist(user, target) > 1 || user.stat || istype(user, /mob/living/silicon/ai) || target == ass) return src.add_fingerprint(user) @@ -332,7 +333,7 @@ copyitem = null updateUsrDialog() -/obj/machinery/photocopier/proc/check_ass() //I'm not sure wether I made this proc because it's good form or because of the name. +/obj/machinery/photocopier/proc/check_ass() //I'm not sure whether I made this proc because it's good form or because of the name. if(!ass) return 0 if(ass.loc != src.loc) @@ -341,7 +342,6 @@ return 0 else playsound(loc, 'sound/machines/ping.ogg', 50, 0) - atom_say("Attention: Posterior Placed on Printing Plaque!") return 1 /obj/machinery/photocopier/emag_act(user as mob) diff --git a/code/modules/pda/PDA.dm b/code/modules/pda/PDA.dm old mode 100755 new mode 100644 index c0f05650d64..d6aaaebf0f6 --- a/code/modules/pda/PDA.dm +++ b/code/modules/pda/PDA.dm @@ -8,7 +8,7 @@ GLOBAL_LIST_EMPTY(PDAs) /obj/item/pda - name = "PDA" + name = "\improper PDA" desc = "A portable microcomputer by Thinktronic Systems, LTD. Functionality determined by a preprogrammed ROM cartridge." icon = 'icons/obj/pda.dmi' icon_state = "pda" @@ -179,7 +179,7 @@ GLOBAL_LIST_EMPTY(PDAs) if(ismob(loc)) var/mob/M = loc M.put_in_hands(id) - to_chat(user, "You remove the ID from the [name].") + to_chat(user, "You remove the ID from [src].") SStgui.update_uis(src) else id.forceMove(get_turf(src)) @@ -214,10 +214,10 @@ GLOBAL_LIST_EMPTY(PDAs) if(issilicon(user)) return - if( can_use(user) ) + if(can_use(user)) var/obj/item/pen/O = locate() in src if(O) - to_chat(user, "You remove the [O] from [src].") + to_chat(user, "You remove [O] from [src].") playsound(src, 'sound/machines/pda_button2.ogg', 50, TRUE) if(istype(loc, /mob)) var/mob/M = loc diff --git a/code/modules/pda/cart_apps.dm b/code/modules/pda/cart_apps.dm index 1dbd072b263..4606003b49e 100644 --- a/code/modules/pda/cart_apps.dm +++ b/code/modules/pda/cart_apps.dm @@ -148,7 +148,7 @@ . = TRUE - if(!pda.silent) + if(pda && !pda.silent) playsound(pda, 'sound/machines/terminal_select.ogg', 15, TRUE) switch(action) diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 00fe161e6d4..09d49a3330a 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -105,6 +105,8 @@ var/global/list/status_overlays_environ var/indestructible = 0 // If set, prevents aliens from destroying it var/keep_preset_name = 0 + /// Was this APC built instead of already existing? Used for malfhack to keep borgs from building apcs in space + var/constructed = FALSE var/report_power_alarm = TRUE @@ -171,14 +173,13 @@ operating = 0 name = "[area.name] APC" stat |= MAINT + constructed = TRUE update_icon() addtimer(CALLBACK(src, .proc/update), 5) /obj/machinery/power/apc/Destroy() SStgui.close_uis(wires) GLOB.apcs -= src - if(malfai && operating) - malfai.malf_picker.processing_time = clamp(malfai.malf_picker.processing_time - 10,0,1000) area.power_light = 0 area.power_equip = 0 area.power_environ = 0 @@ -731,11 +732,11 @@ if(usr == user && opened && !issilicon(user)) if(cell) + user.visible_message("[user.name] removes [cell] from [src]!", "You remove [cell].") user.put_in_hands(cell) cell.add_fingerprint(user) cell.update_icon() cell = null - user.visible_message("[user.name] removes [cell] from [src]!", "You remove the [cell].") charging = FALSE update_icon() return @@ -973,6 +974,9 @@ if(malf.malfhacking) to_chat(malf, "You are already hacking an APC.") return + if(constructed) + to_chat(malf, "This APC was only recently constructed, and is not fully linked to station systems. Hacking it would be pointless.") + return to_chat(malf, "Beginning override of APC systems. This takes some time, and you cannot perform other actions during the process.") malf.malfhack = src malf.malfhacking = addtimer(CALLBACK(malf, /mob/living/silicon/ai/.proc/malfhacked, src), 600, TIMER_STOPPABLE) @@ -1050,7 +1054,7 @@ smoke.start() do_sparks(3, 1, src) for(var/mob/M in viewers(src)) - M.show_message("The [name] suddenly lets out a blast of smoke and some sparks!", 3, "You hear sizzling electronics.", 2) + M.show_message("[src] suddenly lets out a blast of smoke and some sparks!", 3, "You hear sizzling electronics.", 2) /obj/machinery/power/apc/surplus() diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index 3c8db1f50df..250e065cfb6 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -498,9 +498,9 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai /obj/item/stack/cable_coil/suicide_act(mob/user) if(locate(/obj/structure/chair/stool) in user.loc) - user.visible_message("[user] is making a noose with the [name]! It looks like [user.p_theyre()] trying to commit suicide.") + user.visible_message("[user] is making a noose with [src]! It looks like [user.p_theyre()] trying to commit suicide.") else - user.visible_message("[user] is strangling [user.p_them()]self with the [name]! It looks like [user.p_theyre()] trying to commit suicide.") + user.visible_message("[user] is strangling [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide.") return OXYLOSS /obj/item/stack/cable_coil/New(loc, length = MAXCOIL, paramcolor = null) @@ -596,7 +596,7 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai /obj/item/stack/cable_coil/examine(mob/user) . = ..() - if(in_range(user, src)) + if(in_range(user, src) && !is_cyborg) if(get_amount() == 1) . += "A short piece of power cable." else if(get_amount() == 2) @@ -612,10 +612,10 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai if(istype(W, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/C = W // Cable merging is handled by parent proc - if(C.amount >= MAXCOIL) + if(C.get_amount() >= MAXCOIL) to_chat(user, "The coil is as long as it will get.") return - if( (C.amount + src.amount <= MAXCOIL) ) + if((C.get_amount() + get_amount() <= MAXCOIL)) to_chat(user, "You join the cable coils together.") return else @@ -861,7 +861,11 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai return color /obj/item/stack/cable_coil/cyborg - name = "cyborg cable coil" + energy_type = /datum/robot_energy_storage/cable + is_cyborg = TRUE + +/obj/item/stack/cable_coil/cyborg/update_icon() + return // icon_state should always be a full cable /obj/item/stack/cable_coil/cyborg/attack_self(mob/user) var/cablecolor = input(user,"Pick a cable color.","Cable Color") in list("red","yellow","green","blue","pink","orange","cyan","white") diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index 16526a3bde3..ca976915b0e 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -92,7 +92,7 @@ . += "The charge meter reads [round(percent() )]%." /obj/item/stock_parts/cell/suicide_act(mob/user) - to_chat(viewers(user), "[user] is licking the electrodes of the [src]! It looks like [user.p_theyre()] trying to commit suicide.") + to_chat(viewers(user), "[user] is licking the electrodes of [src]! It looks like [user.p_theyre()] trying to commit suicide.") return FIRELOSS /obj/item/stock_parts/cell/attackby(obj/item/W, mob/user, params) diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index e7aafa88fac..e275b747814 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -578,7 +578,7 @@ if(prot > 0 || HAS_TRAIT(user, TRAIT_RESISTHEAT) || HAS_TRAIT(user, TRAIT_RESISTHEATHANDS)) to_chat(user, "You remove the light [fitting]") - else if(user.dna?.GetSEState(GLOB.teleblock)) + else if(HAS_TRAIT(user, TRAIT_TELEKINESIS)) to_chat(user, "You telekinetically remove the light [fitting].") else if(user.a_intent == INTENT_DISARM || user.a_intent == INTENT_GRAB) diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm index 78d728377ae..90acc6dd253 100644 --- a/code/modules/power/port_gen.dm +++ b/code/modules/power/port_gen.dm @@ -249,6 +249,8 @@ /obj/machinery/power/port_gen/pacman/proc/overheat() overheating++ if(overheating > 60) + message_admins("Pacman overheated at [ADMIN_JMP(loc)]. Last touched by: [fingerprintslast ? "[fingerprintslast]" : "*null*"].") + log_game("Pacman overheated at [COORD(loc)]. Last touched by: [fingerprintslast ? "[fingerprintslast]" : "*null*"].") explode() /obj/machinery/power/port_gen/pacman/explode() @@ -277,9 +279,9 @@ var/obj/item/stack/addstack = O var/amount = min((max_sheets - sheets), addstack.amount) if(amount < 1) - to_chat(user, "The [src.name] is full!") + to_chat(user, "[src] is full!") return - to_chat(user, "You add [amount] sheet\s to the [src.name].") + to_chat(user, "You add [amount] sheet\s to [src].") sheets += amount addstack.use(amount) SStgui.update_uis(src) diff --git a/code/modules/power/singularity/containment_field.dm b/code/modules/power/singularity/containment_field.dm index 70ef60b11d6..2f5a92046f1 100644 --- a/code/modules/power/singularity/containment_field.dm +++ b/code/modules/power/singularity/containment_field.dm @@ -7,6 +7,7 @@ density = 0 move_resist = INFINITY resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF + flags_2 = RAD_NO_CONTAMINATE_2 use_power = NO_POWER_USE light_range = 4 layer = OBJ_LAYER + 0.1 @@ -108,7 +109,7 @@ if(prob(20)) user.Stun(2) user.take_overall_damage(0, shock_damage) - user.visible_message("[user.name] was shocked by the [src.name]!", \ + user.visible_message("[user.name] was shocked by [src]!", \ "Energy pulse detected, system damaged!", \ "You hear an electrical crack.") diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index bd14f07c785..6757ee090ea 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -197,7 +197,7 @@ else state = EMITTER_NEEDS_WRENCH anchored = FALSE - user.visible_message("[user] unsecures [src] reinforcing bolts from the floor.", + user.visible_message("[user] unsecures [src]'s reinforcing bolts from the floor.", "You undo the external reinforcing bolts.", "You hear a ratchet.") playsound(src, I.usesound, I.tool_volume, TRUE) diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm index 4d3eb5f51f0..d8d8ce5c0e1 100644 --- a/code/modules/power/singularity/field_generator.dm +++ b/code/modules/power/singularity/field_generator.dm @@ -64,11 +64,11 @@ field_generator power level display if(state == FG_WELDED) if(get_dist(src, user) <= 1)//Need to actually touch the thing to turn it on if(active >= FG_CHARGING) - to_chat(user, "You are unable to turn off the [name] once it is online!") + to_chat(user, "You are unable to turn off [src] once it is online!") return 1 else - user.visible_message("[user.name] turns on the [name].", \ - "You turn on the [name].", \ + user.visible_message("[user] turns on [src].", \ + "You turn on [src].", \ "You hear heavy droning.") turn_on() investigate_log("activated by [user.key].","singulo") @@ -100,7 +100,7 @@ field_generator power level display "You hear ratchet.") anchored = 0 if(FG_WELDED) - to_chat(user, "The [name] needs to be unwelded from the floor!") + to_chat(user, "[src] needs to be unwelded from the floor!") else return ..() @@ -188,7 +188,7 @@ field_generator power level display check_power_level() return 1 else - visible_message("The [name] shuts down!", "You hear something shutting down.") + visible_message("[src] shuts down!", "You hear something shutting down.") turn_off() investigate_log("ran out of power and deactivated","singulo") power = 0 diff --git a/code/modules/power/singularity/generator.dm b/code/modules/power/singularity/generator.dm index 9bed8105a3e..6a6f32a101c 100644 --- a/code/modules/power/singularity/generator.dm +++ b/code/modules/power/singularity/generator.dm @@ -26,13 +26,13 @@ anchored = !anchored playsound(src.loc, W.usesound, 75, 1) if(anchored) - user.visible_message("[user.name] secures [src.name] to the floor.", \ - "You secure the [src.name] to the floor.", \ + user.visible_message("[user.name] secures [src] to the floor.", \ + "You secure [src] to the floor.", \ "You hear a ratchet") src.add_hiddenprint(user) else - user.visible_message("[user.name] unsecures [src.name] from the floor.", \ - "You unsecure the [src.name] from the floor.", \ + user.visible_message("[user.name] unsecures [src] from the floor.", \ + "You unsecure [src.name] from the floor.", \ "You hear a ratchet") return return ..() diff --git a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm index 0edee98e835..0e1e9176642 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm @@ -201,7 +201,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin var/obj/item/stack/cable_coil/C = W if(C.use(1)) playsound(loc, C.usesound, 50, 1) - user.visible_message("[user.name] adds wires to the [name].", \ + user.visible_message("[user] adds wires to [src].", \ "You add some wires.") construction_state = ACCELERATOR_WIRED update_icon() @@ -302,7 +302,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin var/obj/item/stack/cable_coil/C = W if(C.use(1)) playsound(loc, C.usesound, 50, 1) - user.visible_message("[user.name] adds wires to the [name].", \ + user.visible_message("[user] adds wires to [src].", \ "You add some wires.") construction_state = ACCELERATOR_WIRED update_icon() diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm index 26ad13014a1..8f707cc1e14 100644 --- a/code/modules/power/singularity/singularity.dm +++ b/code/modules/power/singularity/singularity.dm @@ -412,12 +412,12 @@ if(istype(H.glasses, /obj/item/clothing/glasses/meson)) var/obj/item/clothing/glasses/meson/MS = H.glasses if(MS.vision_flags == SEE_TURFS) - to_chat(H, "You look directly into the [src.name], good thing you had your protective eyewear on!") + to_chat(H, "You look directly into [src], good thing you had your protective eyewear on!") return M.apply_effect(3, STUN) - M.visible_message("[M] stares blankly at the [src.name]!", \ - "You look directly into the [src.name] and feel weak.") + M.visible_message("[M] stares blankly at [src]!", \ + "You look directly into [src] and feel weak.") return diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm index 6da11d80c22..f6d1fccdb73 100644 --- a/code/modules/power/smes.dm +++ b/code/modules/power/smes.dm @@ -149,12 +149,12 @@ return var/obj/item/stack/cable_coil/C = I - if(C.amount < 10) + if(C.get_amount() < 10) to_chat(user, "You need more wires.") return if(user.loc == loc) - to_chat(user, "You must not be on the same tile as the [src].") + to_chat(user, "You must not be on the same tile as [src].") return //Direction the terminal will face to @@ -173,7 +173,7 @@ to_chat(user, "You must remove the floor plating first.") return - to_chat(user, "You start adding cable to the [src].") + to_chat(user, "You start adding cable to [src].") playsound(loc, C.usesound, 50, 1) if(do_after(user, 50, target = src)) @@ -429,7 +429,7 @@ if(is_station_level(src.z)) if(prob(1)) //explosion for(var/mob/M in viewers(src)) - M.show_message("The [src.name] is making strange noises!", 3, "You hear sizzling electronics.", 2) + M.show_message("[src] is making strange noises!", 3, "You hear sizzling electronics.", 2) sleep(10*pick(4,5,6,7,10,14)) var/datum/effect_system/smoke_spread/smoke = new smoke.set_up(3, 0, src.loc) diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm index 00dd4dbff60..6c3ac951b12 100644 --- a/code/modules/power/solar.dm +++ b/code/modules/power/solar.dm @@ -101,7 +101,7 @@ overlays += image('icons/obj/power.dmi', icon_state = "solar_panel-b", layer = FLY_LAYER) else overlays += image('icons/obj/power.dmi', icon_state = "solar_panel", layer = FLY_LAYER) - src.dir = angle2dir(adir) + set_angle(adir) return //calculates the fraction of the sunlight that the panel recieves @@ -220,7 +220,7 @@ if(istype(W, /obj/item/stack/sheet/glass) || istype(W, /obj/item/stack/sheet/rglass)) var/obj/item/stack/sheet/S = W if(S.use(2)) - glass_type = W.type + glass_type = S.merge_type playsound(loc, S.usesound, 50, 1) user.visible_message("[user] places the glass on the solar assembly.", "You place the glass on the solar assembly.") if(tracker) @@ -298,7 +298,7 @@ if(autostart) search_for_connected() if(connected_tracker && track == TRACKER_AUTO) - connected_tracker.set_angle(SSsun.angle) + connected_tracker.modify_angle(SSsun.angle) set_panels(cdir) /obj/machinery/power/solar_control/Destroy() @@ -338,7 +338,7 @@ return if(track == TRACKER_AUTO && connected_tracker) // auto-tracking - connected_tracker.set_angle(SSsun.angle) + connected_tracker.modify_angle(SSsun.angle) set_panels(cdir) updateDialog() @@ -410,7 +410,7 @@ track = text2num(params["track"]) if(track == TRACKER_AUTO) if(connected_tracker) - connected_tracker.set_angle(SSsun.angle) + connected_tracker.modify_angle(SSsun.angle) set_panels(cdir) else if(track == TRACKER_TIMED) targetdir = cdir @@ -420,7 +420,7 @@ if("refresh") search_for_connected() if(connected_tracker && track == TRACKER_AUTO) - connected_tracker.set_angle(SSsun.angle) + connected_tracker.modify_angle(SSsun.angle) set_panels(cdir) /obj/machinery/power/solar_control/attackby(obj/item/I, mob/user, params) diff --git a/code/modules/power/tesla/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm index 02eaa84183e..dd3a5136bd9 100644 --- a/code/modules/power/tesla/energy_ball.dm +++ b/code/modules/power/tesla/energy_ball.dm @@ -216,6 +216,7 @@ /obj/machinery/gateway, /obj/structure/lattice, /obj/structure/grille, + /obj/structure/cable, /obj/machinery/the_singularitygen/tesla, /obj/machinery/constructable_frame/machine_frame)) diff --git a/code/modules/power/tracker.dm b/code/modules/power/tracker.dm index 621c5f02747..b85659112d9 100644 --- a/code/modules/power/tracker.dm +++ b/code/modules/power/tracker.dm @@ -50,7 +50,7 @@ update_icon() //updates the tracker icon and the facing angle for the control computer -/obj/machinery/power/tracker/proc/set_angle(angle) +/obj/machinery/power/tracker/proc/modify_angle(angle) sun_angle = angle //set icon dir to show sun illumination diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm index 135f8c14718..355972c8fda 100644 --- a/code/modules/projectiles/ammunition/magazines.dm +++ b/code/modules/projectiles/ammunition/magazines.dm @@ -375,6 +375,10 @@ max_ammo = 30 multiple_sprites = 2 +/obj/item/ammo_box/magazine/m556/arg + name = "ARG magazine (5.56mm)" + icon_state = "arg" + /obj/item/ammo_box/magazine/m12g name = "shotgun magazine (12g slugs)" desc = "A drum magazine." diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 96f89935f6d..dedba26bb68 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -40,7 +40,7 @@ var/randomspread = 1 var/unique_rename = TRUE //allows renaming with a pen - var/unique_reskin = TRUE //allows one-time reskinning + var/unique_reskin = FALSE //allows one-time reskinning var/current_skin = null //the skin choice if we had a reskin var/list/options = list() diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index 695ab02c43b..69eccb2d7a5 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -165,10 +165,10 @@ /obj/item/gun/energy/suicide_act(mob/user) if(can_shoot()) - user.visible_message("[user] is putting the barrel of the [name] in [user.p_their()] mouth. It looks like [user.p_theyre()] trying to commit suicide.") + user.visible_message("[user] is putting the barrel of [src] in [user.p_their()] mouth. It looks like [user.p_theyre()] trying to commit suicide.") sleep(25) if(user.l_hand == src || user.r_hand == src) - user.visible_message("[user] melts [user.p_their()] face off with the [name]!") + user.visible_message("[user] melts [user.p_their()] face off with [src]!") playsound(loc, fire_sound, 50, 1, -1) var/obj/item/ammo_casing/energy/shot = ammo_type[select] cell.use(shot.e_cost) @@ -178,7 +178,7 @@ user.visible_message("[user] panics and starts choking to death!") return OXYLOSS else - user.visible_message("[user] is pretending to blow [user.p_their()] brains out with the [name]! It looks like [user.p_theyre()] trying to commit suicide!
      ") + user.visible_message("[user] is pretending to blow [user.p_their()] brains out with [src]! It looks like [user.p_theyre()] trying to commit suicide!
      ") playsound(loc, 'sound/weapons/empty.ogg', 50, 1, -1) return OXYLOSS diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm index c715ba966dd..8a30d27517a 100644 --- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm +++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm @@ -6,7 +6,6 @@ ammo_type = list(/obj/item/ammo_casing/energy/kinetic) cell_type = /obj/item/stock_parts/cell/emproof needs_permit = 0 - unique_rename = 1 origin_tech = "combat=3;powerstorage=3;engineering=3" weapon_weight = WEAPON_LIGHT can_flashlight = 1 @@ -276,7 +275,7 @@ return ..() /obj/item/borg/upgrade/modkit/action(mob/living/silicon/robot/R) - if(..()) + if(!..()) return for(var/obj/item/gun/energy/kinetic_accelerator/cyborg/H in R.module.modules) diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index 85efba9e5dd..543989bb146 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -1,6 +1,6 @@ /obj/item/gun/energy/laser name = "laser gun" - desc = "A basic energy-based laser gun that fires concentrated beams of light which pass through glass and thin metal." + desc = "A WT-650 'Sentinel' laser carbine manufactured by Warp-Tac Inc. The golden shield of Nanotrasen Security is visible." icon_state = "laser" item_state = "laser" w_class = WEIGHT_CLASS_NORMAL @@ -8,7 +8,7 @@ origin_tech = "combat=4;magnets=2" ammo_type = list(/obj/item/ammo_casing/energy/lasergun) ammo_x_offset = 1 - shaded_charge = 1 + shaded_charge = TRUE /obj/item/gun/energy/laser/practice name = "practice laser gun" diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm index 3d9925da974..a39e018909a 100644 --- a/code/modules/projectiles/guns/energy/nuclear.dm +++ b/code/modules/projectiles/guns/energy/nuclear.dm @@ -1,15 +1,15 @@ /obj/item/gun/energy/gun name = "energy gun" - desc = "A basic energy-based gun with two settings: kill and disable." + desc = "An E-07 energy gun manufactured by Shellguard Munitions. The fire selector has 'kill' and 'disable' settings." icon_state = "energy" item_state = null //so the human update icon uses the icon_state instead. ammo_type = list(/obj/item/ammo_casing/energy/disabler, /obj/item/ammo_casing/energy/laser) origin_tech = "combat=4;magnets=3" modifystate = 2 can_flashlight = 1 - ammo_x_offset = 3 - flight_x_offset = 15 + flight_x_offset = 20 flight_y_offset = 10 + shaded_charge = TRUE /obj/item/gun/energy/gun/cyborg desc = "An energy-based laser gun that draws power from the cyborg's internal energy cell directly. So this is what freedom looks like?" @@ -30,6 +30,7 @@ charge_sections = 3 can_flashlight = 0 // Can't attach or detach the flashlight, and override it's icon update actions_types = list(/datum/action/item_action/toggle_gunlight) + shaded_charge = FALSE /obj/item/gun/energy/gun/mini/Initialize(mapload, ...) gun_light = new /obj/item/flashlight/seclite(src) @@ -51,6 +52,7 @@ ammo_type = list(/obj/item/ammo_casing/energy/electrode/hos, /obj/item/ammo_casing/energy/laser/hos, /obj/item/ammo_casing/energy/disabler) ammo_x_offset = 4 resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF + shaded_charge = FALSE /obj/item/gun/energy/gun/blueshield name = "advanced stun revolver" @@ -60,7 +62,7 @@ force = 7 ammo_type = list(/obj/item/ammo_casing/energy/electrode/hos, /obj/item/ammo_casing/energy/laser/hos) ammo_x_offset = 1 - shaded_charge = 1 + shaded_charge = TRUE /obj/item/gun/energy/gun/blueshield/pdw9 name = "PDW-9 taser pistol" @@ -79,6 +81,7 @@ can_flashlight = 0 trigger_guard = TRIGGER_GUARD_NONE ammo_x_offset = 2 + shaded_charge = FALSE /obj/item/gun/energy/gun/nuclear name = "advanced energy gun" @@ -92,3 +95,4 @@ ammo_x_offset = 1 ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser, /obj/item/ammo_casing/energy/disabler) selfcharge = 1 + shaded_charge = FALSE diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index 01f7234b8fa..8d9f50cedd7 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -102,7 +102,7 @@ suppressed = 1 ammo_type = list(/obj/item/ammo_casing/energy/bolt) weapon_weight = WEAPON_LIGHT - unique_rename = 0 + unique_rename = FALSE overheat_time = 20 holds_charge = TRUE unique_frequency = TRUE @@ -129,7 +129,7 @@ /obj/item/gun/energy/kinetic_accelerator/suicide_act(mob/user) if(!suppressed) playsound(loc, 'sound/weapons/kenetic_reload.ogg', 60, 1) - user.visible_message("[user] cocks the [name] and pretends to blow [user.p_their()] brains out! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message("[user] cocks [src] and pretends to blow [user.p_their()] brains out! It looks like [user.p_theyre()] trying to commit suicide!") shoot_live_shot(user, user, FALSE, FALSE) return OXYLOSS diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm index 141366dd5d9..140c14171eb 100644 --- a/code/modules/projectiles/guns/energy/stun.dm +++ b/code/modules/projectiles/guns/energy/stun.dm @@ -15,7 +15,7 @@ origin_tech = "combat=4;materials=4;powerstorage=4" ammo_type = list(/obj/item/ammo_casing/energy/shock_revolver) can_flashlight = 0 - shaded_charge = 1 + shaded_charge = FALSE /obj/item/gun/energy/gun/advtaser name = "hybrid taser" @@ -24,6 +24,8 @@ ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/disabler) origin_tech = "combat=4" ammo_x_offset = 2 + flight_x_offset = 15 + shaded_charge = FALSE /obj/item/gun/energy/gun/advtaser/cyborg name = "cyborg taser" @@ -53,3 +55,12 @@ /obj/item/gun/energy/disabler/cyborg/newshot() ..() robocharge() + +/obj/item/gun/energy/disabler/cyborg/cyborg_recharge(coeff, emagged) + if(cell.charge < cell.maxcharge) + var/obj/item/ammo_casing/energy/E = ammo_type[select] + cell.give(E.e_cost * coeff) + on_recharge() + update_icon() + else + charge_tick = 0 diff --git a/code/modules/projectiles/guns/grenade_launcher.dm b/code/modules/projectiles/guns/grenade_launcher.dm index af7cffbe7c8..1b88098ed15 100644 --- a/code/modules/projectiles/guns/grenade_launcher.dm +++ b/code/modules/projectiles/guns/grenade_launcher.dm @@ -25,7 +25,7 @@ return I.loc = src grenades += I - to_chat(user, "You put the grenade in the [name].") + to_chat(user, "You put the grenade in [src].") to_chat(user, "[grenades.len] / [max_grenades] grenades.") else to_chat(user, "The grenade launcher cannot hold more grenades.") diff --git a/code/modules/projectiles/guns/magic.dm b/code/modules/projectiles/guns/magic.dm index 44273f1e653..05a0134ded6 100644 --- a/code/modules/projectiles/guns/magic.dm +++ b/code/modules/projectiles/guns/magic.dm @@ -75,10 +75,10 @@ return /obj/item/gun/magic/shoot_with_empty_chamber(mob/living/user as mob|obj) - to_chat(user, "The [name] whizzles quietly.") + to_chat(user, "[src] whizzles quietly.") return /obj/item/gun/magic/suicide_act(mob/user) - user.visible_message("[user] is twisting the [name] above [user.p_their()] head, releasing a magical blast! It looks like [user.p_theyre()] trying to commit suicide.") + user.visible_message("[user] is twisting [src] above [user.p_their()] head, releasing a magical blast! It looks like [user.p_theyre()] trying to commit suicide.") playsound(loc, fire_sound, 50, 1, -1) return FIRELOSS diff --git a/code/modules/projectiles/guns/medbeam.dm b/code/modules/projectiles/guns/medbeam.dm index aec8cf946d1..452023946ae 100644 --- a/code/modules/projectiles/guns/medbeam.dm +++ b/code/modules/projectiles/guns/medbeam.dm @@ -92,7 +92,7 @@ return 0 for(var/obj/effect/ebeam/medical/B in turf)// Don't cross the str-beams! if(B.owner != current_beam) - turf.visible_message("The medbeams cross and EXPLODE!") + turf.visible_message("The medbeams cross and EXPLODE!") explosion(B.loc,0,3,5,8) qdel(dummy) return 0 diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm index 6d9fd77e5a4..0a005077a6e 100644 --- a/code/modules/projectiles/guns/projectile.dm +++ b/code/modules/projectiles/guns/projectile.dm @@ -164,17 +164,17 @@ /obj/item/gun/projectile/suicide_act(mob/user) if(chambered && chambered.BB && !chambered.BB.nodamage) - user.visible_message("[user] is putting the barrel of the [name] in [user.p_their()] mouth. It looks like [user.p_theyre()] trying to commit suicide.") + user.visible_message("[user] is putting the barrel of [src] in [user.p_their()] mouth. It looks like [user.p_theyre()] trying to commit suicide.") sleep(25) if(user.l_hand == src || user.r_hand == src) process_fire(user, user, 0, zone_override = "head") - user.visible_message("[user] blows [user.p_their()] brains out with the [name]!") + user.visible_message("[user] blows [user.p_their()] brains out with [src]!") return BRUTELOSS else user.visible_message("[user] panics and starts choking to death!") return OXYLOSS else - user.visible_message("[user] is pretending to blow [user.p_their()] brains out with the [name]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message("[user] is pretending to blow [user.p_their()] brains out with [src]! It looks like [user.p_theyre()] trying to commit suicide!") playsound(loc, 'sound/weapons/empty.ogg', 50, 1, -1) return OXYLOSS diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm index bbd0beca7e0..338cd24c6fe 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -240,7 +240,7 @@ item_state = "arg" slot_flags = 0 origin_tech = "combat=6;engineering=4" - mag_type = /obj/item/ammo_box/magazine/m556 + mag_type = /obj/item/ammo_box/magazine/m556/arg fire_sound = 'sound/weapons/gunshots/gunshot_mg.ogg' magin_sound = 'sound/weapons/gun_interactions/batrifle_magin.ogg' magout_sound = 'sound/weapons/gun_interactions/batrifle_magout.ogg' diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm index d265a420c26..aa365767223 100644 --- a/code/modules/projectiles/guns/projectile/revolver.dm +++ b/code/modules/projectiles/guns/projectile/revolver.dm @@ -92,8 +92,7 @@ name = ".38 Mars Special" icon_state = "detective" mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev38 - unique_rename = 1 - unique_reskin = 1 + unique_reskin = TRUE /obj/item/gun/projectile/revolver/detective/New() ..() @@ -159,6 +158,7 @@ fire_sound_text = null lefthand_file = null righthand_file = null + trigger_guard = TRIGGER_GUARD_ALLOW_ALL clumsy_check = 0 //Stole your uplink! Honk! needs_permit = 0 //go away beepsky @@ -328,7 +328,11 @@ name = "double-barreled shotgun" desc = "A true classic." icon_state = "dshotgun" - item_state = "shotgun" + item_state = "shotgun_db" + lefthand_file = 'icons/mob/inhands/64x64_guns_lefthand.dmi' + righthand_file = 'icons/mob/inhands/64x64_guns_righthand.dmi' + inhand_x_dimension = 64 + inhand_y_dimension = 64 w_class = WEIGHT_CLASS_BULKY weapon_weight = WEAPON_HEAVY force = 10 @@ -338,8 +342,7 @@ fire_sound = 'sound/weapons/gunshots/gunshot_shotgun.ogg' sawn_desc = "Omar's coming!" can_holster = FALSE - unique_rename = 1 - unique_reskin = 1 + unique_reskin = TRUE /obj/item/gun/projectile/revolver/doublebarrel/New() ..() @@ -358,8 +361,10 @@ var/obj/item/melee/energy/W = A if(W.active) sawoff(user) + item_state = "ishotgun_sawn" if(istype(A, /obj/item/circular_saw) || istype(A, /obj/item/gun/energy/plasmacutter)) sawoff(user) + item_state = "ishotgun_sawn" else return ..() @@ -389,15 +394,18 @@ name = "improvised shotgun" desc = "Essentially a tube that aims shotgun shells." icon_state = "ishotgun" - item_state = "shotgun" + item_state = "ishotgun" + lefthand_file = 'icons/mob/inhands/64x64_guns_lefthand.dmi' + righthand_file = 'icons/mob/inhands/64x64_guns_righthand.dmi' + inhand_x_dimension = 64 + inhand_y_dimension = 64 w_class = WEIGHT_CLASS_BULKY force = 10 slot_flags = null mag_type = /obj/item/ammo_box/magazine/internal/shot/improvised fire_sound = 'sound/weapons/gunshots/gunshot_shotgun.ogg' sawn_desc = "I'm just here for the gasoline." - unique_rename = 0 - unique_reskin = 0 + unique_reskin = FALSE var/slung = 0 /obj/item/gun/projectile/revolver/doublebarrel/improvised/attackby(obj/item/A, mob/user, params) @@ -406,6 +414,7 @@ if(C.use(10)) slot_flags = SLOT_BACK icon_state = "ishotgunsling" + item_state = "ishotgunsling" to_chat(user, "You tie the lengths of cable to the shotgun, making a sling.") slung = 1 update_icon() @@ -420,6 +429,7 @@ if(slung && (slot_flags & SLOT_BELT) ) slung = 0 icon_state = "ishotgun-sawn" + item_state = "ishotgun_sawn" /obj/item/gun/projectile/revolver/doublebarrel/improvised/sawoff(mob/user) . = ..() @@ -436,6 +446,8 @@ icon = 'icons/obj/items.dmi' lefthand_file = 'icons/mob/inhands/items_lefthand.dmi' righthand_file = 'icons/mob/inhands/items_righthand.dmi' + inhand_x_dimension = 32 + inhand_y_dimension = 32 icon_state = "cane" item_state = "stick" sawn_state = SAWN_OFF diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm index d50865457dc..c182f909795 100644 --- a/code/modules/projectiles/guns/projectile/shotgun.dm +++ b/code/modules/projectiles/guns/projectile/shotgun.dm @@ -3,6 +3,10 @@ desc = "A traditional shotgun with wood furniture and a four-shell capacity underneath." icon_state = "shotgun" item_state = "shotgun" + lefthand_file = 'icons/mob/inhands/64x64_guns_lefthand.dmi' + righthand_file = 'icons/mob/inhands/64x64_guns_righthand.dmi' + inhand_x_dimension = 64 + inhand_y_dimension = 64 w_class = WEIGHT_CLASS_BULKY force = 10 flags = CONDUCT @@ -80,6 +84,7 @@ name = "riot shotgun" desc = "A sturdy shotgun with a longer magazine and a fixed tactical stock designed for non-lethal riot control." icon_state = "riotshotgun" + item_state = "shotgun_riot" mag_type = /obj/item/ammo_box/magazine/internal/shot/riot sawn_desc = "Come with me if you want to live." sawn_state = SAWN_INTACT @@ -110,7 +115,7 @@ return else afterattack(user, user) - user.visible_message("The [src] goes click!", "The [src] you are holding goes click.") + user.visible_message("[src] goes click!", "[src] you are holding goes click.") if(magazine.ammo_count()) //Spill the mag onto the floor user.visible_message("[user.name] opens [src] up and the shells go goes flying around!", "You open [src] up and the shells go goes flying everywhere!!") while(get_ammo(0) > 0) @@ -131,7 +136,7 @@ desc = sawn_desc w_class = WEIGHT_CLASS_NORMAL current_skin = "riotshotgun-short" - item_state = "gun" //phil235 is it different with different skin? + item_state = "shotgun_assault" //phil235 is it different with different skin? slot_flags &= ~SLOT_BACK //you can't sling it on your back slot_flags |= SLOT_BELT //but you can wear it on your belt (poorly concealed under a trenchcoat, ideally) sawn_state = SAWN_OFF @@ -153,7 +158,7 @@ return else afterattack(user, user) - user.visible_message("The [src] goes click!", "The [src] you are holding goes click.") + user.visible_message("[src] goes click!", "[src] you are holding goes click.") if(magazine.ammo_count()) //Spill the mag onto the floor user.visible_message("[user.name] opens [src] up and the shells go goes flying around!", "You open [src] up and the shells go goes flying everywhere!!") while(get_ammo() > 0) @@ -208,6 +213,10 @@ desc = "This piece of junk looks like something that could have been used 700 years ago." icon_state = "moistnugget" item_state = "moistnugget" + lefthand_file = 'icons/mob/inhands/guns_lefthand.dmi' + righthand_file = 'icons/mob/inhands/guns_righthand.dmi' + inhand_x_dimension = 32 + inhand_y_dimension = 32 slot_flags = 0 //no SLOT_BACK sprite, alas mag_type = /obj/item/ammo_box/magazine/internal/boltaction fire_sound = 'sound/weapons/gunshots/gunshot_rifle.ogg' @@ -305,6 +314,7 @@ name = "combat shotgun" desc = "A semi automatic shotgun with tactical furniture and a six-shell capacity underneath." icon_state = "cshotgun" + item_state = "shotgun_combat" origin_tech = "combat=6" mag_type = /obj/item/ammo_box/magazine/internal/shot/com w_class = WEIGHT_CLASS_HUGE @@ -315,6 +325,11 @@ name = "cycler shotgun" desc = "An advanced shotgun with two separate magazine tubes, allowing you to quickly toggle between ammo types." icon_state = "cycler" + inhand_x_dimension = 32 + inhand_y_dimension = 32 + lefthand_file = 'icons/mob/inhands/guns_lefthand.dmi' + righthand_file = 'icons/mob/inhands/guns_righthand.dmi' + item_state = "bulldog" origin_tech = "combat=4;materials=2" mag_type = /obj/item/ammo_box/magazine/internal/shot/tube w_class = WEIGHT_CLASS_HUGE diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index f727638b475..64b0241279f 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -239,7 +239,7 @@ if((!current || loc == current)) current = locate(clamp(x + xo, 1, world.maxx), clamp(y + yo, 1, world.maxy), z) if(isnull(Angle)) - Angle = round(Get_Angle(src, current)) + Angle = round(get_angle(src, current)) if(spread) Angle += (rand() - 0.5) * spread var/matrix/M = new diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index 415a7e0bb87..027de5c9f54 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -252,8 +252,8 @@ return 1 else blocked = 100 - target.visible_message("The [name] was deflected!", \ - "You were protected against the [name]!") + target.visible_message("[src] was deflected!", \ + "You were protected against [src]!") ..(target, blocked, hit_zone) reagents.set_reacting(TRUE) reagents.handle_reactions() diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm index 5d659eca377..490878ea74d 100644 --- a/code/modules/projectiles/projectile/special.dm +++ b/code/modules/projectiles/projectile/special.dm @@ -159,7 +159,7 @@ /obj/item/projectile/clown/Bump(atom/A as mob|obj|turf|area) do_sparks(3, 1, src) new /obj/effect/decal/cleanable/ash(loc) - visible_message("The [name] explodes!","You hear a snap!") + visible_message("[src] explodes!","You hear a snap!") playsound(src, 'sound/effects/snap.ogg', 50, 1) qdel(src) diff --git a/code/modules/reagents/chemistry/holder.dm b/code/modules/reagents/chemistry/holder.dm index 90c42cb4403..181bc65eeb1 100644 --- a/code/modules/reagents/chemistry/holder.dm +++ b/code/modules/reagents/chemistry/holder.dm @@ -458,7 +458,7 @@ ME2.Uses-- if(ME2.Uses <= 0) // give the notification that the slime core is dead for(var/mob/living/M in seen) - to_chat(M, "[bicon(my_atom)] The [my_atom]'s power is consumed in the reaction.") + to_chat(M, "[bicon(my_atom)] [my_atom]'s power is consumed in the reaction.") ME2.name = "used slime extract" ME2.desc = "This extract has been used up." diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index d05f7f4d8ea..4ee5d7aa28e 100644 --- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm @@ -436,24 +436,26 @@ switch(mode) if("dispense") var/free = target.reagents.maximum_volume - target.reagents.total_volume - var/actual = min(amount, cell.charge / efficiency, free) - target.reagents.add_reagent(current_reagent, actual) - cell.charge -= actual / efficiency + var/actual = min(amount, round(cell.charge * efficiency), free) if(actual) - to_chat(user, "You dispense [amount] units of [current_reagent] into the [target].") - update_icon() + target.reagents.add_reagent(current_reagent, actual) + cell.charge -= actual / efficiency + to_chat(user, "You dispense [actual] unit\s of [current_reagent] into [target].") + update_icon() + else if(free) // If actual is nil and there's still free space, it means we're out of juice + to_chat(user, "Insufficient energy to complete operation.") if("remove") if(!target.reagents.remove_reagent(current_reagent, amount)) - to_chat(user, "You remove [amount] units of [current_reagent] from the [target].") + to_chat(user, "You remove [amount] unit\s of [current_reagent] from [target].") if("isolate") if(!target.reagents.isolate_reagent(current_reagent)) - to_chat(user, "You remove all but the [current_reagent] from the [target].") + to_chat(user, "You remove all but [current_reagent] from [target].") /obj/item/handheld_chem_dispenser/attack_self(mob/user) if(cell) ui_interact(user) else - to_chat(user, "The [src] lacks a power cell!") + to_chat(user, "[src] lacks a power cell!") /obj/item/handheld_chem_dispenser/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.inventory_state) @@ -493,7 +495,7 @@ . = TRUE switch(action) if("amount") - amount = clamp(round(text2num(params["amount"])), 0, 50) // round to nearest 1 and clamp to 0 - 50 + amount = clamp(round(text2num(params["amount"])), 1, 50) // round to nearest 1 and clamp to 1 - 50 if("dispense") if(params["reagent"] in dispensable_reagents) current_reagent = params["reagent"] @@ -569,7 +571,7 @@ cell.update_icon() cell.loc = get_turf(src) cell = null - to_chat(user, "You remove the cell from the [src].") + to_chat(user, "You remove the cell from [src].") update_icon() return ..() diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm index 2a58eaaf223..d3813ddffcc 100644 --- a/code/modules/reagents/chemistry/machinery/chem_master.dm +++ b/code/modules/reagents/chemistry/machinery/chem_master.dm @@ -88,7 +88,7 @@ return if(panel_open) - to_chat(user, "You can't use the [name] while it's panel is opened!") + to_chat(user, "You can't use [src] while it's panel is opened!") return TRUE if(istype(I, /obj/item/reagent_containers/glass) || istype(I, /obj/item/reagent_containers/food/drinks/drinkingglass)) diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm index 2422c7a143d..52a54e47a3b 100644 --- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm +++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm @@ -30,7 +30,7 @@ /obj/item/stack/sheet/mineral/tranquillite = list("nothing" = 20), /obj/item/stack/sheet/mineral/silver = list("silver" = 20), /obj/item/stack/sheet/mineral/gold = list("gold" = 20), - /obj/item/grown/nettle/basic = list("sacid" = 0), + /obj/item/grown/nettle/basic = list("wasabi" = 0), /obj/item/grown/nettle/death = list("facid" = 0, "sacid" = 0), /obj/item/grown/novaflower = list("capsaicin" = 0, "condensedcapsaicin" = 0), @@ -246,7 +246,7 @@ if(!operating) for (var/obj/item/O in holdingitems) - processing_chamber += "\A [O.name]
      " + processing_chamber += "\A [html_encode(O.name)]
      " if (!processing_chamber) is_chamber_empty = 1 diff --git a/code/modules/reagents/chemistry/reagents/alcohol.dm b/code/modules/reagents/chemistry/reagents/alcohol.dm index ad15e19856b..94172e14f0e 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol.dm @@ -688,6 +688,25 @@ M.bodytemperature = min(330, M.bodytemperature + (20 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055 return ..() +/datum/reagent/consumable/ethanol/adminfreeze + name = "Admin Freeze" + id = "adminfreeze" + description = "Ultimate Punishment." + reagent_state = LIQUID + color = "#30F0FF" // rgb: 048, 240, 255 + dizzy_adj = 4 + alcohol_perc = 1.5 // oof + drink_icon = "adminfreeze" + drink_name = "Admin Freeze" + drink_desc = "The ultimate punishment." + taste_description = "a series of bad decisions" + +/datum/reagent/consumable/ethanol/adminfreeze/reaction_mob(mob/living/M, method = REAGENT_INGEST, volume) + ..() + if(method == REAGENT_INGEST) + M.apply_status_effect(/datum/status_effect/freon/watcher) + M.adjust_bodytemperature(-110) + /datum/reagent/consumable/ethanol/barefoot name = "Barefoot" id = "barefoot" diff --git a/code/modules/reagents/chemistry/reagents/blob.dm b/code/modules/reagents/chemistry/reagents/blob.dm index 430586d5654..7ec5ee572df 100644 --- a/code/modules/reagents/chemistry/reagents/blob.dm +++ b/code/modules/reagents/chemistry/reagents/blob.dm @@ -181,11 +181,11 @@ volume = ..() M.apply_damage(0.4 * volume, BURN) if(M.reagents) - if(M.reagents.has_reagent("teslium") && prob(0.6 * volume)) + if(M.reagents.has_reagent("blob_teslium") && prob(0.6 * volume)) M.electrocute_act((0.5 * volume), "the blob's electrical discharge", 1, SHOCK_NOGLOVES) - M.reagents.del_reagent("teslium") + M.reagents.del_reagent("blob_teslium") return //don't add more teslium after you shock it out of someone. - M.reagents.add_reagent("teslium", 0.125 * volume) // a little goes a long way + M.reagents.add_reagent("blob_teslium", 0.125 * volume) // a little goes a long way /datum/reagent/blob/proc/send_message(mob/living/M) var/totalmessage = message diff --git a/code/modules/reagents/chemistry/reagents/food.dm b/code/modules/reagents/chemistry/reagents/food.dm index d22adff060d..38430bc3dce 100644 --- a/code/modules/reagents/chemistry/reagents/food.dm +++ b/code/modules/reagents/chemistry/reagents/food.dm @@ -794,6 +794,21 @@ color = "#B4641B" taste_description = "gravy" +/datum/reagent/consumable/wasabi + name = "Wasabi" + id = "wasabi" + description = "A pungent green paste often served with sushi. Consuming too much causes an uncomfortable burning sensation in the nostrils." + reagent_state = LIQUID + color = "#80942F" + taste_description = "pungency" + +/datum/reagent/consumable/wasabi/reaction_mob(mob/living/M, method=REAGENT_TOUCH, volume) + if(method == REAGENT_INGEST) + if(volume <= 1) + to_chat(M, "Your nostrils tingle briefly.") + else + to_chat(M, "Your nostrils burn uncomfortably!") + M.adjustFireLoss(1) ///Food Related, but non-nutritious diff --git a/code/modules/reagents/chemistry/reagents/medicine.dm b/code/modules/reagents/chemistry/reagents/medicine.dm index c05b578a42c..96f5a766778 100644 --- a/code/modules/reagents/chemistry/reagents/medicine.dm +++ b/code/modules/reagents/chemistry/reagents/medicine.dm @@ -774,6 +774,10 @@ if(M.getBruteLoss() + M.getFireLoss() + M.getCloneLoss() >= 150) M.delayed_gib() return + if(!M.ghost_can_reenter()) + M.visible_message("[M] twitches slightly, but is otherwise unresponsive!") + return + if(!M.suiciding && !HAS_TRAIT(M, TRAIT_HUSK) && !HAS_TRAIT(M, TRAIT_BADDNA)) var/time_dead = world.time - M.timeofdeath M.visible_message("[M] seems to rise from the dead!") @@ -1006,7 +1010,7 @@ reagent_state = LIQUID color = "#FFDCFF" taste_description = "stability" - var/list/drug_list = list("crank","methamphetamine","space_drugs","psilocybin","ephedrine","epinephrine","stimulants","bath_salts","lsd","thc") + var/list/drug_list = list("crank", "methamphetamine", "space_drugs", "synaptizine", "psilocybin", "ephedrine", "epinephrine", "stimulants", "stimulative_agent", "bath_salts", "lsd", "thc") /datum/reagent/medicine/haloperidol/on_mob_life(mob/living/M) var/update_flags = STATUS_UPDATE_NONE diff --git a/code/modules/reagents/chemistry/reagents/misc.dm b/code/modules/reagents/chemistry/reagents/misc.dm index a0122dccd78..a489685a340 100644 --- a/code/modules/reagents/chemistry/reagents/misc.dm +++ b/code/modules/reagents/chemistry/reagents/misc.dm @@ -442,7 +442,7 @@ if(!istype(C)) return if(C.mind) - if(C.mind.assigned_role == "Clown" || C.mind.assigned_role == SPECIAL_ROLE_HONKSQUAD) + if(C.mind.assigned_role == "Clown") to_chat(C, "Whatever that was, it feels great!") else if(C.mind.assigned_role == "Mime") to_chat(C, "You feel nauseous.") @@ -460,7 +460,7 @@ var/update_flags = STATUS_UPDATE_NONE if(prob(10)) M.emote("giggle") - if(M?.mind.assigned_role == "Clown" || M?.mind.assigned_role == SPECIAL_ROLE_HONKSQUAD) + if(M?.mind.assigned_role == "Clown") update_flags |= M.adjustBruteLoss(-1.5 * REAGENTS_EFFECT_MULTIPLIER) //Screw those pesky clown beatings! else M.AdjustDizzy(10, 0, 500) diff --git a/code/modules/reagents/chemistry/reagents/toxins.dm b/code/modules/reagents/chemistry/reagents/toxins.dm index b69c8256c0b..4256b27e762 100644 --- a/code/modules/reagents/chemistry/reagents/toxins.dm +++ b/code/modules/reagents/chemistry/reagents/toxins.dm @@ -334,7 +334,7 @@ return ..() | update_flags /datum/reagent/acid/facid/reaction_mob(mob/living/M, method = REAGENT_TOUCH, volume) - if(ishuman(M)) + if(ishuman(M) && !isgrey(M)) var/mob/living/carbon/human/H = M if(method == REAGENT_TOUCH) if(volume > 9) @@ -1228,15 +1228,19 @@ color = "#20324D" //RGB: 32, 50, 77 metabolization_rate = 0.2 var/shock_timer = 0 + + //The random values assigned to the high and low number for the random time for shocks + var/shock_high = 30 + var/shock_low = 5 + var/use_chaotic_random = TRUE //Do you change the random number every cycle, or after shock is triggered + var/chosen_timer = 15 //The timer chosen last cycle, or every time they are shocked + process_flags = ORGANIC | SYNTHETIC taste_description = "electricity" /datum/reagent/teslium/on_mob_life(mob/living/M) shock_timer++ - if(shock_timer >= rand(5,30)) //Random shocks are wildly unpredictable - shock_timer = 0 - M.electrocute_act(rand(5, 20), "Teslium in their body", 1, SHOCK_NOGLOVES) //Override because it's caused from INSIDE of you - playsound(M, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + shock_proc(M) return ..() /datum/reagent/teslium/on_mob_add(mob/living/M) @@ -1251,6 +1255,24 @@ H.physiology.siemens_coeff *= 0.5 ..() +/datum/reagent/teslium/proc/shock_proc(mob/living/M) + if(use_chaotic_random) + chosen_timer = rand(shock_low, shock_high) + if(shock_timer >= chosen_timer) + shock_timer = 0 + M.electrocute_act(rand(5, 20), "Teslium in their body", 1, SHOCK_NOGLOVES) //Override because it's caused from INSIDE of you + playsound(M, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + chosen_timer = rand(shock_low, shock_high) //It needs to be randomised here for blob teslium, and randoming it here doesn't affect normal + +/datum/reagent/teslium/blob //This version has it's shocks much less frequently, while retaining the shock multiplier + id = "blob_teslium" + shock_low = 10 + use_chaotic_random = FALSE + +/datum/reagent/teslium/blob/on_mob_add(mob/living/M) + ..() + chosen_timer = rand(10, 30) + /datum/reagent/gluttonytoxin name = "Gluttony's Blessing" id = "gluttonytoxin" diff --git a/code/modules/reagents/chemistry/reagents/water.dm b/code/modules/reagents/chemistry/reagents/water.dm index c51972b99c6..0fbde39df4f 100644 --- a/code/modules/reagents/chemistry/reagents/water.dm +++ b/code/modules/reagents/chemistry/reagents/water.dm @@ -57,30 +57,19 @@ taste_description = "floor cleaner" /datum/reagent/space_cleaner/reaction_obj(obj/O, volume) - if(is_cleanable(O)) - var/obj/effect/decal/cleanable/blood/B = O - if(!(istype(B) && B.off_floor)) - qdel(O) + if(istype(O, /obj/effect)) + var/obj/effect/E = O + if(E.is_cleanable()) + var/obj/effect/decal/cleanable/blood/B = E + if(!(istype(B) && B.off_floor)) + qdel(E) else if(O.simulated) O.color = initial(O.color) O.clean_blood() /datum/reagent/space_cleaner/reaction_turf(turf/T, volume) - if(volume >= 1) - var/floor_only = TRUE - for(var/obj/effect/decal/cleanable/C in T) - var/obj/effect/decal/cleanable/blood/B = C - if(istype(B) && B.off_floor) - floor_only = FALSE - else - qdel(C) - T.color = initial(T.color) - if(floor_only) - T.clean_blood() - - for(var/mob/living/simple_animal/slime/M in T) - M.adjustToxLoss(rand(5, 10)) + T.clean(volume >= 1) /datum/reagent/space_cleaner/reaction_mob(mob/living/M, method=REAGENT_TOUCH, volume) M.clean_blood() @@ -265,16 +254,11 @@ M.SetConfused(0) return if(iscultist(M)) - SSticker.mode.remove_cultist(M.mind) + SSticker.mode.remove_cultist(M.mind, TRUE, TRUE) holder.remove_reagent(id, volume) // maybe this is a little too perfect and a max() cap on the statuses would be better?? M.SetJitter(0) M.SetStuttering(0) M.SetConfused(0) - if(ishuman(M)) // Unequip all cult clothing - var/mob/living/carbon/human/H = M - for(var/I in H.contents) - if(is_type_in_list(I, CULT_CLOTHING)) - H.unEquip(I) return if(ishuman(M) && M.mind && M.mind.vampire && !M.mind.vampire.get_ability(/datum/vampire_passive/full) && prob(80)) var/mob/living/carbon/V = M diff --git a/code/modules/reagents/chemistry/recipes/drinks.dm b/code/modules/reagents/chemistry/recipes/drinks.dm index 737ccb4e0b9..1bdb91f1ab6 100644 --- a/code/modules/reagents/chemistry/recipes/drinks.dm +++ b/code/modules/reagents/chemistry/recipes/drinks.dm @@ -443,6 +443,15 @@ result_amount = 4 mix_sound = 'sound/goonstation/misc/drinkfizz.ogg' +/datum/chemical_reaction/adminfreeze + name = "Admin Freeze" + id = "adminfreeze" + result = "adminfreeze" + required_reagents = list("neurotoxin" = 1, "toxinsspecial" = 1, "fernet" = 1, "moonshine" = 1, "morphine" = 1) + min_temp = T0C + 100 + result_amount = 5 + mix_sound = 'sound/effects/adminhelp.ogg' + /datum/chemical_reaction/barefoot name = "Barefoot" id = "barefoot" @@ -455,7 +464,7 @@ name = "Daiquiri" id = "daiquiri" result = "daiquiri" - required_reagents = list("limejuice" = 1, "sugar" = 1, "rum" = 2) + required_reagents = list("limejuice" = 1, "sugar" = 1, "rum" = 2, "ice" = 1) result_amount = 4 mix_sound = 'sound/goonstation/misc/drinkfizz.ogg' diff --git a/code/modules/reagents/chemistry/recipes/slime_extracts.dm b/code/modules/reagents/chemistry/recipes/slime_extracts.dm index 995085b1dce..fd7a4001aa6 100644 --- a/code/modules/reagents/chemistry/recipes/slime_extracts.dm +++ b/code/modules/reagents/chemistry/recipes/slime_extracts.dm @@ -432,7 +432,7 @@ slime.update_name() continue slime.rabid = 1 - slime.visible_message("The [slime] is driven into a frenzy!") + slime.visible_message("[slime] is driven into a frenzy!") /datum/chemical_reaction/slimespeed @@ -563,7 +563,7 @@ SSblackbox.record_feedback("tally", "slime_cores_used", 1, type) if(holder.my_atom) var/obj/item/stack/ore/bluespace_crystal/BC = new(get_turf(holder.my_atom)) - BC.visible_message("The [BC.name] appears out of thin air!") + BC.visible_message("[BC] appears out of thin air!") //Cerulean /datum/chemical_reaction/slimepsteroid2 diff --git a/code/modules/reagents/reagent_containers/dropper.dm b/code/modules/reagents/reagent_containers/dropper.dm index ddd15413820..d3023b9d1ff 100644 --- a/code/modules/reagents/reagent_containers/dropper.dm +++ b/code/modules/reagents/reagent_containers/dropper.dm @@ -115,7 +115,7 @@ /obj/item/reagent_containers/dropper/precision/viral_injector/attack(mob/living/M, mob/living/user, def_zone) if(M.can_inject(user, TRUE)) - to_chat(user, "You stab [M] with the [src].") + to_chat(user, "You stealthily stab [M] with [src].") if(reagents.total_volume && M.reagents) var/list/injected = list() for(var/datum/reagent/R in reagents.reagent_list) diff --git a/code/modules/reagents/reagent_containers/iv_bag.dm b/code/modules/reagents/reagent_containers/iv_bag.dm index bb80be6a91a..e6db62b18ba 100644 --- a/code/modules/reagents/reagent_containers/iv_bag.dm +++ b/code/modules/reagents/reagent_containers/iv_bag.dm @@ -60,7 +60,7 @@ return if(get_dist(get_turf(src), get_turf(injection_target)) > 1) - to_chat(injection_target, "The [src]'s' needle is ripped out of you!") + to_chat(injection_target, "[src]'s needle is ripped out of you!") injection_target.apply_damage(3, BRUTE, pick("r_arm", "l_arm")) end_processing() return diff --git a/code/modules/reagents/reagent_containers/patch.dm b/code/modules/reagents/reagent_containers/patch.dm index 17112901b29..5a5a7c4696f 100644 --- a/code/modules/reagents/reagent_containers/patch.dm +++ b/code/modules/reagents/reagent_containers/patch.dm @@ -18,7 +18,8 @@ return FALSE bitesize = 0 if(M.eat(src, user)) - user.drop_item() + if(user.get_active_hand() == src) + user.drop_item() // Only drop if they're holding the patch directly forceMove(M) LAZYADD(M.processing_patches, src) return TRUE diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index 828040aae80..1002ff117c1 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -131,6 +131,9 @@ volume = 50 list_reagents = list("cleaner" = 50) +/obj/item/reagent_containers/spray/cleaner/drone/cyborg_recharge(coeff, emagged) + reagents.check_and_add("cleaner", volume, 3 * coeff) + //spray tan /obj/item/reagent_containers/spray/spraytan name = "spray tan" diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm index 7e376b0ebaa..c58cb676cc0 100644 --- a/code/modules/reagents/reagent_dispenser.dm +++ b/code/modules/reagents/reagent_dispenser.dm @@ -3,14 +3,19 @@ desc = "..." icon = 'icons/obj/objects.dmi' icon_state = "watertank" - density = 1 - anchored = 0 + density = TRUE + anchored = TRUE pressure_resistance = 2*ONE_ATMOSPHERE container_type = DRAINABLE | AMOUNT_VISIBLE max_integrity = 300 - var/tank_volume = 1000 //In units, how much the dispenser can hold - var/reagent_id = "water" //The ID of the reagent that the dispenser uses - var/lastrigger = "" // The last person to rig this fuel tank - Stored with the object. Only the last person matter for investigation + /// How much this dispenser can hold (In units) + var/tank_volume = 1000 + /// The ID of the reagent that the dispenser uses + var/reagent_id = "water" + /// The last person to rig this fuel tank - Stored with the object. Only the last person matters for investigation + var/lastrigger = "" + /// Can this tank be unwrenched + var/can_be_unwrenched = TRUE /obj/structure/reagent_dispensers/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir) . = ..() @@ -28,6 +33,19 @@ create_reagents(tank_volume) reagents.add_reagent(reagent_id, tank_volume) +/obj/structure/reagent_dispensers/wrench_act(mob/user, obj/item/I) + if(!can_be_unwrenched) + return + . = TRUE + if(!I.tool_use_check(user, 0)) + return + default_unfasten_wrench(user, I) + +/obj/structure/reagent_dispensers/examine(mob/user) + . = ..() + if(can_be_unwrenched) + . += "The wheels look like they can be [anchored ? "unlocked" : "locked in place"] with a wrench." + /obj/structure/reagent_dispensers/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) ..() if(reagents) @@ -206,8 +224,8 @@ name = "pepper spray refiller" desc = "Contains condensed capsaicin for use in law \"enforcement.\"" icon_state = "pepper" - anchored = 1 - density = 0 + density = FALSE + can_be_unwrenched = FALSE reagent_id = "condensedcapsaicin" /obj/structure/reagent_dispensers/water_cooler @@ -215,7 +233,6 @@ desc = "A machine that dispenses liquid to drink." icon = 'icons/obj/vending.dmi' icon_state = "water_cooler" - anchored = 1 tank_volume = 500 reagent_id = "water" var/paper_cups = 25 //Paper cups left from the cooler @@ -234,12 +251,6 @@ user.put_in_hands(S) paper_cups-- -/obj/structure/reagent_dispensers/water_cooler/wrench_act(mob/user, obj/item/I) - . = TRUE - if(!I.tool_use_check(user, 0)) - return - default_unfasten_wrench(user, I, 40) - /obj/structure/reagent_dispensers/beerkeg name = "beer keg" desc = "Beer is liquid bread, it's good for you..." @@ -263,22 +274,22 @@ name = "virus food dispenser" desc = "A dispenser of low-potency virus mutagenic." icon_state = "virus_food" - anchored = 1 - density = 0 + can_be_unwrenched = FALSE + density = FALSE reagent_id = "virusfood" /obj/structure/reagent_dispensers/spacecleanertank name = "space cleaner refiller" desc = "Refills space cleaner bottles." icon_state = "cleaner" - anchored = 1 - density = 0 + can_be_unwrenched = FALSE + density = FALSE tank_volume = 5000 reagent_id = "cleaner" /obj/structure/reagent_dispensers/fueltank/chem icon_state = "fuel_chem" - anchored = 1 - density = 0 - accepts_rig = 0 + can_be_unwrenched = FALSE + density = FALSE + accepts_rig = FALSE tank_volume = 1000 diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index adb27fccc82..b2afa9c06e3 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -120,11 +120,11 @@ if(ismob(G.affecting)) var/mob/GM = G.affecting for(var/mob/V in viewers(usr)) - V.show_message("[usr] starts putting [GM.name] into the disposal.", 3) + V.show_message("[usr] starts putting [GM] into the disposal.", 3) if(do_after(usr, 20, target = GM)) GM.forceMove(src) for(var/mob/C in viewers(src)) - C.show_message("[GM.name] has been placed in the [src] by [user].", 3) + C.show_message("[GM] has been placed in [src] by [user].", 3) qdel(G) add_attack_logs(usr, GM, "Disposal'ed", !!GM.ckey ? null : ATKLOG_ALL) return @@ -137,11 +137,11 @@ if(I) I.forceMove(src) - to_chat(user, "You place \the [I] into the [src].") + to_chat(user, "You place [I] into [src].") for(var/mob/M in viewers(src)) if(M == user) continue - M.show_message("[user.name] places \the [I] into the [src].", 3) + M.show_message("[user.name] places [I] into [src].", 3) update() @@ -203,11 +203,11 @@ return if(target == user && !user.stat && !user.IsWeakened() && !user.stunned && !user.paralysis) // if drop self, then climbed in // must be awake, not stunned or whatever - msg = "[user.name] climbs into the [src]." - to_chat(user, "You climb into the [src].") + msg = "[user.name] climbs into [src]." + to_chat(user, "You climb into [src].") else if(target != user && !user.restrained() && !user.stat && !user.IsWeakened() && !user.stunned && !user.paralysis) - msg = "[user.name] stuffs [target.name] into the [src]!" - to_chat(user, "You stuff [target.name] into the [src]!") + msg = "[user.name] stuffs [target.name] into [src]!" + to_chat(user, "You stuff [target.name] into [src]!") if(!iscarbon(user)) target.LAssailant = null else diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index ab2843a4763..07c92cb8b0a 100755 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -286,7 +286,7 @@ return /obj/machinery/disposal/deliveryChute/Bumped(atom/movable/AM) //Go straight into the chute - if(istype(AM, /obj/item/projectile)) return + if(istype(AM, /obj/item/projectile) || isAI(AM)) return switch(dir) if(NORTH) if(AM.loc.y != src.loc.y+1) return diff --git a/code/modules/research/circuitprinter.dm b/code/modules/research/circuitprinter.dm index 5e8faa17bdb..83b09e5c228 100644 --- a/code/modules/research/circuitprinter.dm +++ b/code/modules/research/circuitprinter.dm @@ -95,7 +95,7 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis). default_deconstruction_crowbar(user, O) return else - to_chat(user, "You can't load the [src.name] while it's opened.") + to_chat(user, "You can't load [src] while it's opened.") return if(O.is_open_container()) return FALSE diff --git a/code/modules/research/destructive_analyzer.dm b/code/modules/research/destructive_analyzer.dm index bbb2583b931..41b7fedd6db 100644 --- a/code/modules/research/destructive_analyzer.dm +++ b/code/modules/research/destructive_analyzer.dm @@ -62,10 +62,10 @@ Note: Must be placed within 3 tiles of the R&D Console if(disabled) return if(!linked_console) - to_chat(user, "The [src.name] must be linked to an R&D console first!") + to_chat(user, "[src] must be linked to an R&D console first!") return if(busy) - to_chat(user, "The [src.name] is busy right now.") + to_chat(user, "[src] is busy right now.") return if(istype(O, /obj/item) && !loaded_item) if(!O.origin_tech) @@ -76,12 +76,12 @@ Note: Must be placed within 3 tiles of the R&D Console to_chat(user, "You cannot deconstruct this item!") return if(!user.drop_item()) - to_chat(user, "\The [O] is stuck to your hand, you cannot put it in the [src.name]!") + to_chat(user, "[O] is stuck to your hand, you cannot put it in [src]!") return busy = 1 loaded_item = O O.loc = src - to_chat(user, "You add the [O.name] to the [src.name]!") + to_chat(user, "You add [O] to [src]!") flick("d_analyzer_la", src) spawn(10) icon_state = "d_analyzer_l" diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm index 1fda208e5d9..a89a70d6e6a 100644 --- a/code/modules/research/experimentor.dm +++ b/code/modules/research/experimentor.dm @@ -16,7 +16,7 @@ #define FAIL 8 /obj/machinery/r_n_d/experimentor - name = "E.X.P.E.R.I-MENTOR" + name = "\improper E.X.P.E.R.I-MENTOR" icon = 'icons/obj/machines/heavy_lathe.dmi' icon_state = "h_lathe" density = 1 @@ -129,16 +129,16 @@ return if(!checkCircumstances(O)) - to_chat(user, "The [O] is not yet valid for the [src] and must be completed!") + to_chat(user, "[O] is not yet valid for [src] and must be completed!") return if(disabled) return if(!linked_console) - to_chat(user, "The [src] must be linked to an R&D console first!") + to_chat(user, "[src] must be linked to an R&D console first!") return if(loaded_item) - to_chat(user, "The [src] is already loaded.") + to_chat(user, "[src] is already loaded.") return if(istype(O, /obj/item)) if(!O.origin_tech) @@ -152,7 +152,7 @@ return loaded_item = O O.loc = src - to_chat(user, "You add the [O.name] to the machine.") + to_chat(user, "You add [O] to the machine.") flick("h_lathe_load", src) return @@ -263,7 +263,7 @@ visible_message("[src] malfunctions!") exp = SCANTYPE_OBLITERATE if(prob(EFFECT_PROB_MEDIUM-badThingCoeff)) - visible_message("[src] malfunctions, throwing the [exp_on]!") + visible_message("[src] malfunctions, throwing [exp_on]!") var/mob/living/target = locate(/mob/living) in oview(7,src) if(target) var/obj/item/throwing = loaded_item @@ -443,7 +443,7 @@ if(exp == SCANTYPE_OBLITERATE) visible_message("[exp_on] activates the crushing mechanism, [exp_on] is destroyed!") if(prob(EFFECT_PROB_LOW) && criticalReaction) - visible_message("[src]'s crushing mechanism slowly and smoothly descends, flattening the [exp_on]!") + visible_message("[src]'s crushing mechanism slowly and smoothly descends, flattening [exp_on]!") new /obj/item/stack/sheet/plasteel(get_turf(pick(oview(1,src)))) if(linked_console.linked_lathe) var/datum/component/material_container/linked_materials = linked_console.linked_lathe.GetComponent(/datum/component/material_container) @@ -478,7 +478,7 @@ visible_message("[exp_on] [a], and [b], the experiment was a failure.") if(exp == SCANTYPE_DISCOVER) - visible_message("[src] scans the [exp_on], revealing its true nature!") + visible_message("[src] scans [exp_on], revealing its true nature!") playsound(src.loc, 'sound/effects/supermatter.ogg', 50, 3, -1) var/obj/item/relic/R = loaded_item R.reveal() @@ -710,17 +710,17 @@ to_chat(user, "[src] begins to heat up!") spawn(rand(35,100)) if(src.loc == user) - visible_message("The [src]'s top opens, releasing a powerful blast!") + visible_message("[src]'s top opens, releasing a powerful blast!") explosion(user.loc, -1, rand(1,5), rand(1,5), rand(1,5), rand(1,5), flame_range = 2) warn_admins(user, "Explosion") qdel(src) //Comment this line to produce a light grenade (the bomb that keeps on exploding when used)!! /obj/item/relic/proc/teleport(mob/user) - to_chat(user, "The [src] begins to vibrate!") + to_chat(user, "[src] begins to vibrate!") spawn(rand(10,30)) var/turf/userturf = get_turf(user) if(src.loc == user && is_teleport_allowed(userturf.z)) //Because Nuke Ops bringing this back on their shuttle, then looting the ERT area is 2fun4you! - visible_message("The [src] twists and bends, relocating itself!") + visible_message("[src] twists and bends, relocating itself!") throwSmoke(userturf) do_teleport(user, userturf, 8, asoundin = 'sound/effects/phasein.ogg') throwSmoke(get_turf(user)) diff --git a/code/modules/research/protolathe.dm b/code/modules/research/protolathe.dm index 44fa7e00e1b..263e67dd795 100644 --- a/code/modules/research/protolathe.dm +++ b/code/modules/research/protolathe.dm @@ -102,7 +102,7 @@ Note: Must be placed west/left of and R&D console to function. default_deconstruction_crowbar(user, O) return 1 else - to_chat(user, "You can't load the [src.name] while it's opened.") + to_chat(user, "You can't load [src] while it's opened.") return 1 if(O.is_open_container()) return FALSE diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index da21ae77d78..ffa8ac763de 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -285,16 +285,16 @@ won't update every console in existence) but it's more of a hassle to do. Also, clear_wait_message() SStgui.update_uis(src) -/obj/machinery/computer/rdconsole/proc/start_destroyer() +/obj/machinery/computer/rdconsole/proc/start_destroyer(mob/user) if(!linked_destroy) return if(linked_destroy.busy) - to_chat(usr, "[linked_destroy] is busy at the moment.") + to_chat(user, "[linked_destroy] is busy at the moment.") return if(!linked_destroy.loaded_item) - to_chat(usr, "[linked_destroy] appears to be empty.") + to_chat(user, "[linked_destroy] appears to be empty.") return var/list/temp_tech = linked_destroy.ConvertReqString2List(linked_destroy.loaded_item.origin_tech) @@ -313,7 +313,7 @@ won't update every console in existence) but it's more of a hassle to do. Also, linked_destroy.busy = TRUE add_wait_message("Processing and Updating Database...", DECONSTRUCT_DELAY) flick("d_analyzer_process", linked_destroy) - addtimer(CALLBACK(src, .proc/finish_destroyer, temp_tech), DECONSTRUCT_DELAY) + addtimer(CALLBACK(src, .proc/finish_destroyer, user, temp_tech), DECONSTRUCT_DELAY) // Sends salvaged materials to a linked protolathe, if any. /obj/machinery/computer/rdconsole/proc/send_mats() @@ -329,14 +329,14 @@ won't update every console in existence) but it's more of a hassle to do. Also, var/can_insert = min(space, salvageable, available) linked_lathe.materials.insert_amount(can_insert, material) -/obj/machinery/computer/rdconsole/proc/finish_destroyer(list/temp_tech) +/obj/machinery/computer/rdconsole/proc/finish_destroyer(mob/user, list/temp_tech) clear_wait_message() if(!linked_destroy || !temp_tech) return if(!linked_destroy.hacked) if(!linked_destroy.loaded_item) - to_chat(usr, "[linked_destroy] appears to be empty.") + to_chat(user, "[linked_destroy] appears to be empty.") else for(var/T in temp_tech) files.UpdateTech(T, temp_tech[T]) diff --git a/code/modules/research/xenobiology/xenobio_camera.dm b/code/modules/research/xenobiology/xenobio_camera.dm index 52b220b866b..0c2079ef160 100644 --- a/code/modules/research/xenobiology/xenobio_camera.dm +++ b/code/modules/research/xenobiology/xenobio_camera.dm @@ -176,7 +176,7 @@ if(istype(M.buffer, /obj/machinery/monkey_recycler)) connected_recycler = M.buffer connected_recycler.connected += src - to_chat(user, "You link [src] to the recycler stored in the [M]'s buffer.") + to_chat(user, "You link [src] to the recycler stored in [M]'s buffer.") /datum/action/innate/slime_place name = "Place Slimes" diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm index 5a83bce5536..d6d7312adc6 100644 --- a/code/modules/research/xenobiology/xenobiology.dm +++ b/code/modules/research/xenobiology/xenobiology.dm @@ -188,7 +188,7 @@ return if(being_used || !ismob(M)) return - if(!isanimal(M) || M.ckey) //only works on animals that aren't player controlled + if(!isanimal(M) || M.mind) //only works on animals that aren't player controlled to_chat(user, "[M] is already too intelligent for this to work!") return ..() if(M.stat) diff --git a/code/modules/response_team/ert.dm b/code/modules/response_team/ert.dm index 13002089925..f709e0455f9 100644 --- a/code/modules/response_team/ert.dm +++ b/code/modules/response_team/ert.dm @@ -312,6 +312,7 @@ GLOBAL_VAR_INIT(ert_request_answered, FALSE) id = /obj/item/card/id/ert l_ear = /obj/item/radio/headset/ert/alt box = /obj/item/storage/box/responseteam + gloves = /obj/item/clothing/gloves/combat implants = list(/obj/item/implant/mindshield) diff --git a/code/modules/response_team/ert_outfits.dm b/code/modules/response_team/ert_outfits.dm index 4f83bfe24c7..550434a44ac 100644 --- a/code/modules/response_team/ert_outfits.dm +++ b/code/modules/response_team/ert_outfits.dm @@ -54,7 +54,6 @@ /datum/outfit/job/centcom/response_team/commander/amber name = "RT Commander (Amber)" shoes = /obj/item/clothing/shoes/combat - gloves = /obj/item/clothing/gloves/color/black suit = /obj/item/clothing/suit/armor/vest/ert/command glasses = /obj/item/clothing/glasses/sunglasses mask = /obj/item/clothing/mask/gas/sechailer @@ -71,7 +70,6 @@ /datum/outfit/job/centcom/response_team/commander/red name = "RT Commander (Red)" shoes = /obj/item/clothing/shoes/combat - gloves = /obj/item/clothing/gloves/combat suit = /obj/item/clothing/suit/space/hardsuit/ert/commander glasses = /obj/item/clothing/glasses/sunglasses mask = /obj/item/clothing/mask/gas/sechailer/swat @@ -95,7 +93,6 @@ /datum/outfit/job/centcom/response_team/commander/gamma name = "RT Commander (Gamma)" shoes = /obj/item/clothing/shoes/magboots/advance - gloves = /obj/item/clothing/gloves/combat suit = /obj/item/clothing/suit/space/hardsuit/ert/commander/gamma glasses = /obj/item/clothing/glasses/night mask = /obj/item/clothing/mask/gas/sechailer/swat @@ -136,7 +133,6 @@ /datum/outfit/job/centcom/response_team/security/amber name = "RT Security (Amber)" shoes = /obj/item/clothing/shoes/combat - gloves = /obj/item/clothing/gloves/color/black suit = /obj/item/clothing/suit/armor/vest/ert/security suit_store = /obj/item/gun/energy/gun/advtaser glasses = /obj/item/clothing/glasses/hud/security/sunglasses @@ -155,7 +151,6 @@ name = "RT Security (Red)" shoes = /obj/item/clothing/shoes/combat - gloves = /obj/item/clothing/gloves/color/black suit = /obj/item/clothing/suit/space/hardsuit/ert/security suit_store = /obj/item/gun/energy/gun/blueshield/pdw9 glasses = /obj/item/clothing/glasses/sunglasses @@ -183,7 +178,6 @@ /datum/outfit/job/centcom/response_team/security/gamma name = "RT Security (Gamma)" shoes = /obj/item/clothing/shoes/magboots/advance - gloves = /obj/item/clothing/gloves/combat suit = /obj/item/clothing/suit/space/hardsuit/ert/security/gamma belt = /obj/item/storage/belt/security/response_team_gamma suit_store = /obj/item/gun/energy/gun/nuclear @@ -221,7 +215,6 @@ rt_mob_job = "ERT Engineering" back = /obj/item/storage/backpack/ert/engineer uniform = /obj/item/clothing/under/rank/engineer - belt = /obj/item/storage/belt/utility/full/multitool pda = /obj/item/pda/heads/ert/engineering id = /obj/item/card/id/ert/engineering @@ -229,7 +222,6 @@ /datum/outfit/job/centcom/response_team/engineer/amber name = "RT Engineer (Amber)" shoes = /obj/item/clothing/shoes/magboots - gloves = /obj/item/clothing/gloves/color/yellow suit = /obj/item/clothing/suit/space/hardsuit/ert/engineer suit_store = /obj/item/tank/internals/emergency_oxygen/engi glasses = /obj/item/clothing/glasses/meson/engine @@ -248,7 +240,6 @@ /datum/outfit/job/centcom/response_team/engineer/red name = "RT Engineer (Red)" shoes = /obj/item/clothing/shoes/magboots/advance - gloves = /obj/item/clothing/gloves/color/yellow belt = /obj/item/storage/belt/utility/chief/full suit = /obj/item/clothing/suit/space/hardsuit/ert/engineer/gamma suit_store = /obj/item/tank/internals/emergency_oxygen/engi @@ -274,7 +265,6 @@ /datum/outfit/job/centcom/response_team/engineer/gamma name = "RT Engineer (Gamma)" shoes = /obj/item/clothing/shoes/magboots/advance - gloves = /obj/item/clothing/gloves/color/yellow belt = /obj/item/storage/belt/utility/chief/full suit = /obj/item/clothing/suit/space/hardsuit/ert/engineer/gamma suit_store = /obj/item/gun/energy/gun/blueshield/pdw9 @@ -316,7 +306,6 @@ name = "RT Medic (Amber)" shoes = /obj/item/clothing/shoes/white - gloves = /obj/item/clothing/gloves/color/latex suit = /obj/item/clothing/suit/armor/vest/ert/medical suit_store = /obj/item/gun/energy/gun/mini glasses = /obj/item/clothing/glasses/hud/health @@ -345,7 +334,6 @@ name = "RT Medic (Red)" rt_mob_job = "ERT Medical" shoes = /obj/item/clothing/shoes/white - gloves = /obj/item/clothing/gloves/color/latex/nitrile suit = /obj/item/clothing/suit/space/hardsuit/ert/medical glasses = /obj/item/clothing/glasses/hud/health/sunglasses suit_store = /obj/item/gun/energy/gun @@ -378,7 +366,6 @@ /datum/outfit/job/centcom/response_team/medic/gamma name = "RT Medic (Gamma)" shoes = /obj/item/clothing/shoes/magboots/advance - gloves = /obj/item/clothing/gloves/combat suit = /obj/item/clothing/suit/space/hardsuit/ert/medical/gamma glasses = /obj/item/clothing/glasses/night mask = /obj/item/clothing/mask/gas/sechailer/swat @@ -418,7 +405,6 @@ rt_mob_job = "ERT Paranormal" uniform = /obj/item/clothing/under/rank/chaplain back = /obj/item/storage/backpack/ert/security - gloves = /obj/item/clothing/gloves/color/black shoes = /obj/item/clothing/shoes/combat l_ear = /obj/item/radio/headset/ert/alt glasses = /obj/item/clothing/glasses/hud/security/sunglasses @@ -487,7 +473,6 @@ uniform = /obj/item/clothing/under/color/purple/sensor back = /obj/item/storage/backpack/ert/janitor belt = /obj/item/storage/belt/janitor/full - gloves = /obj/item/clothing/gloves/color/yellow shoes = /obj/item/clothing/shoes/galoshes l_ear = /obj/item/radio/headset/ert/alt id = /obj/item/card/id/centcom @@ -529,7 +514,6 @@ name = "RT Janitor (Gamma)" suit = /obj/item/clothing/suit/space/hardsuit/ert/janitor/gamma glasses = /obj/item/clothing/glasses/hud/security/sunglasses - gloves = /obj/item/clothing/gloves/combat suit_store = /obj/item/gun/energy/gun l_pocket = /obj/item/grenade/clusterbuster/cleaner r_pocket = /obj/item/scythe/tele diff --git a/code/modules/ruins/lavalandruin_code/ash_walker_den.dm b/code/modules/ruins/lavalandruin_code/ash_walker_den.dm index e03b5a56b00..c37fe1921e9 100644 --- a/code/modules/ruins/lavalandruin_code/ash_walker_den.dm +++ b/code/modules/ruins/lavalandruin_code/ash_walker_den.dm @@ -78,6 +78,7 @@ new_spawn.rename_character(new_spawn.real_name, new_spawn.dna.species.get_random_name(new_spawn.gender)) to_chat(new_spawn, "Drag the corpses of men and beasts to your nest. It will absorb them to create more of your kind. Glory to the Necropolis!") + to_chat(new_spawn, "For more information, check the wiki page: ([config.wikiurl]/index.php/Ash_Walker)") /obj/effect/mob_spawn/human/ash_walker/New() . = ..() diff --git a/code/modules/ruins/lavalandruin_code/puzzle.dm b/code/modules/ruins/lavalandruin_code/puzzle.dm index 0220498df5e..2a3ae55bd4b 100644 --- a/code/modules/ruins/lavalandruin_code/puzzle.dm +++ b/code/modules/ruins/lavalandruin_code/puzzle.dm @@ -194,7 +194,7 @@ /obj/structure/puzzle_element name = "mysterious pillar" - desc = "puzzling..." + desc = "Puzzling..." icon = 'icons/obj/lavaland/artefacts.dmi' icon_state = "puzzle_pillar" anchored = FALSE diff --git a/code/modules/security_levels/security_levels.dm b/code/modules/security_levels/security_levels.dm index c1ab7fce353..af22e0061e4 100644 --- a/code/modules/security_levels/security_levels.dm +++ b/code/modules/security_levels/security_levels.dm @@ -173,3 +173,18 @@ GLOBAL_DATUM_INIT(security_announcement_down, /datum/announcement/priority/secur return SEC_LEVEL_EPSILON if("delta") return SEC_LEVEL_DELTA + +/proc/get_security_level_colors() + switch(GLOB.security_level) + if(SEC_LEVEL_GREEN) + return "Green" + if(SEC_LEVEL_BLUE) + return "Blue" + if(SEC_LEVEL_RED) + return "Red" + if(SEC_LEVEL_GAMMA) + return "Gamma" + if(SEC_LEVEL_EPSILON) + return "Epsilon" + if(SEC_LEVEL_DELTA) + return "Delta" diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm index 8a5c2118794..3be1df48458 100644 --- a/code/modules/shuttle/emergency.dm +++ b/code/modules/shuttle/emergency.dm @@ -269,6 +269,8 @@ for(var/mob/M in GLOB.player_list) if(!isnewplayer(M) && !M.client.karma_spent && !(M.client.ckey in GLOB.karma_spenders) && !M.get_preference(PREFTOGGLE_DISABLE_KARMA_REMINDER)) to_chat(M, "You have not yet spent your karma for the round; was there a player worthy of receiving your reward? Look under Special Verbs tab, Award Karma.") + if(config.map_voting_enabled) + SSvote.initiate_vote("map", "the server", TRUE) if(SHUTTLE_ESCAPE) if(time_left <= 0) diff --git a/code/modules/shuttle/shuttle_rotate.dm b/code/modules/shuttle/shuttle_rotate.dm index 2adaad8e166..9d1989e70fb 100644 --- a/code/modules/shuttle/shuttle_rotate.dm +++ b/code/modules/shuttle/shuttle_rotate.dm @@ -56,6 +56,9 @@ If ever any of these procs are useful for non-shuttles, rename it to proc/rotate d2 = temp update_icon() +/obj/structure/shuttle/engine/shuttleRotate(rotation, params) + setDir(angle2dir(rotation+dir2angle(dir))) + //Fixes dpdir on shuttle rotation /obj/structure/disposalpipe/shuttleRotate(rotation, params) . = ..() diff --git a/code/modules/shuttle/syndicate.dm b/code/modules/shuttle/syndicate.dm index 7f5bf470686..87a03e2e8e9 100644 --- a/code/modules/shuttle/syndicate.dm +++ b/code/modules/shuttle/syndicate.dm @@ -12,6 +12,7 @@ resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF flags = NODECONSTRUCT var/challenge = FALSE + var/challenge_time = 0 //When was war declared? /obj/machinery/computer/shuttle/syndicate/recall name = "syndicate shuttle recall terminal" @@ -19,9 +20,10 @@ possible_destinations = "syndicate_away" /obj/machinery/computer/shuttle/syndicate/can_call_shuttle(user, action) + var/time_to_go = max(SYNDICATE_CHALLENGE_TIMER, (challenge_time + 10 MINUTES)) if(action == "move") - if(challenge && world.time < SYNDICATE_CHALLENGE_TIMER) - to_chat(user, "You've issued a combat challenge to the station! You've got to give them at least [round(((SYNDICATE_CHALLENGE_TIMER - world.time) / 10) / 60)] more minutes to allow them to prepare.") + if(challenge && world.time < time_to_go) + to_chat(user, "You've issued a combat challenge to the station! You've got to give them at least [round(((time_to_go - world.time) / 10) / 60)] more minutes to allow them to prepare.") return FALSE return TRUE diff --git a/code/modules/space_management/level_traits.dm b/code/modules/space_management/level_traits.dm index 6aa3fa802a7..c11a1e6e47c 100644 --- a/code/modules/space_management/level_traits.dm +++ b/code/modules/space_management/level_traits.dm @@ -36,7 +36,8 @@ secure = (z == level_name_to_num(CENTCOMM)) return secure -GLOBAL_LIST_INIT(default_map_traits, MAP_TRANSITION_CONFIG) +// Only CC +GLOBAL_LIST_INIT(default_map_traits, list(CC_TRANSITION_CONFIG)) /proc/check_level_trait(z, trait) if(!z) diff --git a/code/modules/spacepods/lock_buster.dm b/code/modules/spacepods/lock_buster.dm index 8a83315ce3d..0907878fc17 100644 --- a/code/modules/spacepods/lock_buster.dm +++ b/code/modules/spacepods/lock_buster.dm @@ -11,4 +11,4 @@ icon_state = "lock_buster_on" else icon_state = "lock_buster_off" - to_chat(usr, "You turn the [src] [on ? "on" : "off"].") + to_chat(usr, "You turn [src] [on ? "on" : "off"].") diff --git a/code/modules/spacepods/spacepod.dm b/code/modules/spacepods/spacepod.dm index fc03de708b5..29112499926 100644 --- a/code/modules/spacepods/spacepod.dm +++ b/code/modules/spacepods/spacepod.dm @@ -257,7 +257,7 @@ deal_damage(15) playsound(src.loc, 'sound/weapons/slash.ogg', 50, 1, -1) to_chat(user, "You slash at [src]!") - visible_message("The [user] slashes at [src.name]'s armor!") + visible_message("[user] slashes at [src]'s armor!") /obj/spacepod/proc/deal_damage(damage) var/oldhealth = health @@ -391,22 +391,22 @@ else if(istype(W, /obj/item/lock_buster)) var/obj/item/lock_buster/L = W if(L.on && equipment_system.lock_system) - user.visible_message(user, "[user] is drilling through the [src]'s lock!", - "You start drilling through the [src]'s lock!") + user.visible_message(user, "[user] is drilling through [src]'s lock!", + "You start drilling through [src]'s lock!") if(do_after(user, 100 * W.toolspeed, target = src)) QDEL_NULL(equipment_system.lock_system) unlocked = TRUE - user.visible_message(user, "[user] has destroyed the [src]'s lock!", - "You destroy the [src]'s lock!") + user.visible_message(user, "[user] has destroyed [src]'s lock!", + "You destroy [src]'s lock!") else - user.visible_message(user, "[user] fails to break through the [src]'s lock!", - "You were unable to break through the [src]'s lock!") + user.visible_message(user, "[user] fails to break through [src]'s lock!", + "You were unable to break through [src]'s lock!") return if(L.on && unlocked == FALSE) //The buster is on, we don't have a lock system, and the pod is still somehow locked, unlocking. unlocked = TRUE user.visible_message(user, "[user] repairs [src]'s doors with [L].", "You repair [src]'s doors with [L].") - to_chat(user, "Turn the [L] on first.") + to_chat(user, "Turn [L] on first.") return else if(cargo_hold.storage_slots > 0 && !hatch_open && unlocked) // must be the last option as all items not listed prior will be stored @@ -471,7 +471,7 @@ target = passengers[1] if(target && istype(target)) - src.visible_message("[user] is trying to rip the door open and pull [target] out of the [src]!", + src.visible_message("[user] is trying to rip the door open and pull [target] out of [src]!", "You see [user] outside the door trying to rip it open!") if(do_after(user, 50, target = src)) target.Stun(1) @@ -479,11 +479,11 @@ eject_pilot() else eject_passenger(target) - target.visible_message("[user] flings the door open and tears [target] out of the [src]", - "The door flies open and you are thrown out of the [src] and to the ground!") + target.visible_message("[user] flings the door open and tears [target] out of [src]", + "The door flies open and you are thrown out of [src] and to the ground!") return target.visible_message("[user] was unable to get the door open!", - "You manage to keep [user] out of the [src]!") + "You manage to keep [user] out of [src]!") if(!hatch_open) if(cargo_hold.storage_slots > 0) @@ -867,9 +867,9 @@ occupant_sanity_check() if(usr.restrained()) - to_chat(usr, "You attempt to stumble out of the [src]. This will take two minutes.") + to_chat(usr, "You attempt to stumble out of [src]. This will take two minutes.") if(pilot) - to_chat(pilot, "[usr] is trying to escape the [src].") + to_chat(pilot, "[usr] is trying to escape [src].") if(!do_after(usr, 1200, target = src)) return @@ -1016,7 +1016,7 @@ else to_chat(user, "You fail to find anything of value.") else - to_chat(user, "You decide against searching the [src]") + to_chat(user, "You decide against searching [src]") /obj/spacepod/proc/enter_after(delay as num, mob/user as mob, numticks = 5) var/delayfraction = delay/numticks diff --git a/code/modules/station_goals/bluespace_tap.dm b/code/modules/station_goals/bluespace_tap.dm index 5bca3129d0f..6eb4cb9572e 100644 --- a/code/modules/station_goals/bluespace_tap.dm +++ b/code/modules/station_goals/bluespace_tap.dm @@ -156,10 +156,10 @@ /obj/item/reagent_containers/food/snacks/sliceable/cheesecake, /obj/item/reagent_containers/food/snacks/sliceable/bananacake, /obj/item/reagent_containers/food/snacks/sliceable/chocolatecake, - /obj/item/reagent_containers/food/snacks/meatballsoup, - /obj/item/reagent_containers/food/snacks/mysterysoup, - /obj/item/reagent_containers/food/snacks/stew, - /obj/item/reagent_containers/food/snacks/hotchili, + /obj/item/reagent_containers/food/snacks/soup/meatballsoup, + /obj/item/reagent_containers/food/snacks/soup/mysterysoup, + /obj/item/reagent_containers/food/snacks/soup/stew, + /obj/item/reagent_containers/food/snacks/soup/hotchili, /obj/item/reagent_containers/food/snacks/burrito, /obj/item/reagent_containers/food/snacks/fishburger, /obj/item/reagent_containers/food/snacks/cubancarp, diff --git a/code/modules/station_goals/shield.dm b/code/modules/station_goals/shield.dm index f4b5a02783a..3defa561f4f 100644 --- a/code/modules/station_goals/shield.dm +++ b/code/modules/station_goals/shield.dm @@ -126,7 +126,7 @@ to_chat(user, "You can only activate satellites which are in space.") return FALSE if(user) - to_chat(user, "You [active ? "deactivate": "activate"] the [src]") + to_chat(user, "You [active ? "deactivate": "activate"] [src]") active = !active if(active) animate(src, pixel_y = 2, time = 10, loop = -1) diff --git a/code/modules/surgery/helpers.dm b/code/modules/surgery/helpers.dm index 4c8001c9f76..bc579f5387c 100644 --- a/code/modules/surgery/helpers.dm +++ b/code/modules/surgery/helpers.dm @@ -11,6 +11,9 @@ /obj/item/weldingtool = 30 ) + if(M == user) + return // no self surgery + if(istype(M, /mob/living/carbon/human)) H = M affecting = H.get_organ(check_zone(selected_zone)) diff --git a/code/modules/surgery/organs/augments_internal.dm b/code/modules/surgery/organs/augments_internal.dm index ef05df1d350..319f044f449 100644 --- a/code/modules/surgery/organs/augments_internal.dm +++ b/code/modules/surgery/organs/augments_internal.dm @@ -99,12 +99,12 @@ if(L_item) A = pick(oview(range)) L_item.throw_at(A, range, 2) - to_chat(owner, "Your left arm spasms and throws the [L_item.name]!") + to_chat(owner, "Your left arm spasms and throws [L_item]!") l_hand_obj = null if(R_item) A = pick(oview(range)) R_item.throw_at(A, range, 2) - to_chat(owner, "Your right arm spasms and throws the [R_item.name]!") + to_chat(owner, "Your right arm spasms and throws [R_item]!") r_hand_obj = null /obj/item/organ/internal/cyberimp/brain/anti_drop/proc/release_items() diff --git a/code/modules/surgery/organs/eyes.dm b/code/modules/surgery/organs/eyes.dm index b317266dab0..b5df8f90479 100644 --- a/code/modules/surgery/organs/eyes.dm +++ b/code/modules/surgery/organs/eyes.dm @@ -17,7 +17,7 @@ var/tint = 0 var/flash_protect = FLASH_PROTECTION_NONE var/see_invisible = SEE_INVISIBLE_LIVING - var/lighting_alpha + var/lighting_alpha = LIGHTING_PLANE_ALPHA_VISIBLE /obj/item/organ/internal/eyes/proc/update_colour() dna.write_eyes_attributes(src) diff --git a/code/modules/surgery/organs/heart.dm b/code/modules/surgery/organs/heart.dm index ee017cfa4e5..a0c2c10308e 100644 --- a/code/modules/surgery/organs/heart.dm +++ b/code/modules/surgery/organs/heart.dm @@ -64,8 +64,9 @@ /obj/item/organ/internal/heart/prepare_eat() var/obj/S = ..() - S.icon_state = dead_icon - return S + if(S) + S.icon_state = dead_icon + return S /obj/item/organ/internal/heart/cursed name = "cursed heart" diff --git a/code/modules/surgery/organs/lungs.dm b/code/modules/surgery/organs/lungs.dm index 12cc87aeb3f..8250665d587 100644 --- a/code/modules/surgery/organs/lungs.dm +++ b/code/modules/surgery/organs/lungs.dm @@ -304,8 +304,9 @@ /obj/item/organ/internal/lungs/prepare_eat() var/obj/S = ..() - S.reagents.add_reagent("salbutamol", 5) - return S + if(S) + S.reagents.add_reagent("salbutamol", 5) + return S /obj/item/organ/internal/lungs/plasmaman name = "plasma filter" diff --git a/code/modules/surgery/organs/subtypes/skrell.dm b/code/modules/surgery/organs/subtypes/skrell.dm index 9021e53393b..46ca75b623f 100644 --- a/code/modules/surgery/organs/subtypes/skrell.dm +++ b/code/modules/surgery/organs/subtypes/skrell.dm @@ -51,15 +51,18 @@ held_item = null /obj/item/organ/internal/headpocket/emp_act(severity) - held_item.emp_act(severity) + if(held_item) + held_item.emp_act(severity) ..() /obj/item/organ/internal/headpocket/hear_talk(mob/living/M, list/message_pieces) - held_item.hear_talk(M, message_pieces) + if(held_item) + held_item.hear_talk(M, message_pieces) ..() /obj/item/organ/internal/headpocket/hear_message(mob/living/M, msg) - held_item.hear_message(M, msg) + if(held_item) + held_item.hear_message(M, msg) ..() /obj/item/organ/internal/heart/skrell diff --git a/code/modules/surgery/robotics.dm b/code/modules/surgery/robotics.dm index 62efb298006..797a3b7c11a 100644 --- a/code/modules/surgery/robotics.dm +++ b/code/modules/surgery/robotics.dm @@ -209,7 +209,7 @@ current_type = "burn" var/obj/item/stack/cable_coil/C = tool if(!(affected.burn_dam > 0)) - to_chat(user, "The [affected] does not have any burn damage!") + to_chat(user, "\The [affected] does not have any burn damage!") return -1 if(!istype(C)) return -1 @@ -223,7 +223,7 @@ else if(implement_type in implements_heal_brute) current_type = "brute" if(!(affected.brute_dam > 0 || affected.disfigured)) - to_chat(user, "The [affected] does not require welding repair!") + to_chat(user, "\The [affected] does not require welding repair!") return -1 if(tool.tool_behaviour == TOOL_WELDER) if(!tool.use(1)) diff --git a/code/modules/telesci/gps.dm b/code/modules/telesci/gps.dm index 94639805985..ddb43a387c6 100644 --- a/code/modules/telesci/gps.dm +++ b/code/modules/telesci/gps.dm @@ -96,7 +96,7 @@ GLOBAL_LIST_EMPTY(GPS_list) for(var/g in GLOB.GPS_list) var/obj/item/gps/G = g var/turf/GT = get_turf(G) - if(!G.tracking || G == src) + if(isnull(GT) || !G.tracking || G == src) continue if((G.local || same_z) && (GT.z != T.z)) continue diff --git a/code/modules/telesci/telesci_computer.dm b/code/modules/telesci/telesci_computer.dm index 41fed1fd11e..36d151ced6d 100644 --- a/code/modules/telesci/telesci_computer.dm +++ b/code/modules/telesci/telesci_computer.dm @@ -70,7 +70,7 @@ if(M.buffer && istype(M.buffer, /obj/machinery/telepad)) telepad = M.buffer M.buffer = null - to_chat(user, "You upload the data from the [W.name]'s buffer.") + to_chat(user, "You upload the data from [M]'s buffer.") updateUsrDialog() else return ..() diff --git a/code/modules/tgui/modules/generic_crew_manifest.dm b/code/modules/tgui/modules/generic_crew_manifest.dm new file mode 100644 index 00000000000..47826d88321 --- /dev/null +++ b/code/modules/tgui/modules/generic_crew_manifest.dm @@ -0,0 +1,17 @@ +GLOBAL_DATUM_INIT(generic_crew_manifest, /datum/ui_module/generic_crew_manifest, new) + +/datum/ui_module/generic_crew_manifest + name = "Crew Manifest" + +/datum/ui_module/generic_crew_manifest/ui_interact(user, ui_key = "GenericCrewManifest", datum/tgui/ui = null, datum/tgui/master_ui = null, state) + ui = SStgui.try_update_ui(user, src, ui_key, ui) + if(!ui) + ui = new(user, src, ui_key, "GenericCrewManifest", name, 588, 510, master_ui, state) + ui.set_autoupdate(FALSE) + ui.open() + +/datum/ui_module/generic_crew_manifest/ui_data(user) + var/list/data = list() + GLOB.data_core.get_manifest_json() + data["manifest"] = GLOB.PDA_Manifest + return data diff --git a/code/modules/tgui/states.dm b/code/modules/tgui/states.dm index 383344317c1..07a74544181 100644 --- a/code/modules/tgui/states.dm +++ b/code/modules/tgui/states.dm @@ -113,6 +113,6 @@ return STATUS_CLOSE // Otherwise, we got nothing. /mob/living/carbon/human/shared_living_ui_distance(atom/movable/src_object) - if(dna.GetSEState(GLOB.teleblock) && (get_dist(src, src_object) <= 2)) + if(HAS_TRAIT(src, TRAIT_TELEKINESIS) && (get_dist(src, src_object) <= 2)) return STATUS_INTERACTIVE return ..() diff --git a/code/modules/tgui/tgui.dm b/code/modules/tgui/tgui.dm index ae2b695b005..c9ab043cf4c 100644 --- a/code/modules/tgui/tgui.dm +++ b/code/modules/tgui/tgui.dm @@ -197,7 +197,7 @@ "fancy" = user.client.prefs.toggles2 & PREFTOGGLE_2_FANCYUI, "observer" = isobserver(user), "window" = window_id, - "map" = (GLOB.using_map && GLOB.using_map.name) ? GLOB.using_map.name : "Unknown", + "map" = SSmapping.map_datum.technical_name, "ref" = "[src.UID()]" ) diff --git a/code/modules/vehicle/janicart.dm b/code/modules/vehicle/janicart.dm index d7ba87b818c..07187e523ec 100644 --- a/code/modules/vehicle/janicart.dm +++ b/code/modules/vehicle/janicart.dm @@ -49,9 +49,9 @@ var/turf/tile = loc if(isturf(tile)) tile.clean_blood() - for(var/A in tile) - if(is_cleanable(A)) - qdel(A) + for(var/obj/effect/E in tile) + if(E.is_cleanable()) + qdel(E) diff --git a/code/modules/world_topic/adminmsg.dm b/code/modules/world_topic/adminmsg.dm index e3582b0ae46..5ad8f535e47 100644 --- a/code/modules/world_topic/adminmsg.dm +++ b/code/modules/world_topic/adminmsg.dm @@ -19,8 +19,9 @@ if(!C) return json_encode(list("error" = "No client with that name on server")) - var/message = "Discord PM from [input["sender"]]: [input["msg"]]" - var/amessage = "Discord PM from [input["sender"]] to [key_name_admin(C)]: [input["msg"]]" + var/sanitized = sanitize(input["msg"]) + var/message = "Discord PM from [input["sender"]]: [sanitized]" + var/amessage = "Discord PM from [input["sender"]] to [key_name_admin(C)]: [sanitized]" // THESE TWO VARS DO VERY DIFFERENT THINGS. DO NOT ATTEMPT TO COMBINE THEM C.received_discord_pm = world.time diff --git a/code/modules/world_topic/announce.dm b/code/modules/world_topic/announce.dm index 99bc3d280cf..f84481c979f 100644 --- a/code/modules/world_topic/announce.dm +++ b/code/modules/world_topic/announce.dm @@ -4,8 +4,5 @@ /datum/world_topic_handler/announce/execute(list/input, key_valid) var/prtext = input["announce"] - var/pr_substring = copytext(prtext, 1, 23) - if(pr_substring == "Pull Request merged by") - GLOB.pending_server_update = TRUE for(var/client/C in GLOB.clients) to_chat(C, "PR: [prtext]") diff --git a/code/modules/world_topic/hostannounce.dm b/code/modules/world_topic/hostannounce.dm deleted file mode 100644 index 3deb5b3d717..00000000000 --- a/code/modules/world_topic/hostannounce.dm +++ /dev/null @@ -1,7 +0,0 @@ -/datum/world_topic_handler/hostannounce - topic_key = "hostannounce" - requires_commskey = TRUE - -/datum/world_topic_handler/hostannounce/execute(list/input, key_valid) - GLOB.pending_server_update = TRUE - to_chat(world, "
      Server Announcement: [input["message"]]
      ") diff --git a/code/modules/world_topic/status.dm b/code/modules/world_topic/status.dm index 84eaf1831f3..0bd3b8d8da4 100644 --- a/code/modules/world_topic/status.dm +++ b/code/modules/world_topic/status.dm @@ -30,7 +30,7 @@ player_count++ status_info["players"] = player_count status_info["admins"] = admin_count - status_info["map_name"] = GLOB.map_name ? GLOB.map_name : "Unknown" + status_info["map_name"] = SSmapping.map_datum.fluff_name // Add more info if we are authed if(key_valid) diff --git a/config/example/admin_ranks.txt b/config/example/admin_ranks.txt index 6f37f5bf234..84b0036e2c8 100644 --- a/config/example/admin_ranks.txt +++ b/config/example/admin_ranks.txt @@ -24,21 +24,15 @@ # +SPAWN (or +CREATE) = mob transformations, spawning of most atoms including mobs (high-risk atoms, e.g. blackholes, will require the +FUN flag too) # +EVERYTHING (or +HOST or +ALL) = Simply gives you everything without having to type every flag # +VIEWRUNTIMES = Allows a player to view the runtimes of the server, but not use other debug verbs - + # Admin Ranks Admin Observer Mentor +MENTOR -Moderator +MOD -Trial Admin +ADMIN +BAN +DEBUG +REJUVINATE -Game Admin +ADMIN +BAN +DEBUG +REJUVINATE +BUILDMODE +EVENT +SERVER +POSSESS +STEALTH +VAREDIT +SOUND +SPAWN -Senior Admin +ADMIN +BAN +DEBUG +REJUVINATE +BUILDMODE +EVENT +SERVER +POSSESS +STEALTH +VAREDIT +SOUND +SPAWN -Retired Admin +ADMIN +BAN +STEALTH +VAREDIT +SPAWN +Trial Admin +ADMIN +BAN +STEALTH +REJUVINATE +Game Admin +ADMIN +BAN +DEBUG +REJUVINATE +BUILDMODE +EVENT +SERVER +POSSESS +PROCCALL +STEALTH +VAREDIT +SOUND +SPAWN Head of Staff +EVERYTHING Hosting Provider +EVERYTHING # Coder Ranks -Trial Coder +ADMIN +VAREDIT +REJUVINATE +DEBUG -Coders +ADMIN +VAREDIT +REJUVINATE +DEBUG +BUILDMODE +EVENT +SERVER +POSSESS +STEALTH +SOUND +SPAWN -Retired Coder +ADMIN +VAREDIT +REJUVINATE +DEBUG +BUILDMODE +EVENT +SERVER +POSSESS +STEALTH +SOUND +SPAWN +BAN Maintainers +EVERYTHING \ No newline at end of file diff --git a/config/example/away_mission_config.txt b/config/example/away_mission_config.txt index 5d2967295c2..bfbc792d821 100644 --- a/config/example/away_mission_config.txt +++ b/config/example/away_mission_config.txt @@ -10,24 +10,25 @@ #===================================# # BROKEN / INCOMPLETE AWAY MISSIONS # #===================================# -#_maps/map_files/RandomZLevels/centcomAway.dmm #_maps/map_files/RandomZLevels/example.dmm #_maps/map_files/RandomZLevels/spacebattle.dmm #_maps/map_files/RandomZLevels/stationCollision.dmm +#_maps/map_files/RandomZLevels/spacehotel.dmm +#_maps/map_files/RandomZLevels/wildwest.dmm +#_maps/map_files/RandomZLevels/academy.dmm #===================================# # USABLE AWAY MISSIONS # #===================================# - -_maps/map_files/RandomZLevels/beach.dmm _maps/map_files/RandomZLevels/moonoutpost19.dmm -_maps/map_files/RandomZLevels/undergroundoutpost45.dmm -_maps/map_files/RandomZLevels/academy.dmm +#_maps/map_files/RandomZLevels/undergroundoutpost45.dmm _maps/map_files/RandomZLevels/blackmarketpackers.dmm -_maps/map_files/RandomZLevels/wildwest.dmm _maps/map_files/RandomZLevels/terrorspiders.dmm +_maps/map_files/RandomZLevels/centcomAway.dmm +_maps/map_files/RandomZLevels/beach.dmm + #===================================# # SPECIAL AWAY MISSIONS # #===================================# -#_maps/map_files/RandomZLevels/evil_santa.dmm \ No newline at end of file +#_maps/map_files/RandomZLevels/evil_santa.dmm diff --git a/config/example/config.txt b/config/example/config.txt index f38e30ba40c..27fe31e980e 100644 --- a/config/example/config.txt +++ b/config/example/config.txt @@ -1,11 +1,14 @@ -## Server name: This appears at the top of the screen in-game. In this case it will read "spacestation13: station_name" where station_name is the randomly generated name of the station for the round. Remove the # infront of SERVERNAME and replace 'spacestation13' with the name of your choice -# SERVERNAME spacestation13 +## Server name: This identifies your server in the server list. It may also be used as the title of the game window. +SERVERNAME ParaCode Test ## Server tagline: This appears on the hub entry. -#SERVER_TAG_LINE The Perfect Mix of RP & Action +SERVER_TAG_LINE ParaCode Test ## Server extra features: This appears in the feature list on the hub entry. -#SERVER_EXTRA_FEATURES medium RP, varied species/jobs/modes +SERVER_EXTRA_FEATURES Medium RP, varied species/jobs. + +## Download the RSC from the web - this needs to be regenerated every time the code is changed. +#RESOURCE_URLS http://www.paradisestation.org/windows/paradise.rsc.zip ## Add a # infront of this if you want to use the SQL based admin system, the legacy system uses admins.txt. You need to set up your database to use the SQL based system. ADMIN_LEGACY_SYSTEM @@ -13,9 +16,6 @@ ADMIN_LEGACY_SYSTEM ## Add a # infront of this if you want to use the SQL based banning system. The legacy systems use the files in the data folder. You need to set up your database to use the SQL based system. BAN_LEGACY_SYSTEM -## Add a # infront of this to unlimit the builds used to play. Advised is to keep it atleast 1421 due to the middle mouse button locking exploit -MINIMUM_CLIENT_BUILD 1421 - ## Add a # here if you wish to use the setup where jobs have more access. This is intended for servers with low populations - where there are not enough players to fill all roles, so players need to do more than just one job. Also for servers where they don't want people to hide in their own departments. JOBS_HAVE_MINIMAL_ACCESS @@ -46,12 +46,6 @@ LOG_SAY ## log admin actions LOG_ADMIN -## log debug messages -LOG_DEBUG - -## log admin chat -LOG_ADMINCHAT - ## log client access (logon/logoff) LOG_ACCESS @@ -77,49 +71,53 @@ LOG_PDA LOG_RUNTIME ## log world.log messages -LOG_WORLD_OUTPUT +# LOG_WORLD_OUTPUT ## log all Topic() calls (for use by coders in tracking down Topic issues) -# LOG_HREFS +LOG_HREFS -## log admin warning messages +## log admin warning messages - may result in some message duplication LOG_ADMINWARN -## Amount of minutes that a person has to be AFK before he'll be listed on the "List AFK players" verb -#LIST_AFK_MINIMUM 5 +## Log admin chat +LOG_ADMINCHAT ## Amount of minutes that a person has to be AFK before he will be warned by the AFK subsystem. Leave this 0 to prevent the subsystem from activating -WARN_AFK_MINIMUM 0 +WARN_AFK_MINIMUM 15 ## Amount of minutes that a person has to be AFK before he will be cryod by the AFK subsystem. Leave this 0 to prevent the subsystem from activating -AUTO_CRYO_AFK 0 +AUTO_CRYO_AFK 20 ## Amount of minutes that a person has to be AFK before he will be despawned by the AFK subsystem. Leave this 0 to prevent the subsystem from activating -AUTO_DESPAWN_AFK 0 +AUTO_DESPAWN_AFK 21 ## probablities for game modes chosen in "secret" and "random" modes ## ## default probablity is 1, increase to make that mode more likely to be picked ## set to 0 to disable that mode -PROBABILITY EXTEND-A-TRAITORMONGOUS 3 +PROBABILITY ABDUCTION 0 +PROBABILITY BLOB 1 +PROBABILITY CHANGELING 3 +PROBABILITY CULT 3 +PROBABILITY EXTEND-A-TRAITORMONGOUS 2 +PROBABILITY EXTENDED 3 +PROBABILITY HEIST 0 +PROBABILITY METEOR 0 +PROBABILITY NUCLEAR 2 +PROBABILITY RAGINMAGES 0 +PROBABILITY REVOLUTION 0 +PROBABILITY SHADOWLING 1 +PROBABILITY TRAITOR 2 PROBABILITY TRAITORCHAN 3 PROBABILITY TRAITORVAMP 3 -PROBABILITY REVOLUTION 0 -PROBABILITY SHADOWLING 2 -PROBABILITY CULT 4 -PROBABILITY CHANGELING 3 -PROBABILITY WIZARD 2 -PROBABILITY BLOB 1 -PROBABILITY RAGINMAGES 0 -PROBABILITY METEOR 0 -PROBABILITY HEIST 0 PROBABILITY VAMPIRE 3 -PROBABILITY EXTENDED 2 -PROBABILITY NUCLEAR 3 -PROBABILITY ABDUCTION 0 +PROBABILITY WIZARD 2 -## Maximum cycles shadowlings can remain unhatched before they take damage. 1800 = 60 minutes, 900 = 30 minutes, 0 = feature disabled. -SHADOWLING_MAX_AGE 0 +## Uncomment to allow free golems on all roundtypes. Otherwise, disabled on cult, wiz, raging mages, blob, and nuclear. +#UNRESTRICTED_FREE_GOLEMS + +## MAXIMUM SECONDS SHADOWLINGS CAN REMAIN UNHATCHED BEFORE THEY TAKE DAMAGE +SHADOWLING_MAX_AGE 600 ## Hash out to disable random events during the round. ALLOW_RANDOM_EVENTS @@ -178,9 +176,6 @@ NORESPAWN ## disables calling qdel(src) on newmobs if they logout before spawnin in # DONT_DEL_NEWMOB -## set a hosted by name for unix platforms -# HOSTEDBY Example - ## Set to jobban "Guest-" accounts from Captain, HoS, HoP, CE, RD, CMO, Warden, Security, Detective, and AI positions. ## Set to 1 to jobban them from those positions, set to 0 to allow them. GUEST_JOBBAN @@ -194,7 +189,7 @@ PANIC_BUNKER_THRESHOLD 150 ### IPINTEL: ### This allows you to detect likely proxies by checking ips against getipintel.net ## Rating to warn at: (0.90 is good, 1 is 100% likely to be a spammer/proxy, 0.8 is 80%, etc) anything equal to or higher then this number triggers an admin warning -#IPINTEL_RATING_BAD 0.90 +#IPINTEL_RATING_BAD 0.98 ## Contact email, (required to use the service, leaving blank or default disables IPINTEL) #IPINTEL_EMAIL ch@nge.me ## How long to save good matches (ipintel rate limits to 15 per minute and 500 per day. so this shouldn't be too low, getipintel.net suggests 6 hours, time is in hours) (Your ip will get banned if you go over 500 a day too many times) @@ -217,40 +212,40 @@ PANIC_BUNKER_THRESHOLD 150 #FORUM_PLAYERINFO_URL https://example.com/info.php?ckey= ## Comment to disable checking for the cid randomizer dll. (disabled if database isn't enabled or connected) -CHECK_RANDOMIZER +#CHECK_RANDOMIZER ## the whitelist -#USEWHITELIST +USEWHITELIST ## set a server location for world reboot. Don't include the byond://, just give the address and port. # SERVER server.net:port ## Forum address -# FORUMURL http://example.org +FORUMURL https://www.paradisestation.org/forum/ ## Wiki address -# WIKIURL http://example.org +WIKIURL https://www.paradisestation.org/wiki ## Rules address -# RULESURL http://example.org +RULESURL https://www.paradisestation.org/rules -## GitHub address -# GITHUBURL http://example.org +## Github address +GITHUBURL https://github.com/ParadiseSS13/Paradise ## Discord address -# DISCORDURL http://example.org +#DISCORDURL http://example.org ## Discord address (forum-based invite) -# DISCORDFORUMURL http://example.org +DISCORDFORUMURL https://www.paradisestation.org/forum/discord/invite/general/ ## Donations address -# DONATIONSURL http://example.org +DONATIONSURL https://www.patreon.com/ParadiseStation ## Repository address -# REPOSITORYURL http://example.org +REPOSITORYURL https://github.com/ParadiseSS13/Paradise ## Ban appeals URL - usually for a forum or wherever people should go to contact your admins -# BANAPPEALS http://example.org +BANAPPEALS https://www.paradisestation.org/forum/55-unban-requests/ ## In-game features ## spawns a spellbook which gives object-type spells instead of verb-type spells for the wizard @@ -279,16 +274,13 @@ SOCKET_TALK 0 #AUTOMUTE_ON ## How long the delay is before the Away Mission gate opens. Default is half an hour. -GATEWAY_DELAY 6000 +GATEWAY_DELAY 10 ## Remove the # to give assistants maint access. ASSISTANT_MAINT ## Remove the # to enable assistant limiting. -ASSISTANT_LIMIT - -## If you enabled assistant limiting set the ratio of assistants to security members default is 2 assistants to 1 officer -ASSISTANT_RATIO 2 +#ASSISTANT_LIMIT # Mins before SSD crew are cryoed. AUTO_CRYO_SSD_MINS 15 @@ -296,18 +288,21 @@ AUTO_CRYO_SSD_MINS 15 # If enabled, prevents people interacting with SSD players unless they acknowledge they have read the server rules. SSD_WARNING +## If you enabled assistant limiting set the ratio of assistants to security members default is 2 assistants to 1 officer +ASSISTANT_RATIO 2 + ## Remove the # to make rounds which end instantly (Rev, Wizard, Malf) to continue until the shuttle is called or the station is nuked. ## Malf and Rev will let the shuttle be called when the antags/protags are dead. #CONTINUOUS_ROUNDS ## Uncomment to restrict non-admins from using humanoid alien races -#USEALIENWHITELIST +USEALIENWHITELIST ## Comment this to unrestrict the number of alien players allowed in the round. The number represents the number of alien players for every human player. ALIEN_PLAYER_RATIO 0.2 ##Remove the # to let ghosts spin chairs -GHOST_INTERACTION +#GHOST_INTERACTION ## Password used for authorizing external tools via world/Topic. #COMMS_PASSWORD @@ -326,12 +321,12 @@ EVENT_DELAY_UPPER 15;45;70 ## The delay until the first time an event of the given severity runs in minutes. ## Unset setting use the EVENT_DELAY_LOWER and EVENT_DELAY_UPPER values instead. #EVENT_CUSTOM_START_MINOR 10;15 -#EVENT_CUSTOM_START_MODERATE 30;45 -EVENT_CUSTOM_START_MAJOR 80;100 +EVENT_CUSTOM_START_MODERATE 25;40 +EVENT_CUSTOM_START_MAJOR 55;75 ## Starlight for exterior walls and breaches. Uncomment for starlight! ## This is disabled by default to make testing quicker, should be enabled on production servers or testing servers messing with lighting -#STARLIGHT +STARLIGHT ## Player rerouting stuff ## If not 0, players can be rerouted to an overflow server after a certain cap is reached @@ -349,10 +344,10 @@ PLAYER_REROUTE_CAP 0 #DISABLE_SPACE_RUINS ## Minimum number of space ruins levels to generate -EXTRA_SPACE_RUIN_LEVELS_MIN 4 +EXTRA_SPACE_RUIN_LEVELS_MIN 2 ## Maximum number of space ruins levels to generate -EXTRA_SPACE_RUIN_LEVELS_MAX 8 +EXTRA_SPACE_RUIN_LEVELS_MAX 4 ## Uncomment to disable the OOC/LOOC channel by default. #DISABLE_OOC @@ -390,7 +385,7 @@ EXTRA_SPACE_RUIN_LEVELS_MAX 8 ## Uncomment this to shut down the world any time it would normally reboot #SHUTDOWN_ON_REBOOT ## A command to run prior to the world shutting down, only used if the above option is enabled -## This default value will kill Dream Daemon on Windows machines +## This default value will kill Dream Daemon on Windows machines. #SHUTDOWN_SHELL_COMMAND taskkill /f /im dreamdaemon.exe ## Uncomment this to disable karma and unlock all karma purchases for players by default @@ -420,23 +415,24 @@ HIGH_POP_MC_MODE_AMOUNT 65 ##Disengage high pop mode if player count drops below this DISABLE_HIGH_POP_MC_MODE_AMOUNT 60 -##Developer options - ##Uncomment to enable developer start. Auto starts the server after initialization -##DEVELOPER_EXPRESS_START +#DEVELOPER_EXPRESS_START ## Uncomment to disable automatic admin for localhost #DISABLE_LOCALHOST_ADMIN +## Add a # infront of this to unlimit the builds used to play. Advised is to keep it atleast 1421 due to the middle mouse button locking exploit +MINIMUM_CLIENT_BUILD 1421 + ## Uncomment to give a confirmation before hitting start now #START_NOW_CONFIRMATION ## If uncommented, all gamemodes will respect the number of required players. Defaults to no. -#ENABLE_GAMEMODE_PLAYER_LIMIT +ENABLE_GAMEMODE_PLAYER_LIMIT ## BYOND accounts younger than the value below will alert admins when they connect for the first time, ## as well as making the BYOND account age in player panel bold -BYOND_ACCOUNT_AGE_THRESHOLD 7 +BYOND_ACCOUNT_AGE_THRESHOLD 3 ##### DISCORD STUFF ##### @@ -447,7 +443,7 @@ BYOND_ACCOUNT_AGE_THRESHOLD 7 ## Role ID to be pinged with administrative events. If unset, all pings to this role will be disabled ## IF YOU ARE DISABLING THIS COMMENT IT OUT ENTIRELY, DONT LEAVE IT BLANK -#DISCORD_WEBHOOKS_ADMIN_ROLE_ID +#DISCORD_WEBHOOKS_ADMIN_ROLE_ID 111111111111 ## Webhook URLs for the main discord webhook. Separate multiple URLs with a | (EG: https://url1|https://url2) #DISCORD_WEBHOOKS_MAIN_URL @@ -471,7 +467,13 @@ BYOND_ACCOUNT_AGE_THRESHOLD 7 CENTCOM_BAN_DB_URL https://centcom.melonmesa.com/ban/search/ ## Max amount of CIDs that one ckey can have attached to them before they trip a warning. Set to 0 to disable. -MAX_CLIENT_CID_HISTORY 2 +MAX_CLIENT_CID_HISTORY 20 ## Uncomment to enable automatic performance profiling of rounds -#ENABLE_AUTO_PROFILER +ENABLE_AUTO_PROFILER + +## Uncomment to enable map voting +#ENABLE_MAP_VOTING + +## Host for a custom 2FA server. Comment to disable. Do not use a trailing slash or https. +#2FA_HOST http://127.0.0.1:8080 diff --git a/config/example/dbconfig.txt b/config/example/dbconfig.txt index 1cf22d60895..ffceb33e7de 100644 --- a/config/example/dbconfig.txt +++ b/config/example/dbconfig.txt @@ -5,15 +5,9 @@ ## Should SQL be enabled? Uncomment to enable. #SQL_ENABLED -## Database version. This value is used if SQL_ENABLED is uncommented -## This value must be set to the version of the paradise schema in use. -## If this value does not match, the SQL database will not be loaded and an error will be generated. -## Roundstart will be delayed. -DB_VERSION 22 - ## Server the MySQL database can be found at. # Examples: localhost, 200.135.5.43, www.mysqldb.com, etc. -ADDRESS localhost +ADDRESS 127.0.0.1 ## MySQL server port (default is 3306). PORT 3306 @@ -21,6 +15,11 @@ PORT 3306 ## Database for all SQL functions, not just feedback. FEEDBACK_DATABASE feedback +## This value must be set to the version of the paradise schema in use. +## If this value does not match, the SQL database will not be loaded and an error will be generated. +## Roundstart will be delayed. +DB_VERSION 24 + ## Prefix to be added to the name of every table, older databases will require this be set to erro_ ## If left out defaults to erro_ for legacy reasons, if you want no table prefix, give a blank prefix rather then comment out ## Note, this does not change the table names in the database, you will have to do that yourself. diff --git a/config/example/game_options.txt b/config/example/game_options.txt index b05023098a1..0d81a9402c8 100644 --- a/config/example/game_options.txt +++ b/config/example/game_options.txt @@ -11,11 +11,11 @@ REVIVAL_POD_PLANTS 1 REVIVAL_CLONING 1 ## Amount of time (in hundredths of seconds) for which a brain retains the "spark of life" after the person's death (set to -1 for infinite) -REVIVAL_BRAIN_LIFE -1 +REVIVAL_BRAIN_LIFE 60000 ### AUTO TOGGLE OOC DURING ROUND ### #Uncomment this if you want OOC to be automatically disabled during the round, it will be enabled during the lobby and after the round end results. -#AUTO_TOGGLE_OOC_DURING_ROUND +AUTO_TOGGLE_OOC_DURING_ROUND ### MOB MOVEMENT ### ## We suggest editing these variabled in-game to find a good speed for your server. To do this you must be a high level admin. Open the 'debug' tab ingame. Select "Debug Controller" and then, in the popup, select "Configuration". These variables should have the same name. @@ -27,7 +27,7 @@ WALK_SPEED 4 ## The variables below affect the movement of specific mob types. HUMAN_DELAY 1.5 -ROBOT_DELAY 1.5 +ROBOT_DELAY 2.5 MONKEY_DELAY 1.5 ALIEN_DELAY 1.5 SLIME_DELAY 1.5 diff --git a/config/example/jobs.txt b/config/example/jobs.txt index 44543fca332..6a73ab5f517 100644 --- a/config/example/jobs.txt +++ b/config/example/jobs.txt @@ -6,13 +6,13 @@ Research Director=1 Chief Medical Officer=1 Station Engineer=5 -Roboticist=1 +Roboticist=2 Medical Doctor=5 Geneticist=2 Virologist=1 -Scientist=3 +Scientist=6 Chemist=2 Bartender=1 @@ -27,11 +27,11 @@ Detective=1 Security Officer=7 Assistant=-1 -Atmospheric Technician=4 +Atmospheric Technician=3 Cargo Technician=3 Chaplain=1 Lawyer=2 Librarian=1 AI=1 -Cyborg=1 \ No newline at end of file +Cyborg=1 diff --git a/config/example/jobs_highpop.txt b/config/example/jobs_highpop.txt index 44543fca332..eaaa50d55a9 100644 --- a/config/example/jobs_highpop.txt +++ b/config/example/jobs_highpop.txt @@ -5,33 +5,33 @@ Chief Engineer=1 Research Director=1 Chief Medical Officer=1 -Station Engineer=5 -Roboticist=1 +Station Engineer=6 +Roboticist=2 -Medical Doctor=5 +Medical Doctor=6 Geneticist=2 Virologist=1 -Scientist=3 +Scientist=7 Chemist=2 Bartender=1 Botanist=2 Chef=1 -Janitor=1 +Janitor=2 Quartermaster=1 Shaft Miner=6 Warden=1 Detective=1 -Security Officer=7 +Security Officer=8 Assistant=-1 Atmospheric Technician=4 -Cargo Technician=3 +Cargo Technician=4 Chaplain=1 Lawyer=2 Librarian=1 AI=1 -Cyborg=1 \ No newline at end of file +Cyborg=1 diff --git a/config/example/lavaRuinBlacklist.txt b/config/example/lavaRuinBlacklist.txt index c36f9bfcef4..49b70b5e682 100644 --- a/config/example/lavaRuinBlacklist.txt +++ b/config/example/lavaRuinBlacklist.txt @@ -15,8 +15,10 @@ ##SIN #_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_envy.dmm +# Gluttony was blacklisted because its reward is 'become morph'. Unblacklisted as it doesn't seem to generate complaints or be abused - but watch it. #_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_gluttony.dmm -#_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_greed.dmm +# Greed blacklisted because its reward (dice) has a 1/20 chance of making you a wizard +_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_greed.dmm #_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_pride.dmm #_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_sloth.dmm @@ -24,12 +26,14 @@ #_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_blooddrunk1.dmm #_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_blooddrunk2.dmm #_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_blooddrunk3.dmm -#_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_hierophant.dmm +#re-removed 7/24/2020, I ran a month-long test of hierophant Jun-Jul and the staff was still too strong. https://github.com/ParadiseSS13/Paradise/pull/13542 +_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_hierophant.dmm #_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_swarmer_crash.dmm ##MISC #_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm -#_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_cube.dmm +# Cube blacklisted because it contains a wishgranter that gives you hijack on use +_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_cube.dmm #_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm #_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_dead_ratvar.dmm #_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_fountain_hell.dmm" diff --git a/config/example/rank_colours.txt b/config/example/rank_colours.txt new file mode 100644 index 00000000000..b35641c39f4 --- /dev/null +++ b/config/example/rank_colours.txt @@ -0,0 +1,11 @@ +# Use this file to denote colours for ingame admin ranks, using the following format +# Rankname - #12A5F4 +# Colours dont have to be in hex, since this colour string is thrown into the style -aa +Head of Staff - #e74c3c +Maintainer - #992d22 +Server Dev - #1abc9c +Community Manager - #e91e63 +Game Admin - #238afa +Trial Admin - #7fb6fc +PR Reviewer - #c27c0e +Mentor - #f1c40f diff --git a/config/example/rules.html b/config/example/rules.html deleted file mode 100644 index ef37effcea4..00000000000 --- a/config/example/rules.html +++ /dev/null @@ -1,11 +0,0 @@ - -Server Rules - - - - - - \ No newline at end of file diff --git a/config/example/spaceRuinBlacklist.txt b/config/example/spaceRuinBlacklist.txt index c1780d217d7..7ca7abb4b3a 100644 --- a/config/example/spaceRuinBlacklist.txt +++ b/config/example/spaceRuinBlacklist.txt @@ -43,4 +43,4 @@ # The following is a force-spawned ruin consisting mostly of empty space with a shuttle docking port for the free golem shuttle # Disabling it will lead to the free golem shuttle sometimes being stuck on lavaland. -#_maps/map_files/RandomRuins/SpaceRuins/golemtarget.dmm +#_maps/map_files/RandomRuins/SpaceRuins/golemtarget.dmm \ No newline at end of file diff --git a/goon/code/datums/browserOutput.dm b/goon/code/datums/browserOutput.dm index 2006fc601b8..4b4a0d054c2 100644 --- a/goon/code/datums/browserOutput.dm +++ b/goon/code/datums/browserOutput.dm @@ -20,7 +20,6 @@ var/list/chatResources = list( #define MAX_COOKIE_LENGTH 5 /var/savefile/iconCache = new /savefile("data/iconCache.sav") -/var/chatDebug = file("data/chatDebug.log") /datum/chatOutput var/client/owner = null @@ -38,6 +37,7 @@ var/list/chatResources = list( . = ..() owner = C + SSchat_pings.chat_datums += src /datum/chatOutput/proc/start() if(!owner) @@ -92,7 +92,10 @@ var/list/chatResources = list( data = doneLoading(arglist(params)) if("debug") - data = debug(arglist(params)) + if(!length(params)) + return + var/error = params[1] + log_chat_debug("Client: [owner.key || owner] triggered JS error: [error][GLOB.log_end]") if("ping") data = ping(arglist(params)) @@ -124,14 +127,14 @@ var/list/chatResources = list( if(owner.tos_consent) sendClientData() - pingLoop() + updatePing() -/datum/chatOutput/proc/pingLoop() - set waitfor = FALSE - - while (owner) - ehjax_send(data = owner.is_afk(29 SECONDS) ? "softPang" : "pang") // SoftPang isn't handled anywhere but it'll always reset the opts.lastPang. - sleep(30 SECONDS) +// PARADISE EDIT: This just updates the ping and is called from SSchat_pings +/datum/chatOutput/proc/updatePing() + if(!owner) + qdel(src) + return + ehjax_send(data = owner.is_afk(29 SECONDS) ? "softPang" : "pang") // SoftPang isn't handled anywhere but it'll always reset the opts.lastPang. /datum/chatOutput/proc/ehjax_send(client/C = owner, window = "browseroutput", data) if(islist(data)) @@ -185,7 +188,7 @@ var/list/chatResources = list( var/list/row = connectionHistory[i] if(!row || row.len < 3 || !(row["ckey"] && row["compid"] && row["ip"])) return - if(world.IsBanned(key=row["ckey"], address=row["ip"], computer_id=row["compid"], type=null, check_ipintel=FALSE)) + if(world.IsBanned(key=row["ckey"], address=row["ip"], computer_id=row["compid"], type=null, check_ipintel=FALSE, check_2fa=FALSE)) found = row break CHECK_TICK @@ -194,17 +197,13 @@ var/list/chatResources = list( if (found.len > 0) message_admins("[key_name(src.owner)] has a cookie from a banned account! (Matched: [found["ckey"]], [found["ip"]], [found["compid"]])") log_admin("[key_name(src.owner)] has a cookie from a banned account! (Matched: [found["ckey"]], [found["ip"]], [found["compid"]])") - new /datum/cookie_record(owner, found["ckey"], found["ip"], found["compid"]) + new /datum/cookie_record(owner.ckey, found["ckey"], found["ip"], found["compid"]) cookieSent = 1 /datum/chatOutput/proc/ping() return "pong" -/datum/chatOutput/proc/debug(error) - error = "\[[time2text(world.realtime, "YYYY-MM-DD hh:mm:ss")]\] Client : [owner.key ? owner.key : owner] triggered JS error: [error]" - chatDebug << error - /** * Sends the lists of code phrases and responses to Goonchat for clientside highlighting * @@ -223,6 +222,11 @@ var/list/chatResources = list( /datum/chatOutput/proc/clear_syndicate_codes() owner << output(null, "browseroutput:codewordsClear") +/datum/chatOutput/Destroy(force) + SSchat_pings.chat_datums -= src + return ..() + + /client/verb/debug_chat() set hidden = 1 chatOutput.ehjax_send(data = list("firebug" = 1)) diff --git a/icons/_nanomaps/MetaStation_nanomap_z1.png b/icons/_nanomaps/MetaStation_nanomap_z1.png index 7b263fe7da1..6732d365843 100644 Binary files a/icons/_nanomaps/MetaStation_nanomap_z1.png and b/icons/_nanomaps/MetaStation_nanomap_z1.png differ diff --git a/icons/am_engine.dmi b/icons/am_engine.dmi deleted file mode 100644 index a2cd83cec24..00000000000 Binary files a/icons/am_engine.dmi and /dev/null differ diff --git a/icons/effects/effects.dmi b/icons/effects/effects.dmi index e915ba04139..eb888d9ce47 100644 Binary files a/icons/effects/effects.dmi and b/icons/effects/effects.dmi differ diff --git a/icons/effects/genetics.dmi b/icons/effects/genetics.dmi index e51ce35e3ce..bc011a351c4 100644 Binary files a/icons/effects/genetics.dmi and b/icons/effects/genetics.dmi differ diff --git a/icons/effects/targeted.dmi b/icons/effects/targeted.dmi index f2e03c7aacf..f0d4b95f64f 100644 Binary files a/icons/effects/targeted.dmi and b/icons/effects/targeted.dmi differ diff --git a/icons/laptop.dmi b/icons/laptop.dmi deleted file mode 100644 index 8b5a7f96ce3..00000000000 Binary files a/icons/laptop.dmi and /dev/null differ diff --git a/icons/mecha/mecha.dmi b/icons/mecha/mecha.dmi index af6edf692a3..d5b4ecb0e66 100644 Binary files a/icons/mecha/mecha.dmi and b/icons/mecha/mecha.dmi differ diff --git a/icons/mob/actions/actions_cult.dmi b/icons/mob/actions/actions_cult.dmi index 0e5320a54ed..2ccef9755b1 100644 Binary files a/icons/mob/actions/actions_cult.dmi and b/icons/mob/actions/actions_cult.dmi differ diff --git a/icons/mob/blob.dmi b/icons/mob/blob.dmi index 63633844b83..76c9a030c1d 100644 Binary files a/icons/mob/blob.dmi and b/icons/mob/blob.dmi differ diff --git a/icons/mob/cult.dmi b/icons/mob/cult.dmi new file mode 100644 index 00000000000..b13bfa1b51b Binary files /dev/null and b/icons/mob/cult.dmi differ diff --git a/icons/mob/custom_synthetic/custom-synthetic.dmi b/icons/mob/custom_synthetic/custom-synthetic.dmi index d0e38f40a7d..1ec6ced99cd 100644 Binary files a/icons/mob/custom_synthetic/custom-synthetic.dmi and b/icons/mob/custom_synthetic/custom-synthetic.dmi differ diff --git a/icons/mob/eyes.dmi b/icons/mob/eyes.dmi index b3dda4e8c81..07fc7f4ef9e 100644 Binary files a/icons/mob/eyes.dmi and b/icons/mob/eyes.dmi differ diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 1c941d4748d..f6912b8334c 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/hud.dmi b/icons/mob/hud.dmi index b6bf817d15d..8350faf7d16 100644 Binary files a/icons/mob/hud.dmi and b/icons/mob/hud.dmi differ diff --git a/icons/mob/inhands/64x64_guns_lefthand.dmi b/icons/mob/inhands/64x64_guns_lefthand.dmi new file mode 100644 index 00000000000..fa8b012ba29 Binary files /dev/null and b/icons/mob/inhands/64x64_guns_lefthand.dmi differ diff --git a/icons/mob/inhands/64x64_guns_righthand.dmi b/icons/mob/inhands/64x64_guns_righthand.dmi new file mode 100644 index 00000000000..4ff026bcbaa Binary files /dev/null and b/icons/mob/inhands/64x64_guns_righthand.dmi differ diff --git a/icons/mob/inhands/guns_lefthand.dmi b/icons/mob/inhands/guns_lefthand.dmi index 52a1adef4b2..d69dd8a988b 100644 Binary files a/icons/mob/inhands/guns_lefthand.dmi and b/icons/mob/inhands/guns_lefthand.dmi differ diff --git a/icons/mob/inhands/guns_righthand.dmi b/icons/mob/inhands/guns_righthand.dmi index 9a1ee42f32b..44968461e65 100644 Binary files a/icons/mob/inhands/guns_righthand.dmi and b/icons/mob/inhands/guns_righthand.dmi differ diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi index d49f726feba..9b9702e53c3 100644 Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ diff --git a/icons/mob/mob.dmi b/icons/mob/mob.dmi index 79a05bd3b88..86151e74123 100644 Binary files a/icons/mob/mob.dmi and b/icons/mob/mob.dmi differ diff --git a/icons/mob/species/grey/eyes.dmi b/icons/mob/species/grey/eyes.dmi index ec6444b0aa4..7e0c0c9dc8c 100644 Binary files a/icons/mob/species/grey/eyes.dmi and b/icons/mob/species/grey/eyes.dmi differ diff --git a/icons/mob/species/plasmaman/helmet.dmi b/icons/mob/species/plasmaman/helmet.dmi index b836d1de219..6b327384a56 100644 Binary files a/icons/mob/species/plasmaman/helmet.dmi and b/icons/mob/species/plasmaman/helmet.dmi differ diff --git a/icons/mob/species/plasmaman/uniform.dmi b/icons/mob/species/plasmaman/uniform.dmi index f28f3f7e1ff..28787d3a299 100644 Binary files a/icons/mob/species/plasmaman/uniform.dmi and b/icons/mob/species/plasmaman/uniform.dmi differ diff --git a/icons/mob/species/vox/eyes.dmi b/icons/mob/species/vox/eyes.dmi index 3beffab6d9b..8bf2772bff8 100644 Binary files a/icons/mob/species/vox/eyes.dmi and b/icons/mob/species/vox/eyes.dmi differ diff --git a/icons/mob/species/vox/gloves.dmi b/icons/mob/species/vox/gloves.dmi index 7ff60e4d613..fc783d98e40 100644 Binary files a/icons/mob/species/vox/gloves.dmi and b/icons/mob/species/vox/gloves.dmi differ diff --git a/icons/mob/sprite_accessories/ipc/ipc_face.dmi b/icons/mob/sprite_accessories/ipc/ipc_face.dmi index 9339393e386..1c685abeb9f 100644 Binary files a/icons/mob/sprite_accessories/ipc/ipc_face.dmi and b/icons/mob/sprite_accessories/ipc/ipc_face.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 1e185efd9c5..b98c3818b30 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi index b1876a7d063..b1303637768 100644 Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ diff --git a/icons/obj/bureaucracy.dmi b/icons/obj/bureaucracy.dmi index b9cc8b8ca2b..cb29615d4c9 100644 Binary files a/icons/obj/bureaucracy.dmi and b/icons/obj/bureaucracy.dmi differ diff --git a/icons/obj/clothing/glasses.dmi b/icons/obj/clothing/glasses.dmi index 14ad340a547..68465a79014 100644 Binary files a/icons/obj/clothing/glasses.dmi and b/icons/obj/clothing/glasses.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 718731b8af3..c1b757e2f3e 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index 39789326c49..e4d58e11cc2 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ diff --git a/icons/obj/crayons.dmi b/icons/obj/crayons.dmi index 9866fe5a95f..d6038054e3e 100644 Binary files a/icons/obj/crayons.dmi and b/icons/obj/crayons.dmi differ diff --git a/icons/obj/custom_items.dmi b/icons/obj/custom_items.dmi index 8224123aa5d..b3d640050a8 100644 Binary files a/icons/obj/custom_items.dmi and b/icons/obj/custom_items.dmi differ diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 6d30e966c31..fb7c28c3f6d 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ diff --git a/icons/obj/food/containers.dmi b/icons/obj/food/containers.dmi index ed71b4d3c1d..8a317b9edb0 100644 Binary files a/icons/obj/food/containers.dmi and b/icons/obj/food/containers.dmi differ diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi index 2d0513d9027..dbbfeeb5db0 100644 Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ diff --git a/icons/obj/guns/energy.dmi b/icons/obj/guns/energy.dmi index a0c6981f7c8..812b0bfba23 100644 Binary files a/icons/obj/guns/energy.dmi and b/icons/obj/guns/energy.dmi differ diff --git a/icons/obj/guns/projectile.dmi b/icons/obj/guns/projectile.dmi index b1efd604cb5..891d4b0ee43 100644 Binary files a/icons/obj/guns/projectile.dmi and b/icons/obj/guns/projectile.dmi differ diff --git a/icons/obj/guns/toy.dmi b/icons/obj/guns/toy.dmi index 49444798d61..f23e7c0bc9f 100644 Binary files a/icons/obj/guns/toy.dmi and b/icons/obj/guns/toy.dmi differ diff --git a/icons/obj/lighting.dmi b/icons/obj/lighting.dmi index 60ffb6462f9..4886978ff48 100644 Binary files a/icons/obj/lighting.dmi and b/icons/obj/lighting.dmi differ diff --git a/icons/obj/machines/research.dmi b/icons/obj/machines/research.dmi index 65d9a87c7ed..97eba50512f 100644 Binary files a/icons/obj/machines/research.dmi and b/icons/obj/machines/research.dmi differ diff --git a/icons/obj/objects.dmi b/icons/obj/objects.dmi index f3cff7fbd9a..f9cb6e9ae6c 100644 Binary files a/icons/obj/objects.dmi and b/icons/obj/objects.dmi differ diff --git a/icons/obj/pipe-item.dmi b/icons/obj/pipe-item.dmi index e4322cc8e98..ac8eca417dd 100644 Binary files a/icons/obj/pipe-item.dmi and b/icons/obj/pipe-item.dmi differ diff --git a/icons/obj/power.dmi b/icons/obj/power.dmi index 7eb6484038c..d4e21d7e6c8 100644 Binary files a/icons/obj/power.dmi and b/icons/obj/power.dmi differ diff --git a/icons/obj/stationobjs.dmi b/icons/obj/stationobjs.dmi index 00eac418e67..34288086aa4 100755 Binary files a/icons/obj/stationobjs.dmi and b/icons/obj/stationobjs.dmi differ diff --git a/icons/obj/tiles.dmi b/icons/obj/tiles.dmi index 2ee30c21399..027f074a790 100644 Binary files a/icons/obj/tiles.dmi and b/icons/obj/tiles.dmi differ diff --git a/icons/obj/turrets.dmi b/icons/obj/turrets.dmi index 237133e1bc2..3612cccd515 100644 Binary files a/icons/obj/turrets.dmi and b/icons/obj/turrets.dmi differ diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi index bedb0238ab6..ef613913f9f 100755 Binary files a/icons/obj/vending.dmi and b/icons/obj/vending.dmi differ diff --git a/icons/turf/areas.dmi b/icons/turf/areas.dmi index ae3d0ff10ee..a7bcb5d44d0 100755 Binary files a/icons/turf/areas.dmi and b/icons/turf/areas.dmi differ diff --git a/icons/turf/floors.dmi b/icons/turf/floors.dmi index 223f5ccddd0..7e087e01b7b 100644 Binary files a/icons/turf/floors.dmi and b/icons/turf/floors.dmi differ diff --git a/paradise.dme b/paradise.dme index 87d2a7b506e..6295af0a3dd 100644 --- a/paradise.dme +++ b/paradise.dme @@ -11,7 +11,8 @@ // END_PREFERENCES // BEGIN_INCLUDE #include "_maps\__MAP_DEFINES.dm" -#include "_maps\cyberiad.dm" +#include "_maps\base_map.dm" +#include "_maps\map_datums.dm" #include "code\_compile_options.dm" #include "code\hub.dm" #include "code\world.dm" @@ -193,6 +194,7 @@ #include "code\controllers\subsystem\atoms.dm" #include "code\controllers\subsystem\blackbox.dm" #include "code\controllers\subsystem\changelog.dm" +#include "code\controllers\subsystem\chat_pings.dm" #include "code\controllers\subsystem\cleanup.dm" #include "code\controllers\subsystem\dbcore.dm" #include "code\controllers\subsystem\discord.dm" @@ -683,7 +685,6 @@ #include "code\game\machinery\computer\crew.dm" #include "code\game\machinery\computer\depot.dm" #include "code\game\machinery\computer\HolodeckControl.dm" -#include "code\game\machinery\computer\honkputer.dm" #include "code\game\machinery\computer\law.dm" #include "code\game\machinery\computer\medical.dm" #include "code\game\machinery\computer\message.dm" @@ -693,13 +694,10 @@ #include "code\game\machinery\computer\power.dm" #include "code\game\machinery\computer\prisoner.dm" #include "code\game\machinery\computer\robot.dm" -#include "code\game\machinery\computer\salvage_ship.dm" #include "code\game\machinery\computer\security.dm" #include "code\game\machinery\computer\sm_monitor.dm" -#include "code\game\machinery\computer\specops_shuttle.dm" #include "code\game\machinery\computer\station_alert.dm" #include "code\game\machinery\computer\store.dm" -#include "code\game\machinery\computer\syndicate_specops_shuttle.dm" #include "code\game\machinery\doors\airlock.dm" #include "code\game\machinery\doors\airlock_control.dm" #include "code\game\machinery\doors\airlock_electronics.dm" @@ -805,6 +803,7 @@ #include "code\game\objects\effects\spawners\airlock_spawner.dm" #include "code\game\objects\effects\spawners\bombspawner.dm" #include "code\game\objects\effects\spawners\gibspawner.dm" +#include "code\game\objects\effects\spawners\grouped_spawner.dm" #include "code\game\objects\effects\spawners\lootdrop.dm" #include "code\game\objects\effects\spawners\random_barrier.dm" #include "code\game\objects\effects\spawners\random_spawners.dm" @@ -820,7 +819,6 @@ #include "code\game\objects\items\bodybag.dm" #include "code\game\objects\items\candle.dm" #include "code\game\objects\items\cardboard_cutouts.dm" -#include "code\game\objects\items\changestone.dm" #include "code\game\objects\items\contraband.dm" #include "code\game\objects\items\control_wand.dm" #include "code\game\objects\items\crayons.dm" @@ -1181,7 +1179,6 @@ #include "code\modules\admin\verbs\freeze.dm" #include "code\modules\admin\verbs\getlogs.dm" #include "code\modules\admin\verbs\gimmick_team.dm" -#include "code\modules\admin\verbs\honksquad.dm" #include "code\modules\admin\verbs\infiltratorteam_syndicate.dm" #include "code\modules\admin\verbs\logging_view.dm" #include "code\modules\admin\verbs\map_template_loadverb.dm" @@ -1222,6 +1219,7 @@ #include "code\modules\antagonists\traitor\contractor\datums\rep_purchases\balloon.dm" #include "code\modules\antagonists\traitor\contractor\datums\rep_purchases\baton.dm" #include "code\modules\antagonists\traitor\contractor\datums\rep_purchases\blackout.dm" +#include "code\modules\antagonists\traitor\contractor\datums\rep_purchases\flare.dm" #include "code\modules\antagonists\traitor\contractor\datums\rep_purchases\fulton.dm" #include "code\modules\antagonists\traitor\contractor\datums\rep_purchases\pinpointer.dm" #include "code\modules\antagonists\traitor\contractor\datums\rep_purchases\reroll.dm" @@ -1343,6 +1341,7 @@ #include "code\modules\buildmode\submodes\save.dm" #include "code\modules\buildmode\submodes\throwing.dm" #include "code\modules\buildmode\submodes\variable_edit.dm" +#include "code\modules\client\2fa.dm" #include "code\modules\client\asset_cache.dm" #include "code\modules\client\client_defines.dm" #include "code\modules\client\client_procs.dm" @@ -1675,10 +1674,10 @@ #include "code\modules\lighting\lighting_setup.dm" #include "code\modules\lighting\lighting_source.dm" #include "code\modules\lighting\lighting_turf.dm" -#include "code\modules\map_fluff\cyberiad.dm" -#include "code\modules\map_fluff\delta.dm" -#include "code\modules\map_fluff\maps.dm" -#include "code\modules\map_fluff\metastation.dm" +#include "code\modules\mapping\base_map_datum.dm" +#include "code\modules\mapping\cyberiad.dm" +#include "code\modules\mapping\delta.dm" +#include "code\modules\mapping\metastation.dm" #include "code\modules\martial_arts\adminfu.dm" #include "code\modules\martial_arts\brawling.dm" #include "code\modules\martial_arts\cqc.dm" @@ -2454,6 +2453,7 @@ #include "code\modules\tgui\modules\atmos_control.dm" #include "code\modules\tgui\modules\crew_monitor.dm" #include "code\modules\tgui\modules\ert_manager.dm" +#include "code\modules\tgui\modules\generic_crew_manifest.dm" #include "code\modules\tgui\modules\law_manager.dm" #include "code\modules\tgui\modules\power_monitor.dm" #include "code\modules\tgui\modules\volume_mixer.dm" @@ -2489,7 +2489,6 @@ #include "code\modules\world_topic\_topic_base.dm" #include "code\modules\world_topic\adminmsg.dm" #include "code\modules\world_topic\announce.dm" -#include "code\modules\world_topic\hostannounce.dm" #include "code\modules\world_topic\manifest.dm" #include "code\modules\world_topic\ping.dm" #include "code\modules\world_topic\players.dm" diff --git a/sound/effects/kiss.ogg b/sound/effects/kiss.ogg deleted file mode 100644 index 699b13a8de8..00000000000 Binary files a/sound/effects/kiss.ogg and /dev/null differ diff --git a/tgui/packages/tgui-dev-server/package.json b/tgui/packages/tgui-dev-server/package.json index e397fe3e0bb..18fcd54a417 100644 --- a/tgui/packages/tgui-dev-server/package.json +++ b/tgui/packages/tgui-dev-server/package.json @@ -7,6 +7,6 @@ "glob": "^7.1.4", "source-map": "^0.7.3", "stacktrace-parser": "^0.1.7", - "ws": "^7.1.2" + "ws": "^7.4.6" } } diff --git a/tgui/packages/tgui/index.js b/tgui/packages/tgui/index.js index 247125bab5e..350f167659b 100644 --- a/tgui/packages/tgui/index.js +++ b/tgui/packages/tgui/index.js @@ -28,6 +28,7 @@ import './styles/themes/retro.scss'; import './styles/themes/safe.scss'; import './styles/themes/security.scss'; import './styles/themes/syndicate.scss'; +import './styles/themes/nologo.scss'; diff --git a/tgui/packages/tgui/interfaces/AtmosControl.js b/tgui/packages/tgui/interfaces/AtmosControl.js index 4ec6d35095e..bb2ccd07811 100644 --- a/tgui/packages/tgui/interfaces/AtmosControl.js +++ b/tgui/packages/tgui/interfaces/AtmosControl.js @@ -125,7 +125,7 @@ const AtmosControlMapView = (_properties, context) => { return ( setZoom(v)}> - {alarms.filter(a => a.z === 1).map(aa => ( + {alarms.filter(a => a.z === 2).map(aa => ( // The AA means air alarm, and nothing else { + return ( + + +
      + +
      +
      +
      + ); +}; diff --git a/tgui/packages/tgui/interfaces/SecurityRecords.js b/tgui/packages/tgui/interfaces/SecurityRecords.js index 2ded47aaaff..169444396a8 100644 --- a/tgui/packages/tgui/interfaces/SecurityRecords.js +++ b/tgui/packages/tgui/interfaces/SecurityRecords.js @@ -47,8 +47,6 @@ export const SecurityRecords = (properties, context) => { if (currentPage === 1) { body = ; } else if (currentPage === 2) { - body = ; - } else if (currentPage === 3) { body = ; } } @@ -82,15 +80,9 @@ const SecurityRecordsNavigation = (properties, context) => { List Records - act('page', { page: 2 })}> - - Record Maintenance - - {(currentPage === 3 && general && !general.empty) && ( + {(currentPage === 2 && general && !general.empty) && ( + selected={currentPage === 2}> Record: {general.fields[0].value} @@ -219,40 +211,6 @@ const SecurityRecordsActions = (properties, context) => { ); }; -const SecurityRecordsPageMaintenance = (properties, context) => { - const { act } = useBackend(context); - return ( - -